diff --git a/db/changes/10390-constitution/00-absenceType.sql b/db/changes/10390-constitution/00-absenceType.sql
deleted file mode 100644
index 7de22807c..000000000
--- a/db/changes/10390-constitution/00-absenceType.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE vn.absenceType
- SET code='halfPaidLeave'
- WHERE id=15 AND name='Permiso retribuido 1/2 día' AND rgb='#5151c0' AND code IS NULL AND permissionRate=NULL AND holidayEntitlementRate=0.50 AND discountRate=0.00;
diff --git a/db/changes/10390-constitution/00-acl.sql b/db/changes/10390-constitution/00-acl.sql
deleted file mode 100644
index f887a57f0..000000000
--- a/db/changes/10390-constitution/00-acl.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-INSERT INTO `salix`.`ACL`
- (model, property, accessType, permission, principalType, principalId)
- VALUES
- ('EntryObservation', '*', '*', 'ALLOW', 'ROLE', 'buyer'),
- ('LdapConfig', '*', '*', 'ALLOW', 'ROLE', 'sysadmin'),
- ('SambaConfig', '*', '*', 'ALLOW', 'ROLE', 'sysadmin'),
- ('ACL', '*', '*', 'ALLOW', 'ROLE', 'developer'),
- ('AccessToken', '*', '*', 'ALLOW', 'ROLE', 'developer'),
- ('MailAliasAccount', '*', '*', 'ALLOW', 'ROLE', 'marketing'),
- ('MailAliasAccount', '*', '*', 'ALLOW', 'ROLE', 'hr'),
- ('MailAlias', '*', '*', 'ALLOW', 'ROLE', 'hr'),
- ('MailForward', '*', '*', 'ALLOW', 'ROLE', 'marketing'),
- ('MailForward', '*', '*', 'ALLOW', 'ROLE', 'hr'),
- ('RoleInherit', '*', '*', 'ALLOW', 'ROLE', 'it'),
- ('RoleRole', '*', '*', 'ALLOW', 'ROLE', 'it'),
- ('AccountConfig', '*', '*', 'ALLOW', 'ROLE', 'sysadmin');
-
-UPDATE `salix`.`ACL`
- SET accessType='*', principalId='it'
- WHERE model = 'Role';
-
-DELETE FROM `salix`.`ACL`
- WHERE id IN (280, 281);
-
-UPDATE `salix`.`ACL`
- SET accessType='*', principalId='marketing'
- WHERE id=279;
diff --git a/db/changes/10390-constitution/00-defaultViewConfig.sql b/db/changes/10390-constitution/00-defaultViewConfig.sql
deleted file mode 100644
index c67b6fed0..000000000
--- a/db/changes/10390-constitution/00-defaultViewConfig.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE `salix`.`defaultViewConfig`
- SET `columns` = '{"intrastat":false,"description":false,"density":false,"isActive":false,
- "freightValue":false,"packageValue":false,"isIgnored":false,"price2":false,"ektFk":false,"weight":false,
- "size":false,"comissionValue":false,"landing":false}'
- WHERE tableCode = 'latestBuys'
\ No newline at end of file
diff --git a/db/changes/10390-constitution/00-department.sql b/db/changes/10390-constitution/00-department.sql
deleted file mode 100644
index e882296ad..000000000
--- a/db/changes/10390-constitution/00-department.sql
+++ /dev/null
@@ -1,33 +0,0 @@
-UPDATE vn.department
- SET notificationEmail='direccioncomercial@verdnatura.es'
- WHERE id=96;
-UPDATE vn.department
- SET notificationEmail='direccioncomercial@verdnatura.es'
- WHERE id=95;
-UPDATE vn.department
- SET notificationEmail='direccioncomercial@verdnatura.es'
- WHERE id=115;
-UPDATE vn.department
- SET notificationEmail='direccioncomercial@verdnatura.es'
- WHERE id=123;
-UPDATE vn.department
- SET notificationEmail='direccioncomercial@verdnatura.es'
- WHERE id=94;
-UPDATE vn.department
- SET notificationEmail='direccioncomercial@verdnatura.es'
- WHERE id=101;
-UPDATE vn.department
- SET notificationEmail='direccioncomercial@verdnatura.es'
- WHERE id=80;
-UPDATE vn.department
- SET notificationEmail='direccioncomercial@verdnatura.es'
- WHERE id=125;
-UPDATE vn.department
- SET notificationEmail='direccioncomercial@verdnatura.es'
- WHERE id=98;
-UPDATE vn.department
- SET notificationEmail='direccioncomercial@verdnatura.es'
- WHERE id=92;
-UPDATE vn.department
- SET notificationEmail=''
- WHERE id=43;
\ No newline at end of file
diff --git a/db/changes/10390-constitution/00-item_getBalance.sql b/db/changes/10390-constitution/00-item_getBalance.sql
deleted file mode 100644
index f0c4d1c41..000000000
--- a/db/changes/10390-constitution/00-item_getBalance.sql
+++ /dev/null
@@ -1,142 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`item_getBalance`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`item_getBalance`(IN vItemId int, IN vWarehouse int)
-BEGIN
- DECLARE vDateInventory DATETIME;
- DECLARE vCurdate DATE DEFAULT CURDATE();
- DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
-
- SELECT inventoried INTO vDateInventory FROM config;
- SET @a = 0;
- SET @currentLineFk = 0;
- SET @shipped = '';
-
- SELECT DATE(@shipped:= shipped) shipped,
- alertLevel,
- stateName,
- origin,
- reference,
- clientFk,
- name,
- `in` AS invalue,
- `out`,
- @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
- @currentLineFk := IF (@shipped < CURDATE()
- OR (@shipped = CURDATE() AND (isPicked OR alertLevel >= 2)),
- lineFk,@currentLineFk) lastPreparedLineFk,
- isTicket,
- lineFk,
- isPicked,
- clientType,
- claimFk
- FROM
- ( SELECT tr.landed AS shipped,
- b.quantity AS `in`,
- NULL AS `out`,
- al.id AS alertLevel,
- st.name AS stateName,
- s.name AS name,
- e.ref AS reference,
- e.id AS origin,
- s.id AS clientFk,
- IF(al.id = 3, TRUE, FALSE) isPicked,
- FALSE AS isTicket,
- b.id lineFk,
- NULL `order`,
- NULL AS clientType,
- NULL AS claimFk
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel tr ON tr.id = e.travelFk
- JOIN supplier s ON s.id = e.supplierFk
- JOIN alertLevel al ON al.id =
- CASE
- WHEN tr.shipped < CURDATE() THEN 3
- WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3
- ELSE 0
- END
- JOIN state st ON st.code = al.code
- WHERE tr.landed >= vDateInventory
- AND vWarehouse = tr.warehouseInFk
- AND b.itemFk = vItemId
- AND e.isInventory = FALSE
- AND e.isRaid = FALSE
- UNION ALL
-
- SELECT tr.shipped,
- NULL,
- b.quantity,
- al.id,
- st.name,
- s.name,
- e.ref,
- e.id,
- s.id,
- IF(al.id = 3, TRUE, FALSE),
- FALSE,
- b.id,
- NULL,
- NULL,
- NULL
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel tr ON tr.id = e.travelFk
- JOIN warehouse w ON w.id = tr.warehouseOutFk
- JOIN supplier s ON s.id = e.supplierFk
- JOIN alertLevel al ON al.id =
- CASE
- WHEN tr.shipped < CURDATE() THEN 3
- WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3
- ELSE 0
- END
- JOIN state st ON st.code = al.code
- WHERE tr.shipped >= vDateInventory
- AND vWarehouse =tr.warehouseOutFk
- AND s.id <> 4
- AND b.itemFk = vItemId
- AND e.isInventory = FALSE
- AND w.isFeedStock = FALSE
- AND e.isRaid = FALSE
- UNION ALL
-
- SELECT DATE(t.shipped),
- NULL,
- s.quantity,
- al.id,
- st.name,
- t.nickname,
- t.refFk,
- t.id,
- t.clientFk,
- stk.id,
- TRUE,
- s.id,
- st.`order`,
- ct.code,
- cb.claimFk
- FROM sale s
- JOIN ticket t ON t.id = s.ticketFk
- LEFT JOIN ticketState ts ON ts.ticket = t.id
- LEFT JOIN state st ON st.code = ts.code
- JOIN client c ON c.id = t.clientFk
- JOIN clientType ct ON ct.id = c.clientTypeFk
- JOIN alertLevel al ON al.id =
- CASE
- WHEN t.shipped < curdate() THEN 3
- WHEN t.shipped > util.dayEnd(curdate()) THEN 0
- ELSE IFNULL(ts.alertLevel, 0)
- END
- LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
- LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
- LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
- WHERE t.shipped >= vDateInventory
- AND s.itemFk = vItemId
- AND vWarehouse =t.warehouseFk
- ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC
- ) AS itemDiary;
-
-END;
-$$
-DELIMITER ;
diff --git a/db/changes/10390-constitution/00-payMethod.sql b/db/changes/10390-constitution/00-payMethod.sql
deleted file mode 100644
index 6e196af95..000000000
--- a/db/changes/10390-constitution/00-payMethod.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE vn.payMethod CHANGE ibanRequiredForClients isIbanRequiredForClients tinyint(3) DEFAULT 0 NULL;
-ALTER TABLE vn.payMethod CHANGE ibanRequiredForSuppliers isIbanRequiredForSuppliers tinyint(3) DEFAULT 0 NULL;
diff --git a/db/changes/10390-constitution/00-sale_recalcComponent.sql b/db/changes/10390-constitution/00-sale_recalcComponent.sql
deleted file mode 100644
index c28115470..000000000
--- a/db/changes/10390-constitution/00-sale_recalcComponent.sql
+++ /dev/null
@@ -1,120 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`sale_recalcComponent`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`sale_recalcComponent`(vOption INT)
-proc: BEGIN
-/**
- * Actualiza los componentes
- *
- * @table tmp.recalculateSales
- */
- DECLARE vShipped DATE;
- DECLARE vWarehouseFk SMALLINT;
- DECLARE vAgencyModeFk INT;
- DECLARE vAddressFk INT;
- DECLARE vTicketFk BIGINT;
- DECLARE vItemFk BIGINT;
- DECLARE vLanded DATE;
- DECLARE vIsEditable BOOLEAN;
- DECLARE vZoneFk INTEGER;
- DECLARE vOption INTEGER;
-
- DECLARE vSale INTEGER;
- DECLARE vDone BOOL DEFAULT FALSE;
-
- DECLARE vCur CURSOR FOR
- SELECT id from tmp.recalculateSales;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
- OPEN vCur;
-
- l: LOOP
- SET vDone = FALSE;
- FETCH vCur INTO vSale;
-
- IF vDone THEN
- LEAVE l;
- END IF;
-
- SELECT t.refFk IS NULL AND (IFNULL(ts.alertLevel, 0) = 0 OR s.price = 0),
- s.ticketFk,
- s.itemFk ,
- t.zoneFk,
- t.warehouseFk,
- t.shipped,
- t.addressFk,
- t.agencyModeFk,
- t.landed
- INTO vIsEditable,
- vTicketFk,
- vItemFk,
- vZoneFk,
- vWarehouseFk,
- vShipped,
- vAddressFk,
- vAgencyModeFk,
- vLanded
- FROM ticket t
- JOIN sale s ON s.ticketFk = t.id
- LEFT JOIN ticketState ts ON ts.ticketFk = t.id
- WHERE s.id = vSale;
-
- CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk, TRUE);
-
- IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) = 0 THEN
- CALL util.throw('There is no zone for these parameters');
- END IF;
-
- IF vLanded IS NULL OR vZoneFk IS NULL THEN
-
- UPDATE ticket t
- SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1)
- WHERE t.id = vTicketFk AND t.landed IS NULL;
-
- IF vZoneFk IS NULL THEN
- SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
- UPDATE ticket t
- SET t.zoneFk = vZoneFk
- WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
- END IF;
-
- END IF;
-
- DROP TEMPORARY TABLE tmp.zoneGetLanded;
-
- -- rellena la tabla buyUltimate con la ultima compra
- CALL buyUltimate (vWarehouseFk, vShipped);
-
- DELETE FROM tmp.buyUltimate WHERE itemFk != vItemFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
- CREATE TEMPORARY TABLE tmp.ticketLot
- SELECT vWarehouseFk warehouseFk, NULL available, vItemFk itemFk, buyFk, vZoneFk zoneFk
- FROM tmp.buyUltimate
- WHERE itemFk = vItemFk;
-
- CALL catalog_componentPrepare();
- CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale;
- CREATE TEMPORARY TABLE tmp.sale
- (PRIMARY KEY (saleFk)) ENGINE = MEMORY
- SELECT vSale saleFk,vWarehouseFk warehouseFk;
-
- IF vOption IS NULL THEN
- SET vOption = IF(vIsEditable, 1, 6);
- END IF;
-
- CALL ticketComponentUpdateSale(vOption);
- CALL catalog_componentPurge();
-
- DROP TEMPORARY TABLE tmp.buyUltimate;
- DROP TEMPORARY TABLE tmp.sale;
-
- END LOOP;
- CLOSE vCur;
-
-END$$
-DELIMITER ;
diff --git a/db/changes/10390-constitution/01-sale_calculateComponent.sql b/db/changes/10390-constitution/01-sale_calculateComponent.sql
deleted file mode 100644
index 97a154362..000000000
--- a/db/changes/10390-constitution/01-sale_calculateComponent.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`sale_calculateComponent`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`sale_calculateComponent`(vSale INT, vOption INT)
-proc: BEGIN
-/**
- * Crea tabla temporal para vn.sale_recalcComponent() para recalcular los componentes
- *
- * @param vSale Id de la venta
- * @param vOption indica en que componente pone el descuadre, NULL en casos habituales
- */
- DROP TEMPORARY TABLE IF EXISTS tmp.recalculateSales;
- CREATE TEMPORARY TABLE tmp.recalculateSales
- SELECT s.id
- FROM sale s
- WHERE s.id = vSale;
-
- CALL vn.sale_recalcComponent(vOption);
-
- DROP TEMPORARY TABLE tmp.recalculateSales;
-END$$
-DELIMITER ;
\ No newline at end of file
diff --git a/db/changes/10400-christmas/00-ACL.sql b/db/changes/10400-christmas/00-ACL.sql
deleted file mode 100644
index 4f87cb708..000000000
--- a/db/changes/10400-christmas/00-ACL.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
- VALUES ('Sale','payBack','WRITE','ALLOW','ROLE','employee');
diff --git a/db/changes/10400-christmas/00-payMethod_hasVerified.sql b/db/changes/10400-christmas/00-payMethod_hasVerified.sql
deleted file mode 100644
index 280a9e097..000000000
--- a/db/changes/10400-christmas/00-payMethod_hasVerified.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `vn`.`payMethod` ADD hasVerified TINYINT(1) DEFAULT 0 NULL;
\ No newline at end of file
diff --git a/db/changes/10400-christmas/00-ticket_doRefund.sql b/db/changes/10400-christmas/00-ticket_doRefund.sql
deleted file mode 100644
index 1c1faf315..000000000
--- a/db/changes/10400-christmas/00-ticket_doRefund.sql
+++ /dev/null
@@ -1,90 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticket_doRefund`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doRefund`(IN vOriginTicket INT, OUT vNewTicket INT)
-BEGIN
-
- DECLARE vDone BIT DEFAULT 0;
- DECLARE vCustomer MEDIUMINT;
- DECLARE vWarehouse TINYINT;
- DECLARE vCompany MEDIUMINT;
- DECLARE vAddress MEDIUMINT;
- DECLARE vRefundAgencyMode INT;
- DECLARE vItemFk INT;
- DECLARE vQuantity DECIMAL (10,2);
- DECLARE vConcept VARCHAR(50);
- DECLARE vPrice DECIMAL (10,2);
- DECLARE vDiscount TINYINT;
- DECLARE vSaleNew INT;
- DECLARE vSaleMain INT;
- DECLARE vZoneFk INT;
-
- DECLARE vRsMainTicket CURSOR FOR
- SELECT *
- FROM tmp.sale;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
-
- SELECT id INTO vRefundAgencyMode
- FROM agencyMode WHERE `name` = 'ABONO';
-
- SELECT clientFk, warehouseFk, companyFk, addressFk
- INTO vCustomer, vWarehouse, vCompany, vAddress
- FROM ticket
- WHERE id = vOriginTicket;
-
- SELECT id INTO vZoneFk
- FROM zone WHERE agencyModeFk = vRefundAgencyMode
- LIMIT 1;
-
- INSERT INTO vn.ticket (
- clientFk,
- shipped,
- addressFk,
- agencyModeFk,
- nickname,
- warehouseFk,
- companyFk,
- landed,
- zoneFk
- )
- SELECT
- vCustomer,
- CURDATE(),
- vAddress,
- vRefundAgencyMode,
- a.nickname,
- vWarehouse,
- vCompany,
- CURDATE(),
- vZoneFk
- FROM address a
- WHERE a.id = vAddress;
-
- SET vNewTicket = LAST_INSERT_ID();
-
- SET vDone := 0;
- OPEN vRsMainTicket ;
- FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
- WHILE NOT vDone DO
-
- INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount)
- VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount );
-
- SET vSaleNew = LAST_INSERT_ID();
-
- INSERT INTO vn.saleComponent(saleFk,componentFk,`value`)
- SELECT vSaleNew,componentFk,`value`
- FROM vn.saleComponent
- WHERE saleFk = vSaleMain;
-
- FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
- END WHILE;
- CLOSE vRsMainTicket;
-
-END;
-$$
-DELIMITER ;
\ No newline at end of file
diff --git a/db/changes/10400-christmas/00-updateDepartment.sql b/db/changes/10400-christmas/00-updateDepartment.sql
deleted file mode 100644
index ce46220ca..000000000
--- a/db/changes/10400-christmas/00-updateDepartment.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `vn`.`department`
- SET `notificationEmail` = 'finanzas@verdnatura.es'
- WHERE `name` = 'FINANZAS';
\ No newline at end of file
diff --git a/db/changes/10400-christmas/00-updateSupplier.sql b/db/changes/10400-christmas/00-updateSupplier.sql
deleted file mode 100644
index 49fa2eb15..000000000
--- a/db/changes/10400-christmas/00-updateSupplier.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `vn`.`supplier`
- SET isPayMethodChecked = TRUE;
\ No newline at end of file
diff --git a/db/changes/10400-christmas/01-payment_afterInsert.sql b/db/changes/10400-christmas/01-payment_afterInsert.sql
deleted file mode 100644
index f422ebce2..000000000
--- a/db/changes/10400-christmas/01-payment_afterInsert.sql
+++ /dev/null
@@ -1,33 +0,0 @@
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`payment_afterInsert` AFTER INSERT ON `payment` FOR EACH ROW
-BEGIN
- DECLARE vIsPayMethodChecked BOOLEAN;
- DECLARE vEmail VARCHAR(150);
-
- SELECT isPayMethodChecked INTO vIsPayMethodChecked
- FROM supplier
- WHERE id = NEW.supplierFk;
-
-
- IF vIsPayMethodChecked = FALSE THEN
-
- SELECT notificationEmail INTO vEmail
- FROM department
- WHERE name = 'FINANZAS';
-
- CALL mail_insert(
- vEmail,
- NULL,
- 'Pago con método sin verificar',
- CONCAT(
- 'Se ha realizado el pago ',
- NEW.id,
- ' al proveedor ',
- NEW.supplierFk,
- ' con el método de pago sin verificar.'
- )
- );
- END IF;
-END$$
-DELIMITER ;
diff --git a/db/changes/10400-christmas/01-supplier_beforeUpdate.sql b/db/changes/10400-christmas/01-supplier_beforeUpdate.sql
deleted file mode 100644
index b3ffccf9c..000000000
--- a/db/changes/10400-christmas/01-supplier_beforeUpdate.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-DROP TRIGGER IF EXISTS `vn`.`supplier_beforeUpdate`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`supplier_beforeUpdate`
- BEFORE UPDATE ON `vn`.`supplier` FOR EACH ROW
-BEGIN
- DECLARE vHasChange BOOL DEFAULT FALSE;
- DECLARE vPayMethodHasVerified BOOL;
-
- SELECT hasVerified INTO vPayMethodHasVerified
- FROM payMethod
- WHERE id = NEW.payMethodFk;
-
- SET vHasChange = (NEW.payDemFk <> OLD.payDemFk) OR (NEW.payDay <> OLD.payDay);
-
- IF vPayMethodHasVerified AND !vHasChange THEN
- SET vHasChange = (NEW.payMethodFk <> OLD.payMethodFk);
- END IF;
-
- IF vHasChange THEN
- SET NEW.isPayMethodChecked = FALSE;
- END IF;
-
-END$$
-DELIMITER ;
diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql
index e11cf44d5..ce47886f8 100644
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
@@ -22,7 +22,7 @@ USE `util`;
LOCK TABLES `config` WRITE;
/*!40000 ALTER TABLE `config` DISABLE KEYS */;
-INSERT INTO `config` VALUES (1,'10390',0,'production',NULL);
+INSERT INTO `config` VALUES (1,'10411',0,'production',NULL);
/*!40000 ALTER TABLE `config` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -34,7 +34,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-01-13 7:50:24
+-- Dump completed on 2022-03-14 10:27:51
USE `account`;
-- MariaDB dump 10.19 Distrib 10.5.12-MariaDB, for debian-linux-gnu (x86_64)
--
@@ -58,7 +58,7 @@ USE `account`;
LOCK TABLES `role` WRITE;
/*!40000 ALTER TABLE `role` DISABLE KEYS */;
-INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 07:04:58','2021-06-30 13:29:30'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',1,'2018-02-26 15:28:23','2021-02-12 09:42:35'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45'),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10'),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01'),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07'),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05'),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08'),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26'),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56'),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23'),(69,'coolerAssist','Empleado cámara con permiso compras',1,'2020-02-05 12:36:09','2020-02-05 12:36:09'),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25'),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07'),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46'),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27'),(74,'userPhotos','Privilegios para subir fotos de usuario',1,'2021-02-03 10:24:27','2021-02-03 10:24:27'),(75,'catalogPhotos','Privilegios para subir fotos del catálogo',1,'2021-02-03 10:24:27','2021-02-03 10:24:27'),(76,'chat','Rol para utilizar el rocket chat',1,'2020-11-27 13:06:50','2020-12-17 07:49:41'),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07'),(101,'buyerBoss','Jefe del departamento de compras',1,'2021-06-16 09:53:17','2021-06-16 09:53:17'),(102,'preservedBoss','Responsable preservado',1,'2021-09-14 13:45:37','2021-09-14 13:45:37'),(103,'it','Departamento de informática',1,'2021-11-11 09:48:22','2021-11-11 09:48:22'),(104,'itBoss','Jefe de departamento de informática',1,'2021-11-11 09:48:49','2021-11-11 09:48:49'),(105,'grant','Adjudicar roles a usuarios',1,'2021-11-11 12:41:09','2021-11-11 12:41:09'),(106,'ext','Usuarios externos de la Base de datos',1,'2021-11-23 14:51:16','2021-11-23 14:51:16');
+INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 07:04:58','2021-06-30 13:29:30'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',1,'2018-02-26 15:28:23','2021-02-12 09:42:35'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45'),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10'),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01'),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07'),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05'),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08'),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26'),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56'),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23'),(69,'coolerAssist','Empleado cámara con permiso compras',1,'2020-02-05 12:36:09','2020-02-05 12:36:09'),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25'),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07'),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46'),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27'),(74,'userPhotos','Privilegios para subir fotos de usuario',1,'2021-02-03 10:24:27','2021-02-03 10:24:27'),(75,'catalogPhotos','Privilegios para subir fotos del catálogo',1,'2021-02-03 10:24:27','2021-02-03 10:24:27'),(76,'chat','Rol para utilizar el rocket chat',1,'2020-11-27 13:06:50','2020-12-17 07:49:41'),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07'),(101,'buyerBoss','Jefe del departamento de compras',1,'2021-06-16 09:53:17','2021-06-16 09:53:17'),(102,'preservedBoss','Responsable preservado',1,'2021-09-14 13:45:37','2021-09-14 13:45:37'),(103,'it','Departamento de informática',1,'2021-11-11 09:48:22','2021-11-11 09:48:22'),(104,'itBoss','Jefe de departamento de informática',1,'2021-11-11 09:48:49','2021-11-11 09:48:49'),(105,'grant','Adjudicar roles a usuarios',1,'2021-11-11 12:41:09','2021-11-11 12:41:09'),(106,'ext','Usuarios externos de la Base de datos',1,'2021-11-23 14:51:16','2021-11-23 14:51:16'),(107,'productionPlus','Creado para pepe por orden de Juanvi',1,'2022-02-08 06:47:10','2022-02-08 06:47:10');
/*!40000 ALTER TABLE `role` ENABLE KEYS */;
UNLOCK TABLES;
@@ -68,7 +68,7 @@ UNLOCK TABLES;
LOCK TABLES `roleInherit` WRITE;
/*!40000 ALTER TABLE `roleInherit` DISABLE KEYS */;
-INSERT INTO `roleInherit` VALUES (1,1,2),(2,1,3),(3,1,70),(4,2,11),(5,3,11),(6,5,1),(7,5,21),(8,5,33),(124,5,76),(167,9,103),(10,11,6),(11,13,1),(12,15,35),(143,15,49),(150,15,56),(114,15,76),(14,16,13),(15,16,15),(127,16,76),(16,17,20),(17,17,37),(18,17,39),(19,17,64),(145,17,67),(136,17,76),(20,18,1),(132,18,76),(21,19,21),(22,20,13),(23,20,16),(24,20,65),(134,20,76),(25,21,13),(26,21,18),(27,21,53),(131,21,76),(28,22,13),(29,22,21),(30,30,5),(31,30,20),(32,30,22),(33,30,53),(34,30,64),(118,30,76),(35,31,1),(36,32,1),(37,34,1),(38,34,13),(39,34,33),(40,35,1),(142,35,75),(129,35,76),(41,36,44),(42,36,47),(43,37,1),(139,37,74),(125,37,76),(146,38,13),(44,38,37),(45,38,64),(126,38,76),(46,39,5),(47,39,21),(48,39,57),(115,39,76),(49,40,1),(50,40,49),(51,41,13),(52,41,35),(53,41,40),(135,41,76),(54,42,35),(55,42,49),(128,42,76),(56,43,13),(57,43,42),(58,44,1),(59,45,13),(60,45,44),(61,47,1),(62,48,13),(153,48,35),(63,48,47),(64,49,36),(65,49,58),(66,50,13),(67,50,21),(68,50,35),(69,50,49),(70,50,57),(71,50,59),(133,50,76),(72,51,1),(140,51,74),(141,51,75),(73,52,13),(74,52,19),(75,52,35),(76,52,51),(137,52,76),(77,53,1),(78,54,1),(79,55,13),(80,55,54),(81,56,1),(82,57,13),(83,57,56),(138,57,76),(84,58,1),(85,59,13),(109,59,50),(87,60,5),(88,60,37),(89,60,50),(90,60,57),(130,60,76),(91,61,13),(92,61,36),(93,65,19),(94,65,35),(95,65,50),(117,65,76),(168,66,9),(237,66,103),(97,67,5),(98,67,37),(99,69,35),(152,69,47),(101,70,11),(102,71,1),(103,71,58),(104,72,13),(105,72,18),(106,73,5),(108,73,19),(107,73,64),(148,101,13),(147,101,35),(154,102,1),(173,103,1),(194,103,2),(181,103,3),(179,103,5),(201,103,6),(176,103,11),(231,103,13),(212,103,15),(213,103,16),(178,103,17),(230,103,18),(229,103,19),(238,103,20),(228,103,21),(232,103,22),(199,103,30),(200,103,31),(197,103,32),(207,103,33),(182,103,34),(186,103,35),(225,103,36),(204,103,37),(205,103,38),(177,103,39),(202,103,40),(203,103,41),(183,103,42),(184,103,43),(174,103,44),(175,103,45),(191,103,47),(193,103,48),(222,103,49),(224,103,50),(215,103,51),(216,103,52),(206,103,53),(210,103,54),(211,103,55),(195,103,56),(196,103,57),(219,103,58),(220,103,59),(223,103,60),(226,103,61),(185,103,64),(218,103,65),(180,103,67),(192,103,69),(233,103,70),(189,103,71),(190,103,72),(198,103,73),(234,103,74),(188,103,75),(172,103,76),(187,103,101),(221,103,102),(171,104,9),(170,104,66),(169,104,100),(166,104,103),(239,106,11);
+INSERT INTO `roleInherit` VALUES (1,1,2),(2,1,3),(3,1,70),(4,2,11),(5,3,11),(6,5,1),(7,5,21),(8,5,33),(124,5,76),(167,9,103),(10,11,6),(11,13,1),(12,15,35),(143,15,49),(150,15,56),(114,15,76),(14,16,13),(15,16,15),(127,16,76),(16,17,20),(17,17,37),(18,17,39),(19,17,64),(145,17,67),(136,17,76),(20,18,1),(132,18,76),(21,19,21),(242,20,9),(22,20,13),(23,20,16),(24,20,65),(134,20,76),(25,21,13),(26,21,18),(27,21,53),(241,21,72),(131,21,76),(28,22,13),(29,22,21),(30,30,5),(31,30,20),(32,30,22),(33,30,53),(34,30,64),(118,30,76),(35,31,1),(36,32,1),(37,34,1),(38,34,13),(39,34,33),(40,35,1),(142,35,75),(129,35,76),(41,36,44),(42,36,47),(43,37,1),(139,37,74),(125,37,76),(146,38,13),(44,38,37),(45,38,64),(126,38,76),(46,39,5),(47,39,21),(48,39,57),(115,39,76),(49,40,1),(50,40,49),(51,41,13),(52,41,35),(53,41,40),(135,41,76),(54,42,35),(55,42,49),(128,42,76),(56,43,13),(57,43,42),(58,44,1),(59,45,13),(60,45,44),(61,47,1),(62,48,13),(153,48,35),(63,48,47),(64,49,36),(65,49,58),(66,50,13),(67,50,21),(68,50,35),(69,50,49),(70,50,57),(71,50,59),(133,50,76),(72,51,1),(140,51,74),(141,51,75),(73,52,13),(74,52,19),(75,52,35),(76,52,51),(137,52,76),(77,53,1),(78,54,1),(79,55,13),(80,55,54),(81,56,1),(82,57,13),(245,57,33),(83,57,56),(138,57,76),(84,58,1),(85,59,13),(109,59,50),(87,60,5),(89,60,50),(90,60,57),(130,60,76),(91,61,13),(92,61,36),(93,65,19),(94,65,35),(95,65,50),(117,65,76),(168,66,9),(237,66,103),(97,67,5),(98,67,37),(99,69,35),(152,69,47),(101,70,11),(102,71,1),(103,71,58),(104,72,13),(105,72,18),(106,73,5),(108,73,19),(107,73,64),(148,101,13),(147,101,35),(154,102,1),(173,103,1),(194,103,2),(181,103,3),(179,103,5),(201,103,6),(176,103,11),(231,103,13),(212,103,15),(213,103,16),(178,103,17),(230,103,18),(229,103,19),(238,103,20),(228,103,21),(232,103,22),(199,103,30),(200,103,31),(197,103,32),(207,103,33),(182,103,34),(186,103,35),(225,103,36),(204,103,37),(205,103,38),(177,103,39),(202,103,40),(203,103,41),(183,103,42),(184,103,43),(174,103,44),(175,103,45),(191,103,47),(193,103,48),(222,103,49),(224,103,50),(215,103,51),(216,103,52),(206,103,53),(210,103,54),(211,103,55),(195,103,56),(196,103,57),(219,103,58),(220,103,59),(223,103,60),(226,103,61),(185,103,64),(218,103,65),(180,103,67),(192,103,69),(233,103,70),(189,103,71),(190,103,72),(198,103,73),(234,103,74),(188,103,75),(172,103,76),(187,103,101),(221,103,102),(171,104,9),(170,104,66),(169,104,100),(166,104,103),(239,106,11),(240,107,60);
/*!40000 ALTER TABLE `roleInherit` ENABLE KEYS */;
UNLOCK TABLES;
@@ -78,7 +78,7 @@ UNLOCK TABLES;
LOCK TABLES `roleRole` WRITE;
/*!40000 ALTER TABLE `roleRole` DISABLE KEYS */;
-INSERT INTO `roleRole` VALUES (63981,1,1),(63982,1,2),(63983,1,3),(63986,1,6),(63985,1,11),(63984,1,70),(63900,2,2),(63902,2,6),(63901,2,11),(63785,3,3),(63787,3,6),(63786,3,11),(63757,5,1),(63764,5,2),(63763,5,3),(63756,5,5),(63768,5,6),(63767,5,11),(63761,5,13),(63765,5,18),(63758,5,21),(63759,5,33),(63766,5,53),(63762,5,70),(63760,5,76),(64053,6,6),(63922,9,1),(63923,9,2),(63924,9,3),(63925,9,5),(63926,9,6),(63920,9,9),(63927,9,11),(63928,9,13),(63929,9,15),(63930,9,16),(63931,9,17),(63932,9,18),(63933,9,19),(63934,9,20),(63935,9,21),(63936,9,22),(63937,9,30),(63938,9,31),(63939,9,32),(63940,9,33),(63941,9,34),(63942,9,35),(63943,9,36),(63944,9,37),(63945,9,38),(63946,9,39),(63947,9,40),(63948,9,41),(63949,9,42),(63950,9,43),(63951,9,44),(63952,9,45),(63953,9,47),(63954,9,48),(63955,9,49),(63956,9,50),(63957,9,51),(63958,9,52),(63959,9,53),(63960,9,54),(63961,9,55),(63962,9,56),(63963,9,57),(63964,9,58),(63965,9,59),(63966,9,60),(63967,9,61),(63968,9,64),(63969,9,65),(63970,9,67),(63971,9,69),(63972,9,70),(63973,9,71),(63974,9,72),(63975,9,73),(63976,9,74),(63977,9,75),(63978,9,76),(63979,9,101),(63980,9,102),(63921,9,103),(63704,11,6),(63703,11,11),(64644,13,1),(64645,13,2),(64646,13,3),(64649,13,6),(64648,13,11),(64643,13,13),(64647,13,70),(64263,15,1),(64267,15,2),(64266,15,3),(64270,15,6),(64269,15,11),(64255,15,15),(64256,15,35),(64261,15,36),(64264,15,44),(64268,15,47),(64257,15,49),(64258,15,56),(64260,15,58),(64265,15,70),(64262,15,75),(64259,15,76),(64277,16,1),(64282,16,2),(64281,16,3),(64288,16,6),(64287,16,11),(64272,16,13),(64273,16,15),(64271,16,16),(64276,16,35),(64283,16,36),(64286,16,44),(64285,16,47),(64275,16,49),(64278,16,56),(64284,16,58),(64280,16,70),(64279,16,75),(64274,16,76),(63730,17,1),(63739,17,2),(63738,17,3),(63728,17,5),(63751,17,6),(63747,17,11),(63733,17,13),(63743,17,15),(63732,17,16),(63721,17,17),(63744,17,18),(63742,17,19),(63722,17,20),(63734,17,21),(63736,17,33),(63741,17,35),(63753,17,36),(63723,17,37),(63724,17,39),(63755,17,44),(63754,17,47),(63750,17,49),(63740,17,50),(63745,17,53),(63746,17,56),(63735,17,57),(63752,17,58),(63748,17,59),(63725,17,64),(63731,17,65),(63726,17,67),(63737,17,70),(63729,17,74),(63749,17,75),(63727,17,76),(64574,18,1),(64577,18,2),(64576,18,3),(64580,18,6),(64579,18,11),(64573,18,18),(64578,18,70),(64575,18,76),(64567,19,1),(64570,19,2),(64569,19,3),(64572,19,6),(64571,19,11),(64563,19,13),(64564,19,18),(64561,19,19),(64562,19,21),(64565,19,53),(64568,19,70),(64566,19,76),(64297,20,1),(64303,20,2),(64302,20,3),(64315,20,6),(64312,20,11),(64290,20,13),(64296,20,15),(64291,20,16),(64309,20,18),(64295,20,19),(64289,20,20),(64304,20,21),(64294,20,35),(64311,20,36),(64314,20,44),(64313,20,47),(64300,20,49),(64298,20,50),(64308,20,53),(64299,20,56),(64306,20,57),(64310,20,58),(64307,20,59),(64292,20,65),(64301,20,70),(64305,20,75),(64293,20,76),(64555,21,1),(64558,21,2),(64557,21,3),(64560,21,6),(64559,21,11),(64551,21,13),(64552,21,18),(64550,21,21),(64553,21,53),(64556,21,70),(64554,21,76),(64654,22,1),(64659,22,2),(64658,22,3),(64661,22,6),(64660,22,11),(64651,22,13),(64653,22,18),(64652,22,21),(64650,22,22),(64655,22,53),(64657,22,70),(64656,22,76),(64025,30,1),(64031,30,2),(64030,30,3),(64014,30,5),(64042,30,6),(64039,30,11),(64022,30,13),(64027,30,15),(64021,30,16),(64028,30,18),(64026,30,19),(64015,30,20),(64024,30,21),(64016,30,22),(64013,30,30),(64023,30,33),(64032,30,35),(64041,30,36),(64044,30,44),(64043,30,47),(64038,30,49),(64033,30,50),(64017,30,53),(64037,30,56),(64035,30,57),(64040,30,58),(64034,30,59),(64018,30,64),(64020,30,65),(64029,30,70),(64036,30,75),(64019,30,76),(64046,31,1),(64047,31,2),(64048,31,3),(64051,31,6),(64050,31,11),(64045,31,31),(64049,31,70),(63988,32,1),(63989,32,2),(63990,32,3),(63993,32,6),(63992,32,11),(63987,32,32),(63991,32,70),(64111,33,33),(63789,34,1),(63794,34,2),(63793,34,3),(63796,34,6),(63795,34,11),(63790,34,13),(63791,34,33),(63788,34,34),(63792,34,70),(63831,35,1),(63836,35,2),(63835,35,3),(63838,35,6),(63837,35,11),(63830,35,35),(63834,35,70),(63832,35,75),(63833,35,76),(64466,36,1),(64468,36,2),(64467,36,3),(64471,36,6),(64470,36,11),(64463,36,36),(64464,36,44),(64465,36,47),(64469,36,70),(64084,37,1),(64089,37,2),(64088,37,3),(64091,37,6),(64090,37,11),(64083,37,37),(64087,37,70),(64085,37,74),(64086,37,76),(64098,38,1),(64101,38,2),(64100,38,3),(64103,38,6),(64102,38,11),(64093,38,13),(64094,38,37),(64092,38,38),(64095,38,64),(64099,38,70),(64097,38,74),(64096,38,76),(63713,39,1),(63718,39,2),(63717,39,3),(63706,39,5),(63720,39,6),(63719,39,11),(63711,39,13),(63710,39,18),(63707,39,21),(63712,39,33),(63705,39,39),(63714,39,53),(63715,39,56),(63708,39,57),(63716,39,70),(63709,39,76),(64055,40,1),(64058,40,2),(64057,40,3),(64065,40,6),(64064,40,11),(64060,40,36),(64054,40,40),(64063,40,44),(64062,40,47),(64056,40,49),(64061,40,58),(64059,40,70),(64073,41,1),(64077,41,2),(64076,41,3),(64082,41,6),(64081,41,11),(64067,41,13),(64068,41,35),(64074,41,36),(64069,41,40),(64066,41,41),(64080,41,44),(64079,41,47),(64071,41,49),(64078,41,58),(64075,41,70),(64072,41,75),(64070,41,76),(63803,42,1),(63808,42,2),(63807,42,3),(63811,42,6),(63810,42,11),(63798,42,35),(63801,42,36),(63797,42,42),(63805,42,44),(63809,42,47),(63799,42,49),(63804,42,58),(63806,42,70),(63802,42,75),(63800,42,76),(63816,43,1),(63822,43,2),(63821,43,3),(63828,43,6),(63827,43,11),(63813,43,13),(63815,43,35),(63823,43,36),(63814,43,42),(63812,43,43),(63826,43,44),(63825,43,47),(63817,43,49),(63824,43,58),(63820,43,70),(63819,43,75),(63818,43,76),(63688,44,1),(63689,44,2),(63690,44,3),(63693,44,6),(63692,44,11),(63687,44,44),(63691,44,70),(63697,45,1),(63699,45,2),(63698,45,3),(63702,45,6),(63701,45,11),(63695,45,13),(63696,45,44),(63694,45,45),(63700,45,70),(63871,47,1),(63872,47,2),(63873,47,3),(63876,47,6),(63875,47,11),(63870,47,47),(63874,47,70),(63894,48,1),(63897,48,2),(63896,48,3),(63899,48,6),(63898,48,11),(63889,48,13),(63890,48,35),(63891,48,47),(63888,48,48),(63895,48,70),(63893,48,75),(63892,48,76),(64408,49,1),(64411,49,2),(64410,49,3),(64413,49,6),(64412,49,11),(64404,49,36),(64407,49,44),(64406,49,47),(64403,49,49),(64405,49,58),(64409,49,70),(64455,50,1),(64460,50,2),(64459,50,3),(64462,50,6),(64461,50,11),(64442,50,13),(64454,50,18),(64443,50,21),(64444,50,35),(64451,50,36),(64457,50,44),(64456,50,47),(64445,50,49),(64441,50,50),(64453,50,53),(64449,50,56),(64446,50,57),(64450,50,58),(64447,50,59),(64458,50,70),(64452,50,75),(64448,50,76),(64317,51,1),(64322,51,2),(64321,51,3),(64324,51,6),(64323,51,11),(64316,51,51),(64320,51,70),(64318,51,74),(64319,51,75),(64334,52,1),(64339,52,2),(64338,52,3),(64341,52,6),(64340,52,11),(64326,52,13),(64336,52,18),(64327,52,19),(64333,52,21),(64328,52,35),(64329,52,51),(64325,52,52),(64335,52,53),(64337,52,70),(64331,52,74),(64332,52,75),(64330,52,76),(64105,53,1),(64106,53,2),(64107,53,3),(64110,53,6),(64109,53,11),(64104,53,53),(64108,53,70),(64240,54,1),(64241,54,2),(64242,54,3),(64245,54,6),(64244,54,11),(64239,54,54),(64243,54,70),(64249,55,1),(64251,55,2),(64250,55,3),(64254,55,6),(64253,55,11),(64247,55,13),(64248,55,54),(64246,55,55),(64252,55,70),(63904,56,1),(63905,56,2),(63906,56,3),(63909,56,6),(63908,56,11),(63903,56,56),(63907,56,70),(63914,57,1),(63917,57,2),(63916,57,3),(63919,57,6),(63918,57,11),(63911,57,13),(63912,57,56),(63910,57,57),(63915,57,70),(63913,57,76),(64368,58,1),(64369,58,2),(64370,58,3),(64373,58,6),(64372,58,11),(64367,58,58),(64371,58,70),(64378,59,1),(64388,59,2),(64387,59,3),(64395,59,6),(64394,59,11),(64375,59,13),(64385,59,18),(64377,59,21),(64379,59,35),(64389,59,36),(64393,59,44),(64392,59,47),(64380,59,49),(64376,59,50),(64384,59,53),(64391,59,56),(64381,59,57),(64390,59,58),(64374,59,59),(64386,59,70),(64383,59,75),(64382,59,76),(64424,60,1),(64436,60,2),(64435,60,3),(64415,60,5),(64440,60,6),(64439,60,11),(64420,60,13),(64433,60,18),(64423,60,21),(64422,60,33),(64425,60,35),(64430,60,36),(64416,60,37),(64438,60,44),(64437,60,47),(64426,60,49),(64417,60,50),(64432,60,53),(64428,60,56),(64418,60,57),(64429,60,58),(64427,60,59),(64414,60,60),(64434,60,70),(64421,60,74),(64431,60,75),(64419,60,76),(64476,61,1),(64480,61,2),(64479,61,3),(64482,61,6),(64481,61,11),(64473,61,13),(64474,61,36),(64475,61,44),(64477,61,47),(64472,61,61),(64478,61,70),(64342,62,62),(63829,64,64),(64350,65,1),(64359,65,2),(64358,65,3),(64366,65,6),(64365,65,11),(64348,65,13),(64361,65,18),(64344,65,19),(64351,65,21),(64345,65,35),(64356,65,36),(64364,65,44),(64363,65,47),(64352,65,49),(64346,65,50),(64360,65,53),(64362,65,56),(64353,65,57),(64355,65,58),(64354,65,59),(64343,65,65),(64357,65,70),(64349,65,75),(64347,65,76),(64585,66,1),(64584,66,2),(64586,66,3),(64587,66,5),(64588,66,6),(64582,66,9),(64589,66,11),(64590,66,13),(64591,66,15),(64592,66,16),(64593,66,17),(64594,66,18),(64595,66,19),(64596,66,20),(64597,66,21),(64598,66,22),(64599,66,30),(64600,66,31),(64601,66,32),(64602,66,33),(64603,66,34),(64604,66,35),(64605,66,36),(64606,66,37),(64607,66,38),(64608,66,39),(64609,66,40),(64610,66,41),(64611,66,42),(64612,66,43),(64613,66,44),(64614,66,45),(64615,66,47),(64616,66,48),(64617,66,49),(64618,66,50),(64619,66,51),(64620,66,52),(64621,66,53),(64622,66,54),(64623,66,55),(64624,66,56),(64625,66,57),(64626,66,58),(64627,66,59),(64628,66,60),(64629,66,61),(64630,66,64),(64631,66,65),(64581,66,66),(64632,66,67),(64633,66,69),(64634,66,70),(64635,66,71),(64636,66,72),(64637,66,73),(64638,66,74),(64639,66,75),(64640,66,76),(64641,66,101),(64642,66,102),(64583,66,103),(63773,67,1),(63781,67,2),(63780,67,3),(63770,67,5),(63784,67,6),(63783,67,11),(63778,67,13),(63777,67,18),(63772,67,21),(63774,67,33),(63771,67,37),(63782,67,53),(63769,67,67),(63779,67,70),(63776,67,74),(63775,67,76),(63881,69,1),(63885,69,2),(63884,69,3),(63887,69,6),(63886,69,11),(63878,69,35),(63879,69,47),(63877,69,69),(63883,69,70),(63880,69,75),(63882,69,76),(64664,70,6),(64663,70,11),(64662,70,70),(63853,71,1),(63856,71,2),(63855,71,3),(63859,71,6),(63858,71,11),(63854,71,58),(63857,71,70),(63852,71,71),(63864,72,1),(63866,72,2),(63865,72,3),(63869,72,6),(63868,72,11),(63861,72,13),(63862,72,18),(63867,72,70),(63860,72,72),(63863,72,76),(64003,73,1),(64008,73,2),(64007,73,3),(63998,73,5),(64012,73,6),(64011,73,11),(64005,73,13),(64009,73,18),(63999,73,19),(64002,73,21),(64001,73,33),(64010,73,53),(64000,73,64),(64006,73,70),(63997,73,73),(64004,73,76),(64665,74,74),(63850,75,75),(63851,76,76),(64509,100,1),(64505,100,2),(64491,100,3),(64489,100,5),(64516,100,6),(64508,100,9),(64486,100,11),(64546,100,13),(64527,100,15),(64528,100,16),(64488,100,17),(64544,100,18),(64543,100,19),(64529,100,20),(64542,100,21),(64547,100,22),(64513,100,30),(64514,100,31),(64510,100,32),(64522,100,33),(64492,100,34),(64496,100,35),(64540,100,36),(64519,100,37),(64520,100,38),(64487,100,39),(64517,100,40),(64518,100,41),(64493,100,42),(64494,100,43),(64484,100,44),(64485,100,45),(64502,100,47),(64504,100,48),(64537,100,49),(64539,100,50),(64530,100,51),(64531,100,52),(64521,100,53),(64525,100,54),(64526,100,55),(64506,100,56),(64507,100,57),(64534,100,58),(64535,100,59),(64538,100,60),(64541,100,61),(64532,100,62),(64495,100,64),(64533,100,65),(64545,100,66),(64490,100,67),(64503,100,69),(64548,100,70),(64500,100,71),(64501,100,72),(64512,100,73),(64549,100,74),(64498,100,75),(64499,100,76),(64483,100,100),(64497,100,101),(64536,100,102),(64523,100,103),(64524,100,104),(64515,100,105),(64511,100,106),(63843,101,1),(63847,101,2),(63846,101,3),(63849,101,6),(63848,101,11),(63840,101,13),(63841,101,35),(63845,101,70),(63842,101,75),(63844,101,76),(63839,101,101),(64397,102,1),(64398,102,2),(64399,102,3),(64402,102,6),(64401,102,11),(64400,102,70),(64396,102,102),(64113,103,1),(64114,103,2),(64115,103,3),(64116,103,5),(64117,103,6),(64118,103,11),(64119,103,13),(64120,103,15),(64121,103,16),(64122,103,17),(64123,103,18),(64124,103,19),(64125,103,20),(64126,103,21),(64127,103,22),(64128,103,30),(64129,103,31),(64130,103,32),(64131,103,33),(64132,103,34),(64133,103,35),(64134,103,36),(64135,103,37),(64136,103,38),(64137,103,39),(64138,103,40),(64139,103,41),(64140,103,42),(64141,103,43),(64142,103,44),(64143,103,45),(64144,103,47),(64145,103,48),(64146,103,49),(64147,103,50),(64148,103,51),(64149,103,52),(64150,103,53),(64151,103,54),(64152,103,55),(64153,103,56),(64154,103,57),(64155,103,58),(64156,103,59),(64157,103,60),(64158,103,61),(64159,103,64),(64160,103,65),(64161,103,67),(64162,103,69),(64163,103,70),(64164,103,71),(64165,103,72),(64166,103,73),(64167,103,74),(64168,103,75),(64169,103,76),(64170,103,101),(64171,103,102),(64112,103,103),(64180,104,1),(64179,104,2),(64178,104,3),(64177,104,5),(64181,104,6),(64173,104,9),(64182,104,11),(64183,104,13),(64184,104,15),(64185,104,16),(64186,104,17),(64187,104,18),(64188,104,19),(64189,104,20),(64190,104,21),(64191,104,22),(64192,104,30),(64193,104,31),(64194,104,32),(64195,104,33),(64196,104,34),(64197,104,35),(64198,104,36),(64199,104,37),(64200,104,38),(64201,104,39),(64202,104,40),(64203,104,41),(64204,104,42),(64205,104,43),(64206,104,44),(64207,104,45),(64208,104,47),(64209,104,48),(64210,104,49),(64211,104,50),(64212,104,51),(64213,104,52),(64214,104,53),(64215,104,54),(64216,104,55),(64217,104,56),(64218,104,57),(64219,104,58),(64220,104,59),(64221,104,60),(64222,104,61),(64238,104,62),(64223,104,64),(64224,104,65),(64174,104,66),(64225,104,67),(64226,104,69),(64227,104,70),(64228,104,71),(64229,104,72),(64230,104,73),(64231,104,74),(64232,104,75),(64233,104,76),(64175,104,100),(64234,104,101),(64235,104,102),(64176,104,103),(64172,104,104),(64237,104,105),(64236,104,106),(64052,105,105),(63996,106,6),(63995,106,11),(63994,106,106);
+INSERT INTO `roleRole` VALUES (84435,1,1),(84436,1,2),(84437,1,3),(84440,1,6),(84439,1,11),(84438,1,70),(84353,2,2),(84355,2,6),(84354,2,11),(84238,3,3),(84240,3,6),(84239,3,11),(84208,5,1),(84215,5,2),(84214,5,3),(84207,5,5),(84220,5,6),(84219,5,11),(84212,5,13),(84216,5,18),(84209,5,21),(84210,5,33),(84217,5,53),(84213,5,70),(84218,5,72),(84211,5,76),(84537,6,6),(84376,9,1),(84377,9,2),(84378,9,3),(84379,9,5),(84380,9,6),(84374,9,9),(84381,9,11),(84382,9,13),(84383,9,15),(84384,9,16),(84385,9,17),(84386,9,18),(84387,9,19),(84388,9,20),(84389,9,21),(84390,9,22),(84391,9,30),(84392,9,31),(84393,9,32),(84394,9,33),(84395,9,34),(84396,9,35),(84397,9,36),(84398,9,37),(84399,9,38),(84400,9,39),(84401,9,40),(84402,9,41),(84403,9,42),(84404,9,43),(84405,9,44),(84406,9,45),(84407,9,47),(84408,9,48),(84409,9,49),(84410,9,50),(84411,9,51),(84412,9,52),(84413,9,53),(84414,9,54),(84415,9,55),(84416,9,56),(84417,9,57),(84418,9,58),(84419,9,59),(84420,9,60),(84421,9,61),(84422,9,64),(84423,9,65),(84424,9,67),(84425,9,69),(84426,9,70),(84427,9,71),(84428,9,72),(84429,9,73),(84430,9,74),(84431,9,75),(84432,9,76),(84433,9,101),(84434,9,102),(84375,9,103),(84128,11,6),(84127,11,11),(85200,13,1),(85201,13,2),(85202,13,3),(85205,13,6),(85204,13,11),(85199,13,13),(85203,13,70),(84749,15,1),(84753,15,2),(84752,15,3),(84756,15,6),(84755,15,11),(84741,15,15),(84742,15,35),(84747,15,36),(84750,15,44),(84754,15,47),(84743,15,49),(84744,15,56),(84746,15,58),(84751,15,70),(84748,15,75),(84745,15,76),(84763,16,1),(84768,16,2),(84767,16,3),(84774,16,6),(84773,16,11),(84758,16,13),(84759,16,15),(84757,16,16),(84762,16,35),(84769,16,36),(84772,16,44),(84771,16,47),(84761,16,49),(84764,16,56),(84770,16,58),(84766,16,70),(84765,16,75),(84760,16,76),(84154,17,1),(84165,17,2),(84164,17,3),(84159,17,5),(84187,17,6),(84158,17,9),(84186,17,11),(84157,17,13),(84169,17,15),(84156,17,16),(84146,17,17),(84171,17,18),(84168,17,19),(84147,17,20),(84160,17,21),(84185,17,22),(84184,17,30),(84183,17,31),(84182,17,32),(84162,17,33),(84181,17,34),(84167,17,35),(84180,17,36),(84148,17,37),(84179,17,38),(84149,17,39),(84178,17,40),(84177,17,41),(84176,17,42),(84175,17,43),(84188,17,44),(84189,17,45),(84190,17,47),(84191,17,48),(84192,17,49),(84166,17,50),(84193,17,51),(84194,17,52),(84172,17,53),(84195,17,54),(84196,17,55),(84174,17,56),(84161,17,57),(84197,17,58),(84198,17,59),(84199,17,60),(84200,17,61),(84150,17,64),(84155,17,65),(84151,17,67),(84201,17,69),(84163,17,70),(84202,17,71),(84173,17,72),(84203,17,73),(84153,17,74),(84204,17,75),(84152,17,76),(84205,17,101),(84206,17,102),(84170,17,103),(85130,18,1),(85133,18,2),(85132,18,3),(85136,18,6),(85135,18,11),(85129,18,18),(85134,18,70),(85131,18,76),(85123,19,1),(85126,19,2),(85125,19,3),(85128,19,6),(85127,19,11),(85118,19,13),(85119,19,18),(85116,19,19),(85117,19,21),(85120,19,53),(85124,19,70),(85121,19,72),(85122,19,76),(84784,20,1),(84792,20,2),(84791,20,3),(84790,20,5),(84789,20,6),(84776,20,9),(84788,20,11),(84777,20,13),(84783,20,15),(84778,20,16),(84787,20,17),(84793,20,18),(84782,20,19),(84775,20,20),(84794,20,21),(84795,20,22),(84796,20,30),(84797,20,31),(84798,20,32),(84799,20,33),(84800,20,34),(84781,20,35),(84801,20,36),(84802,20,37),(84803,20,38),(84804,20,39),(84805,20,40),(84806,20,41),(84807,20,42),(84808,20,43),(84809,20,44),(84810,20,45),(84811,20,47),(84812,20,48),(84813,20,49),(84786,20,50),(84814,20,51),(84815,20,52),(84816,20,53),(84817,20,54),(84818,20,55),(84819,20,56),(84820,20,57),(84821,20,58),(84822,20,59),(84823,20,60),(84824,20,61),(84825,20,64),(84779,20,65),(84826,20,67),(84827,20,69),(84828,20,70),(84829,20,71),(84830,20,72),(84831,20,73),(84832,20,74),(84833,20,75),(84780,20,76),(84834,20,101),(84835,20,102),(84785,20,103),(85110,21,1),(85113,21,2),(85112,21,3),(85115,21,6),(85114,21,11),(85105,21,13),(85106,21,18),(85104,21,21),(85107,21,53),(85111,21,70),(85108,21,72),(85109,21,76),(85210,22,1),(85216,22,2),(85215,22,3),(85218,22,6),(85217,22,11),(85207,22,13),(85209,22,18),(85208,22,21),(85206,22,22),(85211,22,53),(85214,22,70),(85212,22,72),(85213,22,76),(84480,30,1),(84488,30,2),(84487,30,3),(84469,30,5),(84500,30,6),(84477,30,9),(84501,30,11),(84476,30,13),(84482,30,15),(84475,30,16),(84499,30,17),(84485,30,18),(84489,30,19),(84470,30,20),(84479,30,21),(84471,30,22),(84468,30,30),(84498,30,31),(84497,30,32),(84478,30,33),(84496,30,34),(84490,30,35),(84495,30,36),(84494,30,37),(84493,30,38),(84492,30,39),(84502,30,40),(84503,30,41),(84504,30,42),(84505,30,43),(84506,30,44),(84507,30,45),(84508,30,47),(84509,30,48),(84510,30,49),(84491,30,50),(84511,30,51),(84512,30,52),(84472,30,53),(84513,30,54),(84514,30,55),(84515,30,56),(84516,30,57),(84517,30,58),(84518,30,59),(84519,30,60),(84520,30,61),(84473,30,64),(84481,30,65),(84521,30,67),(84522,30,69),(84486,30,70),(84523,30,71),(84484,30,72),(84524,30,73),(84525,30,74),(84526,30,75),(84474,30,76),(84527,30,101),(84528,30,102),(84483,30,103),(84530,31,1),(84531,31,2),(84532,31,3),(84535,31,6),(84534,31,11),(84529,31,31),(84533,31,70),(84442,32,1),(84443,32,2),(84444,32,3),(84447,32,6),(84446,32,11),(84441,32,32),(84445,32,70),(84595,33,33),(84242,34,1),(84247,34,2),(84246,34,3),(84249,34,6),(84248,34,11),(84243,34,13),(84244,34,33),(84241,34,34),(84245,34,70),(84284,35,1),(84289,35,2),(84288,35,3),(84291,35,6),(84290,35,11),(84283,35,35),(84287,35,70),(84285,35,75),(84286,35,76),(85019,36,1),(85021,36,2),(85020,36,3),(85024,36,6),(85023,36,11),(85016,36,36),(85017,36,44),(85018,36,47),(85022,36,70),(84568,37,1),(84573,37,2),(84572,37,3),(84575,37,6),(84574,37,11),(84567,37,37),(84571,37,70),(84569,37,74),(84570,37,76),(84582,38,1),(84585,38,2),(84584,38,3),(84587,38,6),(84586,38,11),(84577,38,13),(84578,38,37),(84576,38,38),(84579,38,64),(84583,38,70),(84581,38,74),(84580,38,76),(84137,39,1),(84143,39,2),(84142,39,3),(84130,39,5),(84145,39,6),(84144,39,11),(84135,39,13),(84134,39,18),(84131,39,21),(84136,39,33),(84129,39,39),(84138,39,53),(84140,39,56),(84132,39,57),(84141,39,70),(84139,39,72),(84133,39,76),(84539,40,1),(84542,40,2),(84541,40,3),(84549,40,6),(84548,40,11),(84544,40,36),(84538,40,40),(84547,40,44),(84546,40,47),(84540,40,49),(84545,40,58),(84543,40,70),(84557,41,1),(84561,41,2),(84560,41,3),(84566,41,6),(84565,41,11),(84551,41,13),(84552,41,35),(84558,41,36),(84553,41,40),(84550,41,41),(84564,41,44),(84563,41,47),(84555,41,49),(84562,41,58),(84559,41,70),(84556,41,75),(84554,41,76),(84256,42,1),(84261,42,2),(84260,42,3),(84264,42,6),(84263,42,11),(84251,42,35),(84254,42,36),(84250,42,42),(84258,42,44),(84262,42,47),(84252,42,49),(84257,42,58),(84259,42,70),(84255,42,75),(84253,42,76),(84269,43,1),(84275,43,2),(84274,43,3),(84281,43,6),(84280,43,11),(84266,43,13),(84268,43,35),(84276,43,36),(84267,43,42),(84265,43,43),(84279,43,44),(84278,43,47),(84270,43,49),(84277,43,58),(84273,43,70),(84272,43,75),(84271,43,76),(84112,44,1),(84113,44,2),(84114,44,3),(84117,44,6),(84116,44,11),(84111,44,44),(84115,44,70),(84121,45,1),(84123,45,2),(84122,45,3),(84126,45,6),(84125,45,11),(84119,45,13),(84120,45,44),(84118,45,45),(84124,45,70),(84324,47,1),(84325,47,2),(84326,47,3),(84329,47,6),(84328,47,11),(84323,47,47),(84327,47,70),(84347,48,1),(84350,48,2),(84349,48,3),(84352,48,6),(84351,48,11),(84342,48,13),(84343,48,35),(84344,48,47),(84341,48,48),(84348,48,70),(84346,48,75),(84345,48,76),(84933,49,1),(84936,49,2),(84935,49,3),(84938,49,6),(84937,49,11),(84929,49,36),(84932,49,44),(84931,49,47),(84928,49,49),(84930,49,58),(84934,49,70),(84979,50,1),(84986,50,2),(84985,50,3),(84988,50,6),(84987,50,11),(84966,50,13),(84978,50,18),(84967,50,21),(84980,50,33),(84968,50,35),(84974,50,36),(84983,50,44),(84982,50,47),(84969,50,49),(84965,50,50),(84977,50,53),(84981,50,56),(84970,50,57),(84973,50,58),(84971,50,59),(84984,50,70),(84976,50,72),(84975,50,75),(84972,50,76),(84837,51,1),(84842,51,2),(84841,51,3),(84844,51,6),(84843,51,11),(84836,51,51),(84840,51,70),(84838,51,74),(84839,51,75),(84854,52,1),(84859,52,2),(84858,52,3),(84862,52,6),(84861,52,11),(84846,52,13),(84856,52,18),(84847,52,19),(84853,52,21),(84848,52,35),(84849,52,51),(84845,52,52),(84855,52,53),(84857,52,70),(84860,52,72),(84851,52,74),(84852,52,75),(84850,52,76),(84589,53,1),(84590,53,2),(84591,53,3),(84594,53,6),(84593,53,11),(84588,53,53),(84592,53,70),(84726,54,1),(84727,54,2),(84728,54,3),(84731,54,6),(84730,54,11),(84725,54,54),(84729,54,70),(84735,55,1),(84737,55,2),(84736,55,3),(84740,55,6),(84739,55,11),(84733,55,13),(84734,55,54),(84732,55,55),(84738,55,70),(84357,56,1),(84358,56,2),(84359,56,3),(84362,56,6),(84361,56,11),(84356,56,56),(84360,56,70),(84368,57,1),(84371,57,2),(84370,57,3),(84373,57,6),(84372,57,11),(84364,57,13),(84365,57,33),(84366,57,56),(84363,57,57),(84369,57,70),(84367,57,76),(84891,58,1),(84892,58,2),(84893,58,3),(84896,58,6),(84895,58,11),(84890,58,58),(84894,58,70),(84901,59,1),(84911,59,2),(84910,59,3),(84920,59,6),(84919,59,11),(84898,59,13),(84908,59,18),(84900,59,21),(84915,59,33),(84902,59,35),(84913,59,36),(84918,59,44),(84917,59,47),(84903,59,49),(84899,59,50),(84907,59,53),(84916,59,56),(84904,59,57),(84914,59,58),(84897,59,59),(84909,59,70),(84906,59,72),(84912,59,75),(84905,59,76),(84947,60,1),(84959,60,2),(84958,60,3),(84940,60,5),(84964,60,6),(84963,60,11),(84944,60,13),(84956,60,18),(84946,60,21),(84945,60,33),(84948,60,35),(84952,60,36),(84962,60,44),(84961,60,47),(84949,60,49),(84941,60,50),(84955,60,53),(84951,60,56),(84942,60,57),(84960,60,58),(84950,60,59),(84939,60,60),(84957,60,70),(84954,60,72),(84953,60,75),(84943,60,76),(85029,61,1),(85033,61,2),(85032,61,3),(85035,61,6),(85034,61,11),(85026,61,13),(85027,61,36),(85028,61,44),(85030,61,47),(85025,61,61),(85031,61,70),(84863,62,62),(84282,64,64),(84871,65,1),(84879,65,2),(84878,65,3),(84889,65,6),(84888,65,11),(84869,65,13),(84882,65,18),(84865,65,19),(84872,65,21),(84884,65,33),(84866,65,35),(84876,65,36),(84887,65,44),(84886,65,47),(84873,65,49),(84867,65,50),(84881,65,53),(84885,65,56),(84874,65,57),(84883,65,58),(84875,65,59),(84864,65,65),(84877,65,70),(84880,65,72),(84870,65,75),(84868,65,76),(85141,66,1),(85140,66,2),(85142,66,3),(85143,66,5),(85144,66,6),(85138,66,9),(85145,66,11),(85146,66,13),(85147,66,15),(85148,66,16),(85149,66,17),(85150,66,18),(85151,66,19),(85152,66,20),(85153,66,21),(85154,66,22),(85155,66,30),(85156,66,31),(85157,66,32),(85158,66,33),(85159,66,34),(85160,66,35),(85161,66,36),(85162,66,37),(85163,66,38),(85164,66,39),(85165,66,40),(85166,66,41),(85167,66,42),(85168,66,43),(85169,66,44),(85170,66,45),(85171,66,47),(85172,66,48),(85173,66,49),(85174,66,50),(85175,66,51),(85176,66,52),(85177,66,53),(85178,66,54),(85179,66,55),(85180,66,56),(85181,66,57),(85182,66,58),(85183,66,59),(85184,66,60),(85185,66,61),(85186,66,64),(85187,66,65),(85137,66,66),(85188,66,67),(85189,66,69),(85190,66,70),(85191,66,71),(85192,66,72),(85193,66,73),(85194,66,74),(85195,66,75),(85196,66,76),(85197,66,101),(85198,66,102),(85139,66,103),(84225,67,1),(84233,67,2),(84232,67,3),(84222,67,5),(84237,67,6),(84236,67,11),(84230,67,13),(84229,67,18),(84224,67,21),(84226,67,33),(84223,67,37),(84234,67,53),(84221,67,67),(84231,67,70),(84235,67,72),(84228,67,74),(84227,67,76),(84334,69,1),(84338,69,2),(84337,69,3),(84340,69,6),(84339,69,11),(84331,69,35),(84332,69,47),(84330,69,69),(84336,69,70),(84333,69,75),(84335,69,76),(85221,70,6),(85220,70,11),(85219,70,70),(84306,71,1),(84309,71,2),(84308,71,3),(84312,71,6),(84311,71,11),(84307,71,58),(84310,71,70),(84305,71,71),(84317,72,1),(84319,72,2),(84318,72,3),(84322,72,6),(84321,72,11),(84314,72,13),(84315,72,18),(84320,72,70),(84313,72,72),(84316,72,76),(84457,73,1),(84462,73,2),(84461,73,3),(84452,73,5),(84467,73,6),(84466,73,11),(84459,73,13),(84463,73,18),(84453,73,19),(84456,73,21),(84455,73,33),(84464,73,53),(84454,73,64),(84460,73,70),(84465,73,72),(84451,73,73),(84458,73,76),(85222,74,74),(84303,75,75),(84304,76,76),(85062,100,1),(85058,100,2),(85044,100,3),(85042,100,5),(85069,100,6),(85061,100,9),(85039,100,11),(85100,100,13),(85080,100,15),(85081,100,16),(85041,100,17),(85098,100,18),(85097,100,19),(85082,100,20),(85096,100,21),(85101,100,22),(85066,100,30),(85067,100,31),(85063,100,32),(85075,100,33),(85045,100,34),(85049,100,35),(85094,100,36),(85072,100,37),(85073,100,38),(85040,100,39),(85070,100,40),(85071,100,41),(85046,100,42),(85047,100,43),(85037,100,44),(85038,100,45),(85055,100,47),(85057,100,48),(85090,100,49),(85092,100,50),(85083,100,51),(85084,100,52),(85074,100,53),(85078,100,54),(85079,100,55),(85059,100,56),(85060,100,57),(85087,100,58),(85088,100,59),(85091,100,60),(85095,100,61),(85085,100,62),(85048,100,64),(85086,100,65),(85099,100,66),(85043,100,67),(85056,100,69),(85102,100,70),(85053,100,71),(85054,100,72),(85065,100,73),(85103,100,74),(85051,100,75),(85052,100,76),(85036,100,100),(85050,100,101),(85089,100,102),(85076,100,103),(85077,100,104),(85068,100,105),(85064,100,106),(85093,100,107),(84296,101,1),(84300,101,2),(84299,101,3),(84302,101,6),(84301,101,11),(84293,101,13),(84294,101,35),(84298,101,70),(84295,101,75),(84297,101,76),(84292,101,101),(84922,102,1),(84923,102,2),(84924,102,3),(84927,102,6),(84926,102,11),(84925,102,70),(84921,102,102),(84597,103,1),(84598,103,2),(84599,103,3),(84600,103,5),(84601,103,6),(84656,103,9),(84602,103,11),(84603,103,13),(84604,103,15),(84605,103,16),(84606,103,17),(84607,103,18),(84608,103,19),(84609,103,20),(84610,103,21),(84611,103,22),(84612,103,30),(84613,103,31),(84614,103,32),(84615,103,33),(84616,103,34),(84617,103,35),(84618,103,36),(84619,103,37),(84620,103,38),(84621,103,39),(84622,103,40),(84623,103,41),(84624,103,42),(84625,103,43),(84626,103,44),(84627,103,45),(84628,103,47),(84629,103,48),(84630,103,49),(84631,103,50),(84632,103,51),(84633,103,52),(84634,103,53),(84635,103,54),(84636,103,55),(84637,103,56),(84638,103,57),(84639,103,58),(84640,103,59),(84641,103,60),(84642,103,61),(84643,103,64),(84644,103,65),(84645,103,67),(84646,103,69),(84647,103,70),(84648,103,71),(84649,103,72),(84650,103,73),(84651,103,74),(84652,103,75),(84653,103,76),(84654,103,101),(84655,103,102),(84596,103,103),(84665,104,1),(84664,104,2),(84663,104,3),(84662,104,5),(84666,104,6),(84658,104,9),(84667,104,11),(84668,104,13),(84669,104,15),(84670,104,16),(84671,104,17),(84672,104,18),(84673,104,19),(84674,104,20),(84675,104,21),(84676,104,22),(84677,104,30),(84678,104,31),(84679,104,32),(84680,104,33),(84681,104,34),(84682,104,35),(84683,104,36),(84684,104,37),(84685,104,38),(84686,104,39),(84687,104,40),(84688,104,41),(84689,104,42),(84690,104,43),(84691,104,44),(84692,104,45),(84693,104,47),(84694,104,48),(84695,104,49),(84696,104,50),(84697,104,51),(84698,104,52),(84699,104,53),(84700,104,54),(84701,104,55),(84702,104,56),(84703,104,57),(84704,104,58),(84705,104,59),(84706,104,60),(84707,104,61),(84723,104,62),(84708,104,64),(84709,104,65),(84659,104,66),(84710,104,67),(84711,104,69),(84712,104,70),(84713,104,71),(84714,104,72),(84715,104,73),(84716,104,74),(84717,104,75),(84718,104,76),(84660,104,100),(84719,104,101),(84720,104,102),(84661,104,103),(84657,104,104),(84722,104,105),(84721,104,106),(84724,104,107),(84536,105,105),(84450,106,6),(84449,106,11),(84448,106,106),(84998,107,1),(85010,107,2),(85009,107,3),(84991,107,5),(85015,107,6),(85014,107,11),(84995,107,13),(85007,107,18),(84997,107,21),(84996,107,33),(84999,107,35),(85003,107,36),(85013,107,44),(85012,107,47),(85000,107,49),(84992,107,50),(85006,107,53),(85002,107,56),(84993,107,57),(85011,107,58),(85001,107,59),(84990,107,60),(85008,107,70),(85005,107,72),(85004,107,75),(84994,107,76),(84989,107,107);
/*!40000 ALTER TABLE `roleRole` ENABLE KEYS */;
UNLOCK TABLES;
@@ -120,7 +120,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-01-13 7:50:25
+-- Dump completed on 2022-03-14 10:27:53
USE `salix`;
-- MariaDB dump 10.19 Distrib 10.5.12-MariaDB, for debian-linux-gnu (x86_64)
--
@@ -144,7 +144,7 @@ USE `salix`;
LOCK TABLES `ACL` WRITE;
/*!40000 ALTER TABLE `ACL` DISABLE KEYS */;
-INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(101,'Claim','*','*','ALLOW','ROLE','employee'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(103,'ClaimEnd','importTicketSales','WRITE','ALLOW','ROLE','claimManager'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(123,'Worker','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','*','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(174,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(175,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryBoss'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(219,'Account','acl','READ','ALLOW','ROLE','account'),(220,'Account','getCurrentUserData','READ','ALLOW','ROLE','account'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','*','READ','ALLOW','ROLE','salesAssistant'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(240,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(242,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(244,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(246,'Account','changePassword','*','ALLOW','ROLE','account'),(247,'UserAccount','exists','*','ALLOW','ROLE','account'),(248,'RoleMapping','*','READ','ALLOW','ROLE','account'),(249,'UserPassword','*','READ','ALLOW','ROLE','account'),(250,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(251,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(252,'Supplier','*','READ','ALLOW','ROLE','employee'),(253,'Supplier','*','WRITE','ALLOW','ROLE','administrative'),(254,'SupplierLog','*','READ','ALLOW','ROLE','employee'),(256,'Image','*','WRITE','ALLOW','ROLE','employee'),(257,'FixedPrice','*','*','ALLOW','ROLE','buyer'),(258,'PayDem','*','READ','ALLOW','ROLE','employee'),(259,'Client','createReceipt','*','ALLOW','ROLE','salesAssistant'),(260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee'),(261,'SupplierAccount','*','*','ALLOW','ROLE','administrative'),(262,'Entry','*','*','ALLOW','ROLE','administrative'),(263,'InvoiceIn','*','*','ALLOW','ROLE','administrative'),(264,'StarredModule','*','*','ALLOW','ROLE','employee'),(265,'ItemBotanical','*','WRITE','ALLOW','ROLE','logisticBoss'),(266,'ZoneLog','*','READ','ALLOW','ROLE','employee'),(267,'Genus','*','WRITE','ALLOW','ROLE','logisticBoss'),(268,'Specie','*','WRITE','ALLOW','ROLE','logisticBoss'),(269,'InvoiceOut','createPdf','WRITE','ALLOW','ROLE','employee'),(270,'SupplierAddress','*','*','ALLOW','ROLE','employee'),(271,'SalesMonitor','*','*','ALLOW','ROLE','employee'),(272,'InvoiceInLog','*','*','ALLOW','ROLE','employee'),(273,'InvoiceInTax','*','*','ALLOW','ROLE','administrative'),(274,'InvoiceInLog','*','READ','ALLOW','ROLE','administrative'),(275,'InvoiceOut','createManualInvoice','WRITE','ALLOW','ROLE','invoicing'),(276,'InvoiceOut','globalInvoicing','WRITE','ALLOW','ROLE','invoicing'),(277,'Role','*','*','ALLOW','ROLE','it'),(278,'RoleInherit','*','WRITE','ALLOW','ROLE','grant'),(279,'MailAlias','*','*','ALLOW','ROLE','marketing'),(282,'UserAccount','*','WRITE','ALLOW','ROLE','it'),(283,'EntryObservation','*','*','ALLOW','ROLE','buyer'),(284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin'),(285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin'),(286,'ACL','*','*','ALLOW','ROLE','developer'),(287,'AccessToken','*','*','ALLOW','ROLE','developer'),(288,'MailAliasAccount','*','*','ALLOW','ROLE','marketing'),(289,'MailAliasAccount','*','*','ALLOW','ROLE','hr'),(290,'MailAlias','*','*','ALLOW','ROLE','hr'),(291,'MailForward','*','*','ALLOW','ROLE','marketing'),(292,'MailForward','*','*','ALLOW','ROLE','hr'),(293,'RoleInherit','*','*','ALLOW','ROLE','it'),(294,'RoleRole','*','*','ALLOW','ROLE','it'),(295,'AccountConfig','*','*','ALLOW','ROLE','sysadmin'),(296,'Collection','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(101,'Claim','*','*','ALLOW','ROLE','employee'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(103,'ClaimEnd','importTicketSales','WRITE','ALLOW','ROLE','claimManager'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(123,'Worker','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','*','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(174,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(175,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryBoss'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(219,'Account','acl','READ','ALLOW','ROLE','account'),(220,'Account','getCurrentUserData','READ','ALLOW','ROLE','account'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','*','READ','ALLOW','ROLE','salesAssistant'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(240,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(242,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(244,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(246,'Account','changePassword','*','ALLOW','ROLE','account'),(247,'UserAccount','exists','*','ALLOW','ROLE','account'),(248,'RoleMapping','*','READ','ALLOW','ROLE','account'),(249,'UserPassword','*','READ','ALLOW','ROLE','account'),(250,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(251,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(252,'Supplier','*','READ','ALLOW','ROLE','employee'),(253,'Supplier','*','WRITE','ALLOW','ROLE','administrative'),(254,'SupplierLog','*','READ','ALLOW','ROLE','employee'),(256,'Image','*','WRITE','ALLOW','ROLE','employee'),(257,'FixedPrice','*','*','ALLOW','ROLE','buyer'),(258,'PayDem','*','READ','ALLOW','ROLE','employee'),(259,'Client','createReceipt','*','ALLOW','ROLE','salesAssistant'),(260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee'),(261,'SupplierAccount','*','*','ALLOW','ROLE','administrative'),(262,'Entry','*','*','ALLOW','ROLE','administrative'),(263,'InvoiceIn','*','*','ALLOW','ROLE','administrative'),(264,'StarredModule','*','*','ALLOW','ROLE','employee'),(265,'ItemBotanical','*','WRITE','ALLOW','ROLE','logisticBoss'),(266,'ZoneLog','*','READ','ALLOW','ROLE','employee'),(267,'Genus','*','WRITE','ALLOW','ROLE','logisticBoss'),(268,'Specie','*','WRITE','ALLOW','ROLE','logisticBoss'),(269,'InvoiceOut','createPdf','WRITE','ALLOW','ROLE','employee'),(270,'SupplierAddress','*','*','ALLOW','ROLE','employee'),(271,'SalesMonitor','*','*','ALLOW','ROLE','employee'),(272,'InvoiceInLog','*','*','ALLOW','ROLE','employee'),(273,'InvoiceInTax','*','*','ALLOW','ROLE','administrative'),(274,'InvoiceInLog','*','READ','ALLOW','ROLE','administrative'),(275,'InvoiceOut','createManualInvoice','WRITE','ALLOW','ROLE','invoicing'),(276,'InvoiceOut','globalInvoicing','WRITE','ALLOW','ROLE','invoicing'),(277,'Role','*','*','ALLOW','ROLE','it'),(278,'RoleInherit','*','WRITE','ALLOW','ROLE','grant'),(279,'MailAlias','*','*','ALLOW','ROLE','marketing'),(282,'UserAccount','*','WRITE','ALLOW','ROLE','it'),(283,'EntryObservation','*','*','ALLOW','ROLE','buyer'),(284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin'),(285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin'),(286,'ACL','*','*','ALLOW','ROLE','developer'),(287,'AccessToken','*','*','ALLOW','ROLE','developer'),(288,'MailAliasAccount','*','*','ALLOW','ROLE','marketing'),(289,'MailAliasAccount','*','*','ALLOW','ROLE','hr'),(290,'MailAlias','*','*','ALLOW','ROLE','hr'),(291,'MailForward','*','*','ALLOW','ROLE','marketing'),(292,'MailForward','*','*','ALLOW','ROLE','hr'),(293,'RoleInherit','*','*','ALLOW','ROLE','it'),(294,'RoleRole','*','*','ALLOW','ROLE','it'),(295,'AccountConfig','*','*','ALLOW','ROLE','sysadmin'),(296,'Collection','*','READ','ALLOW','ROLE','employee'),(297,'Sale','payBack','WRITE','ALLOW','ROLE','employee'),(298,'InvoiceInDueDay','*','*','ALLOW','ROLE','administrative');
/*!40000 ALTER TABLE `ACL` ENABLE KEYS */;
UNLOCK TABLES;
@@ -186,7 +186,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-01-13 7:50:26
+-- Dump completed on 2022-03-14 10:27:55
USE `vn`;
-- MariaDB dump 10.19 Distrib 10.5.12-MariaDB, for debian-linux-gnu (x86_64)
--
@@ -350,7 +350,7 @@ UNLOCK TABLES;
LOCK TABLES `componentType` WRITE;
/*!40000 ALTER TABLE `componentType` DISABLE KEYS */;
-INSERT INTO `componentType` VALUES (1,'coste',1,0),(2,'com ventas',1,1),(3,'com compras',1,1),(4,'empresa',1,1),(5,'cliente',0,0),(6,'agencia',0,0),(7,'cartera_comercial',0,0),(8,'cartera_producto',0,1),(9,'maniobra',1,0),(10,'cartera_comprador',0,1),(11,'errores',0,1),(12,'otros',0,1);
+INSERT INTO `componentType` VALUES (1,'coste',1,0,'COST'),(2,'com ventas',1,1,NULL),(3,'com compras',1,1,NULL),(4,'empresa',1,1,NULL),(5,'cliente',0,0,NULL),(6,'agencia',0,0,'FREIGHT'),(7,'cartera_comercial',0,0,NULL),(8,'cartera_producto',0,1,NULL),(9,'maniobra',1,0,NULL),(10,'cartera_comprador',0,1,NULL),(11,'errores',0,1,NULL),(12,'otros',0,1,NULL);
/*!40000 ALTER TABLE `componentType` ENABLE KEYS */;
UNLOCK TABLES;
@@ -370,7 +370,7 @@ UNLOCK TABLES;
LOCK TABLES `department` WRITE;
/*!40000 ALTER TABLE `department` DISABLE KEYS */;
-INSERT INTO `department` VALUES (1,NULL,'VERDNATURA',1,2,763,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(22,NULL,'COMPRAS',3,4,NULL,72,596,2,5,0,0,0,0,NULL,'/',NULL,1,NULL,1,0,0),(23,NULL,'CAMARA',14,19,NULL,72,3758,2,6,1,0,1,2,37,'/37/',NULL,0,NULL,0,1,1),(31,'IT','INFORMATICA',5,6,NULL,72,127,3,9,0,0,0,0,NULL,'/','informatica-cau',1,NULL,1,0,0),(34,NULL,'CONTABILIDAD',7,8,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL,1,0,0),(35,NULL,'FINANZAS',9,10,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL,1,0,0),(36,NULL,'LABORAL',11,12,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL,1,0,0),(37,NULL,'PRODUCCION',13,52,NULL,72,3758,3,11,1,0,0,17,NULL,'/',NULL,0,NULL,0,1,1),(38,NULL,'SACADO',20,21,NULL,72,230,4,14,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(39,NULL,'ENCAJADO',22,23,NULL,72,3758,4,12,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(41,NULL,'ADMINISTRACION',53,54,NULL,72,599,3,8,0,0,0,0,NULL,'/',NULL,1,NULL,1,0,0),(43,NULL,'VENTAS',55,78,NULL,0,NULL,NULL,NULL,0,0,0,11,NULL,'/',NULL,1,'',1,0,0),(44,NULL,'GERENCIA',79,80,NULL,72,300,2,7,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(45,NULL,'LOGISTICA',81,82,NULL,72,596,3,19,0,0,0,0,NULL,'/',NULL,1,NULL,1,0,0),(46,NULL,'REPARTO',83,86,NULL,72,659,3,10,0,0,0,1,NULL,'/',NULL,0,NULL,0,0,0),(48,NULL,'ALMACENAJE',87,88,NULL,0,3758,NULL,NULL,1,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(49,NULL,'PROPIEDAD',89,90,NULL,72,1008,1,1,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(52,NULL,'CARGA AEREA',91,92,NULL,72,163,4,28,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(53,NULL,'MARKETING Y COMUNICACIÓN',93,94,NULL,72,1238,0,0,0,0,0,0,NULL,'/',NULL,1,NULL,1,0,0),(54,NULL,'ORNAMENTALES',95,96,NULL,72,433,3,21,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(55,NULL,'TALLER NATURAL',97,98,NULL,72,3758,2,23,0,0,0,0,NULL,'/',NULL,0,NULL,0,1,1),(56,NULL,'TALLER ARTIFICIAL',99,100,NULL,72,1780,2,24,0,0,0,0,NULL,'/',NULL,0,NULL,0,1,1),(58,NULL,'CAMPOS',101,102,NULL,72,3758,2,2,0,0,0,0,NULL,'/',NULL,0,NULL,1,0,0),(59,NULL,'MANTENIMIENTO',103,104,NULL,72,1907,4,16,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(60,NULL,'RECLAMACIONES',105,106,NULL,72,563,3,20,0,0,0,0,NULL,'/',NULL,1,NULL,1,0,0),(61,NULL,'VNH',107,108,NULL,73,1297,3,17,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(63,NULL,'VENTAS FRANCIA',56,57,NULL,72,277,2,27,0,0,1,0,43,'/43/',NULL,0,NULL,0,0,0),(66,NULL,'VERDNAMADRID',109,110,NULL,72,163,3,18,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(68,NULL,'COMPLEMENTOS',24,25,NULL,72,617,3,26,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(69,NULL,'VERDNABARNA',111,112,NULL,74,432,3,22,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(77,NULL,'PALETIZADO',84,85,NULL,72,230,4,15,1,0,1,0,46,'/46/',NULL,0,NULL,0,0,1),(80,NULL,'EQUIPO J VALLES',58,59,NULL,72,693,3,4,0,0,1,0,43,'/43/','jvp_equipo',1,'direccioncomercial@verdnatura.es',1,0,0),(86,NULL,'LIMPIEZA',113,114,NULL,72,599,0,0,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(89,NULL,'COORDINACION',115,116,NULL,0,3758,NULL,NULL,1,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(90,NULL,'TRAILER',117,118,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,0),(91,NULL,'ARTIFICIAL',26,27,NULL,0,3758,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(92,NULL,'EQUIPO SILVERIO',60,61,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','sdc_equipo',1,'direccioncomercial@verdnatura.es',1,0,0),(93,NULL,'CONFECCION',119,120,NULL,0,3758,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,1),(94,NULL,'EQUIPO J BROCAL',62,63,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jes_equipo',1,'direccioncomercial@verdnatura.es',1,0,0),(95,NULL,'EQUIPO C ZAMBRANO',64,65,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','czg_equipo',1,'direccioncomercial@verdnatura.es',1,0,0),(96,NULL,'EQUIPO C LOPEZ',66,67,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','cla_equipo',1,'direccioncomercial@verdnatura.es',1,0,0),(98,NULL,'EQUIPO RODRIGO',68,69,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','rhr_equipo',1,'direccioncomercial@verdnatura.es',1,0,0),(101,NULL,'EQUIPO J IBAÑEZ',70,71,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jmi_equipo',1,'direccioncomercial@verdnatura.es',1,0,0),(102,NULL,'EQ ROJO FV RUBEN C',28,29,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(103,NULL,'EQ AZUL FV A FOLQUES',30,31,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(104,NULL,'EQ AMARILLO FV NORMAN G',32,33,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(105,NULL,'EQ MORADO FV MATOU',34,35,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(106,NULL,'EQ VERDE PCA KEVIN GIMENEZ',36,37,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(107,NULL,'EQ NARANJA PCA RUBEN ZANON',38,39,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(110,NULL,'EQ ROSA PCA J BONDIA',40,41,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(111,NULL,'EQ REPONEDOR CAJAS',42,43,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(112,NULL,'CAMARA EQ EDGAR LLEO',15,16,NULL,0,NULL,NULL,NULL,1,0,2,0,23,'/37/23/',NULL,0,NULL,0,0,0),(113,NULL,'CAMARA EQ MARC ROCA',17,18,NULL,0,NULL,NULL,NULL,1,0,2,0,23,'/37/23/',NULL,0,NULL,0,0,0),(114,NULL,'EQ MARRON PCA JL NUEVO',44,45,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(115,NULL,'EQUIPO CLAUDI',72,73,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','csr_equipo',1,'direccioncomercial@verdnatura.es',1,0,0),(120,NULL,'PCA PRODUCCION',46,47,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(121,NULL,'FV PRODUCCION',48,49,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(122,NULL,'PCA ALMACEN',50,51,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL,0,0,0),(123,NULL,'EQUIPO ELENA BASCUÑANA',74,75,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','ebt_equipo',1,'direccioncomercial@verdnatura.es',1,0,0),(124,NULL,'CONTROL INTERNO',121,122,NULL,72,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL,1,0,0),(125,NULL,'EQUIPO MIRIAM MAR',76,77,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','mir_equipo',0,'direccioncomercial@verdnatura.es',0,0,0),(126,NULL,'PRESERVADO',123,124,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL,0,0,1);
+INSERT INTO `department` VALUES (1,NULL,'VERDNATURA',1,94,763,0,NULL,NULL,NULL,0,0,0,30,NULL,'/',NULL,0,NULL,0,0,0,0),(22,NULL,'COMPRAS',2,3,NULL,72,596,2,5,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0),(23,NULL,'CAMARA',13,14,NULL,72,3758,2,6,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1),(31,'IT','INFORMATICA',4,5,NULL,72,127,3,9,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0),(34,NULL,'CONTABILIDAD',6,7,NULL,0,NULL,NULL,NULL,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0),(35,NULL,'FINANZAS',8,9,NULL,0,NULL,NULL,NULL,0,0,1,0,1,'/1/',NULL,1,'finanzas@verdnatura.es',1,0,0,0),(36,NULL,'LABORAL',10,11,NULL,0,NULL,NULL,NULL,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0),(37,NULL,'PRODUCCION',12,27,NULL,72,3758,3,11,1,1,1,7,1,'/1/',NULL,0,NULL,0,1,1,1),(38,NULL,'SACADO',15,16,NULL,72,230,4,14,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0),(39,NULL,'ENCAJADO',17,18,NULL,72,3758,4,12,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0),(41,NULL,'ADMINISTRACION',28,29,NULL,72,599,3,8,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0),(43,NULL,'VENTAS',30,49,NULL,0,NULL,NULL,NULL,0,0,1,9,1,'/1/',NULL,1,'',1,0,0,0),(44,NULL,'GERENCIA',50,51,NULL,72,300,2,7,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(45,NULL,'LOGISTICA',52,53,NULL,72,596,3,19,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0),(46,NULL,'REPARTO',54,55,NULL,72,659,3,10,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0),(48,NULL,'ALMACENAJE',56,57,NULL,0,3758,NULL,NULL,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(49,NULL,'PROPIEDAD',58,59,NULL,72,1008,1,1,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(52,NULL,'CARGA AEREA',60,61,NULL,72,163,4,28,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(53,NULL,'MARKETING Y COMUNICACIÓN',62,63,NULL,72,1238,0,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0),(54,NULL,'ORNAMENTALES',64,65,NULL,72,433,3,21,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(55,NULL,'TALLER NATURAL',66,67,NULL,72,3758,2,23,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,1,0),(56,NULL,'TALLER ARTIFICIAL',68,69,NULL,72,1780,2,24,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,1,0),(58,NULL,'CAMPOS',70,71,NULL,72,3758,2,2,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(59,NULL,'MANTENIMIENTO',72,73,NULL,72,1907,4,16,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(60,NULL,'RECLAMACIONES',74,75,NULL,72,563,3,20,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0),(61,NULL,'VNH',76,77,NULL,73,1297,3,17,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(63,NULL,'VENTAS FRANCIA',31,32,NULL,72,277,2,27,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,0,0,0),(66,NULL,'VERDNAMADRID',78,79,NULL,72,163,3,18,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(68,NULL,'COMPLEMENTOS',19,20,NULL,72,617,3,26,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0),(69,NULL,'VERDNABARNA',80,81,NULL,74,432,3,22,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(80,NULL,'EQUIPO J VALLES',33,34,NULL,72,693,3,4,0,0,2,0,43,'/1/43/','jvp_equipo',1,'direccioncomercial@verdnatura.es',1,0,0,0),(86,NULL,'LIMPIEZA',82,83,NULL,72,599,0,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(89,NULL,'COORDINACION',84,85,NULL,0,3758,NULL,NULL,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(90,NULL,'TRAILER',86,87,NULL,0,NULL,NULL,NULL,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0),(91,NULL,'ARTIFICIAL',21,22,NULL,0,3758,NULL,NULL,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0),(92,NULL,'EQUIPO SILVERIO',35,36,NULL,0,NULL,NULL,NULL,0,0,2,0,43,'/1/43/','sdc_equipo',1,'direccioncomercial@verdnatura.es',1,0,0,0),(93,NULL,'CONFECCION',88,89,NULL,0,3758,NULL,NULL,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,1,0),(94,NULL,'EQUIPO J BROCAL',37,38,NULL,0,NULL,NULL,NULL,0,0,2,0,43,'/1/43/','jes_equipo',1,'direccioncomercial@verdnatura.es',1,0,0,0),(95,NULL,'EQUIPO C ZAMBRANO',39,40,NULL,0,NULL,NULL,NULL,0,0,2,0,43,'/1/43/','czg_equipo',1,'direccioncomercial@verdnatura.es',1,0,0,0),(96,NULL,'EQUIPO C LOPEZ',41,42,NULL,0,NULL,NULL,NULL,0,0,2,0,43,'/1/43/','cla_equipo',1,'direccioncomercial@verdnatura.es',1,0,0,0),(115,NULL,'EQUIPO CLAUDI',43,44,NULL,0,NULL,NULL,NULL,0,0,2,0,43,'/1/43/','csr_equipo',1,'direccioncomercial@verdnatura.es',1,0,0,0),(123,NULL,'EQUIPO ELENA BASCUÑANA',45,46,NULL,0,NULL,NULL,NULL,0,0,2,0,43,'/1/43/','ebt_equipo',1,'direccioncomercial@verdnatura.es',1,0,0,0),(124,NULL,'CONTROL INTERNO',90,91,NULL,72,NULL,NULL,NULL,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0),(125,NULL,'EQUIPO MIRIAM MAR',47,48,NULL,0,NULL,NULL,NULL,0,0,2,0,43,'/1/43/','mir_equipo',1,'direccioncomercial@verdnatura.es',1,0,0,0),(126,NULL,'PRESERVADO',92,93,NULL,0,NULL,NULL,NULL,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,1,0),(128,NULL,'PALETIZADO',23,24,NULL,0,NULL,NULL,NULL,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0),(130,NULL,'REVISION',25,26,NULL,0,NULL,NULL,NULL,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0);
/*!40000 ALTER TABLE `department` ENABLE KEYS */;
UNLOCK TABLES;
@@ -410,7 +410,7 @@ UNLOCK TABLES;
LOCK TABLES `state` WRITE;
/*!40000 ALTER TABLE `state` DISABLE KEYS */;
-INSERT INTO `state` VALUES (1,'Arreglar',2,0,'FIXING',NULL,1,0,0,0,0,0,0,4,1),(2,'Libre',2,0,'FREE',NULL,2,1,0,0,0,1,0,4,1),(3,'OK',3,0,'OK',3,28,1,0,0,0,1,1,3,0),(4,'Impreso',4,0,'PRINTED',2,29,1,0,1,0,0,1,2,0),(5,'Preparación',6,1,'ON_PREPARATION',7,5,0,0,0,2,0,0,2,0),(6,'En Revisión',7,1,'ON_CHECKING',NULL,6,0,1,0,3,0,0,1,0),(7,'Sin Acabar',1,0,'NOT_READY',NULL,7,0,0,0,0,0,0,4,1),(8,'Revisado',8,1,'CHECKED',NULL,8,0,1,0,3,0,0,1,0),(9,'Encajando',9,2,'PACKING',NULL,9,0,1,0,0,0,0,1,0),(10,'Encajado',10,2,'PACKED',NULL,10,0,1,0,0,0,0,0,0),(11,'Facturado',0,3,'INVOICED',NULL,11,0,1,0,0,0,0,0,0),(12,'Bloqueado',0,0,'BLOCKED',NULL,12,0,0,0,0,0,0,4,1),(13,'En Reparto',11,3,'ON_DELIVERY',NULL,13,0,1,0,0,0,0,0,0),(14,'Preparado',6,1,'PREPARED',NULL,14,0,1,0,2,0,0,1,0),(15,'Pte Recogida',12,3,'WAITING_FOR_PICKUP',NULL,15,0,1,0,0,0,0,0,0),(16,'Entregado',13,3,'DELIVERED',NULL,16,0,1,0,0,0,0,0,0),(20,'Asignado',4,0,'PICKER_DESIGNED',NULL,20,1,0,0,0,0,0,2,0),(21,'Retornado',4,1,'PRINTED_BACK',6,21,0,0,0,0,0,0,2,0),(22,'¿Fecha?',2,0,'WRONG_DATE',NULL,22,0,0,0,0,0,0,4,1),(23,'URGENTE',5,1,'LAST_CALL',NULL,23,1,0,1,0,0,0,4,1),(24,'Encadenado',4,0,'CHAINED',4,24,0,0,0,0,0,0,3,1),(25,'Embarcando',3,0,'BOARDING',5,25,1,0,0,0,0,0,3,0),(26,'Prep Previa',5,1,'PREVIOUS_PREPARATION',1,26,0,0,0,1,0,0,2,0),(27,'Prep Asistida',5,1,'ASSISTED_PREPARATION',7,27,0,0,0,0,0,0,2,0),(28,'Previa OK',3,1,'OK PREVIOUS',3,28,0,0,0,1,1,1,3,0),(29,'Previa Impreso',4,1,'PRINTED PREVIOUS',2,29,0,0,1,1,0,1,3,0),(30,'Embarcado',4,1,'BOARD',5,30,0,0,0,2,0,0,3,0),(31,'Polizon Impreso',4,1,'PRINTED STOWAWAY',2,29,1,0,1,0,0,1,3,0),(32,'Polizon OK',3,1,'OK STOWAWAY',3,31,1,0,0,1,1,1,3,0),(33,'Auto_Impreso',4,0,'PRINTED_AUTO',2,29,1,0,1,0,0,1,2,0),(34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',NULL,34,0,0,0,0,0,0,4,1),(35,'Semi-Encajado',9,2,'HALF_PACKED',NULL,10,0,1,0,0,0,0,1,0),(36,'Control Previa',3,1,'PREVIOUS_CONTROL',1,36,0,1,0,4,0,1,3,0);
+INSERT INTO `state` VALUES (1,'Arreglar',2,0,'FIXING',NULL,1,0,0,0,0,0,0,4,1),(2,'Libre',2,0,'FREE',NULL,2,1,0,0,0,1,0,4,1),(3,'OK',3,0,'OK',3,28,1,0,0,0,1,1,3,0),(4,'Impreso',4,0,'PRINTED',2,29,1,0,1,0,0,1,2,0),(5,'Preparación',6,1,'ON_PREPARATION',7,5,0,0,0,2,0,0,2,0),(6,'En Revisión',7,1,'ON_CHECKING',NULL,6,0,1,0,3,0,0,1,0),(7,'Sin Acabar',1,0,'NOT_READY',NULL,7,0,0,0,0,0,0,4,1),(8,'Revisado',8,1,'CHECKED',NULL,8,0,1,0,3,0,0,1,0),(9,'Encajando',9,2,'PACKING',NULL,9,0,1,0,0,0,0,1,0),(10,'Encajado',10,2,'PACKED',NULL,10,0,1,0,0,0,0,0,0),(11,'Facturado',0,3,'INVOICED',NULL,11,0,1,0,0,0,0,0,0),(12,'Bloqueado',0,0,'BLOCKED',NULL,12,0,0,0,0,0,0,4,1),(13,'En Reparto',11,3,'ON_DELIVERY',NULL,13,0,1,0,0,0,0,0,0),(14,'Preparado',6,1,'PREPARED',NULL,14,0,1,0,2,0,0,1,0),(15,'Pte Recogida',12,3,'WAITING_FOR_PICKUP',NULL,15,0,1,0,0,0,0,0,0),(16,'Entregado',13,3,'DELIVERED',NULL,16,0,1,0,0,0,0,0,0),(20,'Asignado',4,0,'PICKER_DESIGNED',NULL,20,1,0,0,0,0,0,2,0),(21,'Retornado',4,1,'PRINTED_BACK',6,21,0,0,0,0,0,0,2,0),(22,'Pte. Ampliar',2,0,'EXPANDABLE',NULL,22,0,0,0,0,0,0,4,1),(23,'URGENTE',5,1,'LAST_CALL',NULL,23,1,0,1,0,0,0,4,1),(24,'Encadenado',4,0,'CHAINED',4,24,0,0,0,0,0,0,3,1),(25,'Embarcando',3,0,'BOARDING',5,25,1,0,0,0,0,0,3,0),(26,'Prep Previa',5,1,'PREVIOUS_PREPARATION',1,28,0,0,0,1,0,0,2,0),(27,'Prep Asistida',5,1,'ASSISTED_PREPARATION',7,27,0,0,0,0,0,0,2,0),(28,'Previa OK',3,1,'OK PREVIOUS',3,28,0,0,0,1,1,1,3,0),(29,'Previa Impreso',4,1,'PRINTED PREVIOUS',2,29,0,0,1,1,0,1,3,0),(30,'Embarcado',4,1,'BOARD',5,30,0,0,0,2,0,0,3,0),(31,'Polizon Impreso',4,1,'PRINTED STOWAWAY',2,29,1,0,1,0,0,1,3,0),(32,'Polizon OK',3,1,'OK STOWAWAY',3,31,1,0,0,1,1,1,3,0),(33,'Auto_Impreso',4,0,'PRINTED_AUTO',2,29,1,0,1,0,0,1,2,0),(34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',NULL,34,0,0,0,0,0,0,4,1),(35,'Semi-Encajado',9,2,'HALF_PACKED',NULL,10,0,1,0,0,0,0,1,0),(36,'Control Previa',3,1,'PREVIOUS_CONTROL',1,36,0,1,0,4,0,1,3,0);
/*!40000 ALTER TABLE `state` ENABLE KEYS */;
UNLOCK TABLES;
@@ -430,7 +430,7 @@ UNLOCK TABLES;
LOCK TABLES `time` WRITE;
/*!40000 ALTER TABLE `time` DISABLE KEYS */;
-INSERT INTO `time` VALUES ('2007-12-31',200801,12,2007,31,1,200712,2008),('2008-01-01',200801,1,2008,1,1,200801,2008),('2008-01-02',200801,1,2008,2,1,200801,2008),('2008-01-03',200801,1,2008,3,1,200801,2008),('2008-01-04',200801,1,2008,4,1,200801,2008),('2008-01-05',200801,1,2008,5,1,200801,2008),('2008-01-06',200802,1,2008,6,2,200801,2008),('2008-01-07',200802,1,2008,7,2,200801,2008),('2008-01-08',200802,1,2008,8,2,200801,2008),('2008-01-09',200802,1,2008,9,2,200801,2008),('2008-01-10',200802,1,2008,10,2,200801,2008),('2008-01-11',200802,1,2008,11,2,200801,2008),('2008-01-12',200802,1,2008,12,2,200801,2008),('2008-01-13',200803,1,2008,13,3,200801,2008),('2008-01-14',200803,1,2008,14,3,200801,2008),('2008-01-15',200803,1,2008,15,3,200801,2008),('2008-01-16',200803,1,2008,16,3,200801,2008),('2008-01-17',200803,1,2008,17,3,200801,2008),('2008-01-18',200803,1,2008,18,3,200801,2008),('2008-01-19',200803,1,2008,19,3,200801,2008),('2008-01-20',200804,1,2008,20,4,200801,2008),('2008-01-21',200804,1,2008,21,4,200801,2008),('2008-01-22',200804,1,2008,22,4,200801,2008),('2008-01-23',200804,1,2008,23,4,200801,2008),('2008-01-24',200804,1,2008,24,4,200801,2008),('2008-01-25',200804,1,2008,25,4,200801,2008),('2008-01-26',200804,1,2008,26,4,200801,2008),('2008-01-27',200805,1,2008,27,5,200801,2008),('2008-01-28',200805,1,2008,28,5,200801,2008),('2008-01-29',200805,1,2008,29,5,200801,2008),('2008-01-30',200805,1,2008,30,5,200801,2008),('2008-01-31',200805,1,2008,31,5,200801,2008),('2008-02-01',200805,2,2008,1,5,200802,2008),('2008-02-02',200805,2,2008,2,5,200802,2008),('2008-02-03',200806,2,2008,3,6,200802,2008),('2008-02-04',200806,2,2008,4,6,200802,2008),('2008-02-05',200806,2,2008,5,6,200802,2008),('2008-02-06',200806,2,2008,6,6,200802,2008),('2008-02-07',200806,2,2008,7,6,200802,2008),('2008-02-08',200806,2,2008,8,6,200802,2008),('2008-02-09',200806,2,2008,9,6,200802,2008),('2008-02-10',200807,2,2008,10,7,200802,2008),('2008-02-11',200807,2,2008,11,7,200802,2008),('2008-02-12',200807,2,2008,12,7,200802,2008),('2008-02-13',200807,2,2008,13,7,200802,2008),('2008-02-14',200807,2,2008,14,7,200802,2008),('2008-02-15',200807,2,2008,15,7,200802,2008),('2008-02-16',200807,2,2008,16,7,200802,2008),('2008-02-17',200808,2,2008,17,8,200802,2008),('2008-02-18',200808,2,2008,18,8,200802,2008),('2008-02-19',200808,2,2008,19,8,200802,2008),('2008-02-20',200808,2,2008,20,8,200802,2008),('2008-02-21',200808,2,2008,21,8,200802,2008),('2008-02-22',200808,2,2008,22,8,200802,2008),('2008-02-23',200808,2,2008,23,8,200802,2008),('2008-02-24',200809,2,2008,24,9,200802,2008),('2008-02-25',200809,2,2008,25,9,200802,2008),('2008-02-26',200809,2,2008,26,9,200802,2008),('2008-02-27',200809,2,2008,27,9,200802,2008),('2008-02-28',200809,2,2008,28,9,200802,2008),('2008-02-29',200809,2,2008,29,9,200802,2008),('2008-03-01',200809,3,2008,1,9,200803,2008),('2008-03-02',200810,3,2008,2,10,200803,2008),('2008-03-03',200810,3,2008,3,10,200803,2008),('2008-03-04',200810,3,2008,4,10,200803,2008),('2008-03-05',200810,3,2008,5,10,200803,2008),('2008-03-06',200810,3,2008,6,10,200803,2008),('2008-03-07',200810,3,2008,7,10,200803,2008),('2008-03-08',200810,3,2008,8,10,200803,2008),('2008-03-09',200811,3,2008,9,11,200803,2008),('2008-03-10',200811,3,2008,10,11,200803,2008),('2008-03-11',200811,3,2008,11,11,200803,2008),('2008-03-12',200811,3,2008,12,11,200803,2008),('2008-03-13',200811,3,2008,13,11,200803,2008),('2008-03-14',200811,3,2008,14,11,200803,2008),('2008-03-15',200811,3,2008,15,11,200803,2008),('2008-03-16',200812,3,2008,16,12,200803,2008),('2008-03-17',200812,3,2008,17,12,200803,2008),('2008-03-18',200812,3,2008,18,12,200803,2008),('2008-03-19',200812,3,2008,19,12,200803,2008),('2008-03-20',200812,3,2008,20,12,200803,2008),('2008-03-21',200812,3,2008,21,12,200803,2008),('2008-03-22',200812,3,2008,22,12,200803,2008),('2008-03-23',200813,3,2008,23,13,200803,2008),('2008-03-24',200813,3,2008,24,13,200803,2008),('2008-03-25',200813,3,2008,25,13,200803,2008),('2008-03-26',200813,3,2008,26,13,200803,2008),('2008-03-27',200813,3,2008,27,13,200803,2008),('2008-03-28',200813,3,2008,28,13,200803,2008),('2008-03-29',200813,3,2008,29,13,200803,2008),('2008-03-30',200814,3,2008,30,14,200803,2008),('2008-03-31',200814,3,2008,31,14,200803,2008),('2008-04-01',200814,4,2008,1,14,200804,2008),('2008-04-02',200814,4,2008,2,14,200804,2008),('2008-04-03',200814,4,2008,3,14,200804,2008),('2008-04-04',200814,4,2008,4,14,200804,2008),('2008-04-05',200814,4,2008,5,14,200804,2008),('2008-04-06',200815,4,2008,6,15,200804,2008),('2008-04-07',200815,4,2008,7,15,200804,2008),('2008-04-08',200815,4,2008,8,15,200804,2008),('2008-04-09',200815,4,2008,9,15,200804,2008),('2008-04-10',200815,4,2008,10,15,200804,2008),('2008-04-11',200815,4,2008,11,15,200804,2008),('2008-04-12',200815,4,2008,12,15,200804,2008),('2008-04-13',200816,4,2008,13,16,200804,2008),('2008-04-14',200816,4,2008,14,16,200804,2008),('2008-04-15',200816,4,2008,15,16,200804,2008),('2008-04-16',200816,4,2008,16,16,200804,2008),('2008-04-17',200816,4,2008,17,16,200804,2008),('2008-04-18',200816,4,2008,18,16,200804,2008),('2008-04-19',200816,4,2008,19,16,200804,2008),('2008-04-20',200817,4,2008,20,17,200804,2008),('2008-04-21',200817,4,2008,21,17,200804,2008),('2008-04-22',200817,4,2008,22,17,200804,2008),('2008-04-23',200817,4,2008,23,17,200804,2008),('2008-04-24',200817,4,2008,24,17,200804,2008),('2008-04-25',200817,4,2008,25,17,200804,2008),('2008-04-26',200817,4,2008,26,17,200804,2008),('2008-04-27',200818,4,2008,27,18,200804,2008),('2008-04-28',200818,4,2008,28,18,200804,2008),('2008-04-29',200818,4,2008,29,18,200804,2008),('2008-04-30',200818,4,2008,30,18,200804,2008),('2008-05-01',200818,5,2008,1,18,200805,2008),('2008-05-02',200818,5,2008,2,18,200805,2008),('2008-05-03',200818,5,2008,3,18,200805,2008),('2008-05-04',200819,5,2008,4,19,200805,2008),('2008-05-05',200819,5,2008,5,19,200805,2008),('2008-05-06',200819,5,2008,6,19,200805,2008),('2008-05-07',200819,5,2008,7,19,200805,2008),('2008-05-08',200819,5,2008,8,19,200805,2008),('2008-05-09',200819,5,2008,9,19,200805,2008),('2008-05-10',200819,5,2008,10,19,200805,2008),('2008-05-11',200820,5,2008,11,20,200805,2008),('2008-05-12',200820,5,2008,12,20,200805,2008),('2008-05-13',200820,5,2008,13,20,200805,2008),('2008-05-14',200820,5,2008,14,20,200805,2008),('2008-05-15',200820,5,2008,15,20,200805,2008),('2008-05-16',200820,5,2008,16,20,200805,2008),('2008-05-17',200820,5,2008,17,20,200805,2008),('2008-05-18',200821,5,2008,18,21,200805,2008),('2008-05-19',200821,5,2008,19,21,200805,2008),('2008-05-20',200821,5,2008,20,21,200805,2008),('2008-05-21',200821,5,2008,21,21,200805,2008),('2008-05-22',200821,5,2008,22,21,200805,2008),('2008-05-23',200821,5,2008,23,21,200805,2008),('2008-05-24',200821,5,2008,24,21,200805,2008),('2008-05-25',200822,5,2008,25,22,200805,2008),('2008-05-26',200822,5,2008,26,22,200805,2008),('2008-05-27',200822,5,2008,27,22,200805,2008),('2008-05-28',200822,5,2008,28,22,200805,2008),('2008-05-29',200822,5,2008,29,22,200805,2008),('2008-05-30',200822,5,2008,30,22,200805,2008),('2008-05-31',200822,5,2008,31,22,200805,2008),('2008-06-01',200823,6,2008,1,23,200806,2008),('2008-06-02',200823,6,2008,2,23,200806,2008),('2008-06-03',200823,6,2008,3,23,200806,2008),('2008-06-04',200823,6,2008,4,23,200806,2008),('2008-06-05',200823,6,2008,5,23,200806,2008),('2008-06-06',200823,6,2008,6,23,200806,2008),('2008-06-07',200823,6,2008,7,23,200806,2008),('2008-06-08',200824,6,2008,8,24,200806,2008),('2008-06-09',200824,6,2008,9,24,200806,2008),('2008-06-10',200824,6,2008,10,24,200806,2008),('2008-06-11',200824,6,2008,11,24,200806,2008),('2008-06-12',200824,6,2008,12,24,200806,2008),('2008-06-13',200824,6,2008,13,24,200806,2008),('2008-06-14',200824,6,2008,14,24,200806,2008),('2008-06-15',200825,6,2008,15,25,200806,2008),('2008-06-16',200825,6,2008,16,25,200806,2008),('2008-06-17',200825,6,2008,17,25,200806,2008),('2008-06-18',200825,6,2008,18,25,200806,2008),('2008-06-19',200825,6,2008,19,25,200806,2008),('2008-06-20',200825,6,2008,20,25,200806,2008),('2008-06-21',200825,6,2008,21,25,200806,2008),('2008-06-22',200826,6,2008,22,26,200806,2008),('2008-06-23',200826,6,2008,23,26,200806,2008),('2008-06-24',200826,6,2008,24,26,200806,2008),('2008-06-25',200826,6,2008,25,26,200806,2008),('2008-06-26',200826,6,2008,26,26,200806,2008),('2008-06-27',200826,6,2008,27,26,200806,2008),('2008-06-28',200826,6,2008,28,26,200806,2008),('2008-06-29',200827,6,2008,29,27,200806,2008),('2008-06-30',200827,6,2008,30,27,200806,2008),('2008-07-01',200827,7,2008,1,27,200807,2008),('2008-07-02',200827,7,2008,2,27,200807,2008),('2008-07-03',200827,7,2008,3,27,200807,2008),('2008-07-04',200827,7,2008,4,27,200807,2008),('2008-07-05',200827,7,2008,5,27,200807,2008),('2008-07-06',200828,7,2008,6,28,200807,2008),('2008-07-07',200828,7,2008,7,28,200807,2008),('2008-07-08',200828,7,2008,8,28,200807,2008),('2008-07-09',200828,7,2008,9,28,200807,2008),('2008-07-10',200828,7,2008,10,28,200807,2008),('2008-07-11',200828,7,2008,11,28,200807,2008),('2008-07-12',200828,7,2008,12,28,200807,2008),('2008-07-13',200829,7,2008,13,29,200807,2008),('2008-07-14',200829,7,2008,14,29,200807,2008),('2008-07-15',200829,7,2008,15,29,200807,2008),('2008-07-16',200829,7,2008,16,29,200807,2008),('2008-07-17',200829,7,2008,17,29,200807,2008),('2008-07-18',200829,7,2008,18,29,200807,2008),('2008-07-19',200829,7,2008,19,29,200807,2008),('2008-07-20',200830,7,2008,20,30,200807,2008),('2008-07-21',200830,7,2008,21,30,200807,2008),('2008-07-22',200830,7,2008,22,30,200807,2008),('2008-07-23',200830,7,2008,23,30,200807,2008),('2008-07-24',200830,7,2008,24,30,200807,2008),('2008-07-25',200830,7,2008,25,30,200807,2008),('2008-07-26',200830,7,2008,26,30,200807,2008),('2008-07-27',200831,7,2008,27,31,200807,2008),('2008-07-28',200831,7,2008,28,31,200807,2008),('2008-07-29',200831,7,2008,29,31,200807,2008),('2008-07-30',200831,7,2008,30,31,200807,2008),('2008-07-31',200831,7,2008,31,31,200807,2008),('2008-08-01',200831,8,2008,1,31,200808,2008),('2008-08-02',200831,8,2008,2,31,200808,2008),('2008-08-03',200832,8,2008,3,32,200808,2008),('2008-08-04',200832,8,2008,4,32,200808,2008),('2008-08-05',200832,8,2008,5,32,200808,2008),('2008-08-06',200832,8,2008,6,32,200808,2008),('2008-08-07',200832,8,2008,7,32,200808,2008),('2008-08-08',200832,8,2008,8,32,200808,2008),('2008-08-09',200832,8,2008,9,32,200808,2008),('2008-08-10',200833,8,2008,10,33,200808,2008),('2008-08-11',200833,8,2008,11,33,200808,2008),('2008-08-12',200833,8,2008,12,33,200808,2008),('2008-08-13',200833,8,2008,13,33,200808,2008),('2008-08-14',200833,8,2008,14,33,200808,2008),('2008-08-15',200833,8,2008,15,33,200808,2008),('2008-08-16',200833,8,2008,16,33,200808,2008),('2008-08-17',200834,8,2008,17,34,200808,2008),('2008-08-18',200834,8,2008,18,34,200808,2008),('2008-08-19',200834,8,2008,19,34,200808,2008),('2008-08-20',200834,8,2008,20,34,200808,2008),('2008-08-21',200834,8,2008,21,34,200808,2008),('2008-08-22',200834,8,2008,22,34,200808,2008),('2008-08-23',200834,8,2008,23,34,200808,2008),('2008-08-24',200835,8,2008,24,35,200808,2008),('2008-08-25',200835,8,2008,25,35,200808,2008),('2008-08-26',200835,8,2008,26,35,200808,2008),('2008-08-27',200835,8,2008,27,35,200808,2008),('2008-08-28',200835,8,2008,28,35,200808,2008),('2008-08-29',200835,8,2008,29,35,200808,2008),('2008-08-30',200835,8,2008,30,35,200808,2008),('2008-08-31',200836,8,2008,31,36,200808,2008),('2008-09-01',200836,9,2008,1,36,200809,2008),('2008-09-02',200836,9,2008,2,36,200809,2008),('2008-09-03',200836,9,2008,3,36,200809,2008),('2008-09-04',200836,9,2008,4,36,200809,2008),('2008-09-05',200836,9,2008,5,36,200809,2008),('2008-09-06',200836,9,2008,6,36,200809,2008),('2008-09-07',200837,9,2008,7,37,200809,2008),('2008-09-08',200837,9,2008,8,37,200809,2008),('2008-09-09',200837,9,2008,9,37,200809,2008),('2008-09-10',200837,9,2008,10,37,200809,2008),('2008-09-11',200837,9,2008,11,37,200809,2008),('2008-09-12',200837,9,2008,12,37,200809,2008),('2008-09-13',200837,9,2008,13,37,200809,2008),('2008-09-14',200838,9,2008,14,38,200809,2008),('2008-09-15',200838,9,2008,15,38,200809,2008),('2008-09-16',200838,9,2008,16,38,200809,2008),('2008-09-17',200838,9,2008,17,38,200809,2008),('2008-09-18',200838,9,2008,18,38,200809,2008),('2008-09-19',200838,9,2008,19,38,200809,2008),('2008-09-20',200838,9,2008,20,38,200809,2008),('2008-09-21',200839,9,2008,21,39,200809,2008),('2008-09-22',200839,9,2008,22,39,200809,2008),('2008-09-23',200839,9,2008,23,39,200809,2008),('2008-09-24',200839,9,2008,24,39,200809,2008),('2008-09-25',200839,9,2008,25,39,200809,2008),('2008-09-26',200839,9,2008,26,39,200809,2008),('2008-09-27',200839,9,2008,27,39,200809,2008),('2008-09-28',200840,9,2008,28,40,200809,2008),('2008-09-29',200840,9,2008,29,40,200809,2008),('2008-09-30',200840,9,2008,30,40,200809,2008),('2008-10-01',200840,10,2008,1,40,200810,2008),('2008-10-02',200840,10,2008,2,40,200810,2008),('2008-10-03',200840,10,2008,3,40,200810,2008),('2008-10-04',200840,10,2008,4,40,200810,2008),('2008-10-05',200841,10,2008,5,41,200810,2008),('2008-10-06',200841,10,2008,6,41,200810,2008),('2008-10-07',200841,10,2008,7,41,200810,2008),('2008-10-08',200841,10,2008,8,41,200810,2008),('2008-10-09',200841,10,2008,9,41,200810,2008),('2008-10-10',200841,10,2008,10,41,200810,2008),('2008-10-11',200841,10,2008,11,41,200810,2008),('2008-10-12',200842,10,2008,12,42,200810,2008),('2008-10-13',200842,10,2008,13,42,200810,2008),('2008-10-14',200842,10,2008,14,42,200810,2008),('2008-10-15',200842,10,2008,15,42,200810,2008),('2008-10-16',200842,10,2008,16,42,200810,2008),('2008-10-17',200842,10,2008,17,42,200810,2008),('2008-10-18',200842,10,2008,18,42,200810,2008),('2008-10-19',200843,10,2008,19,43,200810,2008),('2008-10-20',200843,10,2008,20,43,200810,2008),('2008-10-21',200843,10,2008,21,43,200810,2008),('2008-10-22',200843,10,2008,22,43,200810,2008),('2008-10-23',200843,10,2008,23,43,200810,2008),('2008-10-24',200843,10,2008,24,43,200810,2008),('2008-10-25',200843,10,2008,25,43,200810,2008),('2008-10-26',200844,10,2008,26,44,200810,2008),('2008-10-27',200844,10,2008,27,44,200810,2008),('2008-10-28',200844,10,2008,28,44,200810,2008),('2008-10-29',200844,10,2008,29,44,200810,2008),('2008-10-30',200844,10,2008,30,44,200810,2008),('2008-10-31',200844,10,2008,31,44,200810,2008),('2008-11-01',200844,11,2008,1,44,200811,2008),('2008-11-02',200845,11,2008,2,45,200811,2008),('2008-11-03',200845,11,2008,3,45,200811,2008),('2008-11-04',200845,11,2008,4,45,200811,2008),('2008-11-05',200845,11,2008,5,45,200811,2008),('2008-11-06',200845,11,2008,6,45,200811,2008),('2008-11-07',200845,11,2008,7,45,200811,2008),('2008-11-08',200845,11,2008,8,45,200811,2008),('2008-11-09',200846,11,2008,9,46,200811,2008),('2008-11-10',200846,11,2008,10,46,200811,2008),('2008-11-11',200846,11,2008,11,46,200811,2008),('2008-11-12',200846,11,2008,12,46,200811,2008),('2008-11-13',200846,11,2008,13,46,200811,2008),('2008-11-14',200846,11,2008,14,46,200811,2008),('2008-11-15',200846,11,2008,15,46,200811,2008),('2008-11-16',200847,11,2008,16,47,200811,2008),('2008-11-17',200847,11,2008,17,47,200811,2008),('2008-11-18',200847,11,2008,18,47,200811,2008),('2008-11-19',200847,11,2008,19,47,200811,2008),('2008-11-20',200847,11,2008,20,47,200811,2008),('2008-11-21',200847,11,2008,21,47,200811,2008),('2008-11-22',200847,11,2008,22,47,200811,2008),('2008-11-23',200848,11,2008,23,48,200811,2008),('2008-11-24',200848,11,2008,24,48,200811,2008),('2008-11-25',200848,11,2008,25,48,200811,2008),('2008-11-26',200848,11,2008,26,48,200811,2008),('2008-11-27',200848,11,2008,27,48,200811,2008),('2008-11-28',200848,11,2008,28,48,200811,2008),('2008-11-29',200848,11,2008,29,48,200811,2008),('2008-11-30',200849,11,2008,30,49,200811,2008),('2008-12-01',200849,12,2008,1,49,200812,2009),('2008-12-02',200849,12,2008,2,49,200812,2009),('2008-12-03',200849,12,2008,3,49,200812,2009),('2008-12-04',200849,12,2008,4,49,200812,2009),('2008-12-05',200849,12,2008,5,49,200812,2009),('2008-12-06',200849,12,2008,6,49,200812,2009),('2008-12-07',200850,12,2008,7,50,200812,2009),('2008-12-08',200850,12,2008,8,50,200812,2009),('2008-12-09',200850,12,2008,9,50,200812,2009),('2008-12-10',200850,12,2008,10,50,200812,2009),('2008-12-11',200850,12,2008,11,50,200812,2009),('2008-12-12',200850,12,2008,12,50,200812,2009),('2008-12-13',200850,12,2008,13,50,200812,2009),('2008-12-14',200851,12,2008,14,51,200812,2009),('2008-12-15',200851,12,2008,15,51,200812,2009),('2008-12-16',200851,12,2008,16,51,200812,2009),('2008-12-17',200851,12,2008,17,51,200812,2009),('2008-12-18',200851,12,2008,18,51,200812,2009),('2008-12-19',200851,12,2008,19,51,200812,2009),('2008-12-20',200851,12,2008,20,51,200812,2009),('2008-12-21',200852,12,2008,21,52,200812,2009),('2008-12-22',200852,12,2008,22,52,200812,2009),('2008-12-23',200852,12,2008,23,52,200812,2009),('2008-12-24',200852,12,2008,24,52,200812,2009),('2008-12-25',200852,12,2008,25,52,200812,2009),('2008-12-26',200852,12,2008,26,52,200812,2009),('2008-12-27',200852,12,2008,27,52,200812,2009),('2008-12-28',200853,12,2008,28,53,200812,2009),('2008-12-29',200901,12,2008,29,53,200812,2009),('2008-12-30',200901,12,2008,30,53,200812,2009),('2008-12-31',200901,12,2008,31,53,200812,2009),('2009-01-01',200901,1,2009,1,53,200901,2009),('2009-01-02',200901,1,2009,2,53,200901,2009),('2009-01-03',200901,1,2009,3,53,200901,2009),('2009-01-04',200902,1,2009,4,1,200901,2009),('2009-01-05',200902,1,2009,5,1,200901,2009),('2009-01-06',200902,1,2009,6,1,200901,2009),('2009-01-07',200902,1,2009,7,1,200901,2009),('2009-01-08',200902,1,2009,8,1,200901,2009),('2009-01-09',200902,1,2009,9,1,200901,2009),('2009-01-10',200902,1,2009,10,1,200901,2009),('2009-01-11',200903,1,2009,11,2,200901,2009),('2009-01-12',200903,1,2009,12,2,200901,2009),('2009-01-13',200903,1,2009,13,2,200901,2009),('2009-01-14',200903,1,2009,14,2,200901,2009),('2009-01-15',200903,1,2009,15,2,200901,2009),('2009-01-16',200903,1,2009,16,2,200901,2009),('2009-01-17',200903,1,2009,17,2,200901,2009),('2009-01-18',200904,1,2009,18,3,200901,2009),('2009-01-19',200904,1,2009,19,3,200901,2009),('2009-01-20',200904,1,2009,20,3,200901,2009),('2009-01-21',200904,1,2009,21,3,200901,2009),('2009-01-22',200904,1,2009,22,3,200901,2009),('2009-01-23',200904,1,2009,23,3,200901,2009),('2009-01-24',200904,1,2009,24,3,200901,2009),('2009-01-25',200905,1,2009,25,4,200901,2009),('2009-01-26',200905,1,2009,26,4,200901,2009),('2009-01-27',200905,1,2009,27,4,200901,2009),('2009-01-28',200905,1,2009,28,4,200901,2009),('2009-01-29',200905,1,2009,29,4,200901,2009),('2009-01-30',200905,1,2009,30,4,200901,2009),('2009-01-31',200905,1,2009,31,4,200901,2009),('2009-02-01',200906,2,2009,1,5,200902,2009),('2009-02-02',200906,2,2009,2,5,200902,2009),('2009-02-03',200906,2,2009,3,5,200902,2009),('2009-02-04',200906,2,2009,4,5,200902,2009),('2009-02-05',200906,2,2009,5,5,200902,2009),('2009-02-06',200906,2,2009,6,5,200902,2009),('2009-02-07',200906,2,2009,7,5,200902,2009),('2009-02-08',200907,2,2009,8,6,200902,2009),('2009-02-09',200907,2,2009,9,6,200902,2009),('2009-02-10',200907,2,2009,10,6,200902,2009),('2009-02-11',200907,2,2009,11,6,200902,2009),('2009-02-12',200907,2,2009,12,6,200902,2009),('2009-02-13',200907,2,2009,13,6,200902,2009),('2009-02-14',200907,2,2009,14,6,200902,2009),('2009-02-15',200908,2,2009,15,7,200902,2009),('2009-02-16',200908,2,2009,16,7,200902,2009),('2009-02-17',200908,2,2009,17,7,200902,2009),('2009-02-18',200908,2,2009,18,7,200902,2009),('2009-02-19',200908,2,2009,19,7,200902,2009),('2009-02-20',200908,2,2009,20,7,200902,2009),('2009-02-21',200908,2,2009,21,7,200902,2009),('2009-02-22',200909,2,2009,22,8,200902,2009),('2009-02-23',200909,2,2009,23,8,200902,2009),('2009-02-24',200909,2,2009,24,8,200902,2009),('2009-02-25',200909,2,2009,25,8,200902,2009),('2009-02-26',200909,2,2009,26,8,200902,2009),('2009-02-27',200909,2,2009,27,8,200902,2009),('2009-02-28',200909,2,2009,28,8,200902,2009),('2009-03-01',200910,3,2009,1,9,200903,2009),('2009-03-02',200910,3,2009,2,9,200903,2009),('2009-03-03',200910,3,2009,3,9,200903,2009),('2009-03-04',200910,3,2009,4,9,200903,2009),('2009-03-05',200910,3,2009,5,9,200903,2009),('2009-03-06',200910,3,2009,6,9,200903,2009),('2009-03-07',200910,3,2009,7,9,200903,2009),('2009-03-08',200911,3,2009,8,10,200903,2009),('2009-03-09',200911,3,2009,9,10,200903,2009),('2009-03-10',200911,3,2009,10,10,200903,2009),('2009-03-11',200911,3,2009,11,10,200903,2009),('2009-03-12',200911,3,2009,12,10,200903,2009),('2009-03-13',200911,3,2009,13,10,200903,2009),('2009-03-14',200911,3,2009,14,10,200903,2009),('2009-03-15',200912,3,2009,15,11,200903,2009),('2009-03-16',200912,3,2009,16,11,200903,2009),('2009-03-17',200912,3,2009,17,11,200903,2009),('2009-03-18',200912,3,2009,18,11,200903,2009),('2009-03-19',200912,3,2009,19,11,200903,2009),('2009-03-20',200912,3,2009,20,11,200903,2009),('2009-03-21',200912,3,2009,21,11,200903,2009),('2009-03-22',200913,3,2009,22,12,200903,2009),('2009-03-23',200913,3,2009,23,12,200903,2009),('2009-03-24',200913,3,2009,24,12,200903,2009),('2009-03-25',200913,3,2009,25,12,200903,2009),('2009-03-26',200913,3,2009,26,12,200903,2009),('2009-03-27',200913,3,2009,27,12,200903,2009),('2009-03-28',200913,3,2009,28,12,200903,2009),('2009-03-29',200914,3,2009,29,13,200903,2009),('2009-03-30',200914,3,2009,30,13,200903,2009),('2009-03-31',200914,3,2009,31,13,200903,2009),('2009-04-01',200914,4,2009,1,13,200904,2009),('2009-04-02',200914,4,2009,2,13,200904,2009),('2009-04-03',200914,4,2009,3,13,200904,2009),('2009-04-04',200914,4,2009,4,13,200904,2009),('2009-04-05',200915,4,2009,5,14,200904,2009),('2009-04-06',200915,4,2009,6,14,200904,2009),('2009-04-07',200915,4,2009,7,14,200904,2009),('2009-04-08',200915,4,2009,8,14,200904,2009),('2009-04-09',200915,4,2009,9,14,200904,2009),('2009-04-10',200915,4,2009,10,14,200904,2009),('2009-04-11',200915,4,2009,11,14,200904,2009),('2009-04-12',200916,4,2009,12,15,200904,2009),('2009-04-13',200916,4,2009,13,15,200904,2009),('2009-04-14',200916,4,2009,14,15,200904,2009),('2009-04-15',200916,4,2009,15,15,200904,2009),('2009-04-16',200916,4,2009,16,15,200904,2009),('2009-04-17',200916,4,2009,17,15,200904,2009),('2009-04-18',200916,4,2009,18,15,200904,2009),('2009-04-19',200917,4,2009,19,16,200904,2009),('2009-04-20',200917,4,2009,20,16,200904,2009),('2009-04-21',200917,4,2009,21,16,200904,2009),('2009-04-22',200917,4,2009,22,16,200904,2009),('2009-04-23',200917,4,2009,23,16,200904,2009),('2009-04-24',200917,4,2009,24,16,200904,2009),('2009-04-25',200917,4,2009,25,16,200904,2009),('2009-04-26',200918,4,2009,26,17,200904,2009),('2009-04-27',200918,4,2009,27,17,200904,2009),('2009-04-28',200918,4,2009,28,17,200904,2009),('2009-04-29',200918,4,2009,29,17,200904,2009),('2009-04-30',200918,4,2009,30,17,200904,2009),('2009-05-01',200918,5,2009,1,17,200905,2009),('2009-05-02',200918,5,2009,2,17,200905,2009),('2009-05-03',200919,5,2009,3,18,200905,2009),('2009-05-04',200919,5,2009,4,18,200905,2009),('2009-05-05',200919,5,2009,5,18,200905,2009),('2009-05-06',200919,5,2009,6,18,200905,2009),('2009-05-07',200919,5,2009,7,18,200905,2009),('2009-05-08',200919,5,2009,8,18,200905,2009),('2009-05-09',200919,5,2009,9,18,200905,2009),('2009-05-10',200920,5,2009,10,19,200905,2009),('2009-05-11',200920,5,2009,11,19,200905,2009),('2009-05-12',200920,5,2009,12,19,200905,2009),('2009-05-13',200920,5,2009,13,19,200905,2009),('2009-05-14',200920,5,2009,14,19,200905,2009),('2009-05-15',200920,5,2009,15,19,200905,2009),('2009-05-16',200920,5,2009,16,19,200905,2009),('2009-05-17',200921,5,2009,17,20,200905,2009),('2009-05-18',200921,5,2009,18,20,200905,2009),('2009-05-19',200921,5,2009,19,20,200905,2009),('2009-05-20',200921,5,2009,20,20,200905,2009),('2009-05-21',200921,5,2009,21,20,200905,2009),('2009-05-22',200921,5,2009,22,20,200905,2009),('2009-05-23',200921,5,2009,23,20,200905,2009),('2009-05-24',200922,5,2009,24,21,200905,2009),('2009-05-25',200922,5,2009,25,21,200905,2009),('2009-05-26',200922,5,2009,26,21,200905,2009),('2009-05-27',200922,5,2009,27,21,200905,2009),('2009-05-28',200922,5,2009,28,21,200905,2009),('2009-05-29',200922,5,2009,29,21,200905,2009),('2009-05-30',200922,5,2009,30,21,200905,2009),('2009-05-31',200923,5,2009,31,22,200905,2009),('2009-06-01',200923,6,2009,1,22,200906,2009),('2009-06-02',200923,6,2009,2,22,200906,2009),('2009-06-03',200923,6,2009,3,22,200906,2009),('2009-06-04',200923,6,2009,4,22,200906,2009),('2009-06-05',200923,6,2009,5,22,200906,2009),('2009-06-06',200923,6,2009,6,22,200906,2009),('2009-06-07',200924,6,2009,7,23,200906,2009),('2009-06-08',200924,6,2009,8,23,200906,2009),('2009-06-09',200924,6,2009,9,23,200906,2009),('2009-06-10',200924,6,2009,10,23,200906,2009),('2009-06-11',200924,6,2009,11,23,200906,2009),('2009-06-12',200924,6,2009,12,23,200906,2009),('2009-06-13',200924,6,2009,13,23,200906,2009),('2009-06-14',200925,6,2009,14,24,200906,2009),('2009-06-15',200925,6,2009,15,24,200906,2009),('2009-06-16',200925,6,2009,16,24,200906,2009),('2009-06-17',200925,6,2009,17,24,200906,2009),('2009-06-18',200925,6,2009,18,24,200906,2009),('2009-06-19',200925,6,2009,19,24,200906,2009),('2009-06-20',200925,6,2009,20,24,200906,2009),('2009-06-21',200926,6,2009,21,25,200906,2009),('2009-06-22',200926,6,2009,22,25,200906,2009),('2009-06-23',200926,6,2009,23,25,200906,2009),('2009-06-24',200926,6,2009,24,25,200906,2009),('2009-06-25',200926,6,2009,25,25,200906,2009),('2009-06-26',200926,6,2009,26,25,200906,2009),('2009-06-27',200926,6,2009,27,25,200906,2009),('2009-06-28',200927,6,2009,28,26,200906,2009),('2009-06-29',200927,6,2009,29,26,200906,2009),('2009-06-30',200927,6,2009,30,26,200906,2009),('2009-07-01',200927,7,2009,1,26,200907,2009),('2009-07-02',200927,7,2009,2,26,200907,2009),('2009-07-03',200927,7,2009,3,26,200907,2009),('2009-07-04',200927,7,2009,4,26,200907,2009),('2009-07-05',200928,7,2009,5,27,200907,2009),('2009-07-06',200928,7,2009,6,27,200907,2009),('2009-07-07',200928,7,2009,7,27,200907,2009),('2009-07-08',200928,7,2009,8,27,200907,2009),('2009-07-09',200928,7,2009,9,27,200907,2009),('2009-07-10',200928,7,2009,10,27,200907,2009),('2009-07-11',200928,7,2009,11,27,200907,2009),('2009-07-12',200929,7,2009,12,28,200907,2009),('2009-07-13',200929,7,2009,13,28,200907,2009),('2009-07-14',200929,7,2009,14,28,200907,2009),('2009-07-15',200929,7,2009,15,28,200907,2009),('2009-07-16',200929,7,2009,16,28,200907,2009),('2009-07-17',200929,7,2009,17,28,200907,2009),('2009-07-18',200929,7,2009,18,28,200907,2009),('2009-07-19',200930,7,2009,19,29,200907,2009),('2009-07-20',200930,7,2009,20,29,200907,2009),('2009-07-21',200930,7,2009,21,29,200907,2009),('2009-07-22',200930,7,2009,22,29,200907,2009),('2009-07-23',200930,7,2009,23,29,200907,2009),('2009-07-24',200930,7,2009,24,29,200907,2009),('2009-07-25',200930,7,2009,25,29,200907,2009),('2009-07-26',200931,7,2009,26,30,200907,2009),('2009-07-27',200931,7,2009,27,30,200907,2009),('2009-07-28',200931,7,2009,28,30,200907,2009),('2009-07-29',200931,7,2009,29,30,200907,2009),('2009-07-30',200931,7,2009,30,30,200907,2009),('2009-07-31',200931,7,2009,31,30,200907,2009),('2009-08-01',200931,8,2009,1,30,200908,2009),('2009-08-02',200932,8,2009,2,31,200908,2009),('2009-08-03',200932,8,2009,3,31,200908,2009),('2009-08-04',200932,8,2009,4,31,200908,2009),('2009-08-05',200932,8,2009,5,31,200908,2009),('2009-08-06',200932,8,2009,6,31,200908,2009),('2009-08-07',200932,8,2009,7,31,200908,2009),('2009-08-08',200932,8,2009,8,31,200908,2009),('2009-08-09',200933,8,2009,9,32,200908,2009),('2009-08-10',200933,8,2009,10,32,200908,2009),('2009-08-11',200933,8,2009,11,32,200908,2009),('2009-08-12',200933,8,2009,12,32,200908,2009),('2009-08-13',200933,8,2009,13,32,200908,2009),('2009-08-14',200933,8,2009,14,32,200908,2009),('2009-08-15',200933,8,2009,15,32,200908,2009),('2009-08-16',200934,8,2009,16,33,200908,2009),('2009-08-17',200934,8,2009,17,33,200908,2009),('2009-08-18',200934,8,2009,18,33,200908,2009),('2009-08-19',200934,8,2009,19,33,200908,2009),('2009-08-20',200934,8,2009,20,33,200908,2009),('2009-08-21',200934,8,2009,21,33,200908,2009),('2009-08-22',200934,8,2009,22,33,200908,2009),('2009-08-23',200935,8,2009,23,34,200908,2009),('2009-08-24',200935,8,2009,24,34,200908,2009),('2009-08-25',200935,8,2009,25,34,200908,2009),('2009-08-26',200935,8,2009,26,34,200908,2009),('2009-08-27',200935,8,2009,27,34,200908,2009),('2009-08-28',200935,8,2009,28,34,200908,2009),('2009-08-29',200935,8,2009,29,34,200908,2009),('2009-08-30',200936,8,2009,30,35,200908,2009),('2009-08-31',200936,8,2009,31,35,200908,2009),('2009-09-01',200936,9,2009,1,35,200909,2009),('2009-09-02',200936,9,2009,2,35,200909,2009),('2009-09-03',200936,9,2009,3,35,200909,2009),('2009-09-04',200936,9,2009,4,35,200909,2009),('2009-09-05',200936,9,2009,5,35,200909,2009),('2009-09-06',200937,9,2009,6,36,200909,2009),('2009-09-07',200937,9,2009,7,36,200909,2009),('2009-09-08',200937,9,2009,8,36,200909,2009),('2009-09-09',200937,9,2009,9,36,200909,2009),('2009-09-10',200937,9,2009,10,36,200909,2009),('2009-09-11',200937,9,2009,11,36,200909,2009),('2009-09-12',200937,9,2009,12,36,200909,2009),('2009-09-13',200938,9,2009,13,37,200909,2009),('2009-09-14',200938,9,2009,14,37,200909,2009),('2009-09-15',200938,9,2009,15,37,200909,2009),('2009-09-16',200938,9,2009,16,37,200909,2009),('2009-09-17',200938,9,2009,17,37,200909,2009),('2009-09-18',200938,9,2009,18,37,200909,2009),('2009-09-19',200938,9,2009,19,37,200909,2009),('2009-09-20',200939,9,2009,20,38,200909,2009),('2009-09-21',200939,9,2009,21,38,200909,2009),('2009-09-22',200939,9,2009,22,38,200909,2009),('2009-09-23',200939,9,2009,23,38,200909,2009),('2009-09-24',200939,9,2009,24,38,200909,2009),('2009-09-25',200939,9,2009,25,38,200909,2009),('2009-09-26',200939,9,2009,26,38,200909,2009),('2009-09-27',200940,9,2009,27,39,200909,2009),('2009-09-28',200940,9,2009,28,39,200909,2009),('2009-09-29',200940,9,2009,29,39,200909,2009),('2009-09-30',200940,9,2009,30,39,200909,2009),('2009-10-01',200940,10,2009,1,39,200910,2009),('2009-10-02',200940,10,2009,2,39,200910,2009),('2009-10-03',200940,10,2009,3,39,200910,2009),('2009-10-04',200941,10,2009,4,40,200910,2009),('2009-10-05',200941,10,2009,5,40,200910,2009),('2009-10-06',200941,10,2009,6,40,200910,2009),('2009-10-07',200941,10,2009,7,40,200910,2009),('2009-10-08',200941,10,2009,8,40,200910,2009),('2009-10-09',200941,10,2009,9,40,200910,2009),('2009-10-10',200941,10,2009,10,40,200910,2009),('2009-10-11',200942,10,2009,11,41,200910,2009),('2009-10-12',200942,10,2009,12,41,200910,2009),('2009-10-13',200942,10,2009,13,41,200910,2009),('2009-10-14',200942,10,2009,14,41,200910,2009),('2009-10-15',200942,10,2009,15,41,200910,2009),('2009-10-16',200942,10,2009,16,41,200910,2009),('2009-10-17',200942,10,2009,17,41,200910,2009),('2009-10-18',200943,10,2009,18,42,200910,2009),('2009-10-19',200943,10,2009,19,42,200910,2009),('2009-10-20',200943,10,2009,20,42,200910,2009),('2009-10-21',200943,10,2009,21,42,200910,2009),('2009-10-22',200943,10,2009,22,42,200910,2009),('2009-10-23',200943,10,2009,23,42,200910,2009),('2009-10-24',200943,10,2009,24,42,200910,2009),('2009-10-25',200944,10,2009,25,43,200910,2009),('2009-10-26',200944,10,2009,26,43,200910,2009),('2009-10-27',200944,10,2009,27,43,200910,2009),('2009-10-28',200944,10,2009,28,43,200910,2009),('2009-10-29',200944,10,2009,29,43,200910,2009),('2009-10-30',200944,10,2009,30,43,200910,2009),('2009-10-31',200944,10,2009,31,43,200910,2009),('2009-11-01',200945,11,2009,1,44,200911,2009),('2009-11-02',200945,11,2009,2,44,200911,2009),('2009-11-03',200945,11,2009,3,44,200911,2009),('2009-11-04',200945,11,2009,4,44,200911,2009),('2009-11-05',200945,11,2009,5,44,200911,2009),('2009-11-06',200945,11,2009,6,44,200911,2009),('2009-11-07',200945,11,2009,7,44,200911,2009),('2009-11-08',200946,11,2009,8,45,200911,2009),('2009-11-09',200946,11,2009,9,45,200911,2009),('2009-11-10',200946,11,2009,10,45,200911,2009),('2009-11-11',200946,11,2009,11,45,200911,2009),('2009-11-12',200946,11,2009,12,45,200911,2009),('2009-11-13',200946,11,2009,13,45,200911,2009),('2009-11-14',200946,11,2009,14,45,200911,2009),('2009-11-15',200947,11,2009,15,46,200911,2009),('2009-11-16',200947,11,2009,16,46,200911,2009),('2009-11-17',200947,11,2009,17,46,200911,2009),('2009-11-18',200947,11,2009,18,46,200911,2009),('2009-11-19',200947,11,2009,19,46,200911,2009),('2009-11-20',200947,11,2009,20,46,200911,2009),('2009-11-21',200947,11,2009,21,46,200911,2009),('2009-11-22',200948,11,2009,22,47,200911,2009),('2009-11-23',200948,11,2009,23,47,200911,2009),('2009-11-24',200948,11,2009,24,47,200911,2009),('2009-11-25',200948,11,2009,25,47,200911,2009),('2009-11-26',200948,11,2009,26,47,200911,2009),('2009-11-27',200948,11,2009,27,47,200911,2009),('2009-11-28',200948,11,2009,28,47,200911,2009),('2009-11-29',200949,11,2009,29,48,200911,2009),('2009-11-30',200949,11,2009,30,48,200911,2009),('2009-12-01',200949,12,2009,1,48,200912,2010),('2009-12-02',200949,12,2009,2,48,200912,2010),('2009-12-03',200949,12,2009,3,48,200912,2010),('2009-12-04',200949,12,2009,4,48,200912,2010),('2009-12-05',200949,12,2009,5,48,200912,2010),('2009-12-06',200950,12,2009,6,49,200912,2010),('2009-12-07',200950,12,2009,7,49,200912,2010),('2009-12-08',200950,12,2009,8,49,200912,2010),('2009-12-09',200950,12,2009,9,49,200912,2010),('2009-12-10',200950,12,2009,10,49,200912,2010),('2009-12-11',200950,12,2009,11,49,200912,2010),('2009-12-12',200950,12,2009,12,49,200912,2010),('2009-12-13',200951,12,2009,13,50,200912,2010),('2009-12-14',200951,12,2009,14,50,200912,2010),('2009-12-15',200951,12,2009,15,50,200912,2010),('2009-12-16',200951,12,2009,16,50,200912,2010),('2009-12-17',200951,12,2009,17,50,200912,2010),('2009-12-18',200951,12,2009,18,50,200912,2010),('2009-12-19',200951,12,2009,19,50,200912,2010),('2009-12-20',200952,12,2009,20,51,200912,2010),('2009-12-21',200952,12,2009,21,51,200912,2010),('2009-12-22',200952,12,2009,22,51,200912,2010),('2009-12-23',200952,12,2009,23,51,200912,2010),('2009-12-24',200952,12,2009,24,51,200912,2010),('2009-12-25',200952,12,2009,25,51,200912,2010),('2009-12-26',200952,12,2009,26,51,200912,2010),('2009-12-27',200953,12,2009,27,52,200912,2010),('2009-12-28',200952,12,2009,28,52,200912,2010),('2009-12-29',200952,12,2009,29,52,200912,2010),('2009-12-30',200952,12,2009,30,52,200912,2010),('2009-12-31',200952,12,2009,31,52,200912,2010),('2010-01-01',201001,1,2010,1,52,201001,2010),('2010-01-02',201001,1,2010,2,52,201001,2010),('2010-01-03',201002,1,2010,3,1,201001,2010),('2010-01-04',201001,1,2010,4,1,201001,2010),('2010-01-05',201001,1,2010,5,1,201001,2010),('2010-01-06',201001,1,2010,6,1,201001,2010),('2010-01-07',201001,1,2010,7,1,201001,2010),('2010-01-08',201001,1,2010,8,1,201001,2010),('2010-01-09',201001,1,2010,9,1,201001,2010),('2010-01-10',201002,1,2010,10,2,201001,2010),('2010-01-11',201002,1,2010,11,2,201001,2010),('2010-01-12',201002,1,2010,12,2,201001,2010),('2010-01-13',201002,1,2010,13,2,201001,2010),('2010-01-14',201002,1,2010,14,2,201001,2010),('2010-01-15',201002,1,2010,15,2,201001,2010),('2010-01-16',201002,1,2010,16,2,201001,2010),('2010-01-17',201003,1,2010,17,3,201001,2010),('2010-01-18',201003,1,2010,18,3,201001,2010),('2010-01-19',201003,1,2010,19,3,201001,2010),('2010-01-20',201003,1,2010,20,3,201001,2010),('2010-01-21',201003,1,2010,21,3,201001,2010),('2010-01-22',201003,1,2010,22,3,201001,2010),('2010-01-23',201003,1,2010,23,3,201001,2010),('2010-01-24',201004,1,2010,24,4,201001,2010),('2010-01-25',201004,1,2010,25,4,201001,2010),('2010-01-26',201004,1,2010,26,4,201001,2010),('2010-01-27',201004,1,2010,27,4,201001,2010),('2010-01-28',201004,1,2010,28,4,201001,2010),('2010-01-29',201004,1,2010,29,4,201001,2010),('2010-01-30',201004,1,2010,30,4,201001,2010),('2010-01-31',201005,1,2010,31,5,201001,2010),('2010-02-01',201005,2,2010,1,5,201002,2010),('2010-02-02',201005,2,2010,2,5,201002,2010),('2010-02-03',201005,2,2010,3,5,201002,2010),('2010-02-04',201005,2,2010,4,5,201002,2010),('2010-02-05',201005,2,2010,5,5,201002,2010),('2010-02-06',201005,2,2010,6,5,201002,2010),('2010-02-07',201006,2,2010,7,6,201002,2010),('2010-02-08',201006,2,2010,8,6,201002,2010),('2010-02-09',201006,2,2010,9,6,201002,2010),('2010-02-10',201006,2,2010,10,6,201002,2010),('2010-02-11',201006,2,2010,11,6,201002,2010),('2010-02-12',201006,2,2010,12,6,201002,2010),('2010-02-13',201006,2,2010,13,6,201002,2010),('2010-02-14',201007,2,2010,14,7,201002,2010),('2010-02-15',201007,2,2010,15,7,201002,2010),('2010-02-16',201007,2,2010,16,7,201002,2010),('2010-02-17',201007,2,2010,17,7,201002,2010),('2010-02-18',201007,2,2010,18,7,201002,2010),('2010-02-19',201007,2,2010,19,7,201002,2010),('2010-02-20',201007,2,2010,20,7,201002,2010),('2010-02-21',201008,2,2010,21,8,201002,2010),('2010-02-22',201008,2,2010,22,8,201002,2010),('2010-02-23',201008,2,2010,23,8,201002,2010),('2010-02-24',201008,2,2010,24,8,201002,2010),('2010-02-25',201008,2,2010,25,8,201002,2010),('2010-02-26',201008,2,2010,26,8,201002,2010),('2010-02-27',201008,2,2010,27,8,201002,2010),('2010-02-28',201009,2,2010,28,9,201002,2010),('2010-03-01',201009,3,2010,1,9,201003,2010),('2010-03-02',201009,3,2010,2,9,201003,2010),('2010-03-03',201009,3,2010,3,9,201003,2010),('2010-03-04',201009,3,2010,4,9,201003,2010),('2010-03-05',201009,3,2010,5,9,201003,2010),('2010-03-06',201009,3,2010,6,9,201003,2010),('2010-03-07',201010,3,2010,7,10,201003,2010),('2010-03-08',201010,3,2010,8,10,201003,2010),('2010-03-09',201010,3,2010,9,10,201003,2010),('2010-03-10',201010,3,2010,10,10,201003,2010),('2010-03-11',201010,3,2010,11,10,201003,2010),('2010-03-12',201010,3,2010,12,10,201003,2010),('2010-03-13',201010,3,2010,13,10,201003,2010),('2010-03-14',201011,3,2010,14,11,201003,2010),('2010-03-15',201011,3,2010,15,11,201003,2010),('2010-03-16',201011,3,2010,16,11,201003,2010),('2010-03-17',201011,3,2010,17,11,201003,2010),('2010-03-18',201011,3,2010,18,11,201003,2010),('2010-03-19',201011,3,2010,19,11,201003,2010),('2010-03-20',201011,3,2010,20,11,201003,2010),('2010-03-21',201012,3,2010,21,12,201003,2010),('2010-03-22',201012,3,2010,22,12,201003,2010),('2010-03-23',201012,3,2010,23,12,201003,2010),('2010-03-24',201012,3,2010,24,12,201003,2010),('2010-03-25',201012,3,2010,25,12,201003,2010),('2010-03-26',201012,3,2010,26,12,201003,2010),('2010-03-27',201012,3,2010,27,12,201003,2010),('2010-03-28',201013,3,2010,28,13,201003,2010),('2010-03-29',201013,3,2010,29,13,201003,2010),('2010-03-30',201013,3,2010,30,13,201003,2010),('2010-03-31',201013,3,2010,31,13,201003,2010),('2010-04-01',201013,4,2010,1,13,201004,2010),('2010-04-02',201013,4,2010,2,13,201004,2010),('2010-04-03',201013,4,2010,3,13,201004,2010),('2010-04-04',201014,4,2010,4,14,201004,2010),('2010-04-05',201014,4,2010,5,14,201004,2010),('2010-04-06',201014,4,2010,6,14,201004,2010),('2010-04-07',201014,4,2010,7,14,201004,2010),('2010-04-08',201014,4,2010,8,14,201004,2010),('2010-04-09',201014,4,2010,9,14,201004,2010),('2010-04-10',201014,4,2010,10,14,201004,2010),('2010-04-11',201015,4,2010,11,15,201004,2010),('2010-04-12',201015,4,2010,12,15,201004,2010),('2010-04-13',201015,4,2010,13,15,201004,2010),('2010-04-14',201015,4,2010,14,15,201004,2010),('2010-04-15',201015,4,2010,15,15,201004,2010),('2010-04-16',201015,4,2010,16,15,201004,2010),('2010-04-17',201015,4,2010,17,15,201004,2010),('2010-04-18',201016,4,2010,18,16,201004,2010),('2010-04-19',201016,4,2010,19,16,201004,2010),('2010-04-20',201016,4,2010,20,16,201004,2010),('2010-04-21',201016,4,2010,21,16,201004,2010),('2010-04-22',201016,4,2010,22,16,201004,2010),('2010-04-23',201016,4,2010,23,16,201004,2010),('2010-04-24',201016,4,2010,24,16,201004,2010),('2010-04-25',201017,4,2010,25,17,201004,2010),('2010-04-26',201017,4,2010,26,17,201004,2010),('2010-04-27',201017,4,2010,27,17,201004,2010),('2010-04-28',201017,4,2010,28,17,201004,2010),('2010-04-29',201017,4,2010,29,17,201004,2010),('2010-04-30',201017,4,2010,30,17,201004,2010),('2010-05-01',201017,5,2010,1,17,201005,2010),('2010-05-02',201018,5,2010,2,18,201005,2010),('2010-05-03',201018,5,2010,3,18,201005,2010),('2010-05-04',201018,5,2010,4,18,201005,2010),('2010-05-05',201018,5,2010,5,18,201005,2010),('2010-05-06',201018,5,2010,6,18,201005,2010),('2010-05-07',201018,5,2010,7,18,201005,2010),('2010-05-08',201018,5,2010,8,18,201005,2010),('2010-05-09',201019,5,2010,9,19,201005,2010),('2010-05-10',201019,5,2010,10,19,201005,2010),('2010-05-11',201019,5,2010,11,19,201005,2010),('2010-05-12',201019,5,2010,12,19,201005,2010),('2010-05-13',201019,5,2010,13,19,201005,2010),('2010-05-14',201019,5,2010,14,19,201005,2010),('2010-05-15',201019,5,2010,15,19,201005,2010),('2010-05-16',201020,5,2010,16,20,201005,2010),('2010-05-17',201020,5,2010,17,20,201005,2010),('2010-05-18',201020,5,2010,18,20,201005,2010),('2010-05-19',201020,5,2010,19,20,201005,2010),('2010-05-20',201020,5,2010,20,20,201005,2010),('2010-05-21',201020,5,2010,21,20,201005,2010),('2010-05-22',201020,5,2010,22,20,201005,2010),('2010-05-23',201021,5,2010,23,21,201005,2010),('2010-05-24',201021,5,2010,24,21,201005,2010),('2010-05-25',201021,5,2010,25,21,201005,2010),('2010-05-26',201021,5,2010,26,21,201005,2010),('2010-05-27',201021,5,2010,27,21,201005,2010),('2010-05-28',201021,5,2010,28,21,201005,2010),('2010-05-29',201021,5,2010,29,21,201005,2010),('2010-05-30',201022,5,2010,30,22,201005,2010),('2010-05-31',201022,5,2010,31,22,201005,2010),('2010-06-01',201022,6,2010,1,22,201006,2010),('2010-06-02',201022,6,2010,2,22,201006,2010),('2010-06-03',201022,6,2010,3,22,201006,2010),('2010-06-04',201022,6,2010,4,22,201006,2010),('2010-06-05',201022,6,2010,5,22,201006,2010),('2010-06-06',201023,6,2010,6,23,201006,2010),('2010-06-07',201023,6,2010,7,23,201006,2010),('2010-06-08',201023,6,2010,8,23,201006,2010),('2010-06-09',201023,6,2010,9,23,201006,2010),('2010-06-10',201023,6,2010,10,23,201006,2010),('2010-06-11',201023,6,2010,11,23,201006,2010),('2010-06-12',201023,6,2010,12,23,201006,2010),('2010-06-13',201024,6,2010,13,24,201006,2010),('2010-06-14',201024,6,2010,14,24,201006,2010),('2010-06-15',201024,6,2010,15,24,201006,2010),('2010-06-16',201024,6,2010,16,24,201006,2010),('2010-06-17',201024,6,2010,17,24,201006,2010),('2010-06-18',201024,6,2010,18,24,201006,2010),('2010-06-19',201024,6,2010,19,24,201006,2010),('2010-06-20',201025,6,2010,20,25,201006,2010),('2010-06-21',201025,6,2010,21,25,201006,2010),('2010-06-22',201025,6,2010,22,25,201006,2010),('2010-06-23',201025,6,2010,23,25,201006,2010),('2010-06-24',201025,6,2010,24,25,201006,2010),('2010-06-25',201025,6,2010,25,25,201006,2010),('2010-06-26',201025,6,2010,26,25,201006,2010),('2010-06-27',201026,6,2010,27,26,201006,2010),('2010-06-28',201026,6,2010,28,26,201006,2010),('2010-06-29',201026,6,2010,29,26,201006,2010),('2010-06-30',201026,6,2010,30,26,201006,2010),('2010-07-01',201026,7,2010,1,26,201007,2010),('2010-07-02',201026,7,2010,2,26,201007,2010),('2010-07-03',201026,7,2010,3,26,201007,2010),('2010-07-04',201027,7,2010,4,27,201007,2010),('2010-07-05',201027,7,2010,5,27,201007,2010),('2010-07-06',201027,7,2010,6,27,201007,2010),('2010-07-07',201027,7,2010,7,27,201007,2010),('2010-07-08',201027,7,2010,8,27,201007,2010),('2010-07-09',201027,7,2010,9,27,201007,2010),('2010-07-10',201027,7,2010,10,27,201007,2010),('2010-07-11',201028,7,2010,11,28,201007,2010),('2010-07-12',201028,7,2010,12,28,201007,2010),('2010-07-13',201028,7,2010,13,28,201007,2010),('2010-07-14',201028,7,2010,14,28,201007,2010),('2010-07-15',201028,7,2010,15,28,201007,2010),('2010-07-16',201028,7,2010,16,28,201007,2010),('2010-07-17',201028,7,2010,17,28,201007,2010),('2010-07-18',201029,7,2010,18,29,201007,2010),('2010-07-19',201029,7,2010,19,29,201007,2010),('2010-07-20',201029,7,2010,20,29,201007,2010),('2010-07-21',201029,7,2010,21,29,201007,2010),('2010-07-22',201029,7,2010,22,29,201007,2010),('2010-07-23',201029,7,2010,23,29,201007,2010),('2010-07-24',201029,7,2010,24,29,201007,2010),('2010-07-25',201030,7,2010,25,30,201007,2010),('2010-07-26',201030,7,2010,26,30,201007,2010),('2010-07-27',201030,7,2010,27,30,201007,2010),('2010-07-28',201030,7,2010,28,30,201007,2010),('2010-07-29',201030,7,2010,29,30,201007,2010),('2010-07-30',201030,7,2010,30,30,201007,2010),('2010-07-31',201030,7,2010,31,30,201007,2010),('2010-08-01',201031,8,2010,1,31,201008,2010),('2010-08-02',201031,8,2010,2,31,201008,2010),('2010-08-03',201031,8,2010,3,31,201008,2010),('2010-08-04',201031,8,2010,4,31,201008,2010),('2010-08-05',201031,8,2010,5,31,201008,2010),('2010-08-06',201031,8,2010,6,31,201008,2010),('2010-08-07',201031,8,2010,7,31,201008,2010),('2010-08-08',201032,8,2010,8,32,201008,2010),('2010-08-09',201032,8,2010,9,32,201008,2010),('2010-08-10',201032,8,2010,10,32,201008,2010),('2010-08-11',201032,8,2010,11,32,201008,2010),('2010-08-12',201032,8,2010,12,32,201008,2010),('2010-08-13',201032,8,2010,13,32,201008,2010),('2010-08-14',201032,8,2010,14,32,201008,2010),('2010-08-15',201033,8,2010,15,33,201008,2010),('2010-08-16',201033,8,2010,16,33,201008,2010),('2010-08-17',201033,8,2010,17,33,201008,2010),('2010-08-18',201033,8,2010,18,33,201008,2010),('2010-08-19',201033,8,2010,19,33,201008,2010),('2010-08-20',201033,8,2010,20,33,201008,2010),('2010-08-21',201033,8,2010,21,33,201008,2010),('2010-08-22',201034,8,2010,22,34,201008,2010),('2010-08-23',201034,8,2010,23,34,201008,2010),('2010-08-24',201034,8,2010,24,34,201008,2010),('2010-08-25',201034,8,2010,25,34,201008,2010),('2010-08-26',201034,8,2010,26,34,201008,2010),('2010-08-27',201034,8,2010,27,34,201008,2010),('2010-08-28',201034,8,2010,28,34,201008,2010),('2010-08-29',201035,8,2010,29,35,201008,2010),('2010-08-30',201035,8,2010,30,35,201008,2010),('2010-08-31',201035,8,2010,31,35,201008,2010),('2010-09-01',201035,9,2010,1,35,201009,2010),('2010-09-02',201035,9,2010,2,35,201009,2010),('2010-09-03',201035,9,2010,3,35,201009,2010),('2010-09-04',201035,9,2010,4,35,201009,2010),('2010-09-05',201036,9,2010,5,36,201009,2010),('2010-09-06',201036,9,2010,6,36,201009,2010),('2010-09-07',201036,9,2010,7,36,201009,2010),('2010-09-08',201036,9,2010,8,36,201009,2010),('2010-09-09',201036,9,2010,9,36,201009,2010),('2010-09-10',201036,9,2010,10,36,201009,2010),('2010-09-11',201036,9,2010,11,36,201009,2010),('2010-09-12',201037,9,2010,12,37,201009,2010),('2010-09-13',201037,9,2010,13,37,201009,2010),('2010-09-14',201037,9,2010,14,37,201009,2010),('2010-09-15',201037,9,2010,15,37,201009,2010),('2010-09-16',201037,9,2010,16,37,201009,2010),('2010-09-17',201037,9,2010,17,37,201009,2010),('2010-09-18',201037,9,2010,18,37,201009,2010),('2010-09-19',201038,9,2010,19,38,201009,2010),('2010-09-20',201038,9,2010,20,38,201009,2010),('2010-09-21',201038,9,2010,21,38,201009,2010),('2010-09-22',201038,9,2010,22,38,201009,2010),('2010-09-23',201038,9,2010,23,38,201009,2010),('2010-09-24',201038,9,2010,24,38,201009,2010),('2010-09-25',201038,9,2010,25,38,201009,2010),('2010-09-26',201039,9,2010,26,39,201009,2010),('2010-09-27',201039,9,2010,27,39,201009,2010),('2010-09-28',201039,9,2010,28,39,201009,2010),('2010-09-29',201039,9,2010,29,39,201009,2010),('2010-09-30',201039,9,2010,30,39,201009,2010),('2010-10-01',201039,10,2010,1,39,201010,2010),('2010-10-02',201039,10,2010,2,39,201010,2010),('2010-10-03',201040,10,2010,3,40,201010,2010),('2010-10-04',201040,10,2010,4,40,201010,2010),('2010-10-05',201040,10,2010,5,40,201010,2010),('2010-10-06',201040,10,2010,6,40,201010,2010),('2010-10-07',201040,10,2010,7,40,201010,2010),('2010-10-08',201040,10,2010,8,40,201010,2010),('2010-10-09',201040,10,2010,9,40,201010,2010),('2010-10-10',201041,10,2010,10,41,201010,2010),('2010-10-11',201041,10,2010,11,41,201010,2010),('2010-10-12',201041,10,2010,12,41,201010,2010),('2010-10-13',201041,10,2010,13,41,201010,2010),('2010-10-14',201041,10,2010,14,41,201010,2010),('2010-10-15',201041,10,2010,15,41,201010,2010),('2010-10-16',201041,10,2010,16,41,201010,2010),('2010-10-17',201042,10,2010,17,42,201010,2010),('2010-10-18',201042,10,2010,18,42,201010,2010),('2010-10-19',201042,10,2010,19,42,201010,2010),('2010-10-20',201042,10,2010,20,42,201010,2010),('2010-10-21',201042,10,2010,21,42,201010,2010),('2010-10-22',201042,10,2010,22,42,201010,2010),('2010-10-23',201042,10,2010,23,42,201010,2010),('2010-10-24',201043,10,2010,24,43,201010,2010),('2010-10-25',201043,10,2010,25,43,201010,2010),('2010-10-26',201043,10,2010,26,43,201010,2010),('2010-10-27',201043,10,2010,27,43,201010,2010),('2010-10-28',201043,10,2010,28,43,201010,2010),('2010-10-29',201043,10,2010,29,43,201010,2010),('2010-10-30',201043,10,2010,30,43,201010,2010),('2010-10-31',201044,10,2010,31,44,201010,2010),('2010-11-01',201044,11,2010,1,44,201011,2010),('2010-11-02',201044,11,2010,2,44,201011,2010),('2010-11-03',201044,11,2010,3,44,201011,2010),('2010-11-04',201044,11,2010,4,44,201011,2010),('2010-11-05',201044,11,2010,5,44,201011,2010),('2010-11-06',201044,11,2010,6,44,201011,2010),('2010-11-07',201045,11,2010,7,45,201011,2010),('2010-11-08',201045,11,2010,8,45,201011,2010),('2010-11-09',201045,11,2010,9,45,201011,2010),('2010-11-10',201045,11,2010,10,45,201011,2010),('2010-11-11',201045,11,2010,11,45,201011,2010),('2010-11-12',201045,11,2010,12,45,201011,2010),('2010-11-13',201045,11,2010,13,45,201011,2010),('2010-11-14',201046,11,2010,14,46,201011,2010),('2010-11-15',201046,11,2010,15,46,201011,2010),('2010-11-16',201046,11,2010,16,46,201011,2010),('2010-11-17',201046,11,2010,17,46,201011,2010),('2010-11-18',201046,11,2010,18,46,201011,2010),('2010-11-19',201046,11,2010,19,46,201011,2010),('2010-11-20',201046,11,2010,20,46,201011,2010),('2010-11-21',201047,11,2010,21,47,201011,2010),('2010-11-22',201047,11,2010,22,47,201011,2010),('2010-11-23',201047,11,2010,23,47,201011,2010),('2010-11-24',201047,11,2010,24,47,201011,2010),('2010-11-25',201047,11,2010,25,47,201011,2010),('2010-11-26',201047,11,2010,26,47,201011,2010),('2010-11-27',201047,11,2010,27,47,201011,2010),('2010-11-28',201048,11,2010,28,48,201011,2010),('2010-11-29',201048,11,2010,29,48,201011,2010),('2010-11-30',201048,11,2010,30,48,201011,2010),('2010-12-01',201048,12,2010,1,48,201012,2011),('2010-12-02',201048,12,2010,2,48,201012,2011),('2010-12-03',201048,12,2010,3,48,201012,2011),('2010-12-04',201048,12,2010,4,48,201012,2011),('2010-12-05',201049,12,2010,5,49,201012,2011),('2010-12-06',201049,12,2010,6,49,201012,2011),('2010-12-07',201049,12,2010,7,49,201012,2011),('2010-12-08',201049,12,2010,8,49,201012,2011),('2010-12-09',201049,12,2010,9,49,201012,2011),('2010-12-10',201049,12,2010,10,49,201012,2011),('2010-12-11',201049,12,2010,11,49,201012,2011),('2010-12-12',201050,12,2010,12,50,201012,2011),('2010-12-13',201050,12,2010,13,50,201012,2011),('2010-12-14',201050,12,2010,14,50,201012,2011),('2010-12-15',201050,12,2010,15,50,201012,2011),('2010-12-16',201050,12,2010,16,50,201012,2011),('2010-12-17',201050,12,2010,17,50,201012,2011),('2010-12-18',201050,12,2010,18,50,201012,2011),('2010-12-19',201051,12,2010,19,51,201012,2011),('2010-12-20',201051,12,2010,20,51,201012,2011),('2010-12-21',201051,12,2010,21,51,201012,2011),('2010-12-22',201051,12,2010,22,51,201012,2011),('2010-12-23',201051,12,2010,23,51,201012,2011),('2010-12-24',201051,12,2010,24,51,201012,2011),('2010-12-25',201051,12,2010,25,51,201012,2011),('2010-12-26',201052,12,2010,26,52,201012,2011),('2010-12-27',201052,12,2010,27,52,201012,2011),('2010-12-28',201052,12,2010,28,52,201012,2011),('2010-12-29',201052,12,2010,29,52,201012,2011),('2010-12-30',201052,12,2010,30,52,201012,2011),('2010-12-31',201052,12,2010,31,52,201012,2011),('2011-01-01',201052,1,2011,1,52,201101,2011),('2011-01-02',201053,1,2011,2,1,201101,2011),('2011-01-03',201101,1,2011,3,1,201101,2011),('2011-01-04',201101,1,2011,4,1,201101,2011),('2011-01-05',201101,1,2011,5,1,201101,2011),('2011-01-06',201101,1,2011,6,1,201101,2011),('2011-01-07',201101,1,2011,7,1,201101,2011),('2011-01-08',201101,1,2011,8,1,201101,2011),('2011-01-09',201102,1,2011,9,2,201101,2011),('2011-01-10',201102,1,2011,10,2,201101,2011),('2011-01-11',201102,1,2011,11,2,201101,2011),('2011-01-12',201102,1,2011,12,2,201101,2011),('2011-01-13',201102,1,2011,13,2,201101,2011),('2011-01-14',201102,1,2011,14,2,201101,2011),('2011-01-15',201102,1,2011,15,2,201101,2011),('2011-01-16',201103,1,2011,16,3,201101,2011),('2011-01-17',201103,1,2011,17,3,201101,2011),('2011-01-18',201103,1,2011,18,3,201101,2011),('2011-01-19',201103,1,2011,19,3,201101,2011),('2011-01-20',201103,1,2011,20,3,201101,2011),('2011-01-21',201103,1,2011,21,3,201101,2011),('2011-01-22',201103,1,2011,22,3,201101,2011),('2011-01-23',201104,1,2011,23,4,201101,2011),('2011-01-24',201104,1,2011,24,4,201101,2011),('2011-01-25',201104,1,2011,25,4,201101,2011),('2011-01-26',201104,1,2011,26,4,201101,2011),('2011-01-27',201104,1,2011,27,4,201101,2011),('2011-01-28',201104,1,2011,28,4,201101,2011),('2011-01-29',201104,1,2011,29,4,201101,2011),('2011-01-30',201105,1,2011,30,5,201101,2011),('2011-01-31',201105,1,2011,31,5,201101,2011),('2011-02-01',201105,2,2011,1,5,201102,2011),('2011-02-02',201105,2,2011,2,5,201102,2011),('2011-02-03',201105,2,2011,3,5,201102,2011),('2011-02-04',201105,2,2011,4,5,201102,2011),('2011-02-05',201105,2,2011,5,5,201102,2011),('2011-02-06',201106,2,2011,6,6,201102,2011),('2011-02-07',201106,2,2011,7,6,201102,2011),('2011-02-08',201106,2,2011,8,6,201102,2011),('2011-02-09',201106,2,2011,9,6,201102,2011),('2011-02-10',201106,2,2011,10,6,201102,2011),('2011-02-11',201106,2,2011,11,6,201102,2011),('2011-02-12',201106,2,2011,12,6,201102,2011),('2011-02-13',201107,2,2011,13,7,201102,2011),('2011-02-14',201107,2,2011,14,7,201102,2011),('2011-02-15',201107,2,2011,15,7,201102,2011),('2011-02-16',201107,2,2011,16,7,201102,2011),('2011-02-17',201107,2,2011,17,7,201102,2011),('2011-02-18',201107,2,2011,18,7,201102,2011),('2011-02-19',201107,2,2011,19,7,201102,2011),('2011-02-20',201108,2,2011,20,8,201102,2011),('2011-02-21',201108,2,2011,21,8,201102,2011),('2011-02-22',201108,2,2011,22,8,201102,2011),('2011-02-23',201108,2,2011,23,8,201102,2011),('2011-02-24',201108,2,2011,24,8,201102,2011),('2011-02-25',201108,2,2011,25,8,201102,2011),('2011-02-26',201108,2,2011,26,8,201102,2011),('2011-02-27',201109,2,2011,27,9,201102,2011),('2011-02-28',201109,2,2011,28,9,201102,2011),('2011-03-01',201109,3,2011,1,9,201103,2011),('2011-03-02',201109,3,2011,2,9,201103,2011),('2011-03-03',201109,3,2011,3,9,201103,2011),('2011-03-04',201109,3,2011,4,9,201103,2011),('2011-03-05',201109,3,2011,5,9,201103,2011),('2011-03-06',201110,3,2011,6,10,201103,2011),('2011-03-07',201110,3,2011,7,10,201103,2011),('2011-03-08',201110,3,2011,8,10,201103,2011),('2011-03-09',201110,3,2011,9,10,201103,2011),('2011-03-10',201110,3,2011,10,10,201103,2011),('2011-03-11',201110,3,2011,11,10,201103,2011),('2011-03-12',201110,3,2011,12,10,201103,2011),('2011-03-13',201111,3,2011,13,11,201103,2011),('2011-03-14',201111,3,2011,14,11,201103,2011),('2011-03-15',201111,3,2011,15,11,201103,2011),('2011-03-16',201111,3,2011,16,11,201103,2011),('2011-03-17',201111,3,2011,17,11,201103,2011),('2011-03-18',201111,3,2011,18,11,201103,2011),('2011-03-19',201111,3,2011,19,11,201103,2011),('2011-03-20',201112,3,2011,20,12,201103,2011),('2011-03-21',201112,3,2011,21,12,201103,2011),('2011-03-22',201112,3,2011,22,12,201103,2011),('2011-03-23',201112,3,2011,23,12,201103,2011),('2011-03-24',201112,3,2011,24,12,201103,2011),('2011-03-25',201112,3,2011,25,12,201103,2011),('2011-03-26',201112,3,2011,26,12,201103,2011),('2011-03-27',201113,3,2011,27,13,201103,2011),('2011-03-28',201113,3,2011,28,13,201103,2011),('2011-03-29',201113,3,2011,29,13,201103,2011),('2011-03-30',201113,3,2011,30,13,201103,2011),('2011-03-31',201113,3,2011,31,13,201103,2011),('2011-04-01',201113,4,2011,1,13,201104,2011),('2011-04-02',201113,4,2011,2,13,201104,2011),('2011-04-03',201114,4,2011,3,14,201104,2011),('2011-04-04',201114,4,2011,4,14,201104,2011),('2011-04-05',201114,4,2011,5,14,201104,2011),('2011-04-06',201114,4,2011,6,14,201104,2011),('2011-04-07',201114,4,2011,7,14,201104,2011),('2011-04-08',201114,4,2011,8,14,201104,2011),('2011-04-09',201114,4,2011,9,14,201104,2011),('2011-04-10',201115,4,2011,10,15,201104,2011),('2011-04-11',201115,4,2011,11,15,201104,2011),('2011-04-12',201115,4,2011,12,15,201104,2011),('2011-04-13',201115,4,2011,13,15,201104,2011),('2011-04-14',201115,4,2011,14,15,201104,2011),('2011-04-15',201115,4,2011,15,15,201104,2011),('2011-04-16',201115,4,2011,16,15,201104,2011),('2011-04-17',201116,4,2011,17,16,201104,2011),('2011-04-18',201116,4,2011,18,16,201104,2011),('2011-04-19',201116,4,2011,19,16,201104,2011),('2011-04-20',201116,4,2011,20,16,201104,2011),('2011-04-21',201116,4,2011,21,16,201104,2011),('2011-04-22',201116,4,2011,22,16,201104,2011),('2011-04-23',201116,4,2011,23,16,201104,2011),('2011-04-24',201117,4,2011,24,17,201104,2011),('2011-04-25',201117,4,2011,25,17,201104,2011),('2011-04-26',201117,4,2011,26,17,201104,2011),('2011-04-27',201117,4,2011,27,17,201104,2011),('2011-04-28',201117,4,2011,28,17,201104,2011),('2011-04-29',201117,4,2011,29,17,201104,2011),('2011-04-30',201117,4,2011,30,17,201104,2011),('2011-05-01',201118,5,2011,1,18,201105,2011),('2011-05-02',201118,5,2011,2,18,201105,2011),('2011-05-03',201118,5,2011,3,18,201105,2011),('2011-05-04',201118,5,2011,4,18,201105,2011),('2011-05-05',201118,5,2011,5,18,201105,2011),('2011-05-06',201118,5,2011,6,18,201105,2011),('2011-05-07',201118,5,2011,7,18,201105,2011),('2011-05-08',201119,5,2011,8,19,201105,2011),('2011-05-09',201119,5,2011,9,19,201105,2011),('2011-05-10',201119,5,2011,10,19,201105,2011),('2011-05-11',201119,5,2011,11,19,201105,2011),('2011-05-12',201119,5,2011,12,19,201105,2011),('2011-05-13',201119,5,2011,13,19,201105,2011),('2011-05-14',201119,5,2011,14,19,201105,2011),('2011-05-15',201120,5,2011,15,20,201105,2011),('2011-05-16',201120,5,2011,16,20,201105,2011),('2011-05-17',201120,5,2011,17,20,201105,2011),('2011-05-18',201120,5,2011,18,20,201105,2011),('2011-05-19',201120,5,2011,19,20,201105,2011),('2011-05-20',201120,5,2011,20,20,201105,2011),('2011-05-21',201120,5,2011,21,20,201105,2011),('2011-05-22',201121,5,2011,22,21,201105,2011),('2011-05-23',201121,5,2011,23,21,201105,2011),('2011-05-24',201121,5,2011,24,21,201105,2011),('2011-05-25',201121,5,2011,25,21,201105,2011),('2011-05-26',201121,5,2011,26,21,201105,2011),('2011-05-27',201121,5,2011,27,21,201105,2011),('2011-05-28',201121,5,2011,28,21,201105,2011),('2011-05-29',201122,5,2011,29,22,201105,2011),('2011-05-30',201122,5,2011,30,22,201105,2011),('2011-05-31',201122,5,2011,31,22,201105,2011),('2011-06-01',201122,6,2011,1,22,201106,2011),('2011-06-02',201122,6,2011,2,22,201106,2011),('2011-06-03',201122,6,2011,3,22,201106,2011),('2011-06-04',201122,6,2011,4,22,201106,2011),('2011-06-05',201123,6,2011,5,23,201106,2011),('2011-06-06',201123,6,2011,6,23,201106,2011),('2011-06-07',201123,6,2011,7,23,201106,2011),('2011-06-08',201123,6,2011,8,23,201106,2011),('2011-06-09',201123,6,2011,9,23,201106,2011),('2011-06-10',201123,6,2011,10,23,201106,2011),('2011-06-11',201123,6,2011,11,23,201106,2011),('2011-06-12',201124,6,2011,12,24,201106,2011),('2011-06-13',201124,6,2011,13,24,201106,2011),('2011-06-14',201124,6,2011,14,24,201106,2011),('2011-06-15',201124,6,2011,15,24,201106,2011),('2011-06-16',201124,6,2011,16,24,201106,2011),('2011-06-17',201124,6,2011,17,24,201106,2011),('2011-06-18',201124,6,2011,18,24,201106,2011),('2011-06-19',201125,6,2011,19,25,201106,2011),('2011-06-20',201125,6,2011,20,25,201106,2011),('2011-06-21',201125,6,2011,21,25,201106,2011),('2011-06-22',201125,6,2011,22,25,201106,2011),('2011-06-23',201125,6,2011,23,25,201106,2011),('2011-06-24',201125,6,2011,24,25,201106,2011),('2011-06-25',201125,6,2011,25,25,201106,2011),('2011-06-26',201126,6,2011,26,26,201106,2011),('2011-06-27',201126,6,2011,27,26,201106,2011),('2011-06-28',201126,6,2011,28,26,201106,2011),('2011-06-29',201126,6,2011,29,26,201106,2011),('2011-06-30',201126,6,2011,30,26,201106,2011),('2011-07-01',201126,7,2011,1,26,201107,2011),('2011-07-02',201126,7,2011,2,26,201107,2011),('2011-07-03',201127,7,2011,3,27,201107,2011),('2011-07-04',201127,7,2011,4,27,201107,2011),('2011-07-05',201127,7,2011,5,27,201107,2011),('2011-07-06',201127,7,2011,6,27,201107,2011),('2011-07-07',201127,7,2011,7,27,201107,2011),('2011-07-08',201127,7,2011,8,27,201107,2011),('2011-07-09',201127,7,2011,9,27,201107,2011),('2011-07-10',201128,7,2011,10,28,201107,2011),('2011-07-11',201128,7,2011,11,28,201107,2011),('2011-07-12',201128,7,2011,12,28,201107,2011),('2011-07-13',201128,7,2011,13,28,201107,2011),('2011-07-14',201128,7,2011,14,28,201107,2011),('2011-07-15',201128,7,2011,15,28,201107,2011),('2011-07-16',201128,7,2011,16,28,201107,2011),('2011-07-17',201129,7,2011,17,29,201107,2011),('2011-07-18',201129,7,2011,18,29,201107,2011),('2011-07-19',201129,7,2011,19,29,201107,2011),('2011-07-20',201129,7,2011,20,29,201107,2011),('2011-07-21',201129,7,2011,21,29,201107,2011),('2011-07-22',201129,7,2011,22,29,201107,2011),('2011-07-23',201129,7,2011,23,29,201107,2011),('2011-07-24',201130,7,2011,24,30,201107,2011),('2011-07-25',201130,7,2011,25,30,201107,2011),('2011-07-26',201130,7,2011,26,30,201107,2011),('2011-07-27',201130,7,2011,27,30,201107,2011),('2011-07-28',201130,7,2011,28,30,201107,2011),('2011-07-29',201130,7,2011,29,30,201107,2011),('2011-07-30',201130,7,2011,30,30,201107,2011),('2011-07-31',201131,7,2011,31,31,201107,2011),('2011-08-01',201131,8,2011,1,31,201108,2011),('2011-08-02',201131,8,2011,2,31,201108,2011),('2011-08-03',201131,8,2011,3,31,201108,2011),('2011-08-04',201131,8,2011,4,31,201108,2011),('2011-08-05',201131,8,2011,5,31,201108,2011),('2011-08-06',201131,8,2011,6,31,201108,2011),('2011-08-07',201132,8,2011,7,32,201108,2011),('2011-08-08',201132,8,2011,8,32,201108,2011),('2011-08-09',201132,8,2011,9,32,201108,2011),('2011-08-10',201132,8,2011,10,32,201108,2011),('2011-08-11',201132,8,2011,11,32,201108,2011),('2011-08-12',201132,8,2011,12,32,201108,2011),('2011-08-13',201132,8,2011,13,32,201108,2011),('2011-08-14',201133,8,2011,14,33,201108,2011),('2011-08-15',201133,8,2011,15,33,201108,2011),('2011-08-16',201133,8,2011,16,33,201108,2011),('2011-08-17',201133,8,2011,17,33,201108,2011),('2011-08-18',201133,8,2011,18,33,201108,2011),('2011-08-19',201133,8,2011,19,33,201108,2011),('2011-08-20',201133,8,2011,20,33,201108,2011),('2011-08-21',201134,8,2011,21,34,201108,2011),('2011-08-22',201134,8,2011,22,34,201108,2011),('2011-08-23',201134,8,2011,23,34,201108,2011),('2011-08-24',201134,8,2011,24,34,201108,2011),('2011-08-25',201134,8,2011,25,34,201108,2011),('2011-08-26',201134,8,2011,26,34,201108,2011),('2011-08-27',201134,8,2011,27,34,201108,2011),('2011-08-28',201135,8,2011,28,35,201108,2011),('2011-08-29',201135,8,2011,29,35,201108,2011),('2011-08-30',201135,8,2011,30,35,201108,2011),('2011-08-31',201135,8,2011,31,35,201108,2011),('2011-09-01',201135,9,2011,1,35,201109,2011),('2011-09-02',201135,9,2011,2,35,201109,2011),('2011-09-03',201135,9,2011,3,35,201109,2011),('2011-09-04',201136,9,2011,4,36,201109,2011),('2011-09-05',201136,9,2011,5,36,201109,2011),('2011-09-06',201136,9,2011,6,36,201109,2011),('2011-09-07',201136,9,2011,7,36,201109,2011),('2011-09-08',201136,9,2011,8,36,201109,2011),('2011-09-09',201136,9,2011,9,36,201109,2011),('2011-09-10',201136,9,2011,10,36,201109,2011),('2011-09-11',201137,9,2011,11,37,201109,2011),('2011-09-12',201137,9,2011,12,37,201109,2011),('2011-09-13',201137,9,2011,13,37,201109,2011),('2011-09-14',201137,9,2011,14,37,201109,2011),('2011-09-15',201137,9,2011,15,37,201109,2011),('2011-09-16',201137,9,2011,16,37,201109,2011),('2011-09-17',201137,9,2011,17,37,201109,2011),('2011-09-18',201138,9,2011,18,38,201109,2011),('2011-09-19',201138,9,2011,19,38,201109,2011),('2011-09-20',201138,9,2011,20,38,201109,2011),('2011-09-21',201138,9,2011,21,38,201109,2011),('2011-09-22',201138,9,2011,22,38,201109,2011),('2011-09-23',201138,9,2011,23,38,201109,2011),('2011-09-24',201138,9,2011,24,38,201109,2011),('2011-09-25',201139,9,2011,25,39,201109,2011),('2011-09-26',201139,9,2011,26,39,201109,2011),('2011-09-27',201139,9,2011,27,39,201109,2011),('2011-09-28',201139,9,2011,28,39,201109,2011),('2011-09-29',201139,9,2011,29,39,201109,2011),('2011-09-30',201139,9,2011,30,39,201109,2011),('2011-10-01',201139,10,2011,1,39,201110,2011),('2011-10-02',201140,10,2011,2,40,201110,2011),('2011-10-03',201140,10,2011,3,40,201110,2011),('2011-10-04',201140,10,2011,4,40,201110,2011),('2011-10-05',201140,10,2011,5,40,201110,2011),('2011-10-06',201140,10,2011,6,40,201110,2011),('2011-10-07',201140,10,2011,7,40,201110,2011),('2011-10-08',201140,10,2011,8,40,201110,2011),('2011-10-09',201141,10,2011,9,41,201110,2011),('2011-10-10',201141,10,2011,10,41,201110,2011),('2011-10-11',201141,10,2011,11,41,201110,2011),('2011-10-12',201141,10,2011,12,41,201110,2011),('2011-10-13',201141,10,2011,13,41,201110,2011),('2011-10-14',201141,10,2011,14,41,201110,2011),('2011-10-15',201141,10,2011,15,41,201110,2011),('2011-10-16',201142,10,2011,16,42,201110,2011),('2011-10-17',201142,10,2011,17,42,201110,2011),('2011-10-18',201142,10,2011,18,42,201110,2011),('2011-10-19',201142,10,2011,19,42,201110,2011),('2011-10-20',201142,10,2011,20,42,201110,2011),('2011-10-21',201142,10,2011,21,42,201110,2011),('2011-10-22',201142,10,2011,22,42,201110,2011),('2011-10-23',201143,10,2011,23,43,201110,2011),('2011-10-24',201143,10,2011,24,43,201110,2011),('2011-10-25',201143,10,2011,25,43,201110,2011),('2011-10-26',201143,10,2011,26,43,201110,2011),('2011-10-27',201143,10,2011,27,43,201110,2011),('2011-10-28',201143,10,2011,28,43,201110,2011),('2011-10-29',201143,10,2011,29,43,201110,2011),('2011-10-30',201144,10,2011,30,44,201110,2011),('2011-10-31',201144,10,2011,31,44,201110,2011),('2011-11-01',201144,11,2011,1,44,201111,2011),('2011-11-02',201144,11,2011,2,44,201111,2011),('2011-11-03',201144,11,2011,3,44,201111,2011),('2011-11-04',201144,11,2011,4,44,201111,2011),('2011-11-05',201144,11,2011,5,44,201111,2011),('2011-11-06',201145,11,2011,6,45,201111,2011),('2011-11-07',201145,11,2011,7,45,201111,2011),('2011-11-08',201145,11,2011,8,45,201111,2011),('2011-11-09',201145,11,2011,9,45,201111,2011),('2011-11-10',201145,11,2011,10,45,201111,2011),('2011-11-11',201145,11,2011,11,45,201111,2011),('2011-11-12',201145,11,2011,12,45,201111,2011),('2011-11-13',201146,11,2011,13,46,201111,2011),('2011-11-14',201146,11,2011,14,46,201111,2011),('2011-11-15',201146,11,2011,15,46,201111,2011),('2011-11-16',201146,11,2011,16,46,201111,2011),('2011-11-17',201146,11,2011,17,46,201111,2011),('2011-11-18',201146,11,2011,18,46,201111,2011),('2011-11-19',201146,11,2011,19,46,201111,2011),('2011-11-20',201147,11,2011,20,47,201111,2011),('2011-11-21',201147,11,2011,21,47,201111,2011),('2011-11-22',201147,11,2011,22,47,201111,2011),('2011-11-23',201147,11,2011,23,47,201111,2011),('2011-11-24',201147,11,2011,24,47,201111,2011),('2011-11-25',201147,11,2011,25,47,201111,2011),('2011-11-26',201147,11,2011,26,47,201111,2011),('2011-11-27',201148,11,2011,27,48,201111,2011),('2011-11-28',201148,11,2011,28,48,201111,2011),('2011-11-29',201148,11,2011,29,48,201111,2011),('2011-11-30',201148,11,2011,30,48,201111,2011),('2011-12-01',201148,12,2011,1,48,201112,2012),('2011-12-02',201148,12,2011,2,48,201112,2012),('2011-12-03',201148,12,2011,3,48,201112,2012),('2011-12-04',201149,12,2011,4,49,201112,2012),('2011-12-05',201149,12,2011,5,49,201112,2012),('2011-12-06',201149,12,2011,6,49,201112,2012),('2011-12-07',201149,12,2011,7,49,201112,2012),('2011-12-08',201149,12,2011,8,49,201112,2012),('2011-12-09',201149,12,2011,9,49,201112,2012),('2011-12-10',201149,12,2011,10,49,201112,2012),('2011-12-11',201150,12,2011,11,50,201112,2012),('2011-12-12',201150,12,2011,12,50,201112,2012),('2011-12-13',201150,12,2011,13,50,201112,2012),('2011-12-14',201150,12,2011,14,50,201112,2012),('2011-12-15',201150,12,2011,15,50,201112,2012),('2011-12-16',201150,12,2011,16,50,201112,2012),('2011-12-17',201150,12,2011,17,50,201112,2012),('2011-12-18',201151,12,2011,18,51,201112,2012),('2011-12-19',201151,12,2011,19,51,201112,2012),('2011-12-20',201151,12,2011,20,51,201112,2012),('2011-12-21',201151,12,2011,21,51,201112,2012),('2011-12-22',201151,12,2011,22,51,201112,2012),('2011-12-23',201151,12,2011,23,51,201112,2012),('2011-12-24',201151,12,2011,24,51,201112,2012),('2011-12-25',201152,12,2011,25,52,201112,2012),('2011-12-26',201152,12,2011,26,52,201112,2012),('2011-12-27',201152,12,2011,27,52,201112,2012),('2011-12-28',201152,12,2011,28,52,201112,2012),('2011-12-29',201152,12,2011,29,52,201112,2012),('2011-12-30',201152,12,2011,30,52,201112,2012),('2011-12-31',201152,12,2011,31,52,201112,2012),('2012-01-01',201153,1,2012,1,1,201201,2012),('2012-01-02',201201,1,2012,2,1,201201,2012),('2012-01-03',201201,1,2012,3,1,201201,2012),('2012-01-04',201201,1,2012,4,1,201201,2012),('2012-01-05',201201,1,2012,5,1,201201,2012),('2012-01-06',201201,1,2012,6,1,201201,2012),('2012-01-07',201201,1,2012,7,1,201201,2012),('2012-01-08',201202,1,2012,8,2,201201,2012),('2012-01-09',201202,1,2012,9,2,201201,2012),('2012-01-10',201202,1,2012,10,2,201201,2012),('2012-01-11',201202,1,2012,11,2,201201,2012),('2012-01-12',201202,1,2012,12,2,201201,2012),('2012-01-13',201202,1,2012,13,2,201201,2012),('2012-01-14',201202,1,2012,14,2,201201,2012),('2012-01-15',201203,1,2012,15,3,201201,2012),('2012-01-16',201203,1,2012,16,3,201201,2012),('2012-01-17',201203,1,2012,17,3,201201,2012),('2012-01-18',201203,1,2012,18,3,201201,2012),('2012-01-19',201203,1,2012,19,3,201201,2012),('2012-01-20',201203,1,2012,20,3,201201,2012),('2012-01-21',201203,1,2012,21,3,201201,2012),('2012-01-22',201204,1,2012,22,4,201201,2012),('2012-01-23',201204,1,2012,23,4,201201,2012),('2012-01-24',201204,1,2012,24,4,201201,2012),('2012-01-25',201204,1,2012,25,4,201201,2012),('2012-01-26',201204,1,2012,26,4,201201,2012),('2012-01-27',201204,1,2012,27,4,201201,2012),('2012-01-28',201204,1,2012,28,4,201201,2012),('2012-01-29',201205,1,2012,29,5,201201,2012),('2012-01-30',201205,1,2012,30,5,201201,2012),('2012-01-31',201205,1,2012,31,5,201201,2012),('2012-02-01',201205,2,2012,1,5,201202,2012),('2012-02-02',201205,2,2012,2,5,201202,2012),('2012-02-03',201205,2,2012,3,5,201202,2012),('2012-02-04',201205,2,2012,4,5,201202,2012),('2012-02-05',201206,2,2012,5,6,201202,2012),('2012-02-06',201206,2,2012,6,6,201202,2012),('2012-02-07',201206,2,2012,7,6,201202,2012),('2012-02-08',201206,2,2012,8,6,201202,2012),('2012-02-09',201206,2,2012,9,6,201202,2012),('2012-02-10',201206,2,2012,10,6,201202,2012),('2012-02-11',201206,2,2012,11,6,201202,2012),('2012-02-12',201207,2,2012,12,7,201202,2012),('2012-02-13',201207,2,2012,13,7,201202,2012),('2012-02-14',201207,2,2012,14,7,201202,2012),('2012-02-15',201207,2,2012,15,7,201202,2012),('2012-02-16',201207,2,2012,16,7,201202,2012),('2012-02-17',201207,2,2012,17,7,201202,2012),('2012-02-18',201207,2,2012,18,7,201202,2012),('2012-02-19',201208,2,2012,19,8,201202,2012),('2012-02-20',201208,2,2012,20,8,201202,2012),('2012-02-21',201208,2,2012,21,8,201202,2012),('2012-02-22',201208,2,2012,22,8,201202,2012),('2012-02-23',201208,2,2012,23,8,201202,2012),('2012-02-24',201208,2,2012,24,8,201202,2012),('2012-02-25',201208,2,2012,25,8,201202,2012),('2012-02-26',201209,2,2012,26,9,201202,2012),('2012-02-27',201209,2,2012,27,9,201202,2012),('2012-02-28',201209,2,2012,28,9,201202,2012),('2012-02-29',201209,2,2012,29,9,201202,2012),('2012-03-01',201209,3,2012,1,9,201203,2012),('2012-03-02',201209,3,2012,2,9,201203,2012),('2012-03-03',201209,3,2012,3,9,201203,2012),('2012-03-04',201210,3,2012,4,10,201203,2012),('2012-03-05',201210,3,2012,5,10,201203,2012),('2012-03-06',201210,3,2012,6,10,201203,2012),('2012-03-07',201210,3,2012,7,10,201203,2012),('2012-03-08',201210,3,2012,8,10,201203,2012),('2012-03-09',201210,3,2012,9,10,201203,2012),('2012-03-10',201210,3,2012,10,10,201203,2012),('2012-03-11',201211,3,2012,11,11,201203,2012),('2012-03-12',201211,3,2012,12,11,201203,2012),('2012-03-13',201211,3,2012,13,11,201203,2012),('2012-03-14',201211,3,2012,14,11,201203,2012),('2012-03-15',201211,3,2012,15,11,201203,2012),('2012-03-16',201211,3,2012,16,11,201203,2012),('2012-03-17',201211,3,2012,17,11,201203,2012),('2012-03-18',201212,3,2012,18,12,201203,2012),('2012-03-19',201212,3,2012,19,12,201203,2012),('2012-03-20',201212,3,2012,20,12,201203,2012),('2012-03-21',201212,3,2012,21,12,201203,2012),('2012-03-22',201212,3,2012,22,12,201203,2012),('2012-03-23',201212,3,2012,23,12,201203,2012),('2012-03-24',201212,3,2012,24,12,201203,2012),('2012-03-25',201213,3,2012,25,13,201203,2012),('2012-03-26',201213,3,2012,26,13,201203,2012),('2012-03-27',201213,3,2012,27,13,201203,2012),('2012-03-28',201213,3,2012,28,13,201203,2012),('2012-03-29',201213,3,2012,29,13,201203,2012),('2012-03-30',201213,3,2012,30,13,201203,2012),('2012-03-31',201213,3,2012,31,13,201203,2012),('2012-04-01',201214,4,2012,1,14,201204,2012),('2012-04-02',201214,4,2012,2,14,201204,2012),('2012-04-03',201214,4,2012,3,14,201204,2012),('2012-04-04',201214,4,2012,4,14,201204,2012),('2012-04-05',201214,4,2012,5,14,201204,2012),('2012-04-06',201214,4,2012,6,14,201204,2012),('2012-04-07',201214,4,2012,7,14,201204,2012),('2012-04-08',201215,4,2012,8,15,201204,2012),('2012-04-09',201215,4,2012,9,15,201204,2012),('2012-04-10',201215,4,2012,10,15,201204,2012),('2012-04-11',201215,4,2012,11,15,201204,2012),('2012-04-12',201215,4,2012,12,15,201204,2012),('2012-04-13',201215,4,2012,13,15,201204,2012),('2012-04-14',201215,4,2012,14,15,201204,2012),('2012-04-15',201216,4,2012,15,16,201204,2012),('2012-04-16',201216,4,2012,16,16,201204,2012),('2012-04-17',201216,4,2012,17,16,201204,2012),('2012-04-18',201216,4,2012,18,16,201204,2012),('2012-04-19',201216,4,2012,19,16,201204,2012),('2012-04-20',201216,4,2012,20,16,201204,2012),('2012-04-21',201216,4,2012,21,16,201204,2012),('2012-04-22',201217,4,2012,22,17,201204,2012),('2012-04-23',201217,4,2012,23,17,201204,2012),('2012-04-24',201217,4,2012,24,17,201204,2012),('2012-04-25',201217,4,2012,25,17,201204,2012),('2012-04-26',201217,4,2012,26,17,201204,2012),('2012-04-27',201217,4,2012,27,17,201204,2012),('2012-04-28',201217,4,2012,28,17,201204,2012),('2012-04-29',201218,4,2012,29,18,201204,2012),('2012-04-30',201218,4,2012,30,18,201204,2012),('2012-05-01',201218,5,2012,1,18,201205,2012),('2012-05-02',201218,5,2012,2,18,201205,2012),('2012-05-03',201218,5,2012,3,18,201205,2012),('2012-05-04',201218,5,2012,4,18,201205,2012),('2012-05-05',201218,5,2012,5,18,201205,2012),('2012-05-06',201219,5,2012,6,19,201205,2012),('2012-05-07',201219,5,2012,7,19,201205,2012),('2012-05-08',201219,5,2012,8,19,201205,2012),('2012-05-09',201219,5,2012,9,19,201205,2012),('2012-05-10',201219,5,2012,10,19,201205,2012),('2012-05-11',201219,5,2012,11,19,201205,2012),('2012-05-12',201219,5,2012,12,19,201205,2012),('2012-05-13',201220,5,2012,13,20,201205,2012),('2012-05-14',201220,5,2012,14,20,201205,2012),('2012-05-15',201220,5,2012,15,20,201205,2012),('2012-05-16',201220,5,2012,16,20,201205,2012),('2012-05-17',201220,5,2012,17,20,201205,2012),('2012-05-18',201220,5,2012,18,20,201205,2012),('2012-05-19',201220,5,2012,19,20,201205,2012),('2012-05-20',201221,5,2012,20,21,201205,2012),('2012-05-21',201221,5,2012,21,21,201205,2012),('2012-05-22',201221,5,2012,22,21,201205,2012),('2012-05-23',201221,5,2012,23,21,201205,2012),('2012-05-24',201221,5,2012,24,21,201205,2012),('2012-05-25',201221,5,2012,25,21,201205,2012),('2012-05-26',201221,5,2012,26,21,201205,2012),('2012-05-27',201222,5,2012,27,22,201205,2012),('2012-05-28',201222,5,2012,28,22,201205,2012),('2012-05-29',201222,5,2012,29,22,201205,2012),('2012-05-30',201222,5,2012,30,22,201205,2012),('2012-05-31',201222,5,2012,31,22,201205,2012),('2012-06-01',201222,6,2012,1,22,201206,2012),('2012-06-02',201222,6,2012,2,22,201206,2012),('2012-06-03',201223,6,2012,3,23,201206,2012),('2012-06-04',201223,6,2012,4,23,201206,2012),('2012-06-05',201223,6,2012,5,23,201206,2012),('2012-06-06',201223,6,2012,6,23,201206,2012),('2012-06-07',201223,6,2012,7,23,201206,2012),('2012-06-08',201223,6,2012,8,23,201206,2012),('2012-06-09',201223,6,2012,9,23,201206,2012),('2012-06-10',201224,6,2012,10,24,201206,2012),('2012-06-11',201224,6,2012,11,24,201206,2012),('2012-06-12',201224,6,2012,12,24,201206,2012),('2012-06-13',201224,6,2012,13,24,201206,2012),('2012-06-14',201224,6,2012,14,24,201206,2012),('2012-06-15',201224,6,2012,15,24,201206,2012),('2012-06-16',201224,6,2012,16,24,201206,2012),('2012-06-17',201225,6,2012,17,25,201206,2012),('2012-06-18',201225,6,2012,18,25,201206,2012),('2012-06-19',201225,6,2012,19,25,201206,2012),('2012-06-20',201225,6,2012,20,25,201206,2012),('2012-06-21',201225,6,2012,21,25,201206,2012),('2012-06-22',201225,6,2012,22,25,201206,2012),('2012-06-23',201225,6,2012,23,25,201206,2012),('2012-06-24',201226,6,2012,24,26,201206,2012),('2012-06-25',201226,6,2012,25,26,201206,2012),('2012-06-26',201226,6,2012,26,26,201206,2012),('2012-06-27',201226,6,2012,27,26,201206,2012),('2012-06-28',201226,6,2012,28,26,201206,2012),('2012-06-29',201226,6,2012,29,26,201206,2012),('2012-06-30',201226,6,2012,30,26,201206,2012),('2012-07-01',201227,7,2012,1,27,201207,2012),('2012-07-02',201227,7,2012,2,27,201207,2012),('2012-07-03',201227,7,2012,3,27,201207,2012),('2012-07-04',201227,7,2012,4,27,201207,2012),('2012-07-05',201227,7,2012,5,27,201207,2012),('2012-07-06',201227,7,2012,6,27,201207,2012),('2012-07-07',201227,7,2012,7,27,201207,2012),('2012-07-08',201228,7,2012,8,28,201207,2012),('2012-07-09',201228,7,2012,9,28,201207,2012),('2012-07-10',201228,7,2012,10,28,201207,2012),('2012-07-11',201228,7,2012,11,28,201207,2012),('2012-07-12',201228,7,2012,12,28,201207,2012),('2012-07-13',201228,7,2012,13,28,201207,2012),('2012-07-14',201228,7,2012,14,28,201207,2012),('2012-07-15',201229,7,2012,15,29,201207,2012),('2012-07-16',201229,7,2012,16,29,201207,2012),('2012-07-17',201229,7,2012,17,29,201207,2012),('2012-07-18',201229,7,2012,18,29,201207,2012),('2012-07-19',201229,7,2012,19,29,201207,2012),('2012-07-20',201229,7,2012,20,29,201207,2012),('2012-07-21',201229,7,2012,21,29,201207,2012),('2012-07-22',201230,7,2012,22,30,201207,2012),('2012-07-23',201230,7,2012,23,30,201207,2012),('2012-07-24',201230,7,2012,24,30,201207,2012),('2012-07-25',201230,7,2012,25,30,201207,2012),('2012-07-26',201230,7,2012,26,30,201207,2012),('2012-07-27',201230,7,2012,27,30,201207,2012),('2012-07-28',201230,7,2012,28,30,201207,2012),('2012-07-29',201231,7,2012,29,31,201207,2012),('2012-07-30',201231,7,2012,30,31,201207,2012),('2012-07-31',201231,7,2012,31,31,201207,2012),('2012-08-01',201231,8,2012,1,31,201208,2012),('2012-08-02',201231,8,2012,2,31,201208,2012),('2012-08-03',201231,8,2012,3,31,201208,2012),('2012-08-04',201231,8,2012,4,31,201208,2012),('2012-08-05',201232,8,2012,5,32,201208,2012),('2012-08-06',201232,8,2012,6,32,201208,2012),('2012-08-07',201232,8,2012,7,32,201208,2012),('2012-08-08',201232,8,2012,8,32,201208,2012),('2012-08-09',201232,8,2012,9,32,201208,2012),('2012-08-10',201232,8,2012,10,32,201208,2012),('2012-08-11',201232,8,2012,11,32,201208,2012),('2012-08-12',201233,8,2012,12,33,201208,2012),('2012-08-13',201233,8,2012,13,33,201208,2012),('2012-08-14',201233,8,2012,14,33,201208,2012),('2012-08-15',201233,8,2012,15,33,201208,2012),('2012-08-16',201233,8,2012,16,33,201208,2012),('2012-08-17',201233,8,2012,17,33,201208,2012),('2012-08-18',201233,8,2012,18,33,201208,2012),('2012-08-19',201234,8,2012,19,34,201208,2012),('2012-08-20',201234,8,2012,20,34,201208,2012),('2012-08-21',201234,8,2012,21,34,201208,2012),('2012-08-22',201234,8,2012,22,34,201208,2012),('2012-08-23',201234,8,2012,23,34,201208,2012),('2012-08-24',201234,8,2012,24,34,201208,2012),('2012-08-25',201234,8,2012,25,34,201208,2012),('2012-08-26',201235,8,2012,26,35,201208,2012),('2012-08-27',201235,8,2012,27,35,201208,2012),('2012-08-28',201235,8,2012,28,35,201208,2012),('2012-08-29',201235,8,2012,29,35,201208,2012),('2012-08-30',201235,8,2012,30,35,201208,2012),('2012-08-31',201235,8,2012,31,35,201208,2012),('2012-09-01',201235,9,2012,1,35,201209,2012),('2012-09-02',201236,9,2012,2,36,201209,2012),('2012-09-03',201236,9,2012,3,36,201209,2012),('2012-09-04',201236,9,2012,4,36,201209,2012),('2012-09-05',201236,9,2012,5,36,201209,2012),('2012-09-06',201236,9,2012,6,36,201209,2012),('2012-09-07',201236,9,2012,7,36,201209,2012),('2012-09-08',201236,9,2012,8,36,201209,2012),('2012-09-09',201237,9,2012,9,37,201209,2012),('2012-09-10',201237,9,2012,10,37,201209,2012),('2012-09-11',201237,9,2012,11,37,201209,2012),('2012-09-12',201237,9,2012,12,37,201209,2012),('2012-09-13',201237,9,2012,13,37,201209,2012),('2012-09-14',201237,9,2012,14,37,201209,2012),('2012-09-15',201237,9,2012,15,37,201209,2012),('2012-09-16',201238,9,2012,16,38,201209,2012),('2012-09-17',201238,9,2012,17,38,201209,2012),('2012-09-18',201238,9,2012,18,38,201209,2012),('2012-09-19',201238,9,2012,19,38,201209,2012),('2012-09-20',201238,9,2012,20,38,201209,2012),('2012-09-21',201238,9,2012,21,38,201209,2012),('2012-09-22',201238,9,2012,22,38,201209,2012),('2012-09-23',201239,9,2012,23,39,201209,2012),('2012-09-24',201239,9,2012,24,39,201209,2012),('2012-09-25',201239,9,2012,25,39,201209,2012),('2012-09-26',201239,9,2012,26,39,201209,2012),('2012-09-27',201239,9,2012,27,39,201209,2012),('2012-09-28',201239,9,2012,28,39,201209,2012),('2012-09-29',201239,9,2012,29,39,201209,2012),('2012-09-30',201240,9,2012,30,40,201209,2012),('2012-10-01',201240,10,2012,1,40,201210,2012),('2012-10-02',201240,10,2012,2,40,201210,2012),('2012-10-03',201240,10,2012,3,40,201210,2012),('2012-10-04',201240,10,2012,4,40,201210,2012),('2012-10-05',201240,10,2012,5,40,201210,2012),('2012-10-06',201240,10,2012,6,40,201210,2012),('2012-10-07',201241,10,2012,7,41,201210,2012),('2012-10-08',201241,10,2012,8,41,201210,2012),('2012-10-09',201241,10,2012,9,41,201210,2012),('2012-10-10',201241,10,2012,10,41,201210,2012),('2012-10-11',201241,10,2012,11,41,201210,2012),('2012-10-12',201241,10,2012,12,41,201210,2012),('2012-10-13',201241,10,2012,13,41,201210,2012),('2012-10-14',201242,10,2012,14,42,201210,2012),('2012-10-15',201242,10,2012,15,42,201210,2012),('2012-10-16',201242,10,2012,16,42,201210,2012),('2012-10-17',201242,10,2012,17,42,201210,2012),('2012-10-18',201242,10,2012,18,42,201210,2012),('2012-10-19',201242,10,2012,19,42,201210,2012),('2012-10-20',201242,10,2012,20,42,201210,2012),('2012-10-21',201243,10,2012,21,43,201210,2012),('2012-10-22',201243,10,2012,22,43,201210,2012),('2012-10-23',201243,10,2012,23,43,201210,2012),('2012-10-24',201243,10,2012,24,43,201210,2012),('2012-10-25',201243,10,2012,25,43,201210,2012),('2012-10-26',201243,10,2012,26,43,201210,2012),('2012-10-27',201243,10,2012,27,43,201210,2012),('2012-10-28',201244,10,2012,28,44,201210,2012),('2012-10-29',201244,10,2012,29,44,201210,2012),('2012-10-30',201244,10,2012,30,44,201210,2012),('2012-10-31',201244,10,2012,31,44,201210,2012),('2012-11-01',201244,11,2012,1,44,201211,2012),('2012-11-02',201244,11,2012,2,44,201211,2012),('2012-11-03',201244,11,2012,3,44,201211,2012),('2012-11-04',201245,11,2012,4,45,201211,2012),('2012-11-05',201245,11,2012,5,45,201211,2012),('2012-11-06',201245,11,2012,6,45,201211,2012),('2012-11-07',201245,11,2012,7,45,201211,2012),('2012-11-08',201245,11,2012,8,45,201211,2012),('2012-11-09',201245,11,2012,9,45,201211,2012),('2012-11-10',201245,11,2012,10,45,201211,2012),('2012-11-11',201246,11,2012,11,46,201211,2012),('2012-11-12',201246,11,2012,12,46,201211,2012),('2012-11-13',201246,11,2012,13,46,201211,2012),('2012-11-14',201246,11,2012,14,46,201211,2012),('2012-11-15',201246,11,2012,15,46,201211,2012),('2012-11-16',201246,11,2012,16,46,201211,2012),('2012-11-17',201246,11,2012,17,46,201211,2012),('2012-11-18',201247,11,2012,18,47,201211,2012),('2012-11-19',201247,11,2012,19,47,201211,2012),('2012-11-20',201247,11,2012,20,47,201211,2012),('2012-11-21',201247,11,2012,21,47,201211,2012),('2012-11-22',201247,11,2012,22,47,201211,2012),('2012-11-23',201247,11,2012,23,47,201211,2012),('2012-11-24',201247,11,2012,24,47,201211,2012),('2012-11-25',201248,11,2012,25,48,201211,2012),('2012-11-26',201248,11,2012,26,48,201211,2012),('2012-11-27',201248,11,2012,27,48,201211,2012),('2012-11-28',201248,11,2012,28,48,201211,2012),('2012-11-29',201248,11,2012,29,48,201211,2012),('2012-11-30',201248,11,2012,30,48,201211,2012),('2012-12-01',201248,12,2012,1,48,201212,2013),('2012-12-02',201249,12,2012,2,49,201212,2013),('2012-12-03',201249,12,2012,3,49,201212,2013),('2012-12-04',201249,12,2012,4,49,201212,2013),('2012-12-05',201249,12,2012,5,49,201212,2013),('2012-12-06',201249,12,2012,6,49,201212,2013),('2012-12-07',201249,12,2012,7,49,201212,2013),('2012-12-08',201249,12,2012,8,49,201212,2013),('2012-12-09',201250,12,2012,9,50,201212,2013),('2012-12-10',201250,12,2012,10,50,201212,2013),('2012-12-11',201250,12,2012,11,50,201212,2013),('2012-12-12',201250,12,2012,12,50,201212,2013),('2012-12-13',201250,12,2012,13,50,201212,2013),('2012-12-14',201250,12,2012,14,50,201212,2013),('2012-12-15',201250,12,2012,15,50,201212,2013),('2012-12-16',201251,12,2012,16,51,201212,2013),('2012-12-17',201251,12,2012,17,51,201212,2013),('2012-12-18',201251,12,2012,18,51,201212,2013),('2012-12-19',201251,12,2012,19,51,201212,2013),('2012-12-20',201251,12,2012,20,51,201212,2013),('2012-12-21',201251,12,2012,21,51,201212,2013),('2012-12-22',201251,12,2012,22,51,201212,2013),('2012-12-23',201252,12,2012,23,52,201212,2013),('2012-12-24',201252,12,2012,24,52,201212,2013),('2012-12-25',201252,12,2012,25,52,201212,2013),('2012-12-26',201252,12,2012,26,52,201212,2013),('2012-12-27',201252,12,2012,27,52,201212,2013),('2012-12-28',201252,12,2012,28,52,201212,2013),('2012-12-29',201252,12,2012,29,52,201212,2013),('2012-12-30',201301,12,2012,30,1,201212,2013),('2012-12-31',201301,12,2012,31,1,201212,2013),('2013-01-01',201301,1,2013,1,1,201301,2013),('2013-01-02',201301,1,2013,2,1,201301,2013),('2013-01-03',201301,1,2013,3,1,201301,2013),('2013-01-04',201301,1,2013,4,1,201301,2013),('2013-01-05',201301,1,2013,5,1,201301,2013),('2013-01-06',201302,1,2013,6,2,201301,2013),('2013-01-07',201302,1,2013,7,2,201301,2013),('2013-01-08',201302,1,2013,8,2,201301,2013),('2013-01-09',201302,1,2013,9,2,201301,2013),('2013-01-10',201302,1,2013,10,2,201301,2013),('2013-01-11',201302,1,2013,11,2,201301,2013),('2013-01-12',201302,1,2013,12,2,201301,2013),('2013-01-13',201303,1,2013,13,3,201301,2013),('2013-01-14',201303,1,2013,14,3,201301,2013),('2013-01-15',201303,1,2013,15,3,201301,2013),('2013-01-16',201303,1,2013,16,3,201301,2013),('2013-01-17',201303,1,2013,17,3,201301,2013),('2013-01-18',201303,1,2013,18,3,201301,2013),('2013-01-19',201303,1,2013,19,3,201301,2013),('2013-01-20',201304,1,2013,20,4,201301,2013),('2013-01-21',201304,1,2013,21,4,201301,2013),('2013-01-22',201304,1,2013,22,4,201301,2013),('2013-01-23',201304,1,2013,23,4,201301,2013),('2013-01-24',201304,1,2013,24,4,201301,2013),('2013-01-25',201304,1,2013,25,4,201301,2013),('2013-01-26',201304,1,2013,26,4,201301,2013),('2013-01-27',201305,1,2013,27,5,201301,2013),('2013-01-28',201305,1,2013,28,5,201301,2013),('2013-01-29',201305,1,2013,29,5,201301,2013),('2013-01-30',201305,1,2013,30,5,201301,2013),('2013-01-31',201305,1,2013,31,5,201301,2013),('2013-02-01',201305,2,2013,1,5,201302,2013),('2013-02-02',201305,2,2013,2,5,201302,2013),('2013-02-03',201306,2,2013,3,6,201302,2013),('2013-02-04',201306,2,2013,4,6,201302,2013),('2013-02-05',201306,2,2013,5,6,201302,2013),('2013-02-06',201306,2,2013,6,6,201302,2013),('2013-02-07',201306,2,2013,7,6,201302,2013),('2013-02-08',201306,2,2013,8,6,201302,2013),('2013-02-09',201306,2,2013,9,6,201302,2013),('2013-02-10',201307,2,2013,10,7,201302,2013),('2013-02-11',201307,2,2013,11,7,201302,2013),('2013-02-12',201307,2,2013,12,7,201302,2013),('2013-02-13',201307,2,2013,13,7,201302,2013),('2013-02-14',201307,2,2013,14,7,201302,2013),('2013-02-15',201307,2,2013,15,7,201302,2013),('2013-02-16',201307,2,2013,16,7,201302,2013),('2013-02-17',201308,2,2013,17,8,201302,2013),('2013-02-18',201308,2,2013,18,8,201302,2013),('2013-02-19',201308,2,2013,19,8,201302,2013),('2013-02-20',201308,2,2013,20,8,201302,2013),('2013-02-21',201308,2,2013,21,8,201302,2013),('2013-02-22',201308,2,2013,22,8,201302,2013),('2013-02-23',201308,2,2013,23,8,201302,2013),('2013-02-24',201309,2,2013,24,9,201302,2013),('2013-02-25',201309,2,2013,25,9,201302,2013),('2013-02-26',201309,2,2013,26,9,201302,2013),('2013-02-27',201309,2,2013,27,9,201302,2013),('2013-02-28',201309,2,2013,28,9,201302,2013),('2013-03-01',201309,3,2013,1,9,201303,2013),('2013-03-02',201309,3,2013,2,9,201303,2013),('2013-03-03',201310,3,2013,3,10,201303,2013),('2013-03-04',201310,3,2013,4,10,201303,2013),('2013-03-05',201310,3,2013,5,10,201303,2013),('2013-03-06',201310,3,2013,6,10,201303,2013),('2013-03-07',201310,3,2013,7,10,201303,2013),('2013-03-08',201310,3,2013,8,10,201303,2013),('2013-03-09',201310,3,2013,9,10,201303,2013),('2013-03-10',201311,3,2013,10,11,201303,2013),('2013-03-11',201311,3,2013,11,11,201303,2013),('2013-03-12',201311,3,2013,12,11,201303,2013),('2013-03-13',201311,3,2013,13,11,201303,2013),('2013-03-14',201311,3,2013,14,11,201303,2013),('2013-03-15',201311,3,2013,15,11,201303,2013),('2013-03-16',201311,3,2013,16,11,201303,2013),('2013-03-17',201312,3,2013,17,12,201303,2013),('2013-03-18',201312,3,2013,18,12,201303,2013),('2013-03-19',201312,3,2013,19,12,201303,2013),('2013-03-20',201312,3,2013,20,12,201303,2013),('2013-03-21',201312,3,2013,21,12,201303,2013),('2013-03-22',201312,3,2013,22,12,201303,2013),('2013-03-23',201312,3,2013,23,12,201303,2013),('2013-03-24',201313,3,2013,24,13,201303,2013),('2013-03-25',201313,3,2013,25,13,201303,2013),('2013-03-26',201313,3,2013,26,13,201303,2013),('2013-03-27',201313,3,2013,27,13,201303,2013),('2013-03-28',201313,3,2013,28,13,201303,2013),('2013-03-29',201313,3,2013,29,13,201303,2013),('2013-03-30',201313,3,2013,30,13,201303,2013),('2013-03-31',201314,3,2013,31,14,201303,2013),('2013-04-01',201314,4,2013,1,14,201304,2013),('2013-04-02',201314,4,2013,2,14,201304,2013),('2013-04-03',201314,4,2013,3,14,201304,2013),('2013-04-04',201314,4,2013,4,14,201304,2013),('2013-04-05',201314,4,2013,5,14,201304,2013),('2013-04-06',201314,4,2013,6,14,201304,2013),('2013-04-07',201315,4,2013,7,15,201304,2013),('2013-04-08',201315,4,2013,8,15,201304,2013),('2013-04-09',201315,4,2013,9,15,201304,2013),('2013-04-10',201315,4,2013,10,15,201304,2013),('2013-04-11',201315,4,2013,11,15,201304,2013),('2013-04-12',201315,4,2013,12,15,201304,2013),('2013-04-13',201315,4,2013,13,15,201304,2013),('2013-04-14',201316,4,2013,14,16,201304,2013),('2013-04-15',201316,4,2013,15,16,201304,2013),('2013-04-16',201316,4,2013,16,16,201304,2013),('2013-04-17',201316,4,2013,17,16,201304,2013),('2013-04-18',201316,4,2013,18,16,201304,2013),('2013-04-19',201316,4,2013,19,16,201304,2013),('2013-04-20',201316,4,2013,20,16,201304,2013),('2013-04-21',201317,4,2013,21,17,201304,2013),('2013-04-22',201317,4,2013,22,17,201304,2013),('2013-04-23',201317,4,2013,23,17,201304,2013),('2013-04-24',201317,4,2013,24,17,201304,2013),('2013-04-25',201317,4,2013,25,17,201304,2013),('2013-04-26',201317,4,2013,26,17,201304,2013),('2013-04-27',201317,4,2013,27,17,201304,2013),('2013-04-28',201318,4,2013,28,18,201304,2013),('2013-04-29',201318,4,2013,29,18,201304,2013),('2013-04-30',201318,4,2013,30,18,201304,2013),('2013-05-01',201318,5,2013,1,18,201305,2013),('2013-05-02',201318,5,2013,2,18,201305,2013),('2013-05-03',201318,5,2013,3,18,201305,2013),('2013-05-04',201318,5,2013,4,18,201305,2013),('2013-05-05',201319,5,2013,5,19,201305,2013),('2013-05-06',201319,5,2013,6,19,201305,2013),('2013-05-07',201319,5,2013,7,19,201305,2013),('2013-05-08',201319,5,2013,8,19,201305,2013),('2013-05-09',201319,5,2013,9,19,201305,2013),('2013-05-10',201319,5,2013,10,19,201305,2013),('2013-05-11',201319,5,2013,11,19,201305,2013),('2013-05-12',201320,5,2013,12,20,201305,2013),('2013-05-13',201320,5,2013,13,20,201305,2013),('2013-05-14',201320,5,2013,14,20,201305,2013),('2013-05-15',201320,5,2013,15,20,201305,2013),('2013-05-16',201320,5,2013,16,20,201305,2013),('2013-05-17',201320,5,2013,17,20,201305,2013),('2013-05-18',201320,5,2013,18,20,201305,2013),('2013-05-19',201321,5,2013,19,21,201305,2013),('2013-05-20',201321,5,2013,20,21,201305,2013),('2013-05-21',201321,5,2013,21,21,201305,2013),('2013-05-22',201321,5,2013,22,21,201305,2013),('2013-05-23',201321,5,2013,23,21,201305,2013),('2013-05-24',201321,5,2013,24,21,201305,2013),('2013-05-25',201321,5,2013,25,21,201305,2013),('2013-05-26',201322,5,2013,26,22,201305,2013),('2013-05-27',201322,5,2013,27,22,201305,2013),('2013-05-28',201322,5,2013,28,22,201305,2013),('2013-05-29',201322,5,2013,29,22,201305,2013),('2013-05-30',201322,5,2013,30,22,201305,2013),('2013-05-31',201322,5,2013,31,22,201305,2013),('2013-06-01',201322,6,2013,1,22,201306,2013),('2013-06-02',201323,6,2013,2,23,201306,2013),('2013-06-03',201323,6,2013,3,23,201306,2013),('2013-06-04',201323,6,2013,4,23,201306,2013),('2013-06-05',201323,6,2013,5,23,201306,2013),('2013-06-06',201323,6,2013,6,23,201306,2013),('2013-06-07',201323,6,2013,7,23,201306,2013),('2013-06-08',201323,6,2013,8,23,201306,2013),('2013-06-09',201324,6,2013,9,24,201306,2013),('2013-06-10',201324,6,2013,10,24,201306,2013),('2013-06-11',201324,6,2013,11,24,201306,2013),('2013-06-12',201324,6,2013,12,24,201306,2013),('2013-06-13',201324,6,2013,13,24,201306,2013),('2013-06-14',201324,6,2013,14,24,201306,2013),('2013-06-15',201324,6,2013,15,24,201306,2013),('2013-06-16',201325,6,2013,16,25,201306,2013),('2013-06-17',201325,6,2013,17,25,201306,2013),('2013-06-18',201325,6,2013,18,25,201306,2013),('2013-06-19',201325,6,2013,19,25,201306,2013),('2013-06-20',201325,6,2013,20,25,201306,2013),('2013-06-21',201325,6,2013,21,25,201306,2013),('2013-06-22',201325,6,2013,22,25,201306,2013),('2013-06-23',201326,6,2013,23,26,201306,2013),('2013-06-24',201326,6,2013,24,26,201306,2013),('2013-06-25',201326,6,2013,25,26,201306,2013),('2013-06-26',201326,6,2013,26,26,201306,2013),('2013-06-27',201326,6,2013,27,26,201306,2013),('2013-06-28',201326,6,2013,28,26,201306,2013),('2013-06-29',201326,6,2013,29,26,201306,2013),('2013-06-30',201327,6,2013,30,27,201306,2013),('2013-07-01',201327,7,2013,1,27,201307,2013),('2013-07-02',201327,7,2013,2,27,201307,2013),('2013-07-03',201327,7,2013,3,27,201307,2013),('2013-07-04',201327,7,2013,4,27,201307,2013),('2013-07-05',201327,7,2013,5,27,201307,2013),('2013-07-06',201327,7,2013,6,27,201307,2013),('2013-07-07',201328,7,2013,7,28,201307,2013),('2013-07-08',201328,7,2013,8,28,201307,2013),('2013-07-09',201328,7,2013,9,28,201307,2013),('2013-07-10',201328,7,2013,10,28,201307,2013),('2013-07-11',201328,7,2013,11,28,201307,2013),('2013-07-12',201328,7,2013,12,28,201307,2013),('2013-07-13',201328,7,2013,13,28,201307,2013),('2013-07-14',201329,7,2013,14,29,201307,2013),('2013-07-15',201329,7,2013,15,29,201307,2013),('2013-07-16',201329,7,2013,16,29,201307,2013),('2013-07-17',201329,7,2013,17,29,201307,2013),('2013-07-18',201329,7,2013,18,29,201307,2013),('2013-07-19',201329,7,2013,19,29,201307,2013),('2013-07-20',201329,7,2013,20,29,201307,2013),('2013-07-21',201330,7,2013,21,30,201307,2013),('2013-07-22',201330,7,2013,22,30,201307,2013),('2013-07-23',201330,7,2013,23,30,201307,2013),('2013-07-24',201330,7,2013,24,30,201307,2013),('2013-07-25',201330,7,2013,25,30,201307,2013),('2013-07-26',201330,7,2013,26,30,201307,2013),('2013-07-27',201330,7,2013,27,30,201307,2013),('2013-07-28',201331,7,2013,28,31,201307,2013),('2013-07-29',201331,7,2013,29,31,201307,2013),('2013-07-30',201331,7,2013,30,31,201307,2013),('2013-07-31',201331,7,2013,31,31,201307,2013),('2013-08-01',201331,8,2013,1,31,201308,2013),('2013-08-02',201331,8,2013,2,31,201308,2013),('2013-08-03',201331,8,2013,3,31,201308,2013),('2013-08-04',201332,8,2013,4,32,201308,2013),('2013-08-05',201332,8,2013,5,32,201308,2013),('2013-08-06',201332,8,2013,6,32,201308,2013),('2013-08-07',201332,8,2013,7,32,201308,2013),('2013-08-08',201332,8,2013,8,32,201308,2013),('2013-08-09',201332,8,2013,9,32,201308,2013),('2013-08-10',201332,8,2013,10,32,201308,2013),('2013-08-11',201333,8,2013,11,33,201308,2013),('2013-08-12',201333,8,2013,12,33,201308,2013),('2013-08-13',201333,8,2013,13,33,201308,2013),('2013-08-14',201333,8,2013,14,33,201308,2013),('2013-08-15',201333,8,2013,15,33,201308,2013),('2013-08-16',201333,8,2013,16,33,201308,2013),('2013-08-17',201333,8,2013,17,33,201308,2013),('2013-08-18',201334,8,2013,18,34,201308,2013),('2013-08-19',201334,8,2013,19,34,201308,2013),('2013-08-20',201334,8,2013,20,34,201308,2013),('2013-08-21',201334,8,2013,21,34,201308,2013),('2013-08-22',201334,8,2013,22,34,201308,2013),('2013-08-23',201334,8,2013,23,34,201308,2013),('2013-08-24',201334,8,2013,24,34,201308,2013),('2013-08-25',201335,8,2013,25,35,201308,2013),('2013-08-26',201335,8,2013,26,35,201308,2013),('2013-08-27',201335,8,2013,27,35,201308,2013),('2013-08-28',201335,8,2013,28,35,201308,2013),('2013-08-29',201335,8,2013,29,35,201308,2013),('2013-08-30',201335,8,2013,30,35,201308,2013),('2013-08-31',201335,8,2013,31,35,201308,2013),('2013-09-01',201336,9,2013,1,36,201309,2013),('2013-09-02',201336,9,2013,2,36,201309,2013),('2013-09-03',201336,9,2013,3,36,201309,2013),('2013-09-04',201336,9,2013,4,36,201309,2013),('2013-09-05',201336,9,2013,5,36,201309,2013),('2013-09-06',201336,9,2013,6,36,201309,2013),('2013-09-07',201336,9,2013,7,36,201309,2013),('2013-09-08',201337,9,2013,8,37,201309,2013),('2013-09-09',201337,9,2013,9,37,201309,2013),('2013-09-10',201337,9,2013,10,37,201309,2013),('2013-09-11',201337,9,2013,11,37,201309,2013),('2013-09-12',201337,9,2013,12,37,201309,2013),('2013-09-13',201337,9,2013,13,37,201309,2013),('2013-09-14',201337,9,2013,14,37,201309,2013),('2013-09-15',201338,9,2013,15,38,201309,2013),('2013-09-16',201338,9,2013,16,38,201309,2013),('2013-09-17',201338,9,2013,17,38,201309,2013),('2013-09-18',201338,9,2013,18,38,201309,2013),('2013-09-19',201338,9,2013,19,38,201309,2013),('2013-09-20',201338,9,2013,20,38,201309,2013),('2013-09-21',201338,9,2013,21,38,201309,2013),('2013-09-22',201339,9,2013,22,39,201309,2013),('2013-09-23',201339,9,2013,23,39,201309,2013),('2013-09-24',201339,9,2013,24,39,201309,2013),('2013-09-25',201339,9,2013,25,39,201309,2013),('2013-09-26',201339,9,2013,26,39,201309,2013),('2013-09-27',201339,9,2013,27,39,201309,2013),('2013-09-28',201339,9,2013,28,39,201309,2013),('2013-09-29',201340,9,2013,29,40,201309,2013),('2013-09-30',201340,9,2013,30,40,201309,2013),('2013-10-01',201340,10,2013,1,40,201310,2013),('2013-10-02',201340,10,2013,2,40,201310,2013),('2013-10-03',201340,10,2013,3,40,201310,2013),('2013-10-04',201340,10,2013,4,40,201310,2013),('2013-10-05',201340,10,2013,5,40,201310,2013),('2013-10-06',201341,10,2013,6,41,201310,2013),('2013-10-07',201341,10,2013,7,41,201310,2013),('2013-10-08',201341,10,2013,8,41,201310,2013),('2013-10-09',201341,10,2013,9,41,201310,2013),('2013-10-10',201341,10,2013,10,41,201310,2013),('2013-10-11',201341,10,2013,11,41,201310,2013),('2013-10-12',201341,10,2013,12,41,201310,2013),('2013-10-13',201342,10,2013,13,42,201310,2013),('2013-10-14',201342,10,2013,14,42,201310,2013),('2013-10-15',201342,10,2013,15,42,201310,2013),('2013-10-16',201342,10,2013,16,42,201310,2013),('2013-10-17',201342,10,2013,17,42,201310,2013),('2013-10-18',201342,10,2013,18,42,201310,2013),('2013-10-19',201342,10,2013,19,42,201310,2013),('2013-10-20',201343,10,2013,20,43,201310,2013),('2013-10-21',201343,10,2013,21,43,201310,2013),('2013-10-22',201343,10,2013,22,43,201310,2013),('2013-10-23',201343,10,2013,23,43,201310,2013),('2013-10-24',201343,10,2013,24,43,201310,2013),('2013-10-25',201343,10,2013,25,43,201310,2013),('2013-10-26',201343,10,2013,26,43,201310,2013),('2013-10-27',201344,10,2013,27,44,201310,2013),('2013-10-28',201344,10,2013,28,44,201310,2013),('2013-10-29',201344,10,2013,29,44,201310,2013),('2013-10-30',201344,10,2013,30,44,201310,2013),('2013-10-31',201344,10,2013,31,44,201310,2013),('2013-11-01',201344,11,2013,1,44,201311,2013),('2013-11-02',201344,11,2013,2,44,201311,2013),('2013-11-03',201345,11,2013,3,45,201311,2013),('2013-11-04',201345,11,2013,4,45,201311,2013),('2013-11-05',201345,11,2013,5,45,201311,2013),('2013-11-06',201345,11,2013,6,45,201311,2013),('2013-11-07',201345,11,2013,7,45,201311,2013),('2013-11-08',201345,11,2013,8,45,201311,2013),('2013-11-09',201345,11,2013,9,45,201311,2013),('2013-11-10',201346,11,2013,10,46,201311,2013),('2013-11-11',201346,11,2013,11,46,201311,2013),('2013-11-12',201346,11,2013,12,46,201311,2013),('2013-11-13',201346,11,2013,13,46,201311,2013),('2013-11-14',201346,11,2013,14,46,201311,2013),('2013-11-15',201346,11,2013,15,46,201311,2013),('2013-11-16',201346,11,2013,16,46,201311,2013),('2013-11-17',201347,11,2013,17,47,201311,2013),('2013-11-18',201347,11,2013,18,47,201311,2013),('2013-11-19',201347,11,2013,19,47,201311,2013),('2013-11-20',201347,11,2013,20,47,201311,2013),('2013-11-21',201347,11,2013,21,47,201311,2013),('2013-11-22',201347,11,2013,22,47,201311,2013),('2013-11-23',201347,11,2013,23,47,201311,2013),('2013-11-24',201348,11,2013,24,48,201311,2013),('2013-11-25',201348,11,2013,25,48,201311,2013),('2013-11-26',201348,11,2013,26,48,201311,2013),('2013-11-27',201348,11,2013,27,48,201311,2013),('2013-11-28',201348,11,2013,28,48,201311,2013),('2013-11-29',201348,11,2013,29,48,201311,2013),('2013-11-30',201348,11,2013,30,48,201311,2013),('2013-12-01',201349,12,2013,1,49,201312,2014),('2013-12-02',201349,12,2013,2,49,201312,2014),('2013-12-03',201349,12,2013,3,49,201312,2014),('2013-12-04',201349,12,2013,4,49,201312,2014),('2013-12-05',201349,12,2013,5,49,201312,2014),('2013-12-06',201349,12,2013,6,49,201312,2014),('2013-12-07',201349,12,2013,7,49,201312,2014),('2013-12-08',201350,12,2013,8,50,201312,2014),('2013-12-09',201350,12,2013,9,50,201312,2014),('2013-12-10',201350,12,2013,10,50,201312,2014),('2013-12-11',201350,12,2013,11,50,201312,2014),('2013-12-12',201350,12,2013,12,50,201312,2014),('2013-12-13',201350,12,2013,13,50,201312,2014),('2013-12-14',201350,12,2013,14,50,201312,2014),('2013-12-15',201351,12,2013,15,51,201312,2014),('2013-12-16',201351,12,2013,16,51,201312,2014),('2013-12-17',201351,12,2013,17,51,201312,2014),('2013-12-18',201351,12,2013,18,51,201312,2014),('2013-12-19',201351,12,2013,19,51,201312,2014),('2013-12-20',201351,12,2013,20,51,201312,2014),('2013-12-21',201351,12,2013,21,51,201312,2014),('2013-12-22',201352,12,2013,22,52,201312,2014),('2013-12-23',201352,12,2013,23,52,201312,2014),('2013-12-24',201352,12,2013,24,52,201312,2014),('2013-12-25',201352,12,2013,25,52,201312,2014),('2013-12-26',201352,12,2013,26,52,201312,2014),('2013-12-27',201352,12,2013,27,52,201312,2014),('2013-12-28',201352,12,2013,28,52,201312,2014),('2013-12-29',201401,12,2013,29,1,201312,2014),('2013-12-30',201401,12,2013,30,1,201312,2014),('2013-12-31',201401,12,2013,31,1,201312,2014),('2014-01-01',201401,1,2014,1,1,201401,2014),('2014-01-02',201401,1,2014,2,1,201401,2014),('2014-01-03',201401,1,2014,3,1,201401,2014),('2014-01-04',201401,1,2014,4,1,201401,2014),('2014-01-05',201402,1,2014,5,2,201401,2014),('2014-01-06',201402,1,2014,6,2,201401,2014),('2014-01-07',201402,1,2014,7,2,201401,2014),('2014-01-08',201402,1,2014,8,2,201401,2014),('2014-01-09',201402,1,2014,9,2,201401,2014),('2014-01-10',201402,1,2014,10,2,201401,2014),('2014-01-11',201402,1,2014,11,2,201401,2014),('2014-01-12',201403,1,2014,12,3,201401,2014),('2014-01-13',201403,1,2014,13,3,201401,2014),('2014-01-14',201403,1,2014,14,3,201401,2014),('2014-01-15',201403,1,2014,15,3,201401,2014),('2014-01-16',201403,1,2014,16,3,201401,2014),('2014-01-17',201403,1,2014,17,3,201401,2014),('2014-01-18',201403,1,2014,18,3,201401,2014),('2014-01-19',201404,1,2014,19,4,201401,2014),('2014-01-20',201404,1,2014,20,4,201401,2014),('2014-01-21',201404,1,2014,21,4,201401,2014),('2014-01-22',201404,1,2014,22,4,201401,2014),('2014-01-23',201404,1,2014,23,4,201401,2014),('2014-01-24',201404,1,2014,24,4,201401,2014),('2014-01-25',201404,1,2014,25,4,201401,2014),('2014-01-26',201405,1,2014,26,5,201401,2014),('2014-01-27',201405,1,2014,27,5,201401,2014),('2014-01-28',201405,1,2014,28,5,201401,2014),('2014-01-29',201405,1,2014,29,5,201401,2014),('2014-01-30',201405,1,2014,30,5,201401,2014),('2014-01-31',201405,1,2014,31,5,201401,2014),('2014-02-01',201405,2,2014,1,5,201402,2014),('2014-02-02',201406,2,2014,2,6,201402,2014),('2014-02-03',201406,2,2014,3,6,201402,2014),('2014-02-04',201406,2,2014,4,6,201402,2014),('2014-02-05',201406,2,2014,5,6,201402,2014),('2014-02-06',201406,2,2014,6,6,201402,2014),('2014-02-07',201406,2,2014,7,6,201402,2014),('2014-02-08',201406,2,2014,8,6,201402,2014),('2014-02-09',201407,2,2014,9,7,201402,2014),('2014-02-10',201407,2,2014,10,7,201402,2014),('2014-02-11',201407,2,2014,11,7,201402,2014),('2014-02-12',201407,2,2014,12,7,201402,2014),('2014-02-13',201407,2,2014,13,7,201402,2014),('2014-02-14',201407,2,2014,14,7,201402,2014),('2014-02-15',201407,2,2014,15,7,201402,2014),('2014-02-16',201408,2,2014,16,8,201402,2014),('2014-02-17',201408,2,2014,17,8,201402,2014),('2014-02-18',201408,2,2014,18,8,201402,2014),('2014-02-19',201408,2,2014,19,8,201402,2014),('2014-02-20',201408,2,2014,20,8,201402,2014),('2014-02-21',201408,2,2014,21,8,201402,2014),('2014-02-22',201408,2,2014,22,8,201402,2014),('2014-02-23',201409,2,2014,23,9,201402,2014),('2014-02-24',201409,2,2014,24,9,201402,2014),('2014-02-25',201409,2,2014,25,9,201402,2014),('2014-02-26',201409,2,2014,26,9,201402,2014),('2014-02-27',201409,2,2014,27,9,201402,2014),('2014-02-28',201409,2,2014,28,9,201402,2014),('2014-03-01',201409,3,2014,1,9,201403,2014),('2014-03-02',201410,3,2014,2,10,201403,2014),('2014-03-03',201410,3,2014,3,10,201403,2014),('2014-03-04',201410,3,2014,4,10,201403,2014),('2014-03-05',201410,3,2014,5,10,201403,2014),('2014-03-06',201410,3,2014,6,10,201403,2014),('2014-03-07',201410,3,2014,7,10,201403,2014),('2014-03-08',201410,3,2014,8,10,201403,2014),('2014-03-09',201411,3,2014,9,11,201403,2014),('2014-03-10',201411,3,2014,10,11,201403,2014),('2014-03-11',201411,3,2014,11,11,201403,2014),('2014-03-12',201411,3,2014,12,11,201403,2014),('2014-03-13',201411,3,2014,13,11,201403,2014),('2014-03-14',201411,3,2014,14,11,201403,2014),('2014-03-15',201411,3,2014,15,11,201403,2014),('2014-03-16',201412,3,2014,16,12,201403,2014),('2014-03-17',201412,3,2014,17,12,201403,2014),('2014-03-18',201412,3,2014,18,12,201403,2014),('2014-03-19',201412,3,2014,19,12,201403,2014),('2014-03-20',201412,3,2014,20,12,201403,2014),('2014-03-21',201412,3,2014,21,12,201403,2014),('2014-03-22',201412,3,2014,22,12,201403,2014),('2014-03-23',201413,3,2014,23,13,201403,2014),('2014-03-24',201413,3,2014,24,13,201403,2014),('2014-03-25',201413,3,2014,25,13,201403,2014),('2014-03-26',201413,3,2014,26,13,201403,2014),('2014-03-27',201413,3,2014,27,13,201403,2014),('2014-03-28',201413,3,2014,28,13,201403,2014),('2014-03-29',201413,3,2014,29,13,201403,2014),('2014-03-30',201414,3,2014,30,14,201403,2014),('2014-03-31',201414,3,2014,31,14,201403,2014),('2014-04-01',201414,4,2014,1,14,201404,2014),('2014-04-02',201414,4,2014,2,14,201404,2014),('2014-04-03',201414,4,2014,3,14,201404,2014),('2014-04-04',201414,4,2014,4,14,201404,2014),('2014-04-05',201414,4,2014,5,14,201404,2014),('2014-04-06',201415,4,2014,6,15,201404,2014),('2014-04-07',201415,4,2014,7,15,201404,2014),('2014-04-08',201415,4,2014,8,15,201404,2014),('2014-04-09',201415,4,2014,9,15,201404,2014),('2014-04-10',201415,4,2014,10,15,201404,2014),('2014-04-11',201415,4,2014,11,15,201404,2014),('2014-04-12',201415,4,2014,12,15,201404,2014),('2014-04-13',201416,4,2014,13,16,201404,2014),('2014-04-14',201416,4,2014,14,16,201404,2014),('2014-04-15',201416,4,2014,15,16,201404,2014),('2014-04-16',201416,4,2014,16,16,201404,2014),('2014-04-17',201416,4,2014,17,16,201404,2014),('2014-04-18',201416,4,2014,18,16,201404,2014),('2014-04-19',201416,4,2014,19,16,201404,2014),('2014-04-20',201417,4,2014,20,17,201404,2014),('2014-04-21',201417,4,2014,21,17,201404,2014),('2014-04-22',201417,4,2014,22,17,201404,2014),('2014-04-23',201417,4,2014,23,17,201404,2014),('2014-04-24',201417,4,2014,24,17,201404,2014),('2014-04-25',201417,4,2014,25,17,201404,2014),('2014-04-26',201417,4,2014,26,17,201404,2014),('2014-04-27',201418,4,2014,27,18,201404,2014),('2014-04-28',201418,4,2014,28,18,201404,2014),('2014-04-29',201418,4,2014,29,18,201404,2014),('2014-04-30',201418,4,2014,30,18,201404,2014),('2014-05-01',201418,5,2014,1,18,201405,2014),('2014-05-02',201418,5,2014,2,18,201405,2014),('2014-05-03',201418,5,2014,3,18,201405,2014),('2014-05-04',201419,5,2014,4,19,201405,2014),('2014-05-05',201419,5,2014,5,19,201405,2014),('2014-05-06',201419,5,2014,6,19,201405,2014),('2014-05-07',201419,5,2014,7,19,201405,2014),('2014-05-08',201419,5,2014,8,19,201405,2014),('2014-05-09',201419,5,2014,9,19,201405,2014),('2014-05-10',201419,5,2014,10,19,201405,2014),('2014-05-11',201420,5,2014,11,20,201405,2014),('2014-05-12',201420,5,2014,12,20,201405,2014),('2014-05-13',201420,5,2014,13,20,201405,2014),('2014-05-14',201420,5,2014,14,20,201405,2014),('2014-05-15',201420,5,2014,15,20,201405,2014),('2014-05-16',201420,5,2014,16,20,201405,2014),('2014-05-17',201420,5,2014,17,20,201405,2014),('2014-05-18',201421,5,2014,18,21,201405,2014),('2014-05-19',201421,5,2014,19,21,201405,2014),('2014-05-20',201421,5,2014,20,21,201405,2014),('2014-05-21',201421,5,2014,21,21,201405,2014),('2014-05-22',201421,5,2014,22,21,201405,2014),('2014-05-23',201421,5,2014,23,21,201405,2014),('2014-05-24',201421,5,2014,24,21,201405,2014),('2014-05-25',201422,5,2014,25,22,201405,2014),('2014-05-26',201422,5,2014,26,22,201405,2014),('2014-05-27',201422,5,2014,27,22,201405,2014),('2014-05-28',201422,5,2014,28,22,201405,2014),('2014-05-29',201422,5,2014,29,22,201405,2014),('2014-05-30',201422,5,2014,30,22,201405,2014),('2014-05-31',201422,5,2014,31,22,201405,2014),('2014-06-01',201423,6,2014,1,23,201406,2014),('2014-06-02',201423,6,2014,2,23,201406,2014),('2014-06-03',201423,6,2014,3,23,201406,2014),('2014-06-04',201423,6,2014,4,23,201406,2014),('2014-06-05',201423,6,2014,5,23,201406,2014),('2014-06-06',201423,6,2014,6,23,201406,2014),('2014-06-07',201423,6,2014,7,23,201406,2014),('2014-06-08',201424,6,2014,8,24,201406,2014),('2014-06-09',201424,6,2014,9,24,201406,2014),('2014-06-10',201424,6,2014,10,24,201406,2014),('2014-06-11',201424,6,2014,11,24,201406,2014),('2014-06-12',201424,6,2014,12,24,201406,2014),('2014-06-13',201424,6,2014,13,24,201406,2014),('2014-06-14',201424,6,2014,14,24,201406,2014),('2014-06-15',201425,6,2014,15,25,201406,2014),('2014-06-16',201425,6,2014,16,25,201406,2014),('2014-06-17',201425,6,2014,17,25,201406,2014),('2014-06-18',201425,6,2014,18,25,201406,2014),('2014-06-19',201425,6,2014,19,25,201406,2014),('2014-06-20',201425,6,2014,20,25,201406,2014),('2014-06-21',201425,6,2014,21,25,201406,2014),('2014-06-22',201426,6,2014,22,26,201406,2014),('2014-06-23',201426,6,2014,23,26,201406,2014),('2014-06-24',201426,6,2014,24,26,201406,2014),('2014-06-25',201426,6,2014,25,26,201406,2014),('2014-06-26',201426,6,2014,26,26,201406,2014),('2014-06-27',201426,6,2014,27,26,201406,2014),('2014-06-28',201426,6,2014,28,26,201406,2014),('2014-06-29',201427,6,2014,29,27,201406,2014),('2014-06-30',201427,6,2014,30,27,201406,2014),('2014-07-01',201427,7,2014,1,27,201407,2014),('2014-07-02',201427,7,2014,2,27,201407,2014),('2014-07-03',201427,7,2014,3,27,201407,2014),('2014-07-04',201427,7,2014,4,27,201407,2014),('2014-07-05',201427,7,2014,5,27,201407,2014),('2014-07-06',201428,7,2014,6,28,201407,2014),('2014-07-07',201428,7,2014,7,28,201407,2014),('2014-07-08',201428,7,2014,8,28,201407,2014),('2014-07-09',201428,7,2014,9,28,201407,2014),('2014-07-10',201428,7,2014,10,28,201407,2014),('2014-07-11',201428,7,2014,11,28,201407,2014),('2014-07-12',201428,7,2014,12,28,201407,2014),('2014-07-13',201429,7,2014,13,29,201407,2014),('2014-07-14',201429,7,2014,14,29,201407,2014),('2014-07-15',201429,7,2014,15,29,201407,2014),('2014-07-16',201429,7,2014,16,29,201407,2014),('2014-07-17',201429,7,2014,17,29,201407,2014),('2014-07-18',201429,7,2014,18,29,201407,2014),('2014-07-19',201429,7,2014,19,29,201407,2014),('2014-07-20',201430,7,2014,20,30,201407,2014),('2014-07-21',201430,7,2014,21,30,201407,2014),('2014-07-22',201430,7,2014,22,30,201407,2014),('2014-07-23',201430,7,2014,23,30,201407,2014),('2014-07-24',201430,7,2014,24,30,201407,2014),('2014-07-25',201430,7,2014,25,30,201407,2014),('2014-07-26',201430,7,2014,26,30,201407,2014),('2014-07-27',201431,7,2014,27,31,201407,2014),('2014-07-28',201431,7,2014,28,31,201407,2014),('2014-07-29',201431,7,2014,29,31,201407,2014),('2014-07-30',201431,7,2014,30,31,201407,2014),('2014-07-31',201431,7,2014,31,31,201407,2014),('2014-08-01',201431,8,2014,1,31,201408,2014),('2014-08-02',201431,8,2014,2,31,201408,2014),('2014-08-03',201432,8,2014,3,32,201408,2014),('2014-08-04',201432,8,2014,4,32,201408,2014),('2014-08-05',201432,8,2014,5,32,201408,2014),('2014-08-06',201432,8,2014,6,32,201408,2014),('2014-08-07',201432,8,2014,7,32,201408,2014),('2014-08-08',201432,8,2014,8,32,201408,2014),('2014-08-09',201432,8,2014,9,32,201408,2014),('2014-08-10',201433,8,2014,10,33,201408,2014),('2014-08-11',201433,8,2014,11,33,201408,2014),('2014-08-12',201433,8,2014,12,33,201408,2014),('2014-08-13',201433,8,2014,13,33,201408,2014),('2014-08-14',201433,8,2014,14,33,201408,2014),('2014-08-15',201433,8,2014,15,33,201408,2014),('2014-08-16',201433,8,2014,16,33,201408,2014),('2014-08-17',201434,8,2014,17,34,201408,2014),('2014-08-18',201434,8,2014,18,34,201408,2014),('2014-08-19',201434,8,2014,19,34,201408,2014),('2014-08-20',201434,8,2014,20,34,201408,2014),('2014-08-21',201434,8,2014,21,34,201408,2014),('2014-08-22',201434,8,2014,22,34,201408,2014),('2014-08-23',201434,8,2014,23,34,201408,2014),('2014-08-24',201435,8,2014,24,35,201408,2014),('2014-08-25',201435,8,2014,25,35,201408,2014),('2014-08-26',201435,8,2014,26,35,201408,2014),('2014-08-27',201435,8,2014,27,35,201408,2014),('2014-08-28',201435,8,2014,28,35,201408,2014),('2014-08-29',201435,8,2014,29,35,201408,2014),('2014-08-30',201435,8,2014,30,35,201408,2014),('2014-08-31',201436,8,2014,31,36,201408,2014),('2014-09-01',201436,9,2014,1,36,201409,2014),('2014-09-02',201436,9,2014,2,36,201409,2014),('2014-09-03',201436,9,2014,3,36,201409,2014),('2014-09-04',201436,9,2014,4,36,201409,2014),('2014-09-05',201436,9,2014,5,36,201409,2014),('2014-09-06',201436,9,2014,6,36,201409,2014),('2014-09-07',201437,9,2014,7,37,201409,2014),('2014-09-08',201437,9,2014,8,37,201409,2014),('2014-09-09',201437,9,2014,9,37,201409,2014),('2014-09-10',201437,9,2014,10,37,201409,2014),('2014-09-11',201437,9,2014,11,37,201409,2014),('2014-09-12',201437,9,2014,12,37,201409,2014),('2014-09-13',201437,9,2014,13,37,201409,2014),('2014-09-14',201438,9,2014,14,38,201409,2014),('2014-09-15',201438,9,2014,15,38,201409,2014),('2014-09-16',201438,9,2014,16,38,201409,2014),('2014-09-17',201438,9,2014,17,38,201409,2014),('2014-09-18',201438,9,2014,18,38,201409,2014),('2014-09-19',201438,9,2014,19,38,201409,2014),('2014-09-20',201438,9,2014,20,38,201409,2014),('2014-09-21',201439,9,2014,21,39,201409,2014),('2014-09-22',201439,9,2014,22,39,201409,2014),('2014-09-23',201439,9,2014,23,39,201409,2014),('2014-09-24',201439,9,2014,24,39,201409,2014),('2014-09-25',201439,9,2014,25,39,201409,2014),('2014-09-26',201439,9,2014,26,39,201409,2014),('2014-09-27',201439,9,2014,27,39,201409,2014),('2014-09-28',201440,9,2014,28,40,201409,2014),('2014-09-29',201440,9,2014,29,40,201409,2014),('2014-09-30',201440,9,2014,30,40,201409,2014),('2014-10-01',201440,10,2014,1,40,201410,2014),('2014-10-02',201440,10,2014,2,40,201410,2014),('2014-10-03',201440,10,2014,3,40,201410,2014),('2014-10-04',201440,10,2014,4,40,201410,2014),('2014-10-05',201441,10,2014,5,41,201410,2014),('2014-10-06',201441,10,2014,6,41,201410,2014),('2014-10-07',201441,10,2014,7,41,201410,2014),('2014-10-08',201441,10,2014,8,41,201410,2014),('2014-10-09',201441,10,2014,9,41,201410,2014),('2014-10-10',201441,10,2014,10,41,201410,2014),('2014-10-11',201441,10,2014,11,41,201410,2014),('2014-10-12',201442,10,2014,12,42,201410,2014),('2014-10-13',201442,10,2014,13,42,201410,2014),('2014-10-14',201442,10,2014,14,42,201410,2014),('2014-10-15',201442,10,2014,15,42,201410,2014),('2014-10-16',201442,10,2014,16,42,201410,2014),('2014-10-17',201442,10,2014,17,42,201410,2014),('2014-10-18',201442,10,2014,18,42,201410,2014),('2014-10-19',201443,10,2014,19,43,201410,2014),('2014-10-20',201443,10,2014,20,43,201410,2014),('2014-10-21',201443,10,2014,21,43,201410,2014),('2014-10-22',201443,10,2014,22,43,201410,2014),('2014-10-23',201443,10,2014,23,43,201410,2014),('2014-10-24',201443,10,2014,24,43,201410,2014),('2014-10-25',201443,10,2014,25,43,201410,2014),('2014-10-26',201444,10,2014,26,44,201410,2014),('2014-10-27',201444,10,2014,27,44,201410,2014),('2014-10-28',201444,10,2014,28,44,201410,2014),('2014-10-29',201444,10,2014,29,44,201410,2014),('2014-10-30',201444,10,2014,30,44,201410,2014),('2014-10-31',201444,10,2014,31,44,201410,2014),('2014-11-01',201444,11,2014,1,44,201411,2014),('2014-11-02',201445,11,2014,2,45,201411,2014),('2014-11-03',201445,11,2014,3,45,201411,2014),('2014-11-04',201445,11,2014,4,45,201411,2014),('2014-11-05',201445,11,2014,5,45,201411,2014),('2014-11-06',201445,11,2014,6,45,201411,2014),('2014-11-07',201445,11,2014,7,45,201411,2014),('2014-11-08',201445,11,2014,8,45,201411,2014),('2014-11-09',201446,11,2014,9,46,201411,2014),('2014-11-10',201446,11,2014,10,46,201411,2014),('2014-11-11',201446,11,2014,11,46,201411,2014),('2014-11-12',201446,11,2014,12,46,201411,2014),('2014-11-13',201446,11,2014,13,46,201411,2014),('2014-11-14',201446,11,2014,14,46,201411,2014),('2014-11-15',201446,11,2014,15,46,201411,2014),('2014-11-16',201447,11,2014,16,47,201411,2014),('2014-11-17',201447,11,2014,17,47,201411,2014),('2014-11-18',201447,11,2014,18,47,201411,2014),('2014-11-19',201447,11,2014,19,47,201411,2014),('2014-11-20',201447,11,2014,20,47,201411,2014),('2014-11-21',201447,11,2014,21,47,201411,2014),('2014-11-22',201447,11,2014,22,47,201411,2014),('2014-11-23',201448,11,2014,23,48,201411,2014),('2014-11-24',201448,11,2014,24,48,201411,2014),('2014-11-25',201448,11,2014,25,48,201411,2014),('2014-11-26',201448,11,2014,26,48,201411,2014),('2014-11-27',201448,11,2014,27,48,201411,2014),('2014-11-28',201448,11,2014,28,48,201411,2014),('2014-11-29',201448,11,2014,29,48,201411,2014),('2014-11-30',201449,11,2014,30,49,201411,2014),('2014-12-01',201449,12,2014,1,49,201412,2015),('2014-12-02',201449,12,2014,2,49,201412,2015),('2014-12-03',201449,12,2014,3,49,201412,2015),('2014-12-04',201449,12,2014,4,49,201412,2015),('2014-12-05',201449,12,2014,5,49,201412,2015),('2014-12-06',201449,12,2014,6,49,201412,2015),('2014-12-07',201450,12,2014,7,50,201412,2015),('2014-12-08',201450,12,2014,8,50,201412,2015),('2014-12-09',201450,12,2014,9,50,201412,2015),('2014-12-10',201450,12,2014,10,50,201412,2015),('2014-12-11',201450,12,2014,11,50,201412,2015),('2014-12-12',201450,12,2014,12,50,201412,2015),('2014-12-13',201450,12,2014,13,50,201412,2015),('2014-12-14',201451,12,2014,14,51,201412,2015),('2014-12-15',201451,12,2014,15,51,201412,2015),('2014-12-16',201451,12,2014,16,51,201412,2015),('2014-12-17',201451,12,2014,17,51,201412,2015),('2014-12-18',201451,12,2014,18,51,201412,2015),('2014-12-19',201451,12,2014,19,51,201412,2015),('2014-12-20',201451,12,2014,20,51,201412,2015),('2014-12-21',201452,12,2014,21,52,201412,2015),('2014-12-22',201452,12,2014,22,52,201412,2015),('2014-12-23',201452,12,2014,23,52,201412,2015),('2014-12-24',201452,12,2014,24,52,201412,2015),('2014-12-25',201452,12,2014,25,52,201412,2015),('2014-12-26',201452,12,2014,26,52,201412,2015),('2014-12-27',201452,12,2014,27,52,201412,2015),('2014-12-28',201453,12,2014,28,53,201412,2015),('2014-12-29',201453,12,2014,29,53,201412,2015),('2014-12-30',201453,12,2014,30,53,201412,2015),('2014-12-31',201453,12,2014,31,53,201412,2015),('2015-01-01',201453,1,2015,1,53,201501,2015),('2015-01-02',201453,1,2015,2,53,201501,2015),('2015-01-03',201453,1,2015,3,53,201501,2015),('2015-01-04',201501,1,2015,4,1,201501,2015),('2015-01-05',201501,1,2015,5,1,201501,2015),('2015-01-06',201501,1,2015,6,1,201501,2015),('2015-01-07',201501,1,2015,7,1,201501,2015),('2015-01-08',201501,1,2015,8,1,201501,2015),('2015-01-09',201501,1,2015,9,1,201501,2015),('2015-01-10',201501,1,2015,10,1,201501,2015),('2015-01-11',201502,1,2015,11,2,201501,2015),('2015-01-12',201502,1,2015,12,2,201501,2015),('2015-01-13',201502,1,2015,13,2,201501,2015),('2015-01-14',201502,1,2015,14,2,201501,2015),('2015-01-15',201502,1,2015,15,2,201501,2015),('2015-01-16',201502,1,2015,16,2,201501,2015),('2015-01-17',201502,1,2015,17,2,201501,2015),('2015-01-18',201503,1,2015,18,3,201501,2015),('2015-01-19',201503,1,2015,19,3,201501,2015),('2015-01-20',201503,1,2015,20,3,201501,2015),('2015-01-21',201503,1,2015,21,3,201501,2015),('2015-01-22',201503,1,2015,22,3,201501,2015),('2015-01-23',201503,1,2015,23,3,201501,2015),('2015-01-24',201503,1,2015,24,3,201501,2015),('2015-01-25',201504,1,2015,25,4,201501,2015),('2015-01-26',201504,1,2015,26,4,201501,2015),('2015-01-27',201504,1,2015,27,4,201501,2015),('2015-01-28',201504,1,2015,28,4,201501,2015),('2015-01-29',201504,1,2015,29,4,201501,2015),('2015-01-30',201504,1,2015,30,4,201501,2015),('2015-01-31',201504,1,2015,31,4,201501,2015),('2015-02-01',201505,2,2015,1,5,201502,2015),('2015-02-02',201505,2,2015,2,5,201502,2015),('2015-02-03',201505,2,2015,3,5,201502,2015),('2015-02-04',201505,2,2015,4,5,201502,2015),('2015-02-05',201505,2,2015,5,5,201502,2015),('2015-02-06',201505,2,2015,6,5,201502,2015),('2015-02-07',201505,2,2015,7,5,201502,2015),('2015-02-08',201506,2,2015,8,6,201502,2015),('2015-02-09',201506,2,2015,9,6,201502,2015),('2015-02-10',201506,2,2015,10,6,201502,2015),('2015-02-11',201506,2,2015,11,6,201502,2015),('2015-02-12',201506,2,2015,12,6,201502,2015),('2015-02-13',201506,2,2015,13,6,201502,2015),('2015-02-14',201506,2,2015,14,6,201502,2015),('2015-02-15',201507,2,2015,15,7,201502,2015),('2015-02-16',201507,2,2015,16,7,201502,2015),('2015-02-17',201507,2,2015,17,7,201502,2015),('2015-02-18',201507,2,2015,18,7,201502,2015),('2015-02-19',201507,2,2015,19,7,201502,2015),('2015-02-20',201507,2,2015,20,7,201502,2015),('2015-02-21',201507,2,2015,21,7,201502,2015),('2015-02-22',201508,2,2015,22,8,201502,2015),('2015-02-23',201508,2,2015,23,8,201502,2015),('2015-02-24',201508,2,2015,24,8,201502,2015),('2015-02-25',201508,2,2015,25,8,201502,2015),('2015-02-26',201508,2,2015,26,8,201502,2015),('2015-02-27',201508,2,2015,27,8,201502,2015),('2015-02-28',201508,2,2015,28,8,201502,2015),('2015-03-01',201509,3,2015,1,9,201503,2015),('2015-03-02',201509,3,2015,2,9,201503,2015),('2015-03-03',201509,3,2015,3,9,201503,2015),('2015-03-04',201509,3,2015,4,9,201503,2015),('2015-03-05',201509,3,2015,5,9,201503,2015),('2015-03-06',201509,3,2015,6,9,201503,2015),('2015-03-07',201509,3,2015,7,9,201503,2015),('2015-03-08',201510,3,2015,8,10,201503,2015),('2015-03-09',201510,3,2015,9,10,201503,2015),('2015-03-10',201510,3,2015,10,10,201503,2015),('2015-03-11',201510,3,2015,11,10,201503,2015),('2015-03-12',201510,3,2015,12,10,201503,2015),('2015-03-13',201510,3,2015,13,10,201503,2015),('2015-03-14',201510,3,2015,14,10,201503,2015),('2015-03-15',201511,3,2015,15,11,201503,2015),('2015-03-16',201511,3,2015,16,11,201503,2015),('2015-03-17',201511,3,2015,17,11,201503,2015),('2015-03-18',201511,3,2015,18,11,201503,2015),('2015-03-19',201511,3,2015,19,11,201503,2015),('2015-03-20',201511,3,2015,20,11,201503,2015),('2015-03-21',201511,3,2015,21,11,201503,2015),('2015-03-22',201512,3,2015,22,12,201503,2015),('2015-03-23',201512,3,2015,23,12,201503,2015),('2015-03-24',201512,3,2015,24,12,201503,2015),('2015-03-25',201512,3,2015,25,12,201503,2015),('2015-03-26',201512,3,2015,26,12,201503,2015),('2015-03-27',201512,3,2015,27,12,201503,2015),('2015-03-28',201512,3,2015,28,12,201503,2015),('2015-03-29',201513,3,2015,29,13,201503,2015),('2015-03-30',201513,3,2015,30,13,201503,2015),('2015-03-31',201513,3,2015,31,13,201503,2015),('2015-04-01',201513,4,2015,1,13,201504,2015),('2015-04-02',201513,4,2015,2,13,201504,2015),('2015-04-03',201513,4,2015,3,13,201504,2015),('2015-04-04',201513,4,2015,4,13,201504,2015),('2015-04-05',201514,4,2015,5,14,201504,2015),('2015-04-06',201514,4,2015,6,14,201504,2015),('2015-04-07',201514,4,2015,7,14,201504,2015),('2015-04-08',201514,4,2015,8,14,201504,2015),('2015-04-09',201514,4,2015,9,14,201504,2015),('2015-04-10',201514,4,2015,10,14,201504,2015),('2015-04-11',201514,4,2015,11,14,201504,2015),('2015-04-12',201515,4,2015,12,15,201504,2015),('2015-04-13',201515,4,2015,13,15,201504,2015),('2015-04-14',201515,4,2015,14,15,201504,2015),('2015-04-15',201515,4,2015,15,15,201504,2015),('2015-04-16',201515,4,2015,16,15,201504,2015),('2015-04-17',201515,4,2015,17,15,201504,2015),('2015-04-18',201515,4,2015,18,15,201504,2015),('2015-04-19',201516,4,2015,19,16,201504,2015),('2015-04-20',201516,4,2015,20,16,201504,2015),('2015-04-21',201516,4,2015,21,16,201504,2015),('2015-04-22',201516,4,2015,22,16,201504,2015),('2015-04-23',201516,4,2015,23,16,201504,2015),('2015-04-24',201516,4,2015,24,16,201504,2015),('2015-04-25',201516,4,2015,25,16,201504,2015),('2015-04-26',201517,4,2015,26,17,201504,2015),('2015-04-27',201517,4,2015,27,17,201504,2015),('2015-04-28',201517,4,2015,28,17,201504,2015),('2015-04-29',201517,4,2015,29,17,201504,2015),('2015-04-30',201517,4,2015,30,17,201504,2015),('2015-05-01',201517,5,2015,1,17,201505,2015),('2015-05-02',201517,5,2015,2,17,201505,2015),('2015-05-03',201518,5,2015,3,18,201505,2015),('2015-05-04',201518,5,2015,4,18,201505,2015),('2015-05-05',201518,5,2015,5,18,201505,2015),('2015-05-06',201518,5,2015,6,18,201505,2015),('2015-05-07',201518,5,2015,7,18,201505,2015),('2015-05-08',201518,5,2015,8,18,201505,2015),('2015-05-09',201518,5,2015,9,18,201505,2015),('2015-05-10',201519,5,2015,10,19,201505,2015),('2015-05-11',201519,5,2015,11,19,201505,2015),('2015-05-12',201519,5,2015,12,19,201505,2015),('2015-05-13',201519,5,2015,13,19,201505,2015),('2015-05-14',201519,5,2015,14,19,201505,2015),('2015-05-15',201519,5,2015,15,19,201505,2015),('2015-05-16',201519,5,2015,16,19,201505,2015),('2015-05-17',201520,5,2015,17,20,201505,2015),('2015-05-18',201520,5,2015,18,20,201505,2015),('2015-05-19',201520,5,2015,19,20,201505,2015),('2015-05-20',201520,5,2015,20,20,201505,2015),('2015-05-21',201520,5,2015,21,20,201505,2015),('2015-05-22',201520,5,2015,22,20,201505,2015),('2015-05-23',201520,5,2015,23,20,201505,2015),('2015-05-24',201521,5,2015,24,21,201505,2015),('2015-05-25',201521,5,2015,25,21,201505,2015),('2015-05-26',201521,5,2015,26,21,201505,2015),('2015-05-27',201521,5,2015,27,21,201505,2015),('2015-05-28',201521,5,2015,28,21,201505,2015),('2015-05-29',201521,5,2015,29,21,201505,2015),('2015-05-30',201521,5,2015,30,21,201505,2015),('2015-05-31',201522,5,2015,31,22,201505,2015),('2015-06-01',201522,6,2015,1,22,201506,2015),('2015-06-02',201522,6,2015,2,22,201506,2015),('2015-06-03',201522,6,2015,3,22,201506,2015),('2015-06-04',201522,6,2015,4,22,201506,2015),('2015-06-05',201522,6,2015,5,22,201506,2015),('2015-06-06',201522,6,2015,6,22,201506,2015),('2015-06-07',201523,6,2015,7,23,201506,2015),('2015-06-08',201523,6,2015,8,23,201506,2015),('2015-06-09',201523,6,2015,9,23,201506,2015),('2015-06-10',201523,6,2015,10,23,201506,2015),('2015-06-11',201523,6,2015,11,23,201506,2015),('2015-06-12',201523,6,2015,12,23,201506,2015),('2015-06-13',201523,6,2015,13,23,201506,2015),('2015-06-14',201524,6,2015,14,24,201506,2015),('2015-06-15',201524,6,2015,15,24,201506,2015),('2015-06-16',201524,6,2015,16,24,201506,2015),('2015-06-17',201524,6,2015,17,24,201506,2015),('2015-06-18',201524,6,2015,18,24,201506,2015),('2015-06-19',201524,6,2015,19,24,201506,2015),('2015-06-20',201524,6,2015,20,24,201506,2015),('2015-06-21',201525,6,2015,21,25,201506,2015),('2015-06-22',201525,6,2015,22,25,201506,2015),('2015-06-23',201525,6,2015,23,25,201506,2015),('2015-06-24',201525,6,2015,24,25,201506,2015),('2015-06-25',201525,6,2015,25,25,201506,2015),('2015-06-26',201525,6,2015,26,25,201506,2015),('2015-06-27',201525,6,2015,27,25,201506,2015),('2015-06-28',201526,6,2015,28,26,201506,2015),('2015-06-29',201526,6,2015,29,26,201506,2015),('2015-06-30',201526,6,2015,30,26,201506,2015),('2015-07-01',201526,7,2015,1,26,201507,2015),('2015-07-02',201526,7,2015,2,26,201507,2015),('2015-07-03',201526,7,2015,3,26,201507,2015),('2015-07-04',201526,7,2015,4,26,201507,2015),('2015-07-05',201527,7,2015,5,27,201507,2015),('2015-07-06',201527,7,2015,6,27,201507,2015),('2015-07-07',201527,7,2015,7,27,201507,2015),('2015-07-08',201527,7,2015,8,27,201507,2015),('2015-07-09',201527,7,2015,9,27,201507,2015),('2015-07-10',201527,7,2015,10,27,201507,2015),('2015-07-11',201527,7,2015,11,27,201507,2015),('2015-07-12',201528,7,2015,12,28,201507,2015),('2015-07-13',201528,7,2015,13,28,201507,2015),('2015-07-14',201528,7,2015,14,28,201507,2015),('2015-07-15',201528,7,2015,15,28,201507,2015),('2015-07-16',201528,7,2015,16,28,201507,2015),('2015-07-17',201528,7,2015,17,28,201507,2015),('2015-07-18',201528,7,2015,18,28,201507,2015),('2015-07-19',201529,7,2015,19,29,201507,2015),('2015-07-20',201529,7,2015,20,29,201507,2015),('2015-07-21',201529,7,2015,21,29,201507,2015),('2015-07-22',201529,7,2015,22,29,201507,2015),('2015-07-23',201529,7,2015,23,29,201507,2015),('2015-07-24',201529,7,2015,24,29,201507,2015),('2015-07-25',201529,7,2015,25,29,201507,2015),('2015-07-26',201530,7,2015,26,30,201507,2015),('2015-07-27',201530,7,2015,27,30,201507,2015),('2015-07-28',201530,7,2015,28,30,201507,2015),('2015-07-29',201530,7,2015,29,30,201507,2015),('2015-07-30',201530,7,2015,30,30,201507,2015),('2015-07-31',201530,7,2015,31,30,201507,2015),('2015-08-01',201530,8,2015,1,30,201508,2015),('2015-08-02',201531,8,2015,2,31,201508,2015),('2015-08-03',201531,8,2015,3,31,201508,2015),('2015-08-04',201531,8,2015,4,31,201508,2015),('2015-08-05',201531,8,2015,5,31,201508,2015),('2015-08-06',201531,8,2015,6,31,201508,2015),('2015-08-07',201531,8,2015,7,31,201508,2015),('2015-08-08',201531,8,2015,8,31,201508,2015),('2015-08-09',201532,8,2015,9,32,201508,2015),('2015-08-10',201532,8,2015,10,32,201508,2015),('2015-08-11',201532,8,2015,11,32,201508,2015),('2015-08-12',201532,8,2015,12,32,201508,2015),('2015-08-13',201532,8,2015,13,32,201508,2015),('2015-08-14',201532,8,2015,14,32,201508,2015),('2015-08-15',201532,8,2015,15,32,201508,2015),('2015-08-16',201533,8,2015,16,33,201508,2015),('2015-08-17',201533,8,2015,17,33,201508,2015),('2015-08-18',201533,8,2015,18,33,201508,2015),('2015-08-19',201533,8,2015,19,33,201508,2015),('2015-08-20',201533,8,2015,20,33,201508,2015),('2015-08-21',201533,8,2015,21,33,201508,2015),('2015-08-22',201533,8,2015,22,33,201508,2015),('2015-08-23',201534,8,2015,23,34,201508,2015),('2015-08-24',201534,8,2015,24,34,201508,2015),('2015-08-25',201534,8,2015,25,34,201508,2015),('2015-08-26',201534,8,2015,26,34,201508,2015),('2015-08-27',201534,8,2015,27,34,201508,2015),('2015-08-28',201534,8,2015,28,34,201508,2015),('2015-08-29',201534,8,2015,29,34,201508,2015),('2015-08-30',201535,8,2015,30,35,201508,2015),('2015-08-31',201535,8,2015,31,35,201508,2015),('2015-09-01',201535,9,2015,1,35,201509,2015),('2015-09-02',201535,9,2015,2,35,201509,2015),('2015-09-03',201535,9,2015,3,35,201509,2015),('2015-09-04',201535,9,2015,4,35,201509,2015),('2015-09-05',201535,9,2015,5,35,201509,2015),('2015-09-06',201536,9,2015,6,36,201509,2015),('2015-09-07',201536,9,2015,7,36,201509,2015),('2015-09-08',201536,9,2015,8,36,201509,2015),('2015-09-09',201536,9,2015,9,36,201509,2015),('2015-09-10',201536,9,2015,10,36,201509,2015),('2015-09-11',201536,9,2015,11,36,201509,2015),('2015-09-12',201536,9,2015,12,36,201509,2015),('2015-09-13',201537,9,2015,13,37,201509,2015),('2015-09-14',201537,9,2015,14,37,201509,2015),('2015-09-15',201537,9,2015,15,37,201509,2015),('2015-09-16',201537,9,2015,16,37,201509,2015),('2015-09-17',201537,9,2015,17,37,201509,2015),('2015-09-18',201537,9,2015,18,37,201509,2015),('2015-09-19',201537,9,2015,19,37,201509,2015),('2015-09-20',201538,9,2015,20,38,201509,2015),('2015-09-21',201538,9,2015,21,38,201509,2015),('2015-09-22',201538,9,2015,22,38,201509,2015),('2015-09-23',201538,9,2015,23,38,201509,2015),('2015-09-24',201538,9,2015,24,38,201509,2015),('2015-09-25',201538,9,2015,25,38,201509,2015),('2015-09-26',201538,9,2015,26,38,201509,2015),('2015-09-27',201539,9,2015,27,39,201509,2015),('2015-09-28',201539,9,2015,28,39,201509,2015),('2015-09-29',201539,9,2015,29,39,201509,2015),('2015-09-30',201539,9,2015,30,39,201509,2015),('2015-10-01',201539,10,2015,1,39,201510,2015),('2015-10-02',201539,10,2015,2,39,201510,2015),('2015-10-03',201539,10,2015,3,39,201510,2015),('2015-10-04',201540,10,2015,4,40,201510,2015),('2015-10-05',201540,10,2015,5,40,201510,2015),('2015-10-06',201540,10,2015,6,40,201510,2015),('2015-10-07',201540,10,2015,7,40,201510,2015),('2015-10-08',201540,10,2015,8,40,201510,2015),('2015-10-09',201540,10,2015,9,40,201510,2015),('2015-10-10',201540,10,2015,10,40,201510,2015),('2015-10-11',201541,10,2015,11,41,201510,2015),('2015-10-12',201541,10,2015,12,41,201510,2015),('2015-10-13',201541,10,2015,13,41,201510,2015),('2015-10-14',201541,10,2015,14,41,201510,2015),('2015-10-15',201541,10,2015,15,41,201510,2015),('2015-10-16',201541,10,2015,16,41,201510,2015),('2015-10-17',201541,10,2015,17,41,201510,2015),('2015-10-18',201542,10,2015,18,42,201510,2015),('2015-10-19',201542,10,2015,19,42,201510,2015),('2015-10-20',201542,10,2015,20,42,201510,2015),('2015-10-21',201542,10,2015,21,42,201510,2015),('2015-10-22',201542,10,2015,22,42,201510,2015),('2015-10-23',201542,10,2015,23,42,201510,2015),('2015-10-24',201542,10,2015,24,42,201510,2015),('2015-10-25',201543,10,2015,25,43,201510,2015),('2015-10-26',201543,10,2015,26,43,201510,2015),('2015-10-27',201543,10,2015,27,43,201510,2015),('2015-10-28',201543,10,2015,28,43,201510,2015),('2015-10-29',201543,10,2015,29,43,201510,2015),('2015-10-30',201543,10,2015,30,43,201510,2015),('2015-10-31',201543,10,2015,31,43,201510,2015),('2015-11-01',201544,11,2015,1,44,201511,2015),('2015-11-02',201544,11,2015,2,44,201511,2015),('2015-11-03',201544,11,2015,3,44,201511,2015),('2015-11-04',201544,11,2015,4,44,201511,2015),('2015-11-05',201544,11,2015,5,44,201511,2015),('2015-11-06',201544,11,2015,6,44,201511,2015),('2015-11-07',201544,11,2015,7,44,201511,2015),('2015-11-08',201545,11,2015,8,45,201511,2015),('2015-11-09',201545,11,2015,9,45,201511,2015),('2015-11-10',201545,11,2015,10,45,201511,2015),('2015-11-11',201545,11,2015,11,45,201511,2015),('2015-11-12',201545,11,2015,12,45,201511,2015),('2015-11-13',201545,11,2015,13,45,201511,2015),('2015-11-14',201545,11,2015,14,45,201511,2015),('2015-11-15',201546,11,2015,15,46,201511,2015),('2015-11-16',201546,11,2015,16,46,201511,2015),('2015-11-17',201546,11,2015,17,46,201511,2015),('2015-11-18',201546,11,2015,18,46,201511,2015),('2015-11-19',201546,11,2015,19,46,201511,2015),('2015-11-20',201546,11,2015,20,46,201511,2015),('2015-11-21',201546,11,2015,21,46,201511,2015),('2015-11-22',201547,11,2015,22,47,201511,2015),('2015-11-23',201547,11,2015,23,47,201511,2015),('2015-11-24',201547,11,2015,24,47,201511,2015),('2015-11-25',201547,11,2015,25,47,201511,2015),('2015-11-26',201547,11,2015,26,47,201511,2015),('2015-11-27',201547,11,2015,27,47,201511,2015),('2015-11-28',201547,11,2015,28,47,201511,2015),('2015-11-29',201548,11,2015,29,48,201511,2015),('2015-11-30',201548,11,2015,30,48,201511,2015),('2015-12-01',201548,12,2015,1,48,201512,2016),('2015-12-02',201548,12,2015,2,48,201512,2016),('2015-12-03',201548,12,2015,3,48,201512,2016),('2015-12-04',201548,12,2015,4,48,201512,2016),('2015-12-05',201548,12,2015,5,48,201512,2016),('2015-12-06',201549,12,2015,6,49,201512,2016),('2015-12-07',201549,12,2015,7,49,201512,2016),('2015-12-08',201549,12,2015,8,49,201512,2016),('2015-12-09',201549,12,2015,9,49,201512,2016),('2015-12-10',201549,12,2015,10,49,201512,2016),('2015-12-11',201549,12,2015,11,49,201512,2016),('2015-12-12',201549,12,2015,12,49,201512,2016),('2015-12-13',201550,12,2015,13,50,201512,2016),('2015-12-14',201550,12,2015,14,50,201512,2016),('2015-12-15',201550,12,2015,15,50,201512,2016),('2015-12-16',201550,12,2015,16,50,201512,2016),('2015-12-17',201550,12,2015,17,50,201512,2016),('2015-12-18',201550,12,2015,18,50,201512,2016),('2015-12-19',201550,12,2015,19,50,201512,2016),('2015-12-20',201551,12,2015,20,51,201512,2016),('2015-12-21',201551,12,2015,21,51,201512,2016),('2015-12-22',201551,12,2015,22,51,201512,2016),('2015-12-23',201551,12,2015,23,51,201512,2016),('2015-12-24',201551,12,2015,24,51,201512,2016),('2015-12-25',201551,12,2015,25,51,201512,2016),('2015-12-26',201551,12,2015,26,51,201512,2016),('2015-12-27',201552,12,2015,27,52,201512,2016),('2015-12-28',201552,12,2015,28,52,201512,2016),('2015-12-29',201552,12,2015,29,52,201512,2016),('2015-12-30',201552,12,2015,30,52,201512,2016),('2015-12-31',201552,12,2015,31,52,201512,2016),('2016-01-01',201552,1,2016,1,1,201601,2016),('2016-01-02',201552,1,2016,2,1,201601,2016),('2016-01-03',201601,1,2016,3,1,201601,2016),('2016-01-04',201601,1,2016,4,1,201601,2016),('2016-01-05',201601,1,2016,5,1,201601,2016),('2016-01-06',201601,1,2016,6,1,201601,2016),('2016-01-07',201601,1,2016,7,1,201601,2016),('2016-01-08',201601,1,2016,8,1,201601,2016),('2016-01-09',201601,1,2016,9,1,201601,2016),('2016-01-10',201602,1,2016,10,2,201601,2016),('2016-01-11',201602,1,2016,11,2,201601,2016),('2016-01-12',201602,1,2016,12,2,201601,2016),('2016-01-13',201602,1,2016,13,2,201601,2016),('2016-01-14',201602,1,2016,14,2,201601,2016),('2016-01-15',201602,1,2016,15,2,201601,2016),('2016-01-16',201602,1,2016,16,2,201601,2016),('2016-01-17',201603,1,2016,17,3,201601,2016),('2016-01-18',201603,1,2016,18,3,201601,2016),('2016-01-19',201603,1,2016,19,3,201601,2016),('2016-01-20',201603,1,2016,20,3,201601,2016),('2016-01-21',201603,1,2016,21,3,201601,2016),('2016-01-22',201603,1,2016,22,3,201601,2016),('2016-01-23',201603,1,2016,23,3,201601,2016),('2016-01-24',201604,1,2016,24,4,201601,2016),('2016-01-25',201604,1,2016,25,4,201601,2016),('2016-01-26',201604,1,2016,26,4,201601,2016),('2016-01-27',201604,1,2016,27,4,201601,2016),('2016-01-28',201604,1,2016,28,4,201601,2016),('2016-01-29',201604,1,2016,29,4,201601,2016),('2016-01-30',201604,1,2016,30,4,201601,2016),('2016-01-31',201605,1,2016,31,5,201601,2016),('2016-02-01',201605,2,2016,1,5,201602,2016),('2016-02-02',201605,2,2016,2,5,201602,2016),('2016-02-03',201605,2,2016,3,5,201602,2016),('2016-02-04',201605,2,2016,4,5,201602,2016),('2016-02-05',201605,2,2016,5,5,201602,2016),('2016-02-06',201605,2,2016,6,5,201602,2016),('2016-02-07',201606,2,2016,7,6,201602,2016),('2016-02-08',201606,2,2016,8,6,201602,2016),('2016-02-09',201606,2,2016,9,6,201602,2016),('2016-02-10',201606,2,2016,10,6,201602,2016),('2016-02-11',201606,2,2016,11,6,201602,2016),('2016-02-12',201606,2,2016,12,6,201602,2016),('2016-02-13',201606,2,2016,13,6,201602,2016),('2016-02-14',201607,2,2016,14,7,201602,2016),('2016-02-15',201607,2,2016,15,7,201602,2016),('2016-02-16',201607,2,2016,16,7,201602,2016),('2016-02-17',201607,2,2016,17,7,201602,2016),('2016-02-18',201607,2,2016,18,7,201602,2016),('2016-02-19',201607,2,2016,19,7,201602,2016),('2016-02-20',201607,2,2016,20,7,201602,2016),('2016-02-21',201608,2,2016,21,8,201602,2016),('2016-02-22',201608,2,2016,22,8,201602,2016),('2016-02-23',201608,2,2016,23,8,201602,2016),('2016-02-24',201608,2,2016,24,8,201602,2016),('2016-02-25',201608,2,2016,25,8,201602,2016),('2016-02-26',201608,2,2016,26,8,201602,2016),('2016-02-27',201608,2,2016,27,8,201602,2016),('2016-02-28',201609,2,2016,28,9,201602,2016),('2016-02-29',201609,2,2016,29,9,201602,2016),('2016-03-01',201609,3,2016,1,9,201603,2016),('2016-03-02',201609,3,2016,2,9,201603,2016),('2016-03-03',201609,3,2016,3,9,201603,2016),('2016-03-04',201609,3,2016,4,9,201603,2016),('2016-03-05',201609,3,2016,5,9,201603,2016),('2016-03-06',201610,3,2016,6,10,201603,2016),('2016-03-07',201610,3,2016,7,10,201603,2016),('2016-03-08',201610,3,2016,8,10,201603,2016),('2016-03-09',201610,3,2016,9,10,201603,2016),('2016-03-10',201610,3,2016,10,10,201603,2016),('2016-03-11',201610,3,2016,11,10,201603,2016),('2016-03-12',201610,3,2016,12,10,201603,2016),('2016-03-13',201611,3,2016,13,11,201603,2016),('2016-03-14',201611,3,2016,14,11,201603,2016),('2016-03-15',201611,3,2016,15,11,201603,2016),('2016-03-16',201611,3,2016,16,11,201603,2016),('2016-03-17',201611,3,2016,17,11,201603,2016),('2016-03-18',201611,3,2016,18,11,201603,2016),('2016-03-19',201611,3,2016,19,11,201603,2016),('2016-03-20',201612,3,2016,20,12,201603,2016),('2016-03-21',201612,3,2016,21,12,201603,2016),('2016-03-22',201612,3,2016,22,12,201603,2016),('2016-03-23',201612,3,2016,23,12,201603,2016),('2016-03-24',201612,3,2016,24,12,201603,2016),('2016-03-25',201612,3,2016,25,12,201603,2016),('2016-03-26',201612,3,2016,26,12,201603,2016),('2016-03-27',201613,3,2016,27,13,201603,2016),('2016-03-28',201613,3,2016,28,13,201603,2016),('2016-03-29',201613,3,2016,29,13,201603,2016),('2016-03-30',201613,3,2016,30,13,201603,2016),('2016-03-31',201613,3,2016,31,13,201603,2016),('2016-04-01',201613,4,2016,1,13,201604,2016),('2016-04-02',201613,4,2016,2,13,201604,2016),('2016-04-03',201614,4,2016,3,14,201604,2016),('2016-04-04',201614,4,2016,4,14,201604,2016),('2016-04-05',201614,4,2016,5,14,201604,2016),('2016-04-06',201614,4,2016,6,14,201604,2016),('2016-04-07',201614,4,2016,7,14,201604,2016),('2016-04-08',201614,4,2016,8,14,201604,2016),('2016-04-09',201614,4,2016,9,14,201604,2016),('2016-04-10',201615,4,2016,10,15,201604,2016),('2016-04-11',201615,4,2016,11,15,201604,2016),('2016-04-12',201615,4,2016,12,15,201604,2016),('2016-04-13',201615,4,2016,13,15,201604,2016),('2016-04-14',201615,4,2016,14,15,201604,2016),('2016-04-15',201615,4,2016,15,15,201604,2016),('2016-04-16',201615,4,2016,16,15,201604,2016),('2016-04-17',201616,4,2016,17,16,201604,2016),('2016-04-18',201616,4,2016,18,16,201604,2016),('2016-04-19',201616,4,2016,19,16,201604,2016),('2016-04-20',201616,4,2016,20,16,201604,2016),('2016-04-21',201616,4,2016,21,16,201604,2016),('2016-04-22',201616,4,2016,22,16,201604,2016),('2016-04-23',201616,4,2016,23,16,201604,2016),('2016-04-24',201617,4,2016,24,17,201604,2016),('2016-04-25',201617,4,2016,25,17,201604,2016),('2016-04-26',201617,4,2016,26,17,201604,2016),('2016-04-27',201617,4,2016,27,17,201604,2016),('2016-04-28',201617,4,2016,28,17,201604,2016),('2016-04-29',201617,4,2016,29,17,201604,2016),('2016-04-30',201617,4,2016,30,17,201604,2016),('2016-05-01',201618,5,2016,1,18,201605,2016),('2016-05-02',201618,5,2016,2,18,201605,2016),('2016-05-03',201618,5,2016,3,18,201605,2016),('2016-05-04',201618,5,2016,4,18,201605,2016),('2016-05-05',201618,5,2016,5,18,201605,2016),('2016-05-06',201618,5,2016,6,18,201605,2016),('2016-05-07',201618,5,2016,7,18,201605,2016),('2016-05-08',201619,5,2016,8,19,201605,2016),('2016-05-09',201619,5,2016,9,19,201605,2016),('2016-05-10',201619,5,2016,10,19,201605,2016),('2016-05-11',201619,5,2016,11,19,201605,2016),('2016-05-12',201619,5,2016,12,19,201605,2016),('2016-05-13',201619,5,2016,13,19,201605,2016),('2016-05-14',201619,5,2016,14,19,201605,2016),('2016-05-15',201620,5,2016,15,20,201605,2016),('2016-05-16',201620,5,2016,16,20,201605,2016),('2016-05-17',201620,5,2016,17,20,201605,2016),('2016-05-18',201620,5,2016,18,20,201605,2016),('2016-05-19',201620,5,2016,19,20,201605,2016),('2016-05-20',201620,5,2016,20,20,201605,2016),('2016-05-21',201620,5,2016,21,20,201605,2016),('2016-05-22',201621,5,2016,22,21,201605,2016),('2016-05-23',201621,5,2016,23,21,201605,2016),('2016-05-24',201621,5,2016,24,21,201605,2016),('2016-05-25',201621,5,2016,25,21,201605,2016),('2016-05-26',201621,5,2016,26,21,201605,2016),('2016-05-27',201621,5,2016,27,21,201605,2016),('2016-05-28',201621,5,2016,28,21,201605,2016),('2016-05-29',201622,5,2016,29,22,201605,2016),('2016-05-30',201622,5,2016,30,22,201605,2016),('2016-05-31',201622,5,2016,31,22,201605,2016),('2016-06-01',201622,6,2016,1,22,201606,2016),('2016-06-02',201622,6,2016,2,22,201606,2016),('2016-06-03',201622,6,2016,3,22,201606,2016),('2016-06-04',201622,6,2016,4,22,201606,2016),('2016-06-05',201623,6,2016,5,23,201606,2016),('2016-06-06',201623,6,2016,6,23,201606,2016),('2016-06-07',201623,6,2016,7,23,201606,2016),('2016-06-08',201623,6,2016,8,23,201606,2016),('2016-06-09',201623,6,2016,9,23,201606,2016),('2016-06-10',201623,6,2016,10,23,201606,2016),('2016-06-11',201623,6,2016,11,23,201606,2016),('2016-06-12',201624,6,2016,12,24,201606,2016),('2016-06-13',201624,6,2016,13,24,201606,2016),('2016-06-14',201624,6,2016,14,24,201606,2016),('2016-06-15',201624,6,2016,15,24,201606,2016),('2016-06-16',201624,6,2016,16,24,201606,2016),('2016-06-17',201624,6,2016,17,24,201606,2016),('2016-06-18',201624,6,2016,18,24,201606,2016),('2016-06-19',201625,6,2016,19,25,201606,2016),('2016-06-20',201625,6,2016,20,25,201606,2016),('2016-06-21',201625,6,2016,21,25,201606,2016),('2016-06-22',201625,6,2016,22,25,201606,2016),('2016-06-23',201625,6,2016,23,25,201606,2016),('2016-06-24',201625,6,2016,24,25,201606,2016),('2016-06-25',201625,6,2016,25,25,201606,2016),('2016-06-26',201626,6,2016,26,26,201606,2016),('2016-06-27',201626,6,2016,27,26,201606,2016),('2016-06-28',201626,6,2016,28,26,201606,2016),('2016-06-29',201626,6,2016,29,26,201606,2016),('2016-06-30',201626,6,2016,30,26,201606,2016),('2016-07-01',201626,7,2016,1,26,201607,2016),('2016-07-02',201626,7,2016,2,26,201607,2016),('2016-07-03',201627,7,2016,3,27,201607,2016),('2016-07-04',201627,7,2016,4,27,201607,2016),('2016-07-05',201627,7,2016,5,27,201607,2016),('2016-07-06',201627,7,2016,6,27,201607,2016),('2016-07-07',201627,7,2016,7,27,201607,2016),('2016-07-08',201627,7,2016,8,27,201607,2016),('2016-07-09',201627,7,2016,9,27,201607,2016),('2016-07-10',201628,7,2016,10,28,201607,2016),('2016-07-11',201628,7,2016,11,28,201607,2016),('2016-07-12',201628,7,2016,12,28,201607,2016),('2016-07-13',201628,7,2016,13,28,201607,2016),('2016-07-14',201628,7,2016,14,28,201607,2016),('2016-07-15',201628,7,2016,15,28,201607,2016),('2016-07-16',201628,7,2016,16,28,201607,2016),('2016-07-17',201629,7,2016,17,29,201607,2016),('2016-07-18',201629,7,2016,18,29,201607,2016),('2016-07-19',201629,7,2016,19,29,201607,2016),('2016-07-20',201629,7,2016,20,29,201607,2016),('2016-07-21',201629,7,2016,21,29,201607,2016),('2016-07-22',201629,7,2016,22,29,201607,2016),('2016-07-23',201629,7,2016,23,29,201607,2016),('2016-07-24',201630,7,2016,24,30,201607,2016),('2016-07-25',201630,7,2016,25,30,201607,2016),('2016-07-26',201630,7,2016,26,30,201607,2016),('2016-07-27',201630,7,2016,27,30,201607,2016),('2016-07-28',201630,7,2016,28,30,201607,2016),('2016-07-29',201630,7,2016,29,30,201607,2016),('2016-07-30',201630,7,2016,30,30,201607,2016),('2016-07-31',201631,7,2016,31,31,201607,2016),('2016-08-01',201631,8,2016,1,31,201608,2016),('2016-08-02',201631,8,2016,2,31,201608,2016),('2016-08-03',201631,8,2016,3,31,201608,2016),('2016-08-04',201631,8,2016,4,31,201608,2016),('2016-08-05',201631,8,2016,5,31,201608,2016),('2016-08-06',201631,8,2016,6,31,201608,2016),('2016-08-07',201632,8,2016,7,32,201608,2016),('2016-08-08',201632,8,2016,8,32,201608,2016),('2016-08-09',201632,8,2016,9,32,201608,2016),('2016-08-10',201632,8,2016,10,32,201608,2016),('2016-08-11',201632,8,2016,11,32,201608,2016),('2016-08-12',201632,8,2016,12,32,201608,2016),('2016-08-13',201632,8,2016,13,32,201608,2016),('2016-08-14',201633,8,2016,14,33,201608,2016),('2016-08-15',201633,8,2016,15,33,201608,2016),('2016-08-16',201633,8,2016,16,33,201608,2016),('2016-08-17',201633,8,2016,17,33,201608,2016),('2016-08-18',201633,8,2016,18,33,201608,2016),('2016-08-19',201633,8,2016,19,33,201608,2016),('2016-08-20',201633,8,2016,20,33,201608,2016),('2016-08-21',201634,8,2016,21,34,201608,2016),('2016-08-22',201634,8,2016,22,34,201608,2016),('2016-08-23',201634,8,2016,23,34,201608,2016),('2016-08-24',201634,8,2016,24,34,201608,2016),('2016-08-25',201634,8,2016,25,34,201608,2016),('2016-08-26',201634,8,2016,26,34,201608,2016),('2016-08-27',201634,8,2016,27,34,201608,2016),('2016-08-28',201635,8,2016,28,35,201608,2016),('2016-08-29',201635,8,2016,29,35,201608,2016),('2016-08-30',201635,8,2016,30,35,201608,2016),('2016-08-31',201635,8,2016,31,35,201608,2016),('2016-09-01',201635,9,2016,1,35,201609,2016),('2016-09-02',201635,9,2016,2,35,201609,2016),('2016-09-03',201635,9,2016,3,35,201609,2016),('2016-09-04',201636,9,2016,4,36,201609,2016),('2016-09-05',201636,9,2016,5,36,201609,2016),('2016-09-06',201636,9,2016,6,36,201609,2016),('2016-09-07',201636,9,2016,7,36,201609,2016),('2016-09-08',201636,9,2016,8,36,201609,2016),('2016-09-09',201636,9,2016,9,36,201609,2016),('2016-09-10',201636,9,2016,10,36,201609,2016),('2016-09-11',201637,9,2016,11,37,201609,2016),('2016-09-12',201637,9,2016,12,37,201609,2016),('2016-09-13',201637,9,2016,13,37,201609,2016),('2016-09-14',201637,9,2016,14,37,201609,2016),('2016-09-15',201637,9,2016,15,37,201609,2016),('2016-09-16',201637,9,2016,16,37,201609,2016),('2016-09-17',201637,9,2016,17,37,201609,2016),('2016-09-18',201638,9,2016,18,38,201609,2016),('2016-09-19',201638,9,2016,19,38,201609,2016),('2016-09-20',201638,9,2016,20,38,201609,2016),('2016-09-21',201638,9,2016,21,38,201609,2016),('2016-09-22',201638,9,2016,22,38,201609,2016),('2016-09-23',201638,9,2016,23,38,201609,2016),('2016-09-24',201638,9,2016,24,38,201609,2016),('2016-09-25',201639,9,2016,25,39,201609,2016),('2016-09-26',201639,9,2016,26,39,201609,2016),('2016-09-27',201639,9,2016,27,39,201609,2016),('2016-09-28',201639,9,2016,28,39,201609,2016),('2016-09-29',201639,9,2016,29,39,201609,2016),('2016-09-30',201639,9,2016,30,39,201609,2016),('2016-10-01',201639,10,2016,1,39,201610,2016),('2016-10-02',201640,10,2016,2,40,201610,2016),('2016-10-03',201640,10,2016,3,40,201610,2016),('2016-10-04',201640,10,2016,4,40,201610,2016),('2016-10-05',201640,10,2016,5,40,201610,2016),('2016-10-06',201640,10,2016,6,40,201610,2016),('2016-10-07',201640,10,2016,7,40,201610,2016),('2016-10-08',201640,10,2016,8,40,201610,2016),('2016-10-09',201641,10,2016,9,41,201610,2016),('2016-10-10',201641,10,2016,10,41,201610,2016),('2016-10-11',201641,10,2016,11,41,201610,2016),('2016-10-12',201641,10,2016,12,41,201610,2016),('2016-10-13',201641,10,2016,13,41,201610,2016),('2016-10-14',201641,10,2016,14,41,201610,2016),('2016-10-15',201641,10,2016,15,41,201610,2016),('2016-10-16',201642,10,2016,16,42,201610,2016),('2016-10-17',201642,10,2016,17,42,201610,2016),('2016-10-18',201642,10,2016,18,42,201610,2016),('2016-10-19',201642,10,2016,19,42,201610,2016),('2016-10-20',201642,10,2016,20,42,201610,2016),('2016-10-21',201642,10,2016,21,42,201610,2016),('2016-10-22',201642,10,2016,22,42,201610,2016),('2016-10-23',201643,10,2016,23,43,201610,2016),('2016-10-24',201643,10,2016,24,43,201610,2016),('2016-10-25',201643,10,2016,25,43,201610,2016),('2016-10-26',201643,10,2016,26,43,201610,2016),('2016-10-27',201643,10,2016,27,43,201610,2016),('2016-10-28',201643,10,2016,28,43,201610,2016),('2016-10-29',201643,10,2016,29,43,201610,2016),('2016-10-30',201644,10,2016,30,44,201610,2016),('2016-10-31',201644,10,2016,31,44,201610,2016),('2016-11-01',201644,11,2016,1,44,201611,2016),('2016-11-02',201644,11,2016,2,44,201611,2016),('2016-11-03',201644,11,2016,3,44,201611,2016),('2016-11-04',201644,11,2016,4,44,201611,2016),('2016-11-05',201644,11,2016,5,44,201611,2016),('2016-11-06',201645,11,2016,6,45,201611,2016),('2016-11-07',201645,11,2016,7,45,201611,2016),('2016-11-08',201645,11,2016,8,45,201611,2016),('2016-11-09',201645,11,2016,9,45,201611,2016),('2016-11-10',201645,11,2016,10,45,201611,2016),('2016-11-11',201645,11,2016,11,45,201611,2016),('2016-11-12',201645,11,2016,12,45,201611,2016),('2016-11-13',201646,11,2016,13,46,201611,2016),('2016-11-14',201646,11,2016,14,46,201611,2016),('2016-11-15',201646,11,2016,15,46,201611,2016),('2016-11-16',201646,11,2016,16,46,201611,2016),('2016-11-17',201646,11,2016,17,46,201611,2016),('2016-11-18',201646,11,2016,18,46,201611,2016),('2016-11-19',201646,11,2016,19,46,201611,2016),('2016-11-20',201647,11,2016,20,47,201611,2016),('2016-11-21',201647,11,2016,21,47,201611,2016),('2016-11-22',201647,11,2016,22,47,201611,2016),('2016-11-23',201647,11,2016,23,47,201611,2016),('2016-11-24',201647,11,2016,24,47,201611,2016),('2016-11-25',201647,11,2016,25,47,201611,2016),('2016-11-26',201647,11,2016,26,47,201611,2016),('2016-11-27',201648,11,2016,27,48,201611,2016),('2016-11-28',201648,11,2016,28,48,201611,2016),('2016-11-29',201648,11,2016,29,48,201611,2016),('2016-11-30',201648,11,2016,30,48,201611,2016),('2016-12-01',201648,12,2016,1,48,201612,2017),('2016-12-02',201648,12,2016,2,48,201612,2017),('2016-12-03',201648,12,2016,3,48,201612,2017),('2016-12-04',201649,12,2016,4,49,201612,2017),('2016-12-05',201649,12,2016,5,49,201612,2017),('2016-12-06',201649,12,2016,6,49,201612,2017),('2016-12-07',201649,12,2016,7,49,201612,2017),('2016-12-08',201649,12,2016,8,49,201612,2017),('2016-12-09',201649,12,2016,9,49,201612,2017),('2016-12-10',201649,12,2016,10,49,201612,2017),('2016-12-11',201650,12,2016,11,50,201612,2017),('2016-12-12',201650,12,2016,12,50,201612,2017),('2016-12-13',201650,12,2016,13,50,201612,2017),('2016-12-14',201650,12,2016,14,50,201612,2017),('2016-12-15',201650,12,2016,15,50,201612,2017),('2016-12-16',201650,12,2016,16,50,201612,2017),('2016-12-17',201650,12,2016,17,50,201612,2017),('2016-12-18',201651,12,2016,18,51,201612,2017),('2016-12-19',201651,12,2016,19,51,201612,2017),('2016-12-20',201651,12,2016,20,51,201612,2017),('2016-12-21',201651,12,2016,21,51,201612,2017),('2016-12-22',201651,12,2016,22,51,201612,2017),('2016-12-23',201651,12,2016,23,51,201612,2017),('2016-12-24',201651,12,2016,24,51,201612,2017),('2016-12-25',201652,12,2016,25,52,201612,2017),('2016-12-26',201652,12,2016,26,52,201612,2017),('2016-12-27',201652,12,2016,27,52,201612,2017),('2016-12-28',201652,12,2016,28,52,201612,2017),('2016-12-29',201652,12,2016,29,52,201612,2017),('2016-12-30',201652,12,2016,30,52,201612,2017),('2016-12-31',201652,12,2016,31,52,201612,2017),('2017-01-01',201701,1,2017,1,1,201701,2017),('2017-01-02',201701,1,2017,2,1,201701,2017),('2017-01-03',201701,1,2017,3,1,201701,2017),('2017-01-04',201701,1,2017,4,1,201701,2017),('2017-01-05',201701,1,2017,5,1,201701,2017),('2017-01-06',201701,1,2017,6,1,201701,2017),('2017-01-07',201701,1,2017,7,1,201701,2017),('2017-01-08',201702,1,2017,8,2,201701,2017),('2017-01-09',201702,1,2017,9,2,201701,2017),('2017-01-10',201702,1,2017,10,2,201701,2017),('2017-01-11',201702,1,2017,11,2,201701,2017),('2017-01-12',201702,1,2017,12,2,201701,2017),('2017-01-13',201702,1,2017,13,2,201701,2017),('2017-01-14',201702,1,2017,14,2,201701,2017),('2017-01-15',201703,1,2017,15,3,201701,2017),('2017-01-16',201703,1,2017,16,3,201701,2017),('2017-01-17',201703,1,2017,17,3,201701,2017),('2017-01-18',201703,1,2017,18,3,201701,2017),('2017-01-19',201703,1,2017,19,3,201701,2017),('2017-01-20',201703,1,2017,20,3,201701,2017),('2017-01-21',201703,1,2017,21,3,201701,2017),('2017-01-22',201704,1,2017,22,4,201701,2017),('2017-01-23',201704,1,2017,23,4,201701,2017),('2017-01-24',201704,1,2017,24,4,201701,2017),('2017-01-25',201704,1,2017,25,4,201701,2017),('2017-01-26',201704,1,2017,26,4,201701,2017),('2017-01-27',201704,1,2017,27,4,201701,2017),('2017-01-28',201704,1,2017,28,4,201701,2017),('2017-01-29',201705,1,2017,29,5,201701,2017),('2017-01-30',201705,1,2017,30,5,201701,2017),('2017-01-31',201705,1,2017,31,5,201701,2017),('2017-02-01',201705,2,2017,1,5,201702,2017),('2017-02-02',201705,2,2017,2,5,201702,2017),('2017-02-03',201705,2,2017,3,5,201702,2017),('2017-02-04',201705,2,2017,4,5,201702,2017),('2017-02-05',201706,2,2017,5,6,201702,2017),('2017-02-06',201706,2,2017,6,6,201702,2017),('2017-02-07',201706,2,2017,7,6,201702,2017),('2017-02-08',201706,2,2017,8,6,201702,2017),('2017-02-09',201706,2,2017,9,6,201702,2017),('2017-02-10',201706,2,2017,10,6,201702,2017),('2017-02-11',201706,2,2017,11,6,201702,2017),('2017-02-12',201707,2,2017,12,7,201702,2017),('2017-02-13',201707,2,2017,13,7,201702,2017),('2017-02-14',201707,2,2017,14,7,201702,2017),('2017-02-15',201707,2,2017,15,7,201702,2017),('2017-02-16',201707,2,2017,16,7,201702,2017),('2017-02-17',201707,2,2017,17,7,201702,2017),('2017-02-18',201707,2,2017,18,7,201702,2017),('2017-02-19',201708,2,2017,19,8,201702,2017),('2017-02-20',201708,2,2017,20,8,201702,2017),('2017-02-21',201708,2,2017,21,8,201702,2017),('2017-02-22',201708,2,2017,22,8,201702,2017),('2017-02-23',201708,2,2017,23,8,201702,2017),('2017-02-24',201708,2,2017,24,8,201702,2017),('2017-02-25',201708,2,2017,25,8,201702,2017),('2017-02-26',201709,2,2017,26,9,201702,2017),('2017-02-27',201709,2,2017,27,9,201702,2017),('2017-02-28',201709,2,2017,28,9,201702,2017),('2017-03-01',201709,3,2017,1,9,201703,2017),('2017-03-02',201709,3,2017,2,9,201703,2017),('2017-03-03',201709,3,2017,3,9,201703,2017),('2017-03-04',201709,3,2017,4,9,201703,2017),('2017-03-05',201710,3,2017,5,10,201703,2017),('2017-03-06',201710,3,2017,6,10,201703,2017),('2017-03-07',201710,3,2017,7,10,201703,2017),('2017-03-08',201710,3,2017,8,10,201703,2017),('2017-03-09',201710,3,2017,9,10,201703,2017),('2017-03-10',201710,3,2017,10,10,201703,2017),('2017-03-11',201710,3,2017,11,10,201703,2017),('2017-03-12',201711,3,2017,12,11,201703,2017),('2017-03-13',201711,3,2017,13,11,201703,2017),('2017-03-14',201711,3,2017,14,11,201703,2017),('2017-03-15',201711,3,2017,15,11,201703,2017),('2017-03-16',201711,3,2017,16,11,201703,2017),('2017-03-17',201711,3,2017,17,11,201703,2017),('2017-03-18',201711,3,2017,18,11,201703,2017),('2017-03-19',201712,3,2017,19,12,201703,2017),('2017-03-20',201712,3,2017,20,12,201703,2017),('2017-03-21',201712,3,2017,21,12,201703,2017),('2017-03-22',201712,3,2017,22,12,201703,2017),('2017-03-23',201712,3,2017,23,12,201703,2017),('2017-03-24',201712,3,2017,24,12,201703,2017),('2017-03-25',201712,3,2017,25,12,201703,2017),('2017-03-26',201713,3,2017,26,13,201703,2017),('2017-03-27',201713,3,2017,27,13,201703,2017),('2017-03-28',201713,3,2017,28,13,201703,2017),('2017-03-29',201713,3,2017,29,13,201703,2017),('2017-03-30',201713,3,2017,30,13,201703,2017),('2017-03-31',201713,3,2017,31,13,201703,2017),('2017-04-01',201713,4,2017,1,13,201704,2017),('2017-04-02',201714,4,2017,2,14,201704,2017),('2017-04-03',201714,4,2017,3,14,201704,2017),('2017-04-04',201714,4,2017,4,14,201704,2017),('2017-04-05',201714,4,2017,5,14,201704,2017),('2017-04-06',201714,4,2017,6,14,201704,2017),('2017-04-07',201714,4,2017,7,14,201704,2017),('2017-04-08',201714,4,2017,8,14,201704,2017),('2017-04-09',201715,4,2017,9,15,201704,2017),('2017-04-10',201715,4,2017,10,15,201704,2017),('2017-04-11',201715,4,2017,11,15,201704,2017),('2017-04-12',201715,4,2017,12,15,201704,2017),('2017-04-13',201715,4,2017,13,15,201704,2017),('2017-04-14',201715,4,2017,14,15,201704,2017),('2017-04-15',201715,4,2017,15,15,201704,2017),('2017-04-16',201716,4,2017,16,16,201704,2017),('2017-04-17',201716,4,2017,17,16,201704,2017),('2017-04-18',201716,4,2017,18,16,201704,2017),('2017-04-19',201716,4,2017,19,16,201704,2017),('2017-04-20',201716,4,2017,20,16,201704,2017),('2017-04-21',201716,4,2017,21,16,201704,2017),('2017-04-22',201716,4,2017,22,16,201704,2017),('2017-04-23',201717,4,2017,23,17,201704,2017),('2017-04-24',201717,4,2017,24,17,201704,2017),('2017-04-25',201717,4,2017,25,17,201704,2017),('2017-04-26',201717,4,2017,26,17,201704,2017),('2017-04-27',201717,4,2017,27,17,201704,2017),('2017-04-28',201717,4,2017,28,17,201704,2017),('2017-04-29',201717,4,2017,29,17,201704,2017),('2017-04-30',201718,4,2017,30,18,201704,2017),('2017-05-01',201718,5,2017,1,18,201705,2017),('2017-05-02',201718,5,2017,2,18,201705,2017),('2017-05-03',201718,5,2017,3,18,201705,2017),('2017-05-04',201718,5,2017,4,18,201705,2017),('2017-05-05',201718,5,2017,5,18,201705,2017),('2017-05-06',201718,5,2017,6,18,201705,2017),('2017-05-07',201719,5,2017,7,19,201705,2017),('2017-05-08',201719,5,2017,8,19,201705,2017),('2017-05-09',201719,5,2017,9,19,201705,2017),('2017-05-10',201719,5,2017,10,19,201705,2017),('2017-05-11',201719,5,2017,11,19,201705,2017),('2017-05-12',201719,5,2017,12,19,201705,2017),('2017-05-13',201719,5,2017,13,19,201705,2017),('2017-05-14',201720,5,2017,14,20,201705,2017),('2017-05-15',201720,5,2017,15,20,201705,2017),('2017-05-16',201720,5,2017,16,20,201705,2017),('2017-05-17',201720,5,2017,17,20,201705,2017),('2017-05-18',201720,5,2017,18,20,201705,2017),('2017-05-19',201720,5,2017,19,20,201705,2017),('2017-05-20',201720,5,2017,20,20,201705,2017),('2017-05-21',201721,5,2017,21,21,201705,2017),('2017-05-22',201721,5,2017,22,21,201705,2017),('2017-05-23',201721,5,2017,23,21,201705,2017),('2017-05-24',201721,5,2017,24,21,201705,2017),('2017-05-25',201721,5,2017,25,21,201705,2017),('2017-05-26',201721,5,2017,26,21,201705,2017),('2017-05-27',201721,5,2017,27,21,201705,2017),('2017-05-28',201722,5,2017,28,22,201705,2017),('2017-05-29',201722,5,2017,29,22,201705,2017),('2017-05-30',201722,5,2017,30,22,201705,2017),('2017-05-31',201722,5,2017,31,22,201705,2017),('2017-06-01',201722,6,2017,1,22,201706,2017),('2017-06-02',201722,6,2017,2,22,201706,2017),('2017-06-03',201722,6,2017,3,22,201706,2017),('2017-06-04',201723,6,2017,4,23,201706,2017),('2017-06-05',201723,6,2017,5,23,201706,2017),('2017-06-06',201723,6,2017,6,23,201706,2017),('2017-06-07',201723,6,2017,7,23,201706,2017),('2017-06-08',201723,6,2017,8,23,201706,2017),('2017-06-09',201723,6,2017,9,23,201706,2017),('2017-06-10',201723,6,2017,10,23,201706,2017),('2017-06-11',201724,6,2017,11,24,201706,2017),('2017-06-12',201724,6,2017,12,24,201706,2017),('2017-06-13',201724,6,2017,13,24,201706,2017),('2017-06-14',201724,6,2017,14,24,201706,2017),('2017-06-15',201724,6,2017,15,24,201706,2017),('2017-06-16',201724,6,2017,16,24,201706,2017),('2017-06-17',201724,6,2017,17,24,201706,2017),('2017-06-18',201725,6,2017,18,25,201706,2017),('2017-06-19',201725,6,2017,19,25,201706,2017),('2017-06-20',201725,6,2017,20,25,201706,2017),('2017-06-21',201725,6,2017,21,25,201706,2017),('2017-06-22',201725,6,2017,22,25,201706,2017),('2017-06-23',201725,6,2017,23,25,201706,2017),('2017-06-24',201725,6,2017,24,25,201706,2017),('2017-06-25',201726,6,2017,25,26,201706,2017),('2017-06-26',201726,6,2017,26,26,201706,2017),('2017-06-27',201726,6,2017,27,26,201706,2017),('2017-06-28',201726,6,2017,28,26,201706,2017),('2017-06-29',201726,6,2017,29,26,201706,2017),('2017-06-30',201726,6,2017,30,26,201706,2017),('2017-07-01',201726,7,2017,1,26,201707,2017),('2017-07-02',201727,7,2017,2,27,201707,2017),('2017-07-03',201727,7,2017,3,27,201707,2017),('2017-07-04',201727,7,2017,4,27,201707,2017),('2017-07-05',201727,7,2017,5,27,201707,2017),('2017-07-06',201727,7,2017,6,27,201707,2017),('2017-07-07',201727,7,2017,7,27,201707,2017),('2017-07-08',201727,7,2017,8,27,201707,2017),('2017-07-09',201728,7,2017,9,28,201707,2017),('2017-07-10',201728,7,2017,10,28,201707,2017),('2017-07-11',201728,7,2017,11,28,201707,2017),('2017-07-12',201728,7,2017,12,28,201707,2017),('2017-07-13',201728,7,2017,13,28,201707,2017),('2017-07-14',201728,7,2017,14,28,201707,2017),('2017-07-15',201728,7,2017,15,28,201707,2017),('2017-07-16',201729,7,2017,16,29,201707,2017),('2017-07-17',201729,7,2017,17,29,201707,2017),('2017-07-18',201729,7,2017,18,29,201707,2017),('2017-07-19',201729,7,2017,19,29,201707,2017),('2017-07-20',201729,7,2017,20,29,201707,2017),('2017-07-21',201729,7,2017,21,29,201707,2017),('2017-07-22',201729,7,2017,22,29,201707,2017),('2017-07-23',201730,7,2017,23,30,201707,2017),('2017-07-24',201730,7,2017,24,30,201707,2017),('2017-07-25',201730,7,2017,25,30,201707,2017),('2017-07-26',201730,7,2017,26,30,201707,2017),('2017-07-27',201730,7,2017,27,30,201707,2017),('2017-07-28',201730,7,2017,28,30,201707,2017),('2017-07-29',201730,7,2017,29,30,201707,2017),('2017-07-30',201731,7,2017,30,31,201707,2017),('2017-07-31',201731,7,2017,31,31,201707,2017),('2017-08-01',201731,8,2017,1,31,201708,2017),('2017-08-02',201731,8,2017,2,31,201708,2017),('2017-08-03',201731,8,2017,3,31,201708,2017),('2017-08-04',201731,8,2017,4,31,201708,2017),('2017-08-05',201731,8,2017,5,31,201708,2017),('2017-08-06',201732,8,2017,6,32,201708,2017),('2017-08-07',201732,8,2017,7,32,201708,2017),('2017-08-08',201732,8,2017,8,32,201708,2017),('2017-08-09',201732,8,2017,9,32,201708,2017),('2017-08-10',201732,8,2017,10,32,201708,2017),('2017-08-11',201732,8,2017,11,32,201708,2017),('2017-08-12',201732,8,2017,12,32,201708,2017),('2017-08-13',201733,8,2017,13,33,201708,2017),('2017-08-14',201733,8,2017,14,33,201708,2017),('2017-08-15',201733,8,2017,15,33,201708,2017),('2017-08-16',201733,8,2017,16,33,201708,2017),('2017-08-17',201733,8,2017,17,33,201708,2017),('2017-08-18',201733,8,2017,18,33,201708,2017),('2017-08-19',201733,8,2017,19,33,201708,2017),('2017-08-20',201734,8,2017,20,34,201708,2017),('2017-08-21',201734,8,2017,21,34,201708,2017),('2017-08-22',201734,8,2017,22,34,201708,2017),('2017-08-23',201734,8,2017,23,34,201708,2017),('2017-08-24',201734,8,2017,24,34,201708,2017),('2017-08-25',201734,8,2017,25,34,201708,2017),('2017-08-26',201734,8,2017,26,34,201708,2017),('2017-08-27',201735,8,2017,27,35,201708,2017),('2017-08-28',201735,8,2017,28,35,201708,2017),('2017-08-29',201735,8,2017,29,35,201708,2017),('2017-08-30',201735,8,2017,30,35,201708,2017),('2017-08-31',201735,8,2017,31,35,201708,2017),('2017-09-01',201735,9,2017,1,35,201709,2017),('2017-09-02',201735,9,2017,2,35,201709,2017),('2017-09-03',201736,9,2017,3,36,201709,2017),('2017-09-04',201736,9,2017,4,36,201709,2017),('2017-09-05',201736,9,2017,5,36,201709,2017),('2017-09-06',201736,9,2017,6,36,201709,2017),('2017-09-07',201736,9,2017,7,36,201709,2017),('2017-09-08',201736,9,2017,8,36,201709,2017),('2017-09-09',201736,9,2017,9,36,201709,2017),('2017-09-10',201737,9,2017,10,37,201709,2017),('2017-09-11',201737,9,2017,11,37,201709,2017),('2017-09-12',201737,9,2017,12,37,201709,2017),('2017-09-13',201737,9,2017,13,37,201709,2017),('2017-09-14',201737,9,2017,14,37,201709,2017),('2017-09-15',201737,9,2017,15,37,201709,2017),('2017-09-16',201737,9,2017,16,37,201709,2017),('2017-09-17',201738,9,2017,17,38,201709,2017),('2017-09-18',201738,9,2017,18,38,201709,2017),('2017-09-19',201738,9,2017,19,38,201709,2017),('2017-09-20',201738,9,2017,20,38,201709,2017),('2017-09-21',201738,9,2017,21,38,201709,2017),('2017-09-22',201738,9,2017,22,38,201709,2017),('2017-09-23',201738,9,2017,23,38,201709,2017),('2017-09-24',201739,9,2017,24,39,201709,2017),('2017-09-25',201739,9,2017,25,39,201709,2017),('2017-09-26',201739,9,2017,26,39,201709,2017),('2017-09-27',201739,9,2017,27,39,201709,2017),('2017-09-28',201739,9,2017,28,39,201709,2017),('2017-09-29',201739,9,2017,29,39,201709,2017),('2017-09-30',201739,9,2017,30,39,201709,2017),('2017-10-01',201740,10,2017,1,40,201710,2017),('2017-10-02',201740,10,2017,2,40,201710,2017),('2017-10-03',201740,10,2017,3,40,201710,2017),('2017-10-04',201740,10,2017,4,40,201710,2017),('2017-10-05',201740,10,2017,5,40,201710,2017),('2017-10-06',201740,10,2017,6,40,201710,2017),('2017-10-07',201740,10,2017,7,40,201710,2017),('2017-10-08',201741,10,2017,8,41,201710,2017),('2017-10-09',201741,10,2017,9,41,201710,2017),('2017-10-10',201741,10,2017,10,41,201710,2017),('2017-10-11',201741,10,2017,11,41,201710,2017),('2017-10-12',201741,10,2017,12,41,201710,2017),('2017-10-13',201741,10,2017,13,41,201710,2017),('2017-10-14',201741,10,2017,14,41,201710,2017),('2017-10-15',201742,10,2017,15,42,201710,2017),('2017-10-16',201742,10,2017,16,42,201710,2017),('2017-10-17',201742,10,2017,17,42,201710,2017),('2017-10-18',201742,10,2017,18,42,201710,2017),('2017-10-19',201742,10,2017,19,42,201710,2017),('2017-10-20',201742,10,2017,20,42,201710,2017),('2017-10-21',201742,10,2017,21,42,201710,2017),('2017-10-22',201743,10,2017,22,43,201710,2017),('2017-10-23',201743,10,2017,23,43,201710,2017),('2017-10-24',201743,10,2017,24,43,201710,2017),('2017-10-25',201743,10,2017,25,43,201710,2017),('2017-10-26',201743,10,2017,26,43,201710,2017),('2017-10-27',201743,10,2017,27,43,201710,2017),('2017-10-28',201743,10,2017,28,43,201710,2017),('2017-10-29',201744,10,2017,29,44,201710,2017),('2017-10-30',201744,10,2017,30,44,201710,2017),('2017-10-31',201744,10,2017,31,44,201710,2017),('2017-11-01',201744,11,2017,1,44,201711,2017),('2017-11-02',201744,11,2017,2,44,201711,2017),('2017-11-03',201744,11,2017,3,44,201711,2017),('2017-11-04',201744,11,2017,4,44,201711,2017),('2017-11-05',201745,11,2017,5,45,201711,2017),('2017-11-06',201745,11,2017,6,45,201711,2017),('2017-11-07',201745,11,2017,7,45,201711,2017),('2017-11-08',201745,11,2017,8,45,201711,2017),('2017-11-09',201745,11,2017,9,45,201711,2017),('2017-11-10',201745,11,2017,10,45,201711,2017),('2017-11-11',201745,11,2017,11,45,201711,2017),('2017-11-12',201746,11,2017,12,46,201711,2017),('2017-11-13',201746,11,2017,13,46,201711,2017),('2017-11-14',201746,11,2017,14,46,201711,2017),('2017-11-15',201746,11,2017,15,46,201711,2017),('2017-11-16',201746,11,2017,16,46,201711,2017),('2017-11-17',201746,11,2017,17,46,201711,2017),('2017-11-18',201746,11,2017,18,46,201711,2017),('2017-11-19',201747,11,2017,19,47,201711,2017),('2017-11-20',201747,11,2017,20,47,201711,2017),('2017-11-21',201747,11,2017,21,47,201711,2017),('2017-11-22',201747,11,2017,22,47,201711,2017),('2017-11-23',201747,11,2017,23,47,201711,2017),('2017-11-24',201747,11,2017,24,47,201711,2017),('2017-11-25',201747,11,2017,25,47,201711,2017),('2017-11-26',201748,11,2017,26,48,201711,2017),('2017-11-27',201748,11,2017,27,48,201711,2017),('2017-11-28',201748,11,2017,28,48,201711,2017),('2017-11-29',201748,11,2017,29,48,201711,2017),('2017-11-30',201748,11,2017,30,48,201711,2017),('2017-12-01',201748,12,2017,1,48,201712,2018),('2017-12-02',201748,12,2017,2,48,201712,2018),('2017-12-03',201749,12,2017,3,49,201712,2018),('2017-12-04',201749,12,2017,4,49,201712,2018),('2017-12-05',201749,12,2017,5,49,201712,2018),('2017-12-06',201749,12,2017,6,49,201712,2018),('2017-12-07',201749,12,2017,7,49,201712,2018),('2017-12-08',201749,12,2017,8,49,201712,2018),('2017-12-09',201749,12,2017,9,49,201712,2018),('2017-12-10',201750,12,2017,10,50,201712,2018),('2017-12-11',201750,12,2017,11,50,201712,2018),('2017-12-12',201750,12,2017,12,50,201712,2018),('2017-12-13',201750,12,2017,13,50,201712,2018),('2017-12-14',201750,12,2017,14,50,201712,2018),('2017-12-15',201750,12,2017,15,50,201712,2018),('2017-12-16',201750,12,2017,16,50,201712,2018),('2017-12-17',201751,12,2017,17,51,201712,2018),('2017-12-18',201751,12,2017,18,51,201712,2018),('2017-12-19',201751,12,2017,19,51,201712,2018),('2017-12-20',201751,12,2017,20,51,201712,2018),('2017-12-21',201751,12,2017,21,51,201712,2018),('2017-12-22',201751,12,2017,22,51,201712,2018),('2017-12-23',201751,12,2017,23,51,201712,2018),('2017-12-24',201752,12,2017,24,52,201712,2018),('2017-12-25',201752,12,2017,25,52,201712,2018),('2017-12-26',201752,12,2017,26,52,201712,2018),('2017-12-27',201752,12,2017,27,52,201712,2018),('2017-12-28',201752,12,2017,28,52,201712,2018),('2017-12-29',201752,12,2017,29,52,201712,2018),('2017-12-30',201752,12,2017,30,52,201712,2018),('2017-12-31',201801,12,2017,31,1,201712,2018),('2018-01-01',201801,1,2018,1,1,201801,2018),('2018-01-02',201801,1,2018,2,1,201801,2018),('2018-01-03',201801,1,2018,3,1,201801,2018),('2018-01-04',201801,1,2018,4,1,201801,2018),('2018-01-05',201801,1,2018,5,1,201801,2018),('2018-01-06',201801,1,2018,6,1,201801,2018),('2018-01-07',201802,1,2018,7,2,201801,2018),('2018-01-08',201802,1,2018,8,2,201801,2018),('2018-01-09',201802,1,2018,9,2,201801,2018),('2018-01-10',201802,1,2018,10,2,201801,2018),('2018-01-11',201802,1,2018,11,2,201801,2018),('2018-01-12',201802,1,2018,12,2,201801,2018),('2018-01-13',201802,1,2018,13,2,201801,2018),('2018-01-14',201803,1,2018,14,3,201801,2018),('2018-01-15',201803,1,2018,15,3,201801,2018),('2018-01-16',201803,1,2018,16,3,201801,2018),('2018-01-17',201803,1,2018,17,3,201801,2018),('2018-01-18',201803,1,2018,18,3,201801,2018),('2018-01-19',201803,1,2018,19,3,201801,2018),('2018-01-20',201803,1,2018,20,3,201801,2018),('2018-01-21',201804,1,2018,21,4,201801,2018),('2018-01-22',201804,1,2018,22,4,201801,2018),('2018-01-23',201804,1,2018,23,4,201801,2018),('2018-01-24',201804,1,2018,24,4,201801,2018),('2018-01-25',201804,1,2018,25,4,201801,2018),('2018-01-26',201804,1,2018,26,4,201801,2018),('2018-01-27',201804,1,2018,27,4,201801,2018),('2018-01-28',201805,1,2018,28,5,201801,2018),('2018-01-29',201805,1,2018,29,5,201801,2018),('2018-01-30',201805,1,2018,30,5,201801,2018),('2018-01-31',201805,1,2018,31,5,201801,2018),('2018-02-01',201805,2,2018,1,5,201802,2018),('2018-02-02',201805,2,2018,2,5,201802,2018),('2018-02-03',201805,2,2018,3,5,201802,2018),('2018-02-04',201806,2,2018,4,6,201802,2018),('2018-02-05',201806,2,2018,5,6,201802,2018),('2018-02-06',201806,2,2018,6,6,201802,2018),('2018-02-07',201806,2,2018,7,6,201802,2018),('2018-02-08',201806,2,2018,8,6,201802,2018),('2018-02-09',201806,2,2018,9,6,201802,2018),('2018-02-10',201806,2,2018,10,6,201802,2018),('2018-02-11',201807,2,2018,11,7,201802,2018),('2018-02-12',201807,2,2018,12,7,201802,2018),('2018-02-13',201807,2,2018,13,7,201802,2018),('2018-02-14',201807,2,2018,14,7,201802,2018),('2018-02-15',201807,2,2018,15,7,201802,2018),('2018-02-16',201807,2,2018,16,7,201802,2018),('2018-02-17',201807,2,2018,17,7,201802,2018),('2018-02-18',201808,2,2018,18,8,201802,2018),('2018-02-19',201808,2,2018,19,8,201802,2018),('2018-02-20',201808,2,2018,20,8,201802,2018),('2018-02-21',201808,2,2018,21,8,201802,2018),('2018-02-22',201808,2,2018,22,8,201802,2018),('2018-02-23',201808,2,2018,23,8,201802,2018),('2018-02-24',201808,2,2018,24,8,201802,2018),('2018-02-25',201809,2,2018,25,9,201802,2018),('2018-02-26',201809,2,2018,26,9,201802,2018),('2018-02-27',201809,2,2018,27,9,201802,2018),('2018-02-28',201809,2,2018,28,9,201802,2018),('2018-03-01',201809,3,2018,1,9,201803,2018),('2018-03-02',201809,3,2018,2,9,201803,2018),('2018-03-03',201809,3,2018,3,9,201803,2018),('2018-03-04',201810,3,2018,4,10,201803,2018),('2018-03-05',201810,3,2018,5,10,201803,2018),('2018-03-06',201810,3,2018,6,10,201803,2018),('2018-03-07',201810,3,2018,7,10,201803,2018),('2018-03-08',201810,3,2018,8,10,201803,2018),('2018-03-09',201810,3,2018,9,10,201803,2018),('2018-03-10',201810,3,2018,10,10,201803,2018),('2018-03-11',201811,3,2018,11,11,201803,2018),('2018-03-12',201811,3,2018,12,11,201803,2018),('2018-03-13',201811,3,2018,13,11,201803,2018),('2018-03-14',201811,3,2018,14,11,201803,2018),('2018-03-15',201811,3,2018,15,11,201803,2018),('2018-03-16',201811,3,2018,16,11,201803,2018),('2018-03-17',201811,3,2018,17,11,201803,2018),('2018-03-18',201812,3,2018,18,12,201803,2018),('2018-03-19',201812,3,2018,19,12,201803,2018),('2018-03-20',201812,3,2018,20,12,201803,2018),('2018-03-21',201812,3,2018,21,12,201803,2018),('2018-03-22',201812,3,2018,22,12,201803,2018),('2018-03-23',201812,3,2018,23,12,201803,2018),('2018-03-24',201812,3,2018,24,12,201803,2018),('2018-03-25',201813,3,2018,25,13,201803,2018),('2018-03-26',201813,3,2018,26,13,201803,2018),('2018-03-27',201813,3,2018,27,13,201803,2018),('2018-03-28',201813,3,2018,28,13,201803,2018),('2018-03-29',201813,3,2018,29,13,201803,2018),('2018-03-30',201813,3,2018,30,13,201803,2018),('2018-03-31',201813,3,2018,31,13,201803,2018),('2018-04-01',201814,4,2018,1,14,201804,2018),('2018-04-02',201814,4,2018,2,14,201804,2018),('2018-04-03',201814,4,2018,3,14,201804,2018),('2018-04-04',201814,4,2018,4,14,201804,2018),('2018-04-05',201814,4,2018,5,14,201804,2018),('2018-04-06',201814,4,2018,6,14,201804,2018),('2018-04-07',201814,4,2018,7,14,201804,2018),('2018-04-08',201815,4,2018,8,15,201804,2018),('2018-04-09',201815,4,2018,9,15,201804,2018),('2018-04-10',201815,4,2018,10,15,201804,2018),('2018-04-11',201815,4,2018,11,15,201804,2018),('2018-04-12',201815,4,2018,12,15,201804,2018),('2018-04-13',201815,4,2018,13,15,201804,2018),('2018-04-14',201815,4,2018,14,15,201804,2018),('2018-04-15',201816,4,2018,15,16,201804,2018),('2018-04-16',201816,4,2018,16,16,201804,2018),('2018-04-17',201816,4,2018,17,16,201804,2018),('2018-04-18',201816,4,2018,18,16,201804,2018),('2018-04-19',201816,4,2018,19,16,201804,2018),('2018-04-20',201816,4,2018,20,16,201804,2018),('2018-04-21',201816,4,2018,21,16,201804,2018),('2018-04-22',201817,4,2018,22,17,201804,2018),('2018-04-23',201817,4,2018,23,17,201804,2018),('2018-04-24',201817,4,2018,24,17,201804,2018),('2018-04-25',201817,4,2018,25,17,201804,2018),('2018-04-26',201817,4,2018,26,17,201804,2018),('2018-04-27',201817,4,2018,27,17,201804,2018),('2018-04-28',201817,4,2018,28,17,201804,2018),('2018-04-29',201818,4,2018,29,18,201804,2018),('2018-04-30',201818,4,2018,30,18,201804,2018),('2018-05-01',201818,5,2018,1,18,201805,2018),('2018-05-02',201818,5,2018,2,18,201805,2018),('2018-05-03',201818,5,2018,3,18,201805,2018),('2018-05-04',201818,5,2018,4,18,201805,2018),('2018-05-05',201818,5,2018,5,18,201805,2018),('2018-05-06',201819,5,2018,6,19,201805,2018),('2018-05-07',201819,5,2018,7,19,201805,2018),('2018-05-08',201819,5,2018,8,19,201805,2018),('2018-05-09',201819,5,2018,9,19,201805,2018),('2018-05-10',201819,5,2018,10,19,201805,2018),('2018-05-11',201819,5,2018,11,19,201805,2018),('2018-05-12',201819,5,2018,12,19,201805,2018),('2018-05-13',201820,5,2018,13,20,201805,2018),('2018-05-14',201820,5,2018,14,20,201805,2018),('2018-05-15',201820,5,2018,15,20,201805,2018),('2018-05-16',201820,5,2018,16,20,201805,2018),('2018-05-17',201820,5,2018,17,20,201805,2018),('2018-05-18',201820,5,2018,18,20,201805,2018),('2018-05-19',201820,5,2018,19,20,201805,2018),('2018-05-20',201821,5,2018,20,21,201805,2018),('2018-05-21',201821,5,2018,21,21,201805,2018),('2018-05-22',201821,5,2018,22,21,201805,2018),('2018-05-23',201821,5,2018,23,21,201805,2018),('2018-05-24',201821,5,2018,24,21,201805,2018),('2018-05-25',201821,5,2018,25,21,201805,2018),('2018-05-26',201821,5,2018,26,21,201805,2018),('2018-05-27',201822,5,2018,27,22,201805,2018),('2018-05-28',201822,5,2018,28,22,201805,2018),('2018-05-29',201822,5,2018,29,22,201805,2018),('2018-05-30',201822,5,2018,30,22,201805,2018),('2018-05-31',201822,5,2018,31,22,201805,2018),('2018-06-01',201822,6,2018,1,22,201806,2018),('2018-06-02',201822,6,2018,2,22,201806,2018),('2018-06-03',201823,6,2018,3,23,201806,2018),('2018-06-04',201823,6,2018,4,23,201806,2018),('2018-06-05',201823,6,2018,5,23,201806,2018),('2018-06-06',201823,6,2018,6,23,201806,2018),('2018-06-07',201823,6,2018,7,23,201806,2018),('2018-06-08',201823,6,2018,8,23,201806,2018),('2018-06-09',201823,6,2018,9,23,201806,2018),('2018-06-10',201824,6,2018,10,24,201806,2018),('2018-06-11',201824,6,2018,11,24,201806,2018),('2018-06-12',201824,6,2018,12,24,201806,2018),('2018-06-13',201824,6,2018,13,24,201806,2018),('2018-06-14',201824,6,2018,14,24,201806,2018),('2018-06-15',201824,6,2018,15,24,201806,2018),('2018-06-16',201824,6,2018,16,24,201806,2018),('2018-06-17',201825,6,2018,17,25,201806,2018),('2018-06-18',201825,6,2018,18,25,201806,2018),('2018-06-19',201825,6,2018,19,25,201806,2018),('2018-06-20',201825,6,2018,20,25,201806,2018),('2018-06-21',201825,6,2018,21,25,201806,2018),('2018-06-22',201825,6,2018,22,25,201806,2018),('2018-06-23',201825,6,2018,23,25,201806,2018),('2018-06-24',201826,6,2018,24,26,201806,2018),('2018-06-25',201826,6,2018,25,26,201806,2018),('2018-06-26',201826,6,2018,26,26,201806,2018),('2018-06-27',201826,6,2018,27,26,201806,2018),('2018-06-28',201826,6,2018,28,26,201806,2018),('2018-06-29',201826,6,2018,29,26,201806,2018),('2018-06-30',201826,6,2018,30,26,201806,2018),('2018-07-01',201827,7,2018,1,27,201807,2018),('2018-07-02',201827,7,2018,2,27,201807,2018),('2018-07-03',201827,7,2018,3,27,201807,2018),('2018-07-04',201827,7,2018,4,27,201807,2018),('2018-07-05',201827,7,2018,5,27,201807,2018),('2018-07-06',201827,7,2018,6,27,201807,2018),('2018-07-07',201827,7,2018,7,27,201807,2018),('2018-07-08',201828,7,2018,8,28,201807,2018),('2018-07-09',201828,7,2018,9,28,201807,2018),('2018-07-10',201828,7,2018,10,28,201807,2018),('2018-07-11',201828,7,2018,11,28,201807,2018),('2018-07-12',201828,7,2018,12,28,201807,2018),('2018-07-13',201828,7,2018,13,28,201807,2018),('2018-07-14',201828,7,2018,14,28,201807,2018),('2018-07-15',201829,7,2018,15,29,201807,2018),('2018-07-16',201829,7,2018,16,29,201807,2018),('2018-07-17',201829,7,2018,17,29,201807,2018),('2018-07-18',201829,7,2018,18,29,201807,2018),('2018-07-19',201829,7,2018,19,29,201807,2018),('2018-07-20',201829,7,2018,20,29,201807,2018),('2018-07-21',201829,7,2018,21,29,201807,2018),('2018-07-22',201830,7,2018,22,30,201807,2018),('2018-07-23',201830,7,2018,23,30,201807,2018),('2018-07-24',201830,7,2018,24,30,201807,2018),('2018-07-25',201830,7,2018,25,30,201807,2018),('2018-07-26',201830,7,2018,26,30,201807,2018),('2018-07-27',201830,7,2018,27,30,201807,2018),('2018-07-28',201830,7,2018,28,30,201807,2018),('2018-07-29',201831,7,2018,29,31,201807,2018),('2018-07-30',201831,7,2018,30,31,201807,2018),('2018-07-31',201831,7,2018,31,31,201807,2018),('2018-08-01',201831,8,2018,1,31,201808,2018),('2018-08-02',201831,8,2018,2,31,201808,2018),('2018-08-03',201831,8,2018,3,31,201808,2018),('2018-08-04',201831,8,2018,4,31,201808,2018),('2018-08-05',201832,8,2018,5,32,201808,2018),('2018-08-06',201832,8,2018,6,32,201808,2018),('2018-08-07',201832,8,2018,7,32,201808,2018),('2018-08-08',201832,8,2018,8,32,201808,2018),('2018-08-09',201832,8,2018,9,32,201808,2018),('2018-08-10',201832,8,2018,10,32,201808,2018),('2018-08-11',201832,8,2018,11,32,201808,2018),('2018-08-12',201833,8,2018,12,33,201808,2018),('2018-08-13',201833,8,2018,13,33,201808,2018),('2018-08-14',201833,8,2018,14,33,201808,2018),('2018-08-15',201833,8,2018,15,33,201808,2018),('2018-08-16',201833,8,2018,16,33,201808,2018),('2018-08-17',201833,8,2018,17,33,201808,2018),('2018-08-18',201833,8,2018,18,33,201808,2018),('2018-08-19',201834,8,2018,19,34,201808,2018),('2018-08-20',201834,8,2018,20,34,201808,2018),('2018-08-21',201834,8,2018,21,34,201808,2018),('2018-08-22',201834,8,2018,22,34,201808,2018),('2018-08-23',201834,8,2018,23,34,201808,2018),('2018-08-24',201834,8,2018,24,34,201808,2018),('2018-08-25',201834,8,2018,25,34,201808,2018),('2018-08-26',201835,8,2018,26,35,201808,2018),('2018-08-27',201835,8,2018,27,35,201808,2018),('2018-08-28',201835,8,2018,28,35,201808,2018),('2018-08-29',201835,8,2018,29,35,201808,2018),('2018-08-30',201835,8,2018,30,35,201808,2018),('2018-08-31',201835,8,2018,31,35,201808,2018),('2018-09-01',201835,9,2018,1,35,201809,2018),('2018-09-02',201836,9,2018,2,36,201809,2018),('2018-09-03',201836,9,2018,3,36,201809,2018),('2018-09-04',201836,9,2018,4,36,201809,2018),('2018-09-05',201836,9,2018,5,36,201809,2018),('2018-09-06',201836,9,2018,6,36,201809,2018),('2018-09-07',201836,9,2018,7,36,201809,2018),('2018-09-08',201836,9,2018,8,36,201809,2018),('2018-09-09',201837,9,2018,9,37,201809,2018),('2018-09-10',201837,9,2018,10,37,201809,2018),('2018-09-11',201837,9,2018,11,37,201809,2018),('2018-09-12',201837,9,2018,12,37,201809,2018),('2018-09-13',201837,9,2018,13,37,201809,2018),('2018-09-14',201837,9,2018,14,37,201809,2018),('2018-09-15',201837,9,2018,15,37,201809,2018),('2018-09-16',201838,9,2018,16,38,201809,2018),('2018-09-17',201838,9,2018,17,38,201809,2018),('2018-09-18',201838,9,2018,18,38,201809,2018),('2018-09-19',201838,9,2018,19,38,201809,2018),('2018-09-20',201838,9,2018,20,38,201809,2018),('2018-09-21',201838,9,2018,21,38,201809,2018),('2018-09-22',201838,9,2018,22,38,201809,2018),('2018-09-23',201839,9,2018,23,39,201809,2018),('2018-09-24',201839,9,2018,24,39,201809,2018),('2018-09-25',201839,9,2018,25,39,201809,2018),('2018-09-26',201839,9,2018,26,39,201809,2018),('2018-09-27',201839,9,2018,27,39,201809,2018),('2018-09-28',201839,9,2018,28,39,201809,2018),('2018-09-29',201839,9,2018,29,39,201809,2018),('2018-09-30',201840,9,2018,30,40,201809,2018),('2018-10-01',201840,10,2018,1,40,201810,2018),('2018-10-02',201840,10,2018,2,40,201810,2018),('2018-10-03',201840,10,2018,3,40,201810,2018),('2018-10-04',201840,10,2018,4,40,201810,2018),('2018-10-05',201840,10,2018,5,40,201810,2018),('2018-10-06',201840,10,2018,6,40,201810,2018),('2018-10-07',201841,10,2018,7,41,201810,2018),('2018-10-08',201841,10,2018,8,41,201810,2018),('2018-10-09',201841,10,2018,9,41,201810,2018),('2018-10-10',201841,10,2018,10,41,201810,2018),('2018-10-11',201841,10,2018,11,41,201810,2018),('2018-10-12',201841,10,2018,12,41,201810,2018),('2018-10-13',201841,10,2018,13,41,201810,2018),('2018-10-14',201842,10,2018,14,42,201810,2018),('2018-10-15',201842,10,2018,15,42,201810,2018),('2018-10-16',201842,10,2018,16,42,201810,2018),('2018-10-17',201842,10,2018,17,42,201810,2018),('2018-10-18',201842,10,2018,18,42,201810,2018),('2018-10-19',201842,10,2018,19,42,201810,2018),('2018-10-20',201842,10,2018,20,42,201810,2018),('2018-10-21',201843,10,2018,21,43,201810,2018),('2018-10-22',201843,10,2018,22,43,201810,2018),('2018-10-23',201843,10,2018,23,43,201810,2018),('2018-10-24',201843,10,2018,24,43,201810,2018),('2018-10-25',201843,10,2018,25,43,201810,2018),('2018-10-26',201843,10,2018,26,43,201810,2018),('2018-10-27',201843,10,2018,27,43,201810,2018),('2018-10-28',201844,10,2018,28,44,201810,2018),('2018-10-29',201844,10,2018,29,44,201810,2018),('2018-10-30',201844,10,2018,30,44,201810,2018),('2018-10-31',201844,10,2018,31,44,201810,2018),('2018-11-01',201844,11,2018,1,44,201811,2018),('2018-11-02',201844,11,2018,2,44,201811,2018),('2018-11-03',201844,11,2018,3,44,201811,2018),('2018-11-04',201845,11,2018,4,45,201811,2018),('2018-11-05',201845,11,2018,5,45,201811,2018),('2018-11-06',201845,11,2018,6,45,201811,2018),('2018-11-07',201845,11,2018,7,45,201811,2018),('2018-11-08',201845,11,2018,8,45,201811,2018),('2018-11-09',201845,11,2018,9,45,201811,2018),('2018-11-10',201845,11,2018,10,45,201811,2018),('2018-11-11',201846,11,2018,11,46,201811,2018),('2018-11-12',201846,11,2018,12,46,201811,2018),('2018-11-13',201846,11,2018,13,46,201811,2018),('2018-11-14',201846,11,2018,14,46,201811,2018),('2018-11-15',201846,11,2018,15,46,201811,2018),('2018-11-16',201846,11,2018,16,46,201811,2018),('2018-11-17',201846,11,2018,17,46,201811,2018),('2018-11-18',201847,11,2018,18,47,201811,2018),('2018-11-19',201847,11,2018,19,47,201811,2018),('2018-11-20',201847,11,2018,20,47,201811,2018),('2018-11-21',201847,11,2018,21,47,201811,2018),('2018-11-22',201847,11,2018,22,47,201811,2018),('2018-11-23',201847,11,2018,23,47,201811,2018),('2018-11-24',201847,11,2018,24,47,201811,2018),('2018-11-25',201848,11,2018,25,48,201811,2018),('2018-11-26',201848,11,2018,26,48,201811,2018),('2018-11-27',201848,11,2018,27,48,201811,2018),('2018-11-28',201848,11,2018,28,48,201811,2018),('2018-11-29',201848,11,2018,29,48,201811,2018),('2018-11-30',201848,11,2018,30,48,201811,2018),('2018-12-01',201848,12,2018,1,48,201812,2019),('2018-12-02',201849,12,2018,2,49,201812,2019),('2018-12-03',201849,12,2018,3,49,201812,2019),('2018-12-04',201849,12,2018,4,49,201812,2019),('2018-12-05',201849,12,2018,5,49,201812,2019),('2018-12-06',201849,12,2018,6,49,201812,2019),('2018-12-07',201849,12,2018,7,49,201812,2019),('2018-12-08',201849,12,2018,8,49,201812,2019),('2018-12-09',201850,12,2018,9,50,201812,2019),('2018-12-10',201850,12,2018,10,50,201812,2019),('2018-12-11',201850,12,2018,11,50,201812,2019),('2018-12-12',201850,12,2018,12,50,201812,2019),('2018-12-13',201850,12,2018,13,50,201812,2019),('2018-12-14',201850,12,2018,14,50,201812,2019),('2018-12-15',201850,12,2018,15,50,201812,2019),('2018-12-16',201851,12,2018,16,51,201812,2019),('2018-12-17',201851,12,2018,17,51,201812,2019),('2018-12-18',201851,12,2018,18,51,201812,2019),('2018-12-19',201851,12,2018,19,51,201812,2019),('2018-12-20',201851,12,2018,20,51,201812,2019),('2018-12-21',201851,12,2018,21,51,201812,2019),('2018-12-22',201851,12,2018,22,51,201812,2019),('2018-12-23',201852,12,2018,23,52,201812,2019),('2018-12-24',201852,12,2018,24,52,201812,2019),('2018-12-25',201852,12,2018,25,52,201812,2019),('2018-12-26',201852,12,2018,26,52,201812,2019),('2018-12-27',201852,12,2018,27,52,201812,2019),('2018-12-28',201852,12,2018,28,52,201812,2019),('2018-12-29',201852,12,2018,29,52,201812,2019),('2018-12-30',201901,1,2019,30,1,201812,2019),('2018-12-31',201901,1,2019,31,1,201812,2019),('2019-01-01',201901,1,2019,1,1,201901,2019),('2019-01-02',201901,1,2019,2,1,201901,2019),('2019-01-03',201901,1,2019,3,1,201901,2019),('2019-01-04',201901,1,2019,4,1,201901,2019),('2019-01-05',201901,1,2019,5,1,201901,2019),('2019-01-06',201902,1,2019,6,2,201901,2019),('2019-01-07',201902,1,2019,7,2,201901,2019),('2019-01-08',201902,1,2019,8,2,201901,2019),('2019-01-09',201902,1,2019,9,2,201901,2019),('2019-01-10',201902,1,2019,10,2,201901,2019),('2019-01-11',201902,1,2019,11,2,201901,2019),('2019-01-12',201902,1,2019,12,2,201901,2019),('2019-01-13',201903,1,2019,13,3,201901,2019),('2019-01-14',201903,1,2019,14,3,201901,2019),('2019-01-15',201903,1,2019,15,3,201901,2019),('2019-01-16',201903,1,2019,16,3,201901,2019),('2019-01-17',201903,1,2019,17,3,201901,2019),('2019-01-18',201903,1,2019,18,3,201901,2019),('2019-01-19',201903,1,2019,19,3,201901,2019),('2019-01-20',201904,1,2019,20,4,201901,2019),('2019-01-21',201904,1,2019,21,4,201901,2019),('2019-01-22',201904,1,2019,22,4,201901,2019),('2019-01-23',201904,1,2019,23,4,201901,2019),('2019-01-24',201904,1,2019,24,4,201901,2019),('2019-01-25',201904,1,2019,25,4,201901,2019),('2019-01-26',201904,1,2019,26,4,201901,2019),('2019-01-27',201905,1,2019,27,5,201901,2019),('2019-01-28',201905,1,2019,28,5,201901,2019),('2019-01-29',201905,1,2019,29,5,201901,2019),('2019-01-30',201905,1,2019,30,5,201901,2019),('2019-01-31',201905,1,2019,31,5,201901,2019),('2019-02-01',201905,2,2019,1,5,201902,2019),('2019-02-02',201905,2,2019,2,5,201902,2019),('2019-02-03',201906,2,2019,3,6,201902,2019),('2019-02-04',201906,2,2019,4,6,201902,2019),('2019-02-05',201906,2,2019,5,6,201902,2019),('2019-02-06',201906,2,2019,6,6,201902,2019),('2019-02-07',201906,2,2019,7,6,201902,2019),('2019-02-08',201906,2,2019,8,6,201902,2019),('2019-02-09',201906,2,2019,9,6,201902,2019),('2019-02-10',201907,2,2019,10,7,201902,2019),('2019-02-11',201907,2,2019,11,7,201902,2019),('2019-02-12',201907,2,2019,12,7,201902,2019),('2019-02-13',201907,2,2019,13,7,201902,2019),('2019-02-14',201907,2,2019,14,7,201902,2019),('2019-02-15',201907,2,2019,15,7,201902,2019),('2019-02-16',201907,2,2019,16,7,201902,2019),('2019-02-17',201908,2,2019,17,8,201902,2019),('2019-02-18',201908,2,2019,18,8,201902,2019),('2019-02-19',201908,2,2019,19,8,201902,2019),('2019-02-20',201908,2,2019,20,8,201902,2019),('2019-02-21',201908,2,2019,21,8,201902,2019),('2019-02-22',201908,2,2019,22,8,201902,2019),('2019-02-23',201908,2,2019,23,8,201902,2019),('2019-02-24',201909,2,2019,24,9,201902,2019),('2019-02-25',201909,2,2019,25,9,201902,2019),('2019-02-26',201909,2,2019,26,9,201902,2019),('2019-02-27',201909,2,2019,27,9,201902,2019),('2019-02-28',201909,2,2019,28,9,201902,2019),('2019-03-01',201909,3,2019,1,9,201903,2019),('2019-03-02',201909,3,2019,2,9,201903,2019),('2019-03-03',201910,3,2019,3,10,201903,2019),('2019-03-04',201910,3,2019,4,10,201903,2019),('2019-03-05',201910,3,2019,5,10,201903,2019),('2019-03-06',201910,3,2019,6,10,201903,2019),('2019-03-07',201910,3,2019,7,10,201903,2019),('2019-03-08',201910,3,2019,8,10,201903,2019),('2019-03-09',201910,3,2019,9,10,201903,2019),('2019-03-10',201911,3,2019,10,11,201903,2019),('2019-03-11',201911,3,2019,11,11,201903,2019),('2019-03-12',201911,3,2019,12,11,201903,2019),('2019-03-13',201911,3,2019,13,11,201903,2019),('2019-03-14',201911,3,2019,14,11,201903,2019),('2019-03-15',201911,3,2019,15,11,201903,2019),('2019-03-16',201911,3,2019,16,11,201903,2019),('2019-03-17',201912,3,2019,17,12,201903,2019),('2019-03-18',201912,3,2019,18,12,201903,2019),('2019-03-19',201912,3,2019,19,12,201903,2019),('2019-03-20',201912,3,2019,20,12,201903,2019),('2019-03-21',201912,3,2019,21,12,201903,2019),('2019-03-22',201912,3,2019,22,12,201903,2019),('2019-03-23',201912,3,2019,23,12,201903,2019),('2019-03-24',201913,3,2019,24,13,201903,2019),('2019-03-25',201913,3,2019,25,13,201903,2019),('2019-03-26',201913,3,2019,26,13,201903,2019),('2019-03-27',201913,3,2019,27,13,201903,2019),('2019-03-28',201913,3,2019,28,13,201903,2019),('2019-03-29',201913,3,2019,29,13,201903,2019),('2019-03-30',201913,3,2019,30,13,201903,2019),('2019-03-31',201914,3,2019,31,14,201903,2019),('2019-04-01',201914,4,2019,1,14,201904,2019),('2019-04-02',201914,4,2019,2,14,201904,2019),('2019-04-03',201914,4,2019,3,14,201904,2019),('2019-04-04',201914,4,2019,4,14,201904,2019),('2019-04-05',201914,4,2019,5,14,201904,2019),('2019-04-06',201914,4,2019,6,14,201904,2019),('2019-04-07',201915,4,2019,7,15,201904,2019),('2019-04-08',201915,4,2019,8,15,201904,2019),('2019-04-09',201915,4,2019,9,15,201904,2019),('2019-04-10',201915,4,2019,10,15,201904,2019),('2019-04-11',201915,4,2019,11,15,201904,2019),('2019-04-12',201915,4,2019,12,15,201904,2019),('2019-04-13',201915,4,2019,13,15,201904,2019),('2019-04-14',201916,4,2019,14,16,201904,2019),('2019-04-15',201916,4,2019,15,16,201904,2019),('2019-04-16',201916,4,2019,16,16,201904,2019),('2019-04-17',201916,4,2019,17,16,201904,2019),('2019-04-18',201916,4,2019,18,16,201904,2019),('2019-04-19',201916,4,2019,19,16,201904,2019),('2019-04-20',201916,4,2019,20,16,201904,2019),('2019-04-21',201917,4,2019,21,17,201904,2019),('2019-04-22',201917,4,2019,22,17,201904,2019),('2019-04-23',201917,4,2019,23,17,201904,2019),('2019-04-24',201917,4,2019,24,17,201904,2019),('2019-04-25',201917,4,2019,25,17,201904,2019),('2019-04-26',201917,4,2019,26,17,201904,2019),('2019-04-27',201917,4,2019,27,17,201904,2019),('2019-04-28',201918,4,2019,28,18,201904,2019),('2019-04-29',201918,4,2019,29,18,201904,2019),('2019-04-30',201918,4,2019,30,18,201904,2019),('2019-05-01',201918,5,2019,1,18,201905,2019),('2019-05-02',201918,5,2019,2,18,201905,2019),('2019-05-03',201918,5,2019,3,18,201905,2019),('2019-05-04',201918,5,2019,4,18,201905,2019),('2019-05-05',201919,5,2019,5,19,201905,2019),('2019-05-06',201919,5,2019,6,19,201905,2019),('2019-05-07',201919,5,2019,7,19,201905,2019),('2019-05-08',201919,5,2019,8,19,201905,2019),('2019-05-09',201919,5,2019,9,19,201905,2019),('2019-05-10',201919,5,2019,10,19,201905,2019),('2019-05-11',201919,5,2019,11,19,201905,2019),('2019-05-12',201920,5,2019,12,20,201905,2019),('2019-05-13',201920,5,2019,13,20,201905,2019),('2019-05-14',201920,5,2019,14,20,201905,2019),('2019-05-15',201920,5,2019,15,20,201905,2019),('2019-05-16',201920,5,2019,16,20,201905,2019),('2019-05-17',201920,5,2019,17,20,201905,2019),('2019-05-18',201920,5,2019,18,20,201905,2019),('2019-05-19',201921,5,2019,19,21,201905,2019),('2019-05-20',201921,5,2019,20,21,201905,2019),('2019-05-21',201921,5,2019,21,21,201905,2019),('2019-05-22',201921,5,2019,22,21,201905,2019),('2019-05-23',201921,5,2019,23,21,201905,2019),('2019-05-24',201921,5,2019,24,21,201905,2019),('2019-05-25',201921,5,2019,25,21,201905,2019),('2019-05-26',201922,5,2019,26,22,201905,2019),('2019-05-27',201922,5,2019,27,22,201905,2019),('2019-05-28',201922,5,2019,28,22,201905,2019),('2019-05-29',201922,5,2019,29,22,201905,2019),('2019-05-30',201922,5,2019,30,22,201905,2019),('2019-05-31',201922,5,2019,31,22,201905,2019),('2019-06-01',201922,6,2019,1,22,201906,2019),('2019-06-02',201923,6,2019,2,23,201906,2019),('2019-06-03',201923,6,2019,3,23,201906,2019),('2019-06-04',201923,6,2019,4,23,201906,2019),('2019-06-05',201923,6,2019,5,23,201906,2019),('2019-06-06',201923,6,2019,6,23,201906,2019),('2019-06-07',201923,6,2019,7,23,201906,2019),('2019-06-08',201923,6,2019,8,23,201906,2019),('2019-06-09',201924,6,2019,9,24,201906,2019),('2019-06-10',201924,6,2019,10,24,201906,2019),('2019-06-11',201924,6,2019,11,24,201906,2019),('2019-06-12',201924,6,2019,12,24,201906,2019),('2019-06-13',201924,6,2019,13,24,201906,2019),('2019-06-14',201924,6,2019,14,24,201906,2019),('2019-06-15',201924,6,2019,15,24,201906,2019),('2019-06-16',201925,6,2019,16,25,201906,2019),('2019-06-17',201925,6,2019,17,25,201906,2019),('2019-06-18',201925,6,2019,18,25,201906,2019),('2019-06-19',201925,6,2019,19,25,201906,2019),('2019-06-20',201925,6,2019,20,25,201906,2019),('2019-06-21',201925,6,2019,21,25,201906,2019),('2019-06-22',201925,6,2019,22,25,201906,2019),('2019-06-23',201926,6,2019,23,26,201906,2019),('2019-06-24',201926,6,2019,24,26,201906,2019),('2019-06-25',201926,6,2019,25,26,201906,2019),('2019-06-26',201926,6,2019,26,26,201906,2019),('2019-06-27',201926,6,2019,27,26,201906,2019),('2019-06-28',201926,6,2019,28,26,201906,2019),('2019-06-29',201926,6,2019,29,26,201906,2019),('2019-06-30',201927,6,2019,30,27,201906,2019),('2019-07-01',201927,7,2019,1,27,201907,2019),('2019-07-02',201927,7,2019,2,27,201907,2019),('2019-07-03',201927,7,2019,3,27,201907,2019),('2019-07-04',201927,7,2019,4,27,201907,2019),('2019-07-05',201927,7,2019,5,27,201907,2019),('2019-07-06',201927,7,2019,6,27,201907,2019),('2019-07-07',201928,7,2019,7,28,201907,2019),('2019-07-08',201928,7,2019,8,28,201907,2019),('2019-07-09',201928,7,2019,9,28,201907,2019),('2019-07-10',201928,7,2019,10,28,201907,2019),('2019-07-11',201928,7,2019,11,28,201907,2019),('2019-07-12',201928,7,2019,12,28,201907,2019),('2019-07-13',201928,7,2019,13,28,201907,2019),('2019-07-14',201929,7,2019,14,29,201907,2019),('2019-07-15',201929,7,2019,15,29,201907,2019),('2019-07-16',201929,7,2019,16,29,201907,2019),('2019-07-17',201929,7,2019,17,29,201907,2019),('2019-07-18',201929,7,2019,18,29,201907,2019),('2019-07-19',201929,7,2019,19,29,201907,2019),('2019-07-20',201929,7,2019,20,29,201907,2019),('2019-07-21',201930,7,2019,21,30,201907,2019),('2019-07-22',201930,7,2019,22,30,201907,2019),('2019-07-23',201930,7,2019,23,30,201907,2019),('2019-07-24',201930,7,2019,24,30,201907,2019),('2019-07-25',201930,7,2019,25,30,201907,2019),('2019-07-26',201930,7,2019,26,30,201907,2019),('2019-07-27',201930,7,2019,27,30,201907,2019),('2019-07-28',201931,7,2019,28,31,201907,2019),('2019-07-29',201931,7,2019,29,31,201907,2019),('2019-07-30',201931,7,2019,30,31,201907,2019),('2019-07-31',201931,7,2019,31,31,201907,2019),('2019-08-01',201931,8,2019,1,31,201908,2019),('2019-08-02',201931,8,2019,2,31,201908,2019),('2019-08-03',201931,8,2019,3,31,201908,2019),('2019-08-04',201932,8,2019,4,32,201908,2019),('2019-08-05',201932,8,2019,5,32,201908,2019),('2019-08-06',201932,8,2019,6,32,201908,2019),('2019-08-07',201932,8,2019,7,32,201908,2019),('2019-08-08',201932,8,2019,8,32,201908,2019),('2019-08-09',201932,8,2019,9,32,201908,2019),('2019-08-10',201932,8,2019,10,32,201908,2019),('2019-08-11',201933,8,2019,11,33,201908,2019),('2019-08-12',201933,8,2019,12,33,201908,2019),('2019-08-13',201933,8,2019,13,33,201908,2019),('2019-08-14',201933,8,2019,14,33,201908,2019),('2019-08-15',201933,8,2019,15,33,201908,2019),('2019-08-16',201933,8,2019,16,33,201908,2019),('2019-08-17',201933,8,2019,17,33,201908,2019),('2019-08-18',201934,8,2019,18,34,201908,2019),('2019-08-19',201934,8,2019,19,34,201908,2019),('2019-08-20',201934,8,2019,20,34,201908,2019),('2019-08-21',201934,8,2019,21,34,201908,2019),('2019-08-22',201934,8,2019,22,34,201908,2019),('2019-08-23',201934,8,2019,23,34,201908,2019),('2019-08-24',201934,8,2019,24,34,201908,2019),('2019-08-25',201935,8,2019,25,35,201908,2019),('2019-08-26',201935,8,2019,26,35,201908,2019),('2019-08-27',201935,8,2019,27,35,201908,2019),('2019-08-28',201935,8,2019,28,35,201908,2019),('2019-08-29',201935,8,2019,29,35,201908,2019),('2019-08-30',201935,8,2019,30,35,201908,2019),('2019-08-31',201935,8,2019,31,35,201908,2019),('2019-09-01',201936,9,2019,1,36,201909,2019),('2019-09-02',201936,9,2019,2,36,201909,2019),('2019-09-03',201936,9,2019,3,36,201909,2019),('2019-09-04',201936,9,2019,4,36,201909,2019),('2019-09-05',201936,9,2019,5,36,201909,2019),('2019-09-06',201936,9,2019,6,36,201909,2019),('2019-09-07',201936,9,2019,7,36,201909,2019),('2019-09-08',201937,9,2019,8,37,201909,2019),('2019-09-09',201937,9,2019,9,37,201909,2019),('2019-09-10',201937,9,2019,10,37,201909,2019),('2019-09-11',201937,9,2019,11,37,201909,2019),('2019-09-12',201937,9,2019,12,37,201909,2019),('2019-09-13',201937,9,2019,13,37,201909,2019),('2019-09-14',201937,9,2019,14,37,201909,2019),('2019-09-15',201938,9,2019,15,38,201909,2019),('2019-09-16',201938,9,2019,16,38,201909,2019),('2019-09-17',201938,9,2019,17,38,201909,2019),('2019-09-18',201938,9,2019,18,38,201909,2019),('2019-09-19',201938,9,2019,19,38,201909,2019),('2019-09-20',201938,9,2019,20,38,201909,2019),('2019-09-21',201938,9,2019,21,38,201909,2019),('2019-09-22',201939,9,2019,22,39,201909,2019),('2019-09-23',201939,9,2019,23,39,201909,2019),('2019-09-24',201939,9,2019,24,39,201909,2019),('2019-09-25',201939,9,2019,25,39,201909,2019),('2019-09-26',201939,9,2019,26,39,201909,2019),('2019-09-27',201939,9,2019,27,39,201909,2019),('2019-09-28',201939,9,2019,28,39,201909,2019),('2019-09-29',201940,9,2019,29,40,201909,2019),('2019-09-30',201940,9,2019,30,40,201909,2019),('2019-10-01',201940,10,2019,1,40,201910,2019),('2019-10-02',201940,10,2019,2,40,201910,2019),('2019-10-03',201940,10,2019,3,40,201910,2019),('2019-10-04',201940,10,2019,4,40,201910,2019),('2019-10-05',201940,10,2019,5,40,201910,2019),('2019-10-06',201941,10,2019,6,41,201910,2019),('2019-10-07',201941,10,2019,7,41,201910,2019),('2019-10-08',201941,10,2019,8,41,201910,2019),('2019-10-09',201941,10,2019,9,41,201910,2019),('2019-10-10',201941,10,2019,10,41,201910,2019),('2019-10-11',201941,10,2019,11,41,201910,2019),('2019-10-12',201941,10,2019,12,41,201910,2019),('2019-10-13',201942,10,2019,13,42,201910,2019),('2019-10-14',201942,10,2019,14,42,201910,2019),('2019-10-15',201942,10,2019,15,42,201910,2019),('2019-10-16',201942,10,2019,16,42,201910,2019),('2019-10-17',201942,10,2019,17,42,201910,2019),('2019-10-18',201942,10,2019,18,42,201910,2019),('2019-10-19',201942,10,2019,19,42,201910,2019),('2019-10-20',201943,10,2019,20,43,201910,2019),('2019-10-21',201943,10,2019,21,43,201910,2019),('2019-10-22',201943,10,2019,22,43,201910,2019),('2019-10-23',201943,10,2019,23,43,201910,2019),('2019-10-24',201943,10,2019,24,43,201910,2019),('2019-10-25',201943,10,2019,25,43,201910,2019),('2019-10-26',201943,10,2019,26,43,201910,2019),('2019-10-27',201944,10,2019,27,44,201910,2019),('2019-10-28',201944,10,2019,28,44,201910,2019),('2019-10-29',201944,10,2019,29,44,201910,2019),('2019-10-30',201944,10,2019,30,44,201910,2019),('2019-10-31',201944,10,2019,31,44,201910,2019),('2019-11-01',201944,11,2019,1,44,201911,2019),('2019-11-02',201944,11,2019,2,44,201911,2019),('2019-11-03',201945,11,2019,3,45,201911,2019),('2019-11-04',201945,11,2019,4,45,201911,2019),('2019-11-05',201945,11,2019,5,45,201911,2019),('2019-11-06',201945,11,2019,6,45,201911,2019),('2019-11-07',201945,11,2019,7,45,201911,2019),('2019-11-08',201945,11,2019,8,45,201911,2019),('2019-11-09',201945,11,2019,9,45,201911,2019),('2019-11-10',201946,11,2019,10,46,201911,2019),('2019-11-11',201946,11,2019,11,46,201911,2019),('2019-11-12',201946,11,2019,12,46,201911,2019),('2019-11-13',201946,11,2019,13,46,201911,2019),('2019-11-14',201946,11,2019,14,46,201911,2019),('2019-11-15',201946,11,2019,15,46,201911,2019),('2019-11-16',201946,11,2019,16,46,201911,2019),('2019-11-17',201947,11,2019,17,47,201911,2019),('2019-11-18',201947,11,2019,18,47,201911,2019),('2019-11-19',201947,11,2019,19,47,201911,2019),('2019-11-20',201947,11,2019,20,47,201911,2019),('2019-11-21',201947,11,2019,21,47,201911,2019),('2019-11-22',201947,11,2019,22,47,201911,2019),('2019-11-23',201947,11,2019,23,47,201911,2019),('2019-11-24',201948,11,2019,24,48,201911,2019),('2019-11-25',201948,11,2019,25,48,201911,2019),('2019-11-26',201948,11,2019,26,48,201911,2019),('2019-11-27',201948,11,2019,27,48,201911,2019),('2019-11-28',201948,11,2019,28,48,201911,2019),('2019-11-29',201948,11,2019,29,48,201911,2019),('2019-11-30',201948,11,2019,30,48,201911,2019),('2019-12-01',201949,12,2019,1,49,201912,2020),('2019-12-02',201949,12,2019,2,49,201912,2020),('2019-12-03',201949,12,2019,3,49,201912,2020),('2019-12-04',201949,12,2019,4,49,201912,2020),('2019-12-05',201949,12,2019,5,49,201912,2020),('2019-12-06',201949,12,2019,6,49,201912,2020),('2019-12-07',201949,12,2019,7,49,201912,2020),('2019-12-08',201950,12,2019,8,50,201912,2020),('2019-12-09',201950,12,2019,9,50,201912,2020),('2019-12-10',201950,12,2019,10,50,201912,2020),('2019-12-11',201950,12,2019,11,50,201912,2020),('2019-12-12',201950,12,2019,12,50,201912,2020),('2019-12-13',201950,12,2019,13,50,201912,2020),('2019-12-14',201950,12,2019,14,50,201912,2020),('2019-12-15',201951,12,2019,15,51,201912,2020),('2019-12-16',201951,12,2019,16,51,201912,2020),('2019-12-17',201951,12,2019,17,51,201912,2020),('2019-12-18',201951,12,2019,18,51,201912,2020),('2019-12-19',201951,12,2019,19,51,201912,2020),('2019-12-20',201951,12,2019,20,51,201912,2020),('2019-12-21',201951,12,2019,21,51,201912,2020),('2019-12-22',201952,12,2019,22,52,201912,2020),('2019-12-23',201952,12,2019,23,52,201912,2020),('2019-12-24',201952,12,2019,24,52,201912,2020),('2019-12-25',201952,12,2019,25,52,201912,2020),('2019-12-26',201952,12,2019,26,52,201912,2020),('2019-12-27',201952,12,2019,27,52,201912,2020),('2019-12-28',201952,12,2019,28,52,201912,2020),('2019-12-29',201953,12,2019,29,1,201912,2020),('2019-12-30',201953,12,2019,30,1,201912,2020),('2019-12-31',201953,12,2019,31,1,201912,2020),('2020-01-01',201953,1,2020,1,1,202001,2020),('2020-01-02',201953,1,2020,2,1,202001,2020),('2020-01-03',201953,1,2020,3,1,202001,2020),('2020-01-04',201953,1,2020,4,1,202001,2020),('2020-01-05',202001,1,2020,5,2,202001,2020),('2020-01-06',202001,1,2020,6,2,202001,2020),('2020-01-07',202001,1,2020,7,2,202001,2020),('2020-01-08',202001,1,2020,8,2,202001,2020),('2020-01-09',202001,1,2020,9,2,202001,2020),('2020-01-10',202001,1,2020,10,2,202001,2020),('2020-01-11',202001,1,2020,11,2,202001,2020),('2020-01-12',202002,1,2020,12,3,202001,2020),('2020-01-13',202002,1,2020,13,3,202001,2020),('2020-01-14',202002,1,2020,14,3,202001,2020),('2020-01-15',202002,1,2020,15,3,202001,2020),('2020-01-16',202002,1,2020,16,3,202001,2020),('2020-01-17',202002,1,2020,17,3,202001,2020),('2020-01-18',202002,1,2020,18,3,202001,2020),('2020-01-19',202003,1,2020,19,4,202001,2020),('2020-01-20',202003,1,2020,20,4,202001,2020),('2020-01-21',202003,1,2020,21,4,202001,2020),('2020-01-22',202003,1,2020,22,4,202001,2020),('2020-01-23',202003,1,2020,23,4,202001,2020),('2020-01-24',202003,1,2020,24,4,202001,2020),('2020-01-25',202003,1,2020,25,4,202001,2020),('2020-01-26',202004,1,2020,26,5,202001,2020),('2020-01-27',202004,1,2020,27,5,202001,2020),('2020-01-28',202004,1,2020,28,5,202001,2020),('2020-01-29',202004,1,2020,29,5,202001,2020),('2020-01-30',202004,1,2020,30,5,202001,2020),('2020-01-31',202004,1,2020,31,5,202001,2020),('2020-02-01',202004,2,2020,1,5,202002,2020),('2020-02-02',202005,2,2020,2,6,202002,2020),('2020-02-03',202005,2,2020,3,6,202002,2020),('2020-02-04',202005,2,2020,4,6,202002,2020),('2020-02-05',202005,2,2020,5,6,202002,2020),('2020-02-06',202005,2,2020,6,6,202002,2020),('2020-02-07',202005,2,2020,7,6,202002,2020),('2020-02-08',202005,2,2020,8,6,202002,2020),('2020-02-09',202006,2,2020,9,7,202002,2020),('2020-02-10',202006,2,2020,10,7,202002,2020),('2020-02-11',202006,2,2020,11,7,202002,2020),('2020-02-12',202006,2,2020,12,7,202002,2020),('2020-02-13',202006,2,2020,13,7,202002,2020),('2020-02-14',202006,2,2020,14,7,202002,2020),('2020-02-15',202006,2,2020,15,7,202002,2020),('2020-02-16',202007,2,2020,16,8,202002,2020),('2020-02-17',202007,2,2020,17,8,202002,2020),('2020-02-18',202007,2,2020,18,8,202002,2020),('2020-02-19',202007,2,2020,19,8,202002,2020),('2020-02-20',202007,2,2020,20,8,202002,2020),('2020-02-21',202007,2,2020,21,8,202002,2020),('2020-02-22',202007,2,2020,22,8,202002,2020),('2020-02-23',202008,2,2020,23,9,202002,2020),('2020-02-24',202008,2,2020,24,9,202002,2020),('2020-02-25',202008,2,2020,25,9,202002,2020),('2020-02-26',202008,2,2020,26,9,202002,2020),('2020-02-27',202008,2,2020,27,9,202002,2020),('2020-02-28',202008,2,2020,28,9,202002,2020),('2020-02-29',202008,2,2020,29,9,202002,2020),('2020-03-01',202009,3,2020,1,10,202003,2020),('2020-03-02',202009,3,2020,2,10,202003,2020),('2020-03-03',202009,3,2020,3,10,202003,2020),('2020-03-04',202009,3,2020,4,10,202003,2020),('2020-03-05',202009,3,2020,5,10,202003,2020),('2020-03-06',202009,3,2020,6,10,202003,2020),('2020-03-07',202009,3,2020,7,10,202003,2020),('2020-03-08',202010,3,2020,8,11,202003,2020),('2020-03-09',202010,3,2020,9,11,202003,2020),('2020-03-10',202010,3,2020,10,11,202003,2020),('2020-03-11',202010,3,2020,11,11,202003,2020),('2020-03-12',202010,3,2020,12,11,202003,2020),('2020-03-13',202010,3,2020,13,11,202003,2020),('2020-03-14',202010,3,2020,14,11,202003,2020),('2020-03-15',202011,3,2020,15,12,202003,2020),('2020-03-16',202011,3,2020,16,12,202003,2020),('2020-03-17',202011,3,2020,17,12,202003,2020),('2020-03-18',202011,3,2020,18,12,202003,2020),('2020-03-19',202011,3,2020,19,12,202003,2020),('2020-03-20',202011,3,2020,20,12,202003,2020),('2020-03-21',202011,3,2020,21,12,202003,2020),('2020-03-22',202012,3,2020,22,13,202003,2020),('2020-03-23',202012,3,2020,23,13,202003,2020),('2020-03-24',202012,3,2020,24,13,202003,2020),('2020-03-25',202012,3,2020,25,13,202003,2020),('2020-03-26',202012,3,2020,26,13,202003,2020),('2020-03-27',202012,3,2020,27,13,202003,2020),('2020-03-28',202012,3,2020,28,13,202003,2020),('2020-03-29',202013,3,2020,29,14,202003,2020),('2020-03-30',202013,3,2020,30,14,202003,2020),('2020-03-31',202013,3,2020,31,14,202003,2020),('2020-04-01',202013,4,2020,1,14,202004,2020),('2020-04-02',202013,4,2020,2,14,202004,2020),('2020-04-03',202013,4,2020,3,14,202004,2020),('2020-04-04',202013,4,2020,4,14,202004,2020),('2020-04-05',202014,4,2020,5,15,202004,2020),('2020-04-06',202014,4,2020,6,15,202004,2020),('2020-04-07',202014,4,2020,7,15,202004,2020),('2020-04-08',202014,4,2020,8,15,202004,2020),('2020-04-09',202014,4,2020,9,15,202004,2020),('2020-04-10',202014,4,2020,10,15,202004,2020),('2020-04-11',202014,4,2020,11,15,202004,2020),('2020-04-12',202015,4,2020,12,16,202004,2020),('2020-04-13',202015,4,2020,13,16,202004,2020),('2020-04-14',202015,4,2020,14,16,202004,2020),('2020-04-15',202015,4,2020,15,16,202004,2020),('2020-04-16',202015,4,2020,16,16,202004,2020),('2020-04-17',202015,4,2020,17,16,202004,2020),('2020-04-18',202015,4,2020,18,16,202004,2020),('2020-04-19',202016,4,2020,19,17,202004,2020),('2020-04-20',202016,4,2020,20,17,202004,2020),('2020-04-21',202016,4,2020,21,17,202004,2020),('2020-04-22',202016,4,2020,22,17,202004,2020),('2020-04-23',202016,4,2020,23,17,202004,2020),('2020-04-24',202016,4,2020,24,17,202004,2020),('2020-04-25',202016,4,2020,25,17,202004,2020),('2020-04-26',202017,4,2020,26,18,202004,2020),('2020-04-27',202017,4,2020,27,18,202004,2020),('2020-04-28',202017,4,2020,28,18,202004,2020),('2020-04-29',202017,4,2020,29,18,202004,2020),('2020-04-30',202017,4,2020,30,18,202004,2020),('2020-05-01',202017,5,2020,1,18,202005,2020),('2020-05-02',202017,5,2020,2,18,202005,2020),('2020-05-03',202018,5,2020,3,19,202005,2020),('2020-05-04',202018,5,2020,4,19,202005,2020),('2020-05-05',202018,5,2020,5,19,202005,2020),('2020-05-06',202018,5,2020,6,19,202005,2020),('2020-05-07',202018,5,2020,7,19,202005,2020),('2020-05-08',202018,5,2020,8,19,202005,2020),('2020-05-09',202018,5,2020,9,19,202005,2020),('2020-05-10',202019,5,2020,10,20,202005,2020),('2020-05-11',202019,5,2020,11,20,202005,2020),('2020-05-12',202019,5,2020,12,20,202005,2020),('2020-05-13',202019,5,2020,13,20,202005,2020),('2020-05-14',202019,5,2020,14,20,202005,2020),('2020-05-15',202019,5,2020,15,20,202005,2020),('2020-05-16',202019,5,2020,16,20,202005,2020),('2020-05-17',202020,5,2020,17,21,202005,2020),('2020-05-18',202020,5,2020,18,21,202005,2020),('2020-05-19',202020,5,2020,19,21,202005,2020),('2020-05-20',202020,5,2020,20,21,202005,2020),('2020-05-21',202020,5,2020,21,21,202005,2020),('2020-05-22',202020,5,2020,22,21,202005,2020),('2020-05-23',202020,5,2020,23,21,202005,2020),('2020-05-24',202021,5,2020,24,22,202005,2020),('2020-05-25',202021,5,2020,25,22,202005,2020),('2020-05-26',202021,5,2020,26,22,202005,2020),('2020-05-27',202021,5,2020,27,22,202005,2020),('2020-05-28',202021,5,2020,28,22,202005,2020),('2020-05-29',202021,5,2020,29,22,202005,2020),('2020-05-30',202021,5,2020,30,22,202005,2020),('2020-05-31',202022,5,2020,31,23,202005,2020),('2020-06-01',202022,6,2020,1,23,202006,2020),('2020-06-02',202022,6,2020,2,23,202006,2020),('2020-06-03',202022,6,2020,3,23,202006,2020),('2020-06-04',202022,6,2020,4,23,202006,2020),('2020-06-05',202022,6,2020,5,23,202006,2020),('2020-06-06',202022,6,2020,6,23,202006,2020),('2020-06-07',202023,6,2020,7,24,202006,2020),('2020-06-08',202023,6,2020,8,24,202006,2020),('2020-06-09',202023,6,2020,9,24,202006,2020),('2020-06-10',202023,6,2020,10,24,202006,2020),('2020-06-11',202023,6,2020,11,24,202006,2020),('2020-06-12',202023,6,2020,12,24,202006,2020),('2020-06-13',202023,6,2020,13,24,202006,2020),('2020-06-14',202024,6,2020,14,25,202006,2020),('2020-06-15',202024,6,2020,15,25,202006,2020),('2020-06-16',202024,6,2020,16,25,202006,2020),('2020-06-17',202024,6,2020,17,25,202006,2020),('2020-06-18',202024,6,2020,18,25,202006,2020),('2020-06-19',202024,6,2020,19,25,202006,2020),('2020-06-20',202024,6,2020,20,25,202006,2020),('2020-06-21',202025,6,2020,21,26,202006,2020),('2020-06-22',202025,6,2020,22,26,202006,2020),('2020-06-23',202025,6,2020,23,26,202006,2020),('2020-06-24',202025,6,2020,24,26,202006,2020),('2020-06-25',202025,6,2020,25,26,202006,2020),('2020-06-26',202025,6,2020,26,26,202006,2020),('2020-06-27',202025,6,2020,27,26,202006,2020),('2020-06-28',202026,6,2020,28,27,202006,2020),('2020-06-29',202026,6,2020,29,27,202006,2020),('2020-06-30',202026,6,2020,30,27,202006,2020),('2020-07-01',202026,7,2020,1,27,202007,2020),('2020-07-02',202026,7,2020,2,27,202007,2020),('2020-07-03',202026,7,2020,3,27,202007,2020),('2020-07-04',202026,7,2020,4,27,202007,2020),('2020-07-05',202027,7,2020,5,28,202007,2020),('2020-07-06',202027,7,2020,6,28,202007,2020),('2020-07-07',202027,7,2020,7,28,202007,2020),('2020-07-08',202027,7,2020,8,28,202007,2020),('2020-07-09',202027,7,2020,9,28,202007,2020),('2020-07-10',202027,7,2020,10,28,202007,2020),('2020-07-11',202027,7,2020,11,28,202007,2020),('2020-07-12',202028,7,2020,12,29,202007,2020),('2020-07-13',202028,7,2020,13,29,202007,2020),('2020-07-14',202028,7,2020,14,29,202007,2020),('2020-07-15',202028,7,2020,15,29,202007,2020),('2020-07-16',202028,7,2020,16,29,202007,2020),('2020-07-17',202028,7,2020,17,29,202007,2020),('2020-07-18',202028,7,2020,18,29,202007,2020),('2020-07-19',202029,7,2020,19,30,202007,2020),('2020-07-20',202029,7,2020,20,30,202007,2020),('2020-07-21',202029,7,2020,21,30,202007,2020),('2020-07-22',202029,7,2020,22,30,202007,2020),('2020-07-23',202029,7,2020,23,30,202007,2020),('2020-07-24',202029,7,2020,24,30,202007,2020),('2020-07-25',202029,7,2020,25,30,202007,2020),('2020-07-26',202030,7,2020,26,31,202007,2020),('2020-07-27',202030,7,2020,27,31,202007,2020),('2020-07-28',202030,7,2020,28,31,202007,2020),('2020-07-29',202030,7,2020,29,31,202007,2020),('2020-07-30',202030,7,2020,30,31,202007,2020),('2020-07-31',202030,7,2020,31,31,202007,2020),('2020-08-01',202030,8,2020,1,31,202008,2020),('2020-08-02',202031,8,2020,2,32,202008,2020),('2020-08-03',202031,8,2020,3,32,202008,2020),('2020-08-04',202031,8,2020,4,32,202008,2020),('2020-08-05',202031,8,2020,5,32,202008,2020),('2020-08-06',202031,8,2020,6,32,202008,2020),('2020-08-07',202031,8,2020,7,32,202008,2020),('2020-08-08',202031,8,2020,8,32,202008,2020),('2020-08-09',202032,8,2020,9,33,202008,2020),('2020-08-10',202032,8,2020,10,33,202008,2020),('2020-08-11',202032,8,2020,11,33,202008,2020),('2020-08-12',202032,8,2020,12,33,202008,2020),('2020-08-13',202032,8,2020,13,33,202008,2020),('2020-08-14',202032,8,2020,14,33,202008,2020),('2020-08-15',202032,8,2020,15,33,202008,2020),('2020-08-16',202033,8,2020,16,34,202008,2020),('2020-08-17',202033,8,2020,17,34,202008,2020),('2020-08-18',202033,8,2020,18,34,202008,2020),('2020-08-19',202033,8,2020,19,34,202008,2020),('2020-08-20',202033,8,2020,20,34,202008,2020),('2020-08-21',202033,8,2020,21,34,202008,2020),('2020-08-22',202033,8,2020,22,34,202008,2020),('2020-08-23',202034,8,2020,23,35,202008,2020),('2020-08-24',202034,8,2020,24,35,202008,2020),('2020-08-25',202034,8,2020,25,35,202008,2020),('2020-08-26',202034,8,2020,26,35,202008,2020),('2020-08-27',202034,8,2020,27,35,202008,2020),('2020-08-28',202034,8,2020,28,35,202008,2020),('2020-08-29',202034,8,2020,29,35,202008,2020),('2020-08-30',202035,8,2020,30,36,202008,2020),('2020-08-31',202035,8,2020,31,36,202008,2020),('2020-09-01',202035,9,2020,1,36,202009,2020),('2020-09-02',202035,9,2020,2,36,202009,2020),('2020-09-03',202035,9,2020,3,36,202009,2020),('2020-09-04',202035,9,2020,4,36,202009,2020),('2020-09-05',202035,9,2020,5,36,202009,2020),('2020-09-06',202036,9,2020,6,37,202009,2020),('2020-09-07',202036,9,2020,7,37,202009,2020),('2020-09-08',202036,9,2020,8,37,202009,2020),('2020-09-09',202036,9,2020,9,37,202009,2020),('2020-09-10',202036,9,2020,10,37,202009,2020),('2020-09-11',202036,9,2020,11,37,202009,2020),('2020-09-12',202036,9,2020,12,37,202009,2020),('2020-09-13',202037,9,2020,13,38,202009,2020),('2020-09-14',202037,9,2020,14,38,202009,2020),('2020-09-15',202037,9,2020,15,38,202009,2020),('2020-09-16',202037,9,2020,16,38,202009,2020),('2020-09-17',202037,9,2020,17,38,202009,2020),('2020-09-18',202037,9,2020,18,38,202009,2020),('2020-09-19',202037,9,2020,19,38,202009,2020),('2020-09-20',202038,9,2020,20,39,202009,2020),('2020-09-21',202038,9,2020,21,39,202009,2020),('2020-09-22',202038,9,2020,22,39,202009,2020),('2020-09-23',202038,9,2020,23,39,202009,2020),('2020-09-24',202038,9,2020,24,39,202009,2020),('2020-09-25',202038,9,2020,25,39,202009,2020),('2020-09-26',202038,9,2020,26,39,202009,2020),('2020-09-27',202039,9,2020,27,40,202009,2020),('2020-09-28',202039,9,2020,28,40,202009,2020),('2020-09-29',202039,9,2020,29,40,202009,2020),('2020-09-30',202039,9,2020,30,40,202009,2020),('2020-10-01',202039,10,2020,1,40,202010,2020),('2020-10-02',202039,10,2020,2,40,202010,2020),('2020-10-03',202039,10,2020,3,40,202010,2020),('2020-10-04',202040,10,2020,4,41,202010,2020),('2020-10-05',202040,10,2020,5,41,202010,2020),('2020-10-06',202040,10,2020,6,41,202010,2020),('2020-10-07',202040,10,2020,7,41,202010,2020),('2020-10-08',202040,10,2020,8,41,202010,2020),('2020-10-09',202040,10,2020,9,41,202010,2020),('2020-10-10',202040,10,2020,10,41,202010,2020),('2020-10-11',202041,10,2020,11,42,202010,2020),('2020-10-12',202041,10,2020,12,42,202010,2020),('2020-10-13',202041,10,2020,13,42,202010,2020),('2020-10-14',202041,10,2020,14,42,202010,2020),('2020-10-15',202041,10,2020,15,42,202010,2020),('2020-10-16',202041,10,2020,16,42,202010,2020),('2020-10-17',202041,10,2020,17,42,202010,2020),('2020-10-18',202042,10,2020,18,43,202010,2020),('2020-10-19',202042,10,2020,19,43,202010,2020),('2020-10-20',202042,10,2020,20,43,202010,2020),('2020-10-21',202042,10,2020,21,43,202010,2020),('2020-10-22',202042,10,2020,22,43,202010,2020),('2020-10-23',202042,10,2020,23,43,202010,2020),('2020-10-24',202042,10,2020,24,43,202010,2020),('2020-10-25',202043,10,2020,25,44,202010,2020),('2020-10-26',202043,10,2020,26,44,202010,2020),('2020-10-27',202043,10,2020,27,44,202010,2020),('2020-10-28',202043,10,2020,28,44,202010,2020),('2020-10-29',202043,10,2020,29,44,202010,2020),('2020-10-30',202043,10,2020,30,44,202010,2020),('2020-10-31',202043,10,2020,31,44,202010,2020),('2020-11-01',202044,11,2020,1,45,202011,2020),('2020-11-02',202044,11,2020,2,45,202011,2020),('2020-11-03',202044,11,2020,3,45,202011,2020),('2020-11-04',202044,11,2020,4,45,202011,2020),('2020-11-05',202044,11,2020,5,45,202011,2020),('2020-11-06',202044,11,2020,6,45,202011,2020),('2020-11-07',202044,11,2020,7,45,202011,2020),('2020-11-08',202045,11,2020,8,46,202011,2020),('2020-11-09',202045,11,2020,9,46,202011,2020),('2020-11-10',202045,11,2020,10,46,202011,2020),('2020-11-11',202045,11,2020,11,46,202011,2020),('2020-11-12',202045,11,2020,12,46,202011,2020),('2020-11-13',202045,11,2020,13,46,202011,2020),('2020-11-14',202045,11,2020,14,46,202011,2020),('2020-11-15',202046,11,2020,15,47,202011,2020),('2020-11-16',202046,11,2020,16,47,202011,2020),('2020-11-17',202046,11,2020,17,47,202011,2020),('2020-11-18',202046,11,2020,18,47,202011,2020),('2020-11-19',202046,11,2020,19,47,202011,2020),('2020-11-20',202046,11,2020,20,47,202011,2020),('2020-11-21',202046,11,2020,21,47,202011,2020),('2020-11-22',202047,11,2020,22,48,202011,2020),('2020-11-23',202047,11,2020,23,48,202011,2020),('2020-11-24',202047,11,2020,24,48,202011,2020),('2020-11-25',202047,11,2020,25,48,202011,2020),('2020-11-26',202047,11,2020,26,48,202011,2020),('2020-11-27',202047,11,2020,27,48,202011,2020),('2020-11-28',202047,11,2020,28,48,202011,2020),('2020-11-29',202048,11,2020,29,49,202011,2020),('2020-11-30',202048,11,2020,30,49,202011,2020),('2020-12-01',202048,12,2020,1,49,202012,2021),('2020-12-02',202048,12,2020,2,49,202012,2021),('2020-12-03',202048,12,2020,3,49,202012,2021),('2020-12-04',202048,12,2020,4,49,202012,2021),('2020-12-05',202048,12,2020,5,49,202012,2021),('2020-12-06',202049,12,2020,6,50,202012,2021),('2020-12-07',202049,12,2020,7,50,202012,2021),('2020-12-08',202049,12,2020,8,50,202012,2021),('2020-12-09',202049,12,2020,9,50,202012,2021),('2020-12-10',202049,12,2020,10,50,202012,2021),('2020-12-11',202049,12,2020,11,50,202012,2021),('2020-12-12',202049,12,2020,12,50,202012,2021),('2020-12-13',202050,12,2020,13,51,202012,2021),('2020-12-14',202050,12,2020,14,51,202012,2021),('2020-12-15',202050,12,2020,15,51,202012,2021),('2020-12-16',202050,12,2020,16,51,202012,2021),('2020-12-17',202050,12,2020,17,51,202012,2021),('2020-12-18',202050,12,2020,18,51,202012,2021),('2020-12-19',202050,12,2020,19,51,202012,2021),('2020-12-20',202051,12,2020,20,52,202012,2021),('2020-12-21',202051,12,2020,21,52,202012,2021),('2020-12-22',202051,12,2020,22,52,202012,2021),('2020-12-23',202051,12,2020,23,52,202012,2021),('2020-12-24',202051,12,2020,24,52,202012,2021),('2020-12-25',202051,12,2020,25,52,202012,2021),('2020-12-26',202051,12,2020,26,52,202012,2021),('2020-12-27',202052,12,2020,27,53,202012,2021),('2020-12-28',202052,12,2020,28,53,202012,2021),('2020-12-29',202052,12,2020,29,53,202012,2021),('2020-12-30',202052,12,2020,30,53,202012,2021),('2020-12-31',202052,12,2020,31,53,202012,2021),('2021-01-01',202101,1,2021,1,1,202101,2021),('2021-01-02',202101,1,2021,2,1,202101,2021),('2021-01-03',202101,1,2021,3,1,202101,2021),('2021-01-04',202101,1,2021,4,1,202101,2021),('2021-01-05',202101,1,2021,5,1,202101,2021),('2021-01-06',202101,1,2021,6,1,202101,2021),('2021-01-07',202101,1,2021,7,1,202101,2021),('2021-01-08',202101,1,2021,8,1,202101,2021),('2021-01-09',202101,1,2021,9,1,202101,2021),('2021-01-10',202102,1,2021,10,2,202101,2021),('2021-01-11',202102,1,2021,11,2,202101,2021),('2021-01-12',202102,1,2021,12,2,202101,2021),('2021-01-13',202102,1,2021,13,2,202101,2021),('2021-01-14',202102,1,2021,14,2,202101,2021),('2021-01-15',202102,1,2021,15,2,202101,2021),('2021-01-16',202102,1,2021,16,2,202101,2021),('2021-01-17',202103,1,2021,17,3,202101,2021),('2021-01-18',202103,1,2021,18,3,202101,2021),('2021-01-19',202103,1,2021,19,3,202101,2021),('2021-01-20',202103,1,2021,20,3,202101,2021),('2021-01-21',202103,1,2021,21,3,202101,2021),('2021-01-22',202103,1,2021,22,3,202101,2021),('2021-01-23',202103,1,2021,23,3,202101,2021),('2021-01-24',202104,1,2021,24,4,202101,2021),('2021-01-25',202104,1,2021,25,4,202101,2021),('2021-01-26',202104,1,2021,26,4,202101,2021),('2021-01-27',202104,1,2021,27,4,202101,2021),('2021-01-28',202104,1,2021,28,4,202101,2021),('2021-01-29',202104,1,2021,29,4,202101,2021),('2021-01-30',202104,1,2021,30,4,202101,2021),('2021-01-31',202105,1,2021,31,5,202101,2021),('2021-02-01',202105,2,2021,1,5,202102,2021),('2021-02-02',202105,2,2021,2,5,202102,2021),('2021-02-03',202105,2,2021,3,5,202102,2021),('2021-02-04',202105,2,2021,4,5,202102,2021),('2021-02-05',202105,2,2021,5,5,202102,2021),('2021-02-06',202105,2,2021,6,5,202102,2021),('2021-02-07',202106,2,2021,7,6,202102,2021),('2021-02-08',202106,2,2021,8,6,202102,2021),('2021-02-09',202106,2,2021,9,6,202102,2021),('2021-02-10',202106,2,2021,10,6,202102,2021),('2021-02-11',202106,2,2021,11,6,202102,2021),('2021-02-12',202106,2,2021,12,6,202102,2021),('2021-02-13',202106,2,2021,13,6,202102,2021),('2021-02-14',202107,2,2021,14,7,202102,2021),('2021-02-15',202107,2,2021,15,7,202102,2021),('2021-02-16',202107,2,2021,16,7,202102,2021),('2021-02-17',202107,2,2021,17,7,202102,2021),('2021-02-18',202107,2,2021,18,7,202102,2021),('2021-02-19',202107,2,2021,19,7,202102,2021),('2021-02-20',202107,2,2021,20,7,202102,2021),('2021-02-21',202108,2,2021,21,8,202102,2021),('2021-02-22',202108,2,2021,22,8,202102,2021),('2021-02-23',202108,2,2021,23,8,202102,2021),('2021-02-24',202108,2,2021,24,8,202102,2021),('2021-02-25',202108,2,2021,25,8,202102,2021),('2021-02-26',202108,2,2021,26,8,202102,2021),('2021-02-27',202108,2,2021,27,8,202102,2021),('2021-02-28',202109,2,2021,28,9,202102,2021),('2021-03-01',202109,3,2021,1,9,202103,2021),('2021-03-02',202109,3,2021,2,9,202103,2021),('2021-03-03',202109,3,2021,3,9,202103,2021),('2021-03-04',202109,3,2021,4,9,202103,2021),('2021-03-05',202109,3,2021,5,9,202103,2021),('2021-03-06',202109,3,2021,6,9,202103,2021),('2021-03-07',202110,3,2021,7,10,202103,2021),('2021-03-08',202110,3,2021,8,10,202103,2021),('2021-03-09',202110,3,2021,9,10,202103,2021),('2021-03-10',202110,3,2021,10,10,202103,2021),('2021-03-11',202110,3,2021,11,10,202103,2021),('2021-03-12',202110,3,2021,12,10,202103,2021),('2021-03-13',202110,3,2021,13,10,202103,2021),('2021-03-14',202111,3,2021,14,11,202103,2021),('2021-03-15',202111,3,2021,15,11,202103,2021),('2021-03-16',202111,3,2021,16,11,202103,2021),('2021-03-17',202111,3,2021,17,11,202103,2021),('2021-03-18',202111,3,2021,18,11,202103,2021),('2021-03-19',202111,3,2021,19,11,202103,2021),('2021-03-20',202111,3,2021,20,11,202103,2021),('2021-03-21',202112,3,2021,21,12,202103,2021),('2021-03-22',202112,3,2021,22,12,202103,2021),('2021-03-23',202112,3,2021,23,12,202103,2021),('2021-03-24',202112,3,2021,24,12,202103,2021),('2021-03-25',202112,3,2021,25,12,202103,2021),('2021-03-26',202112,3,2021,26,12,202103,2021),('2021-03-27',202112,3,2021,27,12,202103,2021),('2021-03-28',202113,3,2021,28,13,202103,2021),('2021-03-29',202113,3,2021,29,13,202103,2021),('2021-03-30',202113,3,2021,30,13,202103,2021),('2021-03-31',202113,3,2021,31,13,202103,2021),('2021-04-01',202113,4,2021,1,13,202104,2021),('2021-04-02',202113,4,2021,2,13,202104,2021),('2021-04-03',202113,4,2021,3,13,202104,2021),('2021-04-04',202114,4,2021,4,14,202104,2021),('2021-04-05',202114,4,2021,5,14,202104,2021),('2021-04-06',202114,4,2021,6,14,202104,2021),('2021-04-07',202114,4,2021,7,14,202104,2021),('2021-04-08',202114,4,2021,8,14,202104,2021),('2021-04-09',202114,4,2021,9,14,202104,2021),('2021-04-10',202114,4,2021,10,14,202104,2021),('2021-04-11',202115,4,2021,11,15,202104,2021),('2021-04-12',202115,4,2021,12,15,202104,2021),('2021-04-13',202115,4,2021,13,15,202104,2021),('2021-04-14',202115,4,2021,14,15,202104,2021),('2021-04-15',202115,4,2021,15,15,202104,2021),('2021-04-16',202115,4,2021,16,15,202104,2021),('2021-04-17',202115,4,2021,17,15,202104,2021),('2021-04-18',202116,4,2021,18,16,202104,2021),('2021-04-19',202116,4,2021,19,16,202104,2021),('2021-04-20',202116,4,2021,20,16,202104,2021),('2021-04-21',202116,4,2021,21,16,202104,2021),('2021-04-22',202116,4,2021,22,16,202104,2021),('2021-04-23',202116,4,2021,23,16,202104,2021),('2021-04-24',202116,4,2021,24,16,202104,2021),('2021-04-25',202117,4,2021,25,17,202104,2021),('2021-04-26',202117,4,2021,26,17,202104,2021),('2021-04-27',202117,4,2021,27,17,202104,2021),('2021-04-28',202117,4,2021,28,17,202104,2021),('2021-04-29',202117,4,2021,29,17,202104,2021),('2021-04-30',202117,4,2021,30,17,202104,2021),('2021-05-01',202117,5,2021,1,17,202105,2021),('2021-05-02',202118,5,2021,2,18,202105,2021),('2021-05-03',202118,5,2021,3,18,202105,2021),('2021-05-04',202118,5,2021,4,18,202105,2021),('2021-05-05',202118,5,2021,5,18,202105,2021),('2021-05-06',202118,5,2021,6,18,202105,2021),('2021-05-07',202118,5,2021,7,18,202105,2021),('2021-05-08',202118,5,2021,8,18,202105,2021),('2021-05-09',202119,5,2021,9,19,202105,2021),('2021-05-10',202119,5,2021,10,19,202105,2021),('2021-05-11',202119,5,2021,11,19,202105,2021),('2021-05-12',202119,5,2021,12,19,202105,2021),('2021-05-13',202119,5,2021,13,19,202105,2021),('2021-05-14',202119,5,2021,14,19,202105,2021),('2021-05-15',202119,5,2021,15,19,202105,2021),('2021-05-16',202120,5,2021,16,20,202105,2021),('2021-05-17',202120,5,2021,17,20,202105,2021),('2021-05-18',202120,5,2021,18,20,202105,2021),('2021-05-19',202120,5,2021,19,20,202105,2021),('2021-05-20',202120,5,2021,20,20,202105,2021),('2021-05-21',202120,5,2021,21,20,202105,2021),('2021-05-22',202120,5,2021,22,20,202105,2021),('2021-05-23',202121,5,2021,23,21,202105,2021),('2021-05-24',202121,5,2021,24,21,202105,2021),('2021-05-25',202121,5,2021,25,21,202105,2021),('2021-05-26',202121,5,2021,26,21,202105,2021),('2021-05-27',202121,5,2021,27,21,202105,2021),('2021-05-28',202121,5,2021,28,21,202105,2021),('2021-05-29',202121,5,2021,29,21,202105,2021),('2021-05-30',202122,5,2021,30,22,202105,2021),('2021-05-31',202122,5,2021,31,22,202105,2021),('2021-06-01',202122,6,2021,1,22,202106,2021),('2021-06-02',202122,6,2021,2,22,202106,2021),('2021-06-03',202122,6,2021,3,22,202106,2021),('2021-06-04',202122,6,2021,4,22,202106,2021),('2021-06-05',202122,6,2021,5,22,202106,2021),('2021-06-06',202123,6,2021,6,23,202106,2021),('2021-06-07',202123,6,2021,7,23,202106,2021),('2021-06-08',202123,6,2021,8,23,202106,2021),('2021-06-09',202123,6,2021,9,23,202106,2021),('2021-06-10',202123,6,2021,10,23,202106,2021),('2021-06-11',202123,6,2021,11,23,202106,2021),('2021-06-12',202123,6,2021,12,23,202106,2021),('2021-06-13',202124,6,2021,13,24,202106,2021),('2021-06-14',202124,6,2021,14,24,202106,2021),('2021-06-15',202124,6,2021,15,24,202106,2021),('2021-06-16',202124,6,2021,16,24,202106,2021),('2021-06-17',202124,6,2021,17,24,202106,2021),('2021-06-18',202124,6,2021,18,24,202106,2021),('2021-06-19',202124,6,2021,19,24,202106,2021),('2021-06-20',202125,6,2021,20,25,202106,2021),('2021-06-21',202125,6,2021,21,25,202106,2021),('2021-06-22',202125,6,2021,22,25,202106,2021),('2021-06-23',202125,6,2021,23,25,202106,2021),('2021-06-24',202125,6,2021,24,25,202106,2021),('2021-06-25',202125,6,2021,25,25,202106,2021),('2021-06-26',202125,6,2021,26,25,202106,2021),('2021-06-27',202126,6,2021,27,26,202106,2021),('2021-06-28',202126,6,2021,28,26,202106,2021),('2021-06-29',202126,6,2021,29,26,202106,2021),('2021-06-30',202126,6,2021,30,26,202106,2021),('2021-07-01',202126,7,2021,1,26,202107,2021),('2021-07-02',202126,7,2021,2,26,202107,2021),('2021-07-03',202126,7,2021,3,26,202107,2021),('2021-07-04',202127,7,2021,4,27,202107,2021),('2021-07-05',202127,7,2021,5,27,202107,2021),('2021-07-06',202127,7,2021,6,27,202107,2021),('2021-07-07',202127,7,2021,7,27,202107,2021),('2021-07-08',202127,7,2021,8,27,202107,2021),('2021-07-09',202127,7,2021,9,27,202107,2021),('2021-07-10',202127,7,2021,10,27,202107,2021),('2021-07-11',202128,7,2021,11,28,202107,2021),('2021-07-12',202128,7,2021,12,28,202107,2021),('2021-07-13',202128,7,2021,13,28,202107,2021),('2021-07-14',202128,7,2021,14,28,202107,2021),('2021-07-15',202128,7,2021,15,28,202107,2021),('2021-07-16',202128,7,2021,16,28,202107,2021),('2021-07-17',202128,7,2021,17,28,202107,2021),('2021-07-18',202129,7,2021,18,29,202107,2021),('2021-07-19',202129,7,2021,19,29,202107,2021),('2021-07-20',202129,7,2021,20,29,202107,2021),('2021-07-21',202129,7,2021,21,29,202107,2021),('2021-07-22',202129,7,2021,22,29,202107,2021),('2021-07-23',202129,7,2021,23,29,202107,2021),('2021-07-24',202129,7,2021,24,29,202107,2021),('2021-07-25',202130,7,2021,25,30,202107,2021),('2021-07-26',202130,7,2021,26,30,202107,2021),('2021-07-27',202130,7,2021,27,30,202107,2021),('2021-07-28',202130,7,2021,28,30,202107,2021),('2021-07-29',202130,7,2021,29,30,202107,2021),('2021-07-30',202130,7,2021,30,30,202107,2021),('2021-07-31',202130,7,2021,31,30,202107,2021),('2021-08-01',202131,8,2021,1,31,202108,2021),('2021-08-02',202131,8,2021,2,31,202108,2021),('2021-08-03',202131,8,2021,3,31,202108,2021),('2021-08-04',202131,8,2021,4,31,202108,2021),('2021-08-05',202131,8,2021,5,31,202108,2021),('2021-08-06',202131,8,2021,6,31,202108,2021),('2021-08-07',202131,8,2021,7,31,202108,2021),('2021-08-08',202132,8,2021,8,32,202108,2021),('2021-08-09',202132,8,2021,9,32,202108,2021),('2021-08-10',202132,8,2021,10,32,202108,2021),('2021-08-11',202132,8,2021,11,32,202108,2021),('2021-08-12',202132,8,2021,12,32,202108,2021),('2021-08-13',202132,8,2021,13,32,202108,2021),('2021-08-14',202132,8,2021,14,32,202108,2021),('2021-08-15',202133,8,2021,15,33,202108,2021),('2021-08-16',202133,8,2021,16,33,202108,2021),('2021-08-17',202133,8,2021,17,33,202108,2021),('2021-08-18',202133,8,2021,18,33,202108,2021),('2021-08-19',202133,8,2021,19,33,202108,2021),('2021-08-20',202133,8,2021,20,33,202108,2021),('2021-08-21',202133,8,2021,21,33,202108,2021),('2021-08-22',202134,8,2021,22,34,202108,2021),('2021-08-23',202134,8,2021,23,34,202108,2021),('2021-08-24',202134,8,2021,24,34,202108,2021),('2021-08-25',202134,8,2021,25,34,202108,2021),('2021-08-26',202134,8,2021,26,34,202108,2021),('2021-08-27',202134,8,2021,27,34,202108,2021),('2021-08-28',202134,8,2021,28,34,202108,2021),('2021-08-29',202135,8,2021,29,35,202108,2021),('2021-08-30',202135,8,2021,30,35,202108,2021),('2021-08-31',202135,8,2021,31,35,202108,2021),('2021-09-01',202135,9,2021,1,35,202109,2021),('2021-09-02',202135,9,2021,2,35,202109,2021),('2021-09-03',202135,9,2021,3,35,202109,2021),('2021-09-04',202135,9,2021,4,35,202109,2021),('2021-09-05',202136,9,2021,5,36,202109,2021),('2021-09-06',202136,9,2021,6,36,202109,2021),('2021-09-07',202136,9,2021,7,36,202109,2021),('2021-09-08',202136,9,2021,8,36,202109,2021),('2021-09-09',202136,9,2021,9,36,202109,2021),('2021-09-10',202136,9,2021,10,36,202109,2021),('2021-09-11',202136,9,2021,11,36,202109,2021),('2021-09-12',202137,9,2021,12,37,202109,2021),('2021-09-13',202137,9,2021,13,37,202109,2021),('2021-09-14',202137,9,2021,14,37,202109,2021),('2021-09-15',202137,9,2021,15,37,202109,2021),('2021-09-16',202137,9,2021,16,37,202109,2021),('2021-09-17',202137,9,2021,17,37,202109,2021),('2021-09-18',202137,9,2021,18,37,202109,2021),('2021-09-19',202138,9,2021,19,38,202109,2021),('2021-09-20',202138,9,2021,20,38,202109,2021),('2021-09-21',202138,9,2021,21,38,202109,2021),('2021-09-22',202138,9,2021,22,38,202109,2021),('2021-09-23',202138,9,2021,23,38,202109,2021),('2021-09-24',202138,9,2021,24,38,202109,2021),('2021-09-25',202138,9,2021,25,38,202109,2021),('2021-09-26',202139,9,2021,26,39,202109,2021),('2021-09-27',202139,9,2021,27,39,202109,2021),('2021-09-28',202139,9,2021,28,39,202109,2021),('2021-09-29',202139,9,2021,29,39,202109,2021),('2021-09-30',202139,9,2021,30,39,202109,2021),('2021-10-01',202139,10,2021,1,39,202110,2021),('2021-10-02',202139,10,2021,2,39,202110,2021),('2021-10-03',202140,10,2021,3,40,202110,2021),('2021-10-04',202140,10,2021,4,40,202110,2021),('2021-10-05',202140,10,2021,5,40,202110,2021),('2021-10-06',202140,10,2021,6,40,202110,2021),('2021-10-07',202140,10,2021,7,40,202110,2021),('2021-10-08',202140,10,2021,8,40,202110,2021),('2021-10-09',202140,10,2021,9,40,202110,2021),('2021-10-10',202141,10,2021,10,41,202110,2021),('2021-10-11',202141,10,2021,11,41,202110,2021),('2021-10-12',202141,10,2021,12,41,202110,2021),('2021-10-13',202141,10,2021,13,41,202110,2021),('2021-10-14',202141,10,2021,14,41,202110,2021),('2021-10-15',202141,10,2021,15,41,202110,2021),('2021-10-16',202141,10,2021,16,41,202110,2021),('2021-10-17',202142,10,2021,17,42,202110,2021),('2021-10-18',202142,10,2021,18,42,202110,2021),('2021-10-19',202142,10,2021,19,42,202110,2021),('2021-10-20',202142,10,2021,20,42,202110,2021),('2021-10-21',202142,10,2021,21,42,202110,2021),('2021-10-22',202142,10,2021,22,42,202110,2021),('2021-10-23',202142,10,2021,23,42,202110,2021),('2021-10-24',202143,10,2021,24,43,202110,2021),('2021-10-25',202143,10,2021,25,43,202110,2021),('2021-10-26',202143,10,2021,26,43,202110,2021),('2021-10-27',202143,10,2021,27,43,202110,2021),('2021-10-28',202143,10,2021,28,43,202110,2021),('2021-10-29',202143,10,2021,29,43,202110,2021),('2021-10-30',202143,10,2021,30,43,202110,2021),('2021-10-31',202144,10,2021,31,44,202110,2021),('2021-11-01',202144,11,2021,1,44,202111,2021),('2021-11-02',202144,11,2021,2,44,202111,2021),('2021-11-03',202144,11,2021,3,44,202111,2021),('2021-11-04',202144,11,2021,4,44,202111,2021),('2021-11-05',202144,11,2021,5,44,202111,2021),('2021-11-06',202144,11,2021,6,44,202111,2021),('2021-11-07',202145,11,2021,7,45,202111,2021),('2021-11-08',202145,11,2021,8,45,202111,2021),('2021-11-09',202145,11,2021,9,45,202111,2021),('2021-11-10',202145,11,2021,10,45,202111,2021),('2021-11-11',202145,11,2021,11,45,202111,2021),('2021-11-12',202145,11,2021,12,45,202111,2021),('2021-11-13',202145,11,2021,13,45,202111,2021),('2021-11-14',202146,11,2021,14,46,202111,2021),('2021-11-15',202146,11,2021,15,46,202111,2021),('2021-11-16',202146,11,2021,16,46,202111,2021),('2021-11-17',202146,11,2021,17,46,202111,2021),('2021-11-18',202146,11,2021,18,46,202111,2021),('2021-11-19',202146,11,2021,19,46,202111,2021),('2021-11-20',202146,11,2021,20,46,202111,2021),('2021-11-21',202147,11,2021,21,47,202111,2021),('2021-11-22',202147,11,2021,22,47,202111,2021),('2021-11-23',202147,11,2021,23,47,202111,2021),('2021-11-24',202147,11,2021,24,47,202111,2021),('2021-11-25',202147,11,2021,25,47,202111,2021),('2021-11-26',202147,11,2021,26,47,202111,2021),('2021-11-27',202147,11,2021,27,47,202111,2021),('2021-11-28',202148,11,2021,28,48,202111,2021),('2021-11-29',202148,11,2021,29,48,202111,2021),('2021-11-30',202148,11,2021,30,48,202111,2021),('2021-12-01',202148,12,2021,1,48,202112,2022),('2021-12-02',202148,12,2021,2,48,202112,2022),('2021-12-03',202148,12,2021,3,48,202112,2022),('2021-12-04',202148,12,2021,4,48,202112,2022),('2021-12-05',202149,12,2021,5,49,202112,2022),('2021-12-06',202149,12,2021,6,49,202112,2022),('2021-12-07',202149,12,2021,7,49,202112,2022),('2021-12-08',202149,12,2021,8,49,202112,2022),('2021-12-09',202149,12,2021,9,49,202112,2022),('2021-12-10',202149,12,2021,10,49,202112,2022),('2021-12-11',202149,12,2021,11,49,202112,2022),('2021-12-12',202150,12,2021,12,50,202112,2022),('2021-12-13',202150,12,2021,13,50,202112,2022),('2021-12-14',202150,12,2021,14,50,202112,2022),('2021-12-15',202150,12,2021,15,50,202112,2022),('2021-12-16',202150,12,2021,16,50,202112,2022),('2021-12-17',202150,12,2021,17,50,202112,2022),('2021-12-18',202150,12,2021,18,50,202112,2022),('2021-12-19',202151,12,2021,19,51,202112,2022),('2021-12-20',202151,12,2021,20,51,202112,2022),('2021-12-21',202151,12,2021,21,51,202112,2022),('2021-12-22',202151,12,2021,22,51,202112,2022),('2021-12-23',202151,12,2021,23,51,202112,2022),('2021-12-24',202151,12,2021,24,51,202112,2022),('2021-12-25',202151,12,2021,25,51,202112,2022),('2021-12-26',202152,12,2021,26,52,202112,2022),('2021-12-27',202152,12,2021,27,52,202112,2022),('2021-12-28',202152,12,2021,28,52,202112,2022),('2021-12-29',202152,12,2021,29,52,202112,2022),('2021-12-30',202152,12,2021,30,52,202112,2022),('2021-12-31',202152,12,2021,31,52,202112,2022),('2022-01-01',202252,1,2022,1,52,202201,2022),('2022-01-02',202201,1,2022,2,1,202201,2022),('2022-01-03',202201,1,2022,3,1,202201,2022),('2022-01-04',202201,1,2022,4,1,202201,2022),('2022-01-05',202201,1,2022,5,1,202201,2022),('2022-01-06',202201,1,2022,6,1,202201,2022),('2022-01-07',202201,1,2022,7,1,202201,2022),('2022-01-08',202201,1,2022,8,1,202201,2022),('2022-01-09',202202,1,2022,9,2,202201,2022),('2022-01-10',202202,1,2022,10,2,202201,2022),('2022-01-11',202202,1,2022,11,2,202201,2022),('2022-01-12',202202,1,2022,12,2,202201,2022),('2022-01-13',202202,1,2022,13,2,202201,2022),('2022-01-14',202202,1,2022,14,2,202201,2022),('2022-01-15',202202,1,2022,15,2,202201,2022),('2022-01-16',202203,1,2022,16,3,202201,2022),('2022-01-17',202203,1,2022,17,3,202201,2022),('2022-01-18',202203,1,2022,18,3,202201,2022),('2022-01-19',202203,1,2022,19,3,202201,2022),('2022-01-20',202203,1,2022,20,3,202201,2022),('2022-01-21',202203,1,2022,21,3,202201,2022),('2022-01-22',202203,1,2022,22,3,202201,2022),('2022-01-23',202204,1,2022,23,4,202201,2022),('2022-01-24',202204,1,2022,24,4,202201,2022),('2022-01-25',202204,1,2022,25,4,202201,2022),('2022-01-26',202204,1,2022,26,4,202201,2022),('2022-01-27',202204,1,2022,27,4,202201,2022),('2022-01-28',202204,1,2022,28,4,202201,2022),('2022-01-29',202204,1,2022,29,4,202201,2022),('2022-01-30',202205,1,2022,30,5,202201,2022),('2022-01-31',202205,1,2022,31,5,202201,2022),('2022-02-01',202205,2,2022,1,5,202202,2022),('2022-02-02',202205,2,2022,2,5,202202,2022),('2022-02-03',202205,2,2022,3,5,202202,2022),('2022-02-04',202205,2,2022,4,5,202202,2022),('2022-02-05',202205,2,2022,5,5,202202,2022),('2022-02-06',202206,2,2022,6,6,202202,2022),('2022-02-07',202206,2,2022,7,6,202202,2022),('2022-02-08',202206,2,2022,8,6,202202,2022),('2022-02-09',202206,2,2022,9,6,202202,2022),('2022-02-10',202206,2,2022,10,6,202202,2022),('2022-02-11',202206,2,2022,11,6,202202,2022),('2022-02-12',202206,2,2022,12,6,202202,2022),('2022-02-13',202207,2,2022,13,7,202202,2022),('2022-02-14',202207,2,2022,14,7,202202,2022),('2022-02-15',202207,2,2022,15,7,202202,2022),('2022-02-16',202207,2,2022,16,7,202202,2022),('2022-02-17',202207,2,2022,17,7,202202,2022),('2022-02-18',202207,2,2022,18,7,202202,2022),('2022-02-19',202207,2,2022,19,7,202202,2022),('2022-02-20',202208,2,2022,20,8,202202,2022),('2022-02-21',202208,2,2022,21,8,202202,2022),('2022-02-22',202208,2,2022,22,8,202202,2022),('2022-02-23',202208,2,2022,23,8,202202,2022),('2022-02-24',202208,2,2022,24,8,202202,2022),('2022-02-25',202208,2,2022,25,8,202202,2022),('2022-02-26',202208,2,2022,26,8,202202,2022),('2022-02-27',202209,2,2022,27,9,202202,2022),('2022-02-28',202209,2,2022,28,9,202202,2022),('2022-03-01',202209,3,2022,1,9,202203,2022),('2022-03-02',202209,3,2022,2,9,202203,2022),('2022-03-03',202209,3,2022,3,9,202203,2022),('2022-03-04',202209,3,2022,4,9,202203,2022),('2022-03-05',202209,3,2022,5,9,202203,2022),('2022-03-06',202210,3,2022,6,10,202203,2022),('2022-03-07',202210,3,2022,7,10,202203,2022),('2022-03-08',202210,3,2022,8,10,202203,2022),('2022-03-09',202210,3,2022,9,10,202203,2022),('2022-03-10',202210,3,2022,10,10,202203,2022),('2022-03-11',202210,3,2022,11,10,202203,2022),('2022-03-12',202210,3,2022,12,10,202203,2022),('2022-03-13',202211,3,2022,13,11,202203,2022),('2022-03-14',202211,3,2022,14,11,202203,2022),('2022-03-15',202211,3,2022,15,11,202203,2022),('2022-03-16',202211,3,2022,16,11,202203,2022),('2022-03-17',202211,3,2022,17,11,202203,2022),('2022-03-18',202211,3,2022,18,11,202203,2022),('2022-03-19',202211,3,2022,19,11,202203,2022),('2022-03-20',202212,3,2022,20,12,202203,2022),('2022-03-21',202212,3,2022,21,12,202203,2022),('2022-03-22',202212,3,2022,22,12,202203,2022),('2022-03-23',202212,3,2022,23,12,202203,2022),('2022-03-24',202212,3,2022,24,12,202203,2022),('2022-03-25',202212,3,2022,25,12,202203,2022),('2022-03-26',202212,3,2022,26,12,202203,2022),('2022-03-27',202213,3,2022,27,13,202203,2022),('2022-03-28',202213,3,2022,28,13,202203,2022),('2022-03-29',202213,3,2022,29,13,202203,2022),('2022-03-30',202213,3,2022,30,13,202203,2022),('2022-03-31',202213,3,2022,31,13,202203,2022),('2022-04-01',202213,4,2022,1,13,202204,2022),('2022-04-02',202213,4,2022,2,13,202204,2022),('2022-04-03',202214,4,2022,3,14,202204,2022),('2022-04-04',202214,4,2022,4,14,202204,2022),('2022-04-05',202214,4,2022,5,14,202204,2022),('2022-04-06',202214,4,2022,6,14,202204,2022),('2022-04-07',202214,4,2022,7,14,202204,2022),('2022-04-08',202214,4,2022,8,14,202204,2022),('2022-04-09',202214,4,2022,9,14,202204,2022),('2022-04-10',202215,4,2022,10,15,202204,2022),('2022-04-11',202215,4,2022,11,15,202204,2022),('2022-04-12',202215,4,2022,12,15,202204,2022),('2022-04-13',202215,4,2022,13,15,202204,2022),('2022-04-14',202215,4,2022,14,15,202204,2022),('2022-04-15',202215,4,2022,15,15,202204,2022),('2022-04-16',202215,4,2022,16,15,202204,2022),('2022-04-17',202216,4,2022,17,16,202204,2022),('2022-04-18',202216,4,2022,18,16,202204,2022),('2022-04-19',202216,4,2022,19,16,202204,2022),('2022-04-20',202216,4,2022,20,16,202204,2022),('2022-04-21',202216,4,2022,21,16,202204,2022),('2022-04-22',202216,4,2022,22,16,202204,2022),('2022-04-23',202216,4,2022,23,16,202204,2022),('2022-04-24',202217,4,2022,24,17,202204,2022),('2022-04-25',202217,4,2022,25,17,202204,2022),('2022-04-26',202217,4,2022,26,17,202204,2022),('2022-04-27',202217,4,2022,27,17,202204,2022),('2022-04-28',202217,4,2022,28,17,202204,2022),('2022-04-29',202217,4,2022,29,17,202204,2022),('2022-04-30',202217,4,2022,30,17,202204,2022),('2022-05-01',202218,5,2022,1,18,202205,2022),('2022-05-02',202218,5,2022,2,18,202205,2022),('2022-05-03',202218,5,2022,3,18,202205,2022),('2022-05-04',202218,5,2022,4,18,202205,2022),('2022-05-05',202218,5,2022,5,18,202205,2022),('2022-05-06',202218,5,2022,6,18,202205,2022),('2022-05-07',202218,5,2022,7,18,202205,2022),('2022-05-08',202219,5,2022,8,19,202205,2022),('2022-05-09',202219,5,2022,9,19,202205,2022),('2022-05-10',202219,5,2022,10,19,202205,2022),('2022-05-11',202219,5,2022,11,19,202205,2022),('2022-05-12',202219,5,2022,12,19,202205,2022),('2022-05-13',202219,5,2022,13,19,202205,2022),('2022-05-14',202219,5,2022,14,19,202205,2022),('2022-05-15',202220,5,2022,15,20,202205,2022),('2022-05-16',202220,5,2022,16,20,202205,2022),('2022-05-17',202220,5,2022,17,20,202205,2022),('2022-05-18',202220,5,2022,18,20,202205,2022),('2022-05-19',202220,5,2022,19,20,202205,2022),('2022-05-20',202220,5,2022,20,20,202205,2022),('2022-05-21',202220,5,2022,21,20,202205,2022),('2022-05-22',202221,5,2022,22,21,202205,2022),('2022-05-23',202221,5,2022,23,21,202205,2022),('2022-05-24',202221,5,2022,24,21,202205,2022),('2022-05-25',202221,5,2022,25,21,202205,2022),('2022-05-26',202221,5,2022,26,21,202205,2022),('2022-05-27',202221,5,2022,27,21,202205,2022),('2022-05-28',202221,5,2022,28,21,202205,2022),('2022-05-29',202222,5,2022,29,22,202205,2022),('2022-05-30',202222,5,2022,30,22,202205,2022),('2022-05-31',202222,5,2022,31,22,202205,2022),('2022-06-01',202222,6,2022,1,22,202206,2022),('2022-06-02',202222,6,2022,2,22,202206,2022),('2022-06-03',202222,6,2022,3,22,202206,2022),('2022-06-04',202222,6,2022,4,22,202206,2022),('2022-06-05',202223,6,2022,5,23,202206,2022),('2022-06-06',202223,6,2022,6,23,202206,2022),('2022-06-07',202223,6,2022,7,23,202206,2022),('2022-06-08',202223,6,2022,8,23,202206,2022),('2022-06-09',202223,6,2022,9,23,202206,2022),('2022-06-10',202223,6,2022,10,23,202206,2022),('2022-06-11',202223,6,2022,11,23,202206,2022),('2022-06-12',202224,6,2022,12,24,202206,2022),('2022-06-13',202224,6,2022,13,24,202206,2022),('2022-06-14',202224,6,2022,14,24,202206,2022),('2022-06-15',202224,6,2022,15,24,202206,2022),('2022-06-16',202224,6,2022,16,24,202206,2022),('2022-06-17',202224,6,2022,17,24,202206,2022),('2022-06-18',202224,6,2022,18,24,202206,2022),('2022-06-19',202225,6,2022,19,25,202206,2022),('2022-06-20',202225,6,2022,20,25,202206,2022),('2022-06-21',202225,6,2022,21,25,202206,2022),('2022-06-22',202225,6,2022,22,25,202206,2022),('2022-06-23',202225,6,2022,23,25,202206,2022),('2022-06-24',202225,6,2022,24,25,202206,2022),('2022-06-25',202225,6,2022,25,25,202206,2022),('2022-06-26',202226,6,2022,26,26,202206,2022),('2022-06-27',202226,6,2022,27,26,202206,2022),('2022-06-28',202226,6,2022,28,26,202206,2022),('2022-06-29',202226,6,2022,29,26,202206,2022),('2022-06-30',202226,6,2022,30,26,202206,2022),('2022-07-01',202226,7,2022,1,26,202207,2022),('2022-07-02',202226,7,2022,2,26,202207,2022),('2022-07-03',202227,7,2022,3,27,202207,2022),('2022-07-04',202227,7,2022,4,27,202207,2022),('2022-07-05',202227,7,2022,5,27,202207,2022),('2022-07-06',202227,7,2022,6,27,202207,2022),('2022-07-07',202227,7,2022,7,27,202207,2022),('2022-07-08',202227,7,2022,8,27,202207,2022),('2022-07-09',202227,7,2022,9,27,202207,2022),('2022-07-10',202228,7,2022,10,28,202207,2022),('2022-07-11',202228,7,2022,11,28,202207,2022),('2022-07-12',202228,7,2022,12,28,202207,2022),('2022-07-13',202228,7,2022,13,28,202207,2022),('2022-07-14',202228,7,2022,14,28,202207,2022),('2022-07-15',202228,7,2022,15,28,202207,2022),('2022-07-16',202228,7,2022,16,28,202207,2022),('2022-07-17',202229,7,2022,17,29,202207,2022),('2022-07-18',202229,7,2022,18,29,202207,2022),('2022-07-19',202229,7,2022,19,29,202207,2022),('2022-07-20',202229,7,2022,20,29,202207,2022),('2022-07-21',202229,7,2022,21,29,202207,2022),('2022-07-22',202229,7,2022,22,29,202207,2022),('2022-07-23',202229,7,2022,23,29,202207,2022),('2022-07-24',202230,7,2022,24,30,202207,2022),('2022-07-25',202230,7,2022,25,30,202207,2022),('2022-07-26',202230,7,2022,26,30,202207,2022),('2022-07-27',202230,7,2022,27,30,202207,2022),('2022-07-28',202230,7,2022,28,30,202207,2022),('2022-07-29',202230,7,2022,29,30,202207,2022),('2022-07-30',202230,7,2022,30,30,202207,2022),('2022-07-31',202231,7,2022,31,31,202207,2022),('2022-08-01',202231,8,2022,1,31,202208,2022),('2022-08-02',202231,8,2022,2,31,202208,2022),('2022-08-03',202231,8,2022,3,31,202208,2022),('2022-08-04',202231,8,2022,4,31,202208,2022),('2022-08-05',202231,8,2022,5,31,202208,2022),('2022-08-06',202231,8,2022,6,31,202208,2022),('2022-08-07',202232,8,2022,7,32,202208,2022),('2022-08-08',202232,8,2022,8,32,202208,2022),('2022-08-09',202232,8,2022,9,32,202208,2022),('2022-08-10',202232,8,2022,10,32,202208,2022),('2022-08-11',202232,8,2022,11,32,202208,2022),('2022-08-12',202232,8,2022,12,32,202208,2022),('2022-08-13',202232,8,2022,13,32,202208,2022),('2022-08-14',202233,8,2022,14,33,202208,2022),('2022-08-15',202233,8,2022,15,33,202208,2022),('2022-08-16',202233,8,2022,16,33,202208,2022),('2022-08-17',202233,8,2022,17,33,202208,2022),('2022-08-18',202233,8,2022,18,33,202208,2022),('2022-08-19',202233,8,2022,19,33,202208,2022),('2022-08-20',202233,8,2022,20,33,202208,2022),('2022-08-21',202234,8,2022,21,34,202208,2022),('2022-08-22',202234,8,2022,22,34,202208,2022),('2022-08-23',202234,8,2022,23,34,202208,2022),('2022-08-24',202234,8,2022,24,34,202208,2022),('2022-08-25',202234,8,2022,25,34,202208,2022),('2022-08-26',202234,8,2022,26,34,202208,2022),('2022-08-27',202234,8,2022,27,34,202208,2022),('2022-08-28',202235,8,2022,28,35,202208,2022),('2022-08-29',202235,8,2022,29,35,202208,2022),('2022-08-30',202235,8,2022,30,35,202208,2022),('2022-08-31',202235,8,2022,31,35,202208,2022),('2022-09-01',202235,9,2022,1,35,202209,2022),('2022-09-02',202235,9,2022,2,35,202209,2022),('2022-09-03',202235,9,2022,3,35,202209,2022),('2022-09-04',202236,9,2022,4,36,202209,2022),('2022-09-05',202236,9,2022,5,36,202209,2022),('2022-09-06',202236,9,2022,6,36,202209,2022),('2022-09-07',202236,9,2022,7,36,202209,2022),('2022-09-08',202236,9,2022,8,36,202209,2022),('2022-09-09',202236,9,2022,9,36,202209,2022),('2022-09-10',202236,9,2022,10,36,202209,2022),('2022-09-11',202237,9,2022,11,37,202209,2022),('2022-09-12',202237,9,2022,12,37,202209,2022),('2022-09-13',202237,9,2022,13,37,202209,2022),('2022-09-14',202237,9,2022,14,37,202209,2022),('2022-09-15',202237,9,2022,15,37,202209,2022),('2022-09-16',202237,9,2022,16,37,202209,2022),('2022-09-17',202237,9,2022,17,37,202209,2022),('2022-09-18',202238,9,2022,18,38,202209,2022),('2022-09-19',202238,9,2022,19,38,202209,2022),('2022-09-20',202238,9,2022,20,38,202209,2022),('2022-09-21',202238,9,2022,21,38,202209,2022),('2022-09-22',202238,9,2022,22,38,202209,2022),('2022-09-23',202238,9,2022,23,38,202209,2022),('2022-09-24',202238,9,2022,24,38,202209,2022),('2022-09-25',202239,9,2022,25,39,202209,2022),('2022-09-26',202239,9,2022,26,39,202209,2022),('2022-09-27',202239,9,2022,27,39,202209,2022),('2022-09-28',202239,9,2022,28,39,202209,2022),('2022-09-29',202239,9,2022,29,39,202209,2022),('2022-09-30',202239,9,2022,30,39,202209,2022),('2022-10-01',202239,10,2022,1,39,202210,2022),('2022-10-02',202240,10,2022,2,40,202210,2022),('2022-10-03',202240,10,2022,3,40,202210,2022),('2022-10-04',202240,10,2022,4,40,202210,2022),('2022-10-05',202240,10,2022,5,40,202210,2022),('2022-10-06',202240,10,2022,6,40,202210,2022),('2022-10-07',202240,10,2022,7,40,202210,2022),('2022-10-08',202240,10,2022,8,40,202210,2022),('2022-10-09',202241,10,2022,9,41,202210,2022),('2022-10-10',202241,10,2022,10,41,202210,2022),('2022-10-11',202241,10,2022,11,41,202210,2022),('2022-10-12',202241,10,2022,12,41,202210,2022),('2022-10-13',202241,10,2022,13,41,202210,2022),('2022-10-14',202241,10,2022,14,41,202210,2022),('2022-10-15',202241,10,2022,15,41,202210,2022),('2022-10-16',202242,10,2022,16,42,202210,2022),('2022-10-17',202242,10,2022,17,42,202210,2022),('2022-10-18',202242,10,2022,18,42,202210,2022),('2022-10-19',202242,10,2022,19,42,202210,2022),('2022-10-20',202242,10,2022,20,42,202210,2022),('2022-10-21',202242,10,2022,21,42,202210,2022),('2022-10-22',202242,10,2022,22,42,202210,2022),('2022-10-23',202243,10,2022,23,43,202210,2022),('2022-10-24',202243,10,2022,24,43,202210,2022),('2022-10-25',202243,10,2022,25,43,202210,2022),('2022-10-26',202243,10,2022,26,43,202210,2022),('2022-10-27',202243,10,2022,27,43,202210,2022),('2022-10-28',202243,10,2022,28,43,202210,2022),('2022-10-29',202243,10,2022,29,43,202210,2022),('2022-10-30',202244,10,2022,30,44,202210,2022),('2022-10-31',202244,10,2022,31,44,202210,2022),('2022-11-01',202244,11,2022,1,44,202211,2022),('2022-11-02',202244,11,2022,2,44,202211,2022),('2022-11-03',202244,11,2022,3,44,202211,2022),('2022-11-04',202244,11,2022,4,44,202211,2022),('2022-11-05',202244,11,2022,5,44,202211,2022),('2022-11-06',202245,11,2022,6,45,202211,2022),('2022-11-07',202245,11,2022,7,45,202211,2022),('2022-11-08',202245,11,2022,8,45,202211,2022),('2022-11-09',202245,11,2022,9,45,202211,2022),('2022-11-10',202245,11,2022,10,45,202211,2022),('2022-11-11',202245,11,2022,11,45,202211,2022),('2022-11-12',202245,11,2022,12,45,202211,2022),('2022-11-13',202246,11,2022,13,46,202211,2022),('2022-11-14',202246,11,2022,14,46,202211,2022),('2022-11-15',202246,11,2022,15,46,202211,2022),('2022-11-16',202246,11,2022,16,46,202211,2022),('2022-11-17',202246,11,2022,17,46,202211,2022),('2022-11-18',202246,11,2022,18,46,202211,2022),('2022-11-19',202246,11,2022,19,46,202211,2022),('2022-11-20',202247,11,2022,20,47,202211,2022),('2022-11-21',202247,11,2022,21,47,202211,2022),('2022-11-22',202247,11,2022,22,47,202211,2022),('2022-11-23',202247,11,2022,23,47,202211,2022),('2022-11-24',202247,11,2022,24,47,202211,2022),('2022-11-25',202247,11,2022,25,47,202211,2022),('2022-11-26',202247,11,2022,26,47,202211,2022),('2022-11-27',202248,11,2022,27,48,202211,2022),('2022-11-28',202248,11,2022,28,48,202211,2022),('2022-11-29',202248,11,2022,29,48,202211,2022),('2022-11-30',202248,11,2022,30,48,202211,2022),('2022-12-01',202248,12,2022,1,48,202212,2023),('2022-12-02',202248,12,2022,2,48,202212,2023),('2022-12-03',202248,12,2022,3,48,202212,2023),('2022-12-04',202249,12,2022,4,49,202212,2023),('2022-12-05',202249,12,2022,5,49,202212,2023),('2022-12-06',202249,12,2022,6,49,202212,2023),('2022-12-07',202249,12,2022,7,49,202212,2023),('2022-12-08',202249,12,2022,8,49,202212,2023),('2022-12-09',202249,12,2022,9,49,202212,2023),('2022-12-10',202249,12,2022,10,49,202212,2023),('2022-12-11',202250,12,2022,11,50,202212,2023),('2022-12-12',202250,12,2022,12,50,202212,2023),('2022-12-13',202250,12,2022,13,50,202212,2023),('2022-12-14',202250,12,2022,14,50,202212,2023),('2022-12-15',202250,12,2022,15,50,202212,2023),('2022-12-16',202250,12,2022,16,50,202212,2023),('2022-12-17',202250,12,2022,17,50,202212,2023),('2022-12-18',202251,12,2022,18,51,202212,2023),('2022-12-19',202251,12,2022,19,51,202212,2023),('2022-12-20',202251,12,2022,20,51,202212,2023),('2022-12-21',202251,12,2022,21,51,202212,2023),('2022-12-22',202251,12,2022,22,51,202212,2023),('2022-12-23',202251,12,2022,23,51,202212,2023),('2022-12-24',202251,12,2022,24,51,202212,2023),('2022-12-25',202252,12,2022,25,52,202212,2023),('2022-12-26',202252,12,2022,26,52,202212,2023),('2022-12-27',202252,12,2022,27,52,202212,2023),('2022-12-28',202252,12,2022,28,52,202212,2023),('2022-12-29',202252,12,2022,29,52,202212,2023),('2022-12-30',202252,12,2022,30,52,202212,2023),('2022-12-31',202252,12,2022,31,52,202212,2023),('2023-01-01',202353,1,2023,1,1,202301,2023),('2023-01-02',202301,1,2023,2,1,202301,2023),('2023-01-03',202301,1,2023,3,1,202301,2023),('2023-01-04',202301,1,2023,4,1,202301,2023),('2023-01-05',202301,1,2023,5,1,202301,2023),('2023-01-06',202301,1,2023,6,1,202301,2023),('2023-01-07',202301,1,2023,7,1,202301,2023),('2023-01-08',202302,1,2023,8,2,202301,2023),('2023-01-09',202302,1,2023,9,2,202301,2023),('2023-01-10',202302,1,2023,10,2,202301,2023),('2023-01-11',202302,1,2023,11,2,202301,2023),('2023-01-12',202302,1,2023,12,2,202301,2023),('2023-01-13',202302,1,2023,13,2,202301,2023),('2023-01-14',202302,1,2023,14,2,202301,2023),('2023-01-15',202303,1,2023,15,3,202301,2023),('2023-01-16',202303,1,2023,16,3,202301,2023),('2023-01-17',202303,1,2023,17,3,202301,2023),('2023-01-18',202303,1,2023,18,3,202301,2023),('2023-01-19',202303,1,2023,19,3,202301,2023),('2023-01-20',202303,1,2023,20,3,202301,2023),('2023-01-21',202303,1,2023,21,3,202301,2023),('2023-01-22',202304,1,2023,22,4,202301,2023),('2023-01-23',202304,1,2023,23,4,202301,2023),('2023-01-24',202304,1,2023,24,4,202301,2023),('2023-01-25',202304,1,2023,25,4,202301,2023),('2023-01-26',202304,1,2023,26,4,202301,2023),('2023-01-27',202304,1,2023,27,4,202301,2023),('2023-01-28',202304,1,2023,28,4,202301,2023),('2023-01-29',202305,1,2023,29,5,202301,2023),('2023-01-30',202305,1,2023,30,5,202301,2023),('2023-01-31',202305,1,2023,31,5,202301,2023),('2023-02-01',202305,2,2023,1,5,202302,2023),('2023-02-02',202305,2,2023,2,5,202302,2023),('2023-02-03',202305,2,2023,3,5,202302,2023),('2023-02-04',202305,2,2023,4,5,202302,2023),('2023-02-05',202306,2,2023,5,6,202302,2023),('2023-02-06',202306,2,2023,6,6,202302,2023),('2023-02-07',202306,2,2023,7,6,202302,2023),('2023-02-08',202306,2,2023,8,6,202302,2023),('2023-02-09',202306,2,2023,9,6,202302,2023),('2023-02-10',202306,2,2023,10,6,202302,2023),('2023-02-11',202306,2,2023,11,6,202302,2023),('2023-02-12',202307,2,2023,12,7,202302,2023),('2023-02-13',202307,2,2023,13,7,202302,2023),('2023-02-14',202307,2,2023,14,7,202302,2023),('2023-02-15',202307,2,2023,15,7,202302,2023),('2023-02-16',202307,2,2023,16,7,202302,2023),('2023-02-17',202307,2,2023,17,7,202302,2023),('2023-02-18',202307,2,2023,18,7,202302,2023),('2023-02-19',202308,2,2023,19,8,202302,2023),('2023-02-20',202308,2,2023,20,8,202302,2023),('2023-02-21',202308,2,2023,21,8,202302,2023),('2023-02-22',202308,2,2023,22,8,202302,2023),('2023-02-23',202308,2,2023,23,8,202302,2023),('2023-02-24',202308,2,2023,24,8,202302,2023),('2023-02-25',202308,2,2023,25,8,202302,2023),('2023-02-26',202309,2,2023,26,9,202302,2023),('2023-02-27',202309,2,2023,27,9,202302,2023),('2023-02-28',202309,2,2023,28,9,202302,2023),('2023-03-01',202309,3,2023,1,9,202303,2023),('2023-03-02',202309,3,2023,2,9,202303,2023),('2023-03-03',202309,3,2023,3,9,202303,2023),('2023-03-04',202309,3,2023,4,9,202303,2023),('2023-03-05',202310,3,2023,5,10,202303,2023),('2023-03-06',202310,3,2023,6,10,202303,2023),('2023-03-07',202310,3,2023,7,10,202303,2023),('2023-03-08',202310,3,2023,8,10,202303,2023),('2023-03-09',202310,3,2023,9,10,202303,2023),('2023-03-10',202310,3,2023,10,10,202303,2023),('2023-03-11',202310,3,2023,11,10,202303,2023),('2023-03-12',202311,3,2023,12,11,202303,2023),('2023-03-13',202311,3,2023,13,11,202303,2023),('2023-03-14',202311,3,2023,14,11,202303,2023),('2023-03-15',202311,3,2023,15,11,202303,2023),('2023-03-16',202311,3,2023,16,11,202303,2023),('2023-03-17',202311,3,2023,17,11,202303,2023),('2023-03-18',202311,3,2023,18,11,202303,2023),('2023-03-19',202312,3,2023,19,12,202303,2023),('2023-03-20',202312,3,2023,20,12,202303,2023),('2023-03-21',202312,3,2023,21,12,202303,2023),('2023-03-22',202312,3,2023,22,12,202303,2023),('2023-03-23',202312,3,2023,23,12,202303,2023),('2023-03-24',202312,3,2023,24,12,202303,2023),('2023-03-25',202312,3,2023,25,12,202303,2023),('2023-03-26',202313,3,2023,26,13,202303,2023),('2023-03-27',202313,3,2023,27,13,202303,2023),('2023-03-28',202313,3,2023,28,13,202303,2023),('2023-03-29',202313,3,2023,29,13,202303,2023),('2023-03-30',202313,3,2023,30,13,202303,2023),('2023-03-31',202313,3,2023,31,13,202303,2023),('2023-04-01',202313,4,2023,1,13,202304,2023),('2023-04-02',202314,4,2023,2,14,202304,2023),('2023-04-03',202314,4,2023,3,14,202304,2023),('2023-04-04',202314,4,2023,4,14,202304,2023),('2023-04-05',202314,4,2023,5,14,202304,2023),('2023-04-06',202314,4,2023,6,14,202304,2023),('2023-04-07',202314,4,2023,7,14,202304,2023),('2023-04-08',202314,4,2023,8,14,202304,2023),('2023-04-09',202315,4,2023,9,15,202304,2023),('2023-04-10',202315,4,2023,10,15,202304,2023),('2023-04-11',202315,4,2023,11,15,202304,2023),('2023-04-12',202315,4,2023,12,15,202304,2023),('2023-04-13',202315,4,2023,13,15,202304,2023),('2023-04-14',202315,4,2023,14,15,202304,2023),('2023-04-15',202315,4,2023,15,15,202304,2023),('2023-04-16',202316,4,2023,16,16,202304,2023),('2023-04-17',202316,4,2023,17,16,202304,2023),('2023-04-18',202316,4,2023,18,16,202304,2023),('2023-04-19',202316,4,2023,19,16,202304,2023),('2023-04-20',202316,4,2023,20,16,202304,2023),('2023-04-21',202316,4,2023,21,16,202304,2023),('2023-04-22',202316,4,2023,22,16,202304,2023),('2023-04-23',202317,4,2023,23,17,202304,2023),('2023-04-24',202317,4,2023,24,17,202304,2023),('2023-04-25',202317,4,2023,25,17,202304,2023),('2023-04-26',202317,4,2023,26,17,202304,2023),('2023-04-27',202317,4,2023,27,17,202304,2023),('2023-04-28',202317,4,2023,28,17,202304,2023),('2023-04-29',202317,4,2023,29,17,202304,2023),('2023-04-30',202318,4,2023,30,18,202304,2023),('2023-05-01',202318,5,2023,1,18,202305,2023),('2023-05-02',202318,5,2023,2,18,202305,2023),('2023-05-03',202318,5,2023,3,18,202305,2023),('2023-05-04',202318,5,2023,4,18,202305,2023),('2023-05-05',202318,5,2023,5,18,202305,2023),('2023-05-06',202318,5,2023,6,18,202305,2023),('2023-05-07',202319,5,2023,7,19,202305,2023),('2023-05-08',202319,5,2023,8,19,202305,2023),('2023-05-09',202319,5,2023,9,19,202305,2023),('2023-05-10',202319,5,2023,10,19,202305,2023),('2023-05-11',202319,5,2023,11,19,202305,2023),('2023-05-12',202319,5,2023,12,19,202305,2023),('2023-05-13',202319,5,2023,13,19,202305,2023),('2023-05-14',202320,5,2023,14,20,202305,2023),('2023-05-15',202320,5,2023,15,20,202305,2023),('2023-05-16',202320,5,2023,16,20,202305,2023),('2023-05-17',202320,5,2023,17,20,202305,2023),('2023-05-18',202320,5,2023,18,20,202305,2023),('2023-05-19',202320,5,2023,19,20,202305,2023),('2023-05-20',202320,5,2023,20,20,202305,2023),('2023-05-21',202321,5,2023,21,21,202305,2023),('2023-05-22',202321,5,2023,22,21,202305,2023),('2023-05-23',202321,5,2023,23,21,202305,2023),('2023-05-24',202321,5,2023,24,21,202305,2023),('2023-05-25',202321,5,2023,25,21,202305,2023),('2023-05-26',202321,5,2023,26,21,202305,2023),('2023-05-27',202321,5,2023,27,21,202305,2023),('2023-05-28',202322,5,2023,28,22,202305,2023),('2023-05-29',202322,5,2023,29,22,202305,2023),('2023-05-30',202322,5,2023,30,22,202305,2023),('2023-05-31',202322,5,2023,31,22,202305,2023),('2023-06-01',202322,6,2023,1,22,202306,2023),('2023-06-02',202322,6,2023,2,22,202306,2023),('2023-06-03',202322,6,2023,3,22,202306,2023),('2023-06-04',202323,6,2023,4,23,202306,2023),('2023-06-05',202323,6,2023,5,23,202306,2023),('2023-06-06',202323,6,2023,6,23,202306,2023),('2023-06-07',202323,6,2023,7,23,202306,2023),('2023-06-08',202323,6,2023,8,23,202306,2023),('2023-06-09',202323,6,2023,9,23,202306,2023),('2023-06-10',202323,6,2023,10,23,202306,2023),('2023-06-11',202324,6,2023,11,24,202306,2023),('2023-06-12',202324,6,2023,12,24,202306,2023),('2023-06-13',202324,6,2023,13,24,202306,2023),('2023-06-14',202324,6,2023,14,24,202306,2023),('2023-06-15',202324,6,2023,15,24,202306,2023),('2023-06-16',202324,6,2023,16,24,202306,2023),('2023-06-17',202324,6,2023,17,24,202306,2023),('2023-06-18',202325,6,2023,18,25,202306,2023),('2023-06-19',202325,6,2023,19,25,202306,2023),('2023-06-20',202325,6,2023,20,25,202306,2023),('2023-06-21',202325,6,2023,21,25,202306,2023),('2023-06-22',202325,6,2023,22,25,202306,2023),('2023-06-23',202325,6,2023,23,25,202306,2023),('2023-06-24',202325,6,2023,24,25,202306,2023),('2023-06-25',202326,6,2023,25,26,202306,2023),('2023-06-26',202326,6,2023,26,26,202306,2023),('2023-06-27',202326,6,2023,27,26,202306,2023),('2023-06-28',202326,6,2023,28,26,202306,2023),('2023-06-29',202326,6,2023,29,26,202306,2023),('2023-06-30',202326,6,2023,30,26,202306,2023),('2023-07-01',202326,7,2023,1,26,202307,2023),('2023-07-02',202327,7,2023,2,27,202307,2023),('2023-07-03',202327,7,2023,3,27,202307,2023),('2023-07-04',202327,7,2023,4,27,202307,2023),('2023-07-05',202327,7,2023,5,27,202307,2023),('2023-07-06',202327,7,2023,6,27,202307,2023),('2023-07-07',202327,7,2023,7,27,202307,2023),('2023-07-08',202327,7,2023,8,27,202307,2023),('2023-07-09',202328,7,2023,9,28,202307,2023),('2023-07-10',202328,7,2023,10,28,202307,2023),('2023-07-11',202328,7,2023,11,28,202307,2023),('2023-07-12',202328,7,2023,12,28,202307,2023),('2023-07-13',202328,7,2023,13,28,202307,2023),('2023-07-14',202328,7,2023,14,28,202307,2023),('2023-07-15',202328,7,2023,15,28,202307,2023),('2023-07-16',202329,7,2023,16,29,202307,2023),('2023-07-17',202329,7,2023,17,29,202307,2023),('2023-07-18',202329,7,2023,18,29,202307,2023),('2023-07-19',202329,7,2023,19,29,202307,2023),('2023-07-20',202329,7,2023,20,29,202307,2023),('2023-07-21',202329,7,2023,21,29,202307,2023),('2023-07-22',202329,7,2023,22,29,202307,2023),('2023-07-23',202330,7,2023,23,30,202307,2023),('2023-07-24',202330,7,2023,24,30,202307,2023),('2023-07-25',202330,7,2023,25,30,202307,2023),('2023-07-26',202330,7,2023,26,30,202307,2023),('2023-07-27',202330,7,2023,27,30,202307,2023),('2023-07-28',202330,7,2023,28,30,202307,2023),('2023-07-29',202330,7,2023,29,30,202307,2023),('2023-07-30',202331,7,2023,30,31,202307,2023),('2023-07-31',202331,7,2023,31,31,202307,2023),('2023-08-01',202331,8,2023,1,31,202308,2023),('2023-08-02',202331,8,2023,2,31,202308,2023),('2023-08-03',202331,8,2023,3,31,202308,2023),('2023-08-04',202331,8,2023,4,31,202308,2023),('2023-08-05',202331,8,2023,5,31,202308,2023),('2023-08-06',202332,8,2023,6,32,202308,2023),('2023-08-07',202332,8,2023,7,32,202308,2023),('2023-08-08',202332,8,2023,8,32,202308,2023),('2023-08-09',202332,8,2023,9,32,202308,2023),('2023-08-10',202332,8,2023,10,32,202308,2023),('2023-08-11',202332,8,2023,11,32,202308,2023),('2023-08-12',202332,8,2023,12,32,202308,2023),('2023-08-13',202333,8,2023,13,33,202308,2023),('2023-08-14',202333,8,2023,14,33,202308,2023),('2023-08-15',202333,8,2023,15,33,202308,2023),('2023-08-16',202333,8,2023,16,33,202308,2023),('2023-08-17',202333,8,2023,17,33,202308,2023),('2023-08-18',202333,8,2023,18,33,202308,2023),('2023-08-19',202333,8,2023,19,33,202308,2023),('2023-08-20',202334,8,2023,20,34,202308,2023),('2023-08-21',202334,8,2023,21,34,202308,2023),('2023-08-22',202334,8,2023,22,34,202308,2023),('2023-08-23',202334,8,2023,23,34,202308,2023),('2023-08-24',202334,8,2023,24,34,202308,2023),('2023-08-25',202334,8,2023,25,34,202308,2023),('2023-08-26',202334,8,2023,26,34,202308,2023),('2023-08-27',202335,8,2023,27,35,202308,2023),('2023-08-28',202335,8,2023,28,35,202308,2023),('2023-08-29',202335,8,2023,29,35,202308,2023),('2023-08-30',202335,8,2023,30,35,202308,2023),('2023-08-31',202335,8,2023,31,35,202308,2023),('2023-09-01',202335,9,2023,1,35,202309,2023),('2023-09-02',202335,9,2023,2,35,202309,2023),('2023-09-03',202336,9,2023,3,36,202309,2023),('2023-09-04',202336,9,2023,4,36,202309,2023),('2023-09-05',202336,9,2023,5,36,202309,2023),('2023-09-06',202336,9,2023,6,36,202309,2023),('2023-09-07',202336,9,2023,7,36,202309,2023),('2023-09-08',202336,9,2023,8,36,202309,2023),('2023-09-09',202336,9,2023,9,36,202309,2023),('2023-09-10',202337,9,2023,10,37,202309,2023),('2023-09-11',202337,9,2023,11,37,202309,2023),('2023-09-12',202337,9,2023,12,37,202309,2023),('2023-09-13',202337,9,2023,13,37,202309,2023),('2023-09-14',202337,9,2023,14,37,202309,2023),('2023-09-15',202337,9,2023,15,37,202309,2023),('2023-09-16',202337,9,2023,16,37,202309,2023),('2023-09-17',202338,9,2023,17,38,202309,2023),('2023-09-18',202338,9,2023,18,38,202309,2023),('2023-09-19',202338,9,2023,19,38,202309,2023),('2023-09-20',202338,9,2023,20,38,202309,2023),('2023-09-21',202338,9,2023,21,38,202309,2023),('2023-09-22',202338,9,2023,22,38,202309,2023),('2023-09-23',202338,9,2023,23,38,202309,2023),('2023-09-24',202339,9,2023,24,39,202309,2023),('2023-09-25',202339,9,2023,25,39,202309,2023),('2023-09-26',202339,9,2023,26,39,202309,2023),('2023-09-27',202339,9,2023,27,39,202309,2023),('2023-09-28',202339,9,2023,28,39,202309,2023),('2023-09-29',202339,9,2023,29,39,202309,2023),('2023-09-30',202339,9,2023,30,39,202309,2023),('2023-10-01',202340,10,2023,1,40,202310,2023),('2023-10-02',202340,10,2023,2,40,202310,2023),('2023-10-03',202340,10,2023,3,40,202310,2023),('2023-10-04',202340,10,2023,4,40,202310,2023),('2023-10-05',202340,10,2023,5,40,202310,2023),('2023-10-06',202340,10,2023,6,40,202310,2023),('2023-10-07',202340,10,2023,7,40,202310,2023),('2023-10-08',202341,10,2023,8,41,202310,2023),('2023-10-09',202341,10,2023,9,41,202310,2023),('2023-10-10',202341,10,2023,10,41,202310,2023),('2023-10-11',202341,10,2023,11,41,202310,2023),('2023-10-12',202341,10,2023,12,41,202310,2023),('2023-10-13',202341,10,2023,13,41,202310,2023),('2023-10-14',202341,10,2023,14,41,202310,2023),('2023-10-15',202342,10,2023,15,42,202310,2023),('2023-10-16',202342,10,2023,16,42,202310,2023),('2023-10-17',202342,10,2023,17,42,202310,2023),('2023-10-18',202342,10,2023,18,42,202310,2023),('2023-10-19',202342,10,2023,19,42,202310,2023),('2023-10-20',202342,10,2023,20,42,202310,2023),('2023-10-21',202342,10,2023,21,42,202310,2023),('2023-10-22',202343,10,2023,22,43,202310,2023),('2023-10-23',202343,10,2023,23,43,202310,2023),('2023-10-24',202343,10,2023,24,43,202310,2023),('2023-10-25',202343,10,2023,25,43,202310,2023),('2023-10-26',202343,10,2023,26,43,202310,2023),('2023-10-27',202343,10,2023,27,43,202310,2023),('2023-10-28',202343,10,2023,28,43,202310,2023),('2023-10-29',202344,10,2023,29,44,202310,2023),('2023-10-30',202344,10,2023,30,44,202310,2023),('2023-10-31',202344,10,2023,31,44,202310,2023),('2023-11-01',202344,11,2023,1,44,202311,2023),('2023-11-02',202344,11,2023,2,44,202311,2023),('2023-11-03',202344,11,2023,3,44,202311,2023),('2023-11-04',202344,11,2023,4,44,202311,2023),('2023-11-05',202345,11,2023,5,45,202311,2023),('2023-11-06',202345,11,2023,6,45,202311,2023),('2023-11-07',202345,11,2023,7,45,202311,2023),('2023-11-08',202345,11,2023,8,45,202311,2023),('2023-11-09',202345,11,2023,9,45,202311,2023),('2023-11-10',202345,11,2023,10,45,202311,2023),('2023-11-11',202345,11,2023,11,45,202311,2023),('2023-11-12',202346,11,2023,12,46,202311,2023),('2023-11-13',202346,11,2023,13,46,202311,2023),('2023-11-14',202346,11,2023,14,46,202311,2023),('2023-11-15',202346,11,2023,15,46,202311,2023),('2023-11-16',202346,11,2023,16,46,202311,2023),('2023-11-17',202346,11,2023,17,46,202311,2023),('2023-11-18',202346,11,2023,18,46,202311,2023),('2023-11-19',202347,11,2023,19,47,202311,2023),('2023-11-20',202347,11,2023,20,47,202311,2023),('2023-11-21',202347,11,2023,21,47,202311,2023),('2023-11-22',202347,11,2023,22,47,202311,2023),('2023-11-23',202347,11,2023,23,47,202311,2023),('2023-11-24',202347,11,2023,24,47,202311,2023),('2023-11-25',202347,11,2023,25,47,202311,2023),('2023-11-26',202348,11,2023,26,48,202311,2023),('2023-11-27',202348,11,2023,27,48,202311,2023),('2023-11-28',202348,11,2023,28,48,202311,2023),('2023-11-29',202348,11,2023,29,48,202311,2023),('2023-11-30',202348,11,2023,30,48,202311,2023),('2023-12-01',202348,12,2023,1,48,202312,2024),('2023-12-02',202348,12,2023,2,48,202312,2024),('2023-12-03',202349,12,2023,3,49,202312,2024),('2023-12-04',202349,12,2023,4,49,202312,2024),('2023-12-05',202349,12,2023,5,49,202312,2024),('2023-12-06',202349,12,2023,6,49,202312,2024),('2023-12-07',202349,12,2023,7,49,202312,2024),('2023-12-08',202349,12,2023,8,49,202312,2024),('2023-12-09',202349,12,2023,9,49,202312,2024),('2023-12-10',202350,12,2023,10,50,202312,2024),('2023-12-11',202350,12,2023,11,50,202312,2024),('2023-12-12',202350,12,2023,12,50,202312,2024),('2023-12-13',202350,12,2023,13,50,202312,2024),('2023-12-14',202350,12,2023,14,50,202312,2024),('2023-12-15',202350,12,2023,15,50,202312,2024),('2023-12-16',202350,12,2023,16,50,202312,2024),('2023-12-17',202351,12,2023,17,51,202312,2024),('2023-12-18',202351,12,2023,18,51,202312,2024),('2023-12-19',202351,12,2023,19,51,202312,2024),('2023-12-20',202351,12,2023,20,51,202312,2024),('2023-12-21',202351,12,2023,21,51,202312,2024),('2023-12-22',202351,12,2023,22,51,202312,2024),('2023-12-23',202351,12,2023,23,51,202312,2024),('2023-12-24',202352,12,2023,24,52,202312,2024),('2023-12-25',202352,12,2023,25,52,202312,2024),('2023-12-26',202352,12,2023,26,52,202312,2024),('2023-12-27',202352,12,2023,27,52,202312,2024),('2023-12-28',202352,12,2023,28,52,202312,2024),('2023-12-29',202352,12,2023,29,52,202312,2024),('2023-12-30',202352,12,2023,30,52,202312,2024),('2023-12-31',202353,12,2023,31,1,202312,2024),('2024-01-01',202401,1,2024,1,1,202401,2024),('2024-01-02',202401,1,2024,2,1,202401,2024),('2024-01-03',202401,1,2024,3,1,202401,2024),('2024-01-04',202401,1,2024,4,1,202401,2024),('2024-01-05',202401,1,2024,5,1,202401,2024),('2024-01-06',202401,1,2024,6,1,202401,2024),('2024-01-07',202402,1,2024,7,2,202401,2024),('2024-01-08',202402,1,2024,8,2,202401,2024),('2024-01-09',202402,1,2024,9,2,202401,2024),('2024-01-10',202402,1,2024,10,2,202401,2024),('2024-01-11',202402,1,2024,11,2,202401,2024),('2024-01-12',202402,1,2024,12,2,202401,2024),('2024-01-13',202402,1,2024,13,2,202401,2024),('2024-01-14',202403,1,2024,14,3,202401,2024),('2024-01-15',202403,1,2024,15,3,202401,2024),('2024-01-16',202403,1,2024,16,3,202401,2024),('2024-01-17',202403,1,2024,17,3,202401,2024),('2024-01-18',202403,1,2024,18,3,202401,2024),('2024-01-19',202403,1,2024,19,3,202401,2024),('2024-01-20',202403,1,2024,20,3,202401,2024),('2024-01-21',202404,1,2024,21,4,202401,2024),('2024-01-22',202404,1,2024,22,4,202401,2024),('2024-01-23',202404,1,2024,23,4,202401,2024),('2024-01-24',202404,1,2024,24,4,202401,2024),('2024-01-25',202404,1,2024,25,4,202401,2024),('2024-01-26',202404,1,2024,26,4,202401,2024),('2024-01-27',202404,1,2024,27,4,202401,2024),('2024-01-28',202405,1,2024,28,5,202401,2024),('2024-01-29',202405,1,2024,29,5,202401,2024),('2024-01-30',202405,1,2024,30,5,202401,2024),('2024-01-31',202405,1,2024,31,5,202401,2024),('2024-02-01',202405,2,2024,1,5,202402,2024),('2024-02-02',202405,2,2024,2,5,202402,2024),('2024-02-03',202405,2,2024,3,5,202402,2024),('2024-02-04',202406,2,2024,4,6,202402,2024),('2024-02-05',202406,2,2024,5,6,202402,2024),('2024-02-06',202406,2,2024,6,6,202402,2024),('2024-02-07',202406,2,2024,7,6,202402,2024),('2024-02-08',202406,2,2024,8,6,202402,2024),('2024-02-09',202406,2,2024,9,6,202402,2024),('2024-02-10',202406,2,2024,10,6,202402,2024),('2024-02-11',202407,2,2024,11,7,202402,2024),('2024-02-12',202407,2,2024,12,7,202402,2024),('2024-02-13',202407,2,2024,13,7,202402,2024),('2024-02-14',202407,2,2024,14,7,202402,2024),('2024-02-15',202407,2,2024,15,7,202402,2024),('2024-02-16',202407,2,2024,16,7,202402,2024),('2024-02-17',202407,2,2024,17,7,202402,2024),('2024-02-18',202408,2,2024,18,8,202402,2024),('2024-02-19',202408,2,2024,19,8,202402,2024),('2024-02-20',202408,2,2024,20,8,202402,2024),('2024-02-21',202408,2,2024,21,8,202402,2024),('2024-02-22',202408,2,2024,22,8,202402,2024),('2024-02-23',202408,2,2024,23,8,202402,2024),('2024-02-24',202408,2,2024,24,8,202402,2024),('2024-02-25',202409,2,2024,25,9,202402,2024),('2024-02-26',202409,2,2024,26,9,202402,2024),('2024-02-27',202409,2,2024,27,9,202402,2024),('2024-02-28',202409,2,2024,28,9,202402,2024),('2024-02-29',202409,2,2024,29,9,202402,2024),('2024-03-01',202409,3,2024,1,9,202403,2024),('2024-03-02',202409,3,2024,2,9,202403,2024),('2024-03-03',202410,3,2024,3,10,202403,2024),('2024-03-04',202410,3,2024,4,10,202403,2024),('2024-03-05',202410,3,2024,5,10,202403,2024),('2024-03-06',202410,3,2024,6,10,202403,2024),('2024-03-07',202410,3,2024,7,10,202403,2024),('2024-03-08',202410,3,2024,8,10,202403,2024),('2024-03-09',202410,3,2024,9,10,202403,2024),('2024-03-10',202411,3,2024,10,11,202403,2024),('2024-03-11',202411,3,2024,11,11,202403,2024),('2024-03-12',202411,3,2024,12,11,202403,2024),('2024-03-13',202411,3,2024,13,11,202403,2024),('2024-03-14',202411,3,2024,14,11,202403,2024),('2024-03-15',202411,3,2024,15,11,202403,2024),('2024-03-16',202411,3,2024,16,11,202403,2024),('2024-03-17',202412,3,2024,17,12,202403,2024),('2024-03-18',202412,3,2024,18,12,202403,2024),('2024-03-19',202412,3,2024,19,12,202403,2024),('2024-03-20',202412,3,2024,20,12,202403,2024),('2024-03-21',202412,3,2024,21,12,202403,2024),('2024-03-22',202412,3,2024,22,12,202403,2024),('2024-03-23',202412,3,2024,23,12,202403,2024),('2024-03-24',202413,3,2024,24,13,202403,2024),('2024-03-25',202413,3,2024,25,13,202403,2024),('2024-03-26',202413,3,2024,26,13,202403,2024),('2024-03-27',202413,3,2024,27,13,202403,2024),('2024-03-28',202413,3,2024,28,13,202403,2024),('2024-03-29',202413,3,2024,29,13,202403,2024),('2024-03-30',202413,3,2024,30,13,202403,2024),('2024-03-31',202414,3,2024,31,14,202403,2024),('2024-04-01',202414,4,2024,1,14,202404,2024),('2024-04-02',202414,4,2024,2,14,202404,2024),('2024-04-03',202414,4,2024,3,14,202404,2024),('2024-04-04',202414,4,2024,4,14,202404,2024),('2024-04-05',202414,4,2024,5,14,202404,2024),('2024-04-06',202414,4,2024,6,14,202404,2024),('2024-04-07',202415,4,2024,7,15,202404,2024),('2024-04-08',202415,4,2024,8,15,202404,2024),('2024-04-09',202415,4,2024,9,15,202404,2024),('2024-04-10',202415,4,2024,10,15,202404,2024),('2024-04-11',202415,4,2024,11,15,202404,2024),('2024-04-12',202415,4,2024,12,15,202404,2024),('2024-04-13',202415,4,2024,13,15,202404,2024),('2024-04-14',202416,4,2024,14,16,202404,2024),('2024-04-15',202416,4,2024,15,16,202404,2024),('2024-04-16',202416,4,2024,16,16,202404,2024),('2024-04-17',202416,4,2024,17,16,202404,2024),('2024-04-18',202416,4,2024,18,16,202404,2024),('2024-04-19',202416,4,2024,19,16,202404,2024),('2024-04-20',202416,4,2024,20,16,202404,2024),('2024-04-21',202417,4,2024,21,17,202404,2024),('2024-04-22',202417,4,2024,22,17,202404,2024),('2024-04-23',202417,4,2024,23,17,202404,2024),('2024-04-24',202417,4,2024,24,17,202404,2024),('2024-04-25',202417,4,2024,25,17,202404,2024),('2024-04-26',202417,4,2024,26,17,202404,2024),('2024-04-27',202417,4,2024,27,17,202404,2024),('2024-04-28',202418,4,2024,28,18,202404,2024),('2024-04-29',202418,4,2024,29,18,202404,2024),('2024-04-30',202418,4,2024,30,18,202404,2024),('2024-05-01',202418,5,2024,1,18,202405,2024),('2024-05-02',202418,5,2024,2,18,202405,2024),('2024-05-03',202418,5,2024,3,18,202405,2024),('2024-05-04',202418,5,2024,4,18,202405,2024),('2024-05-05',202419,5,2024,5,19,202405,2024),('2024-05-06',202419,5,2024,6,19,202405,2024),('2024-05-07',202419,5,2024,7,19,202405,2024),('2024-05-08',202419,5,2024,8,19,202405,2024),('2024-05-09',202419,5,2024,9,19,202405,2024),('2024-05-10',202419,5,2024,10,19,202405,2024),('2024-05-11',202419,5,2024,11,19,202405,2024),('2024-05-12',202420,5,2024,12,20,202405,2024),('2024-05-13',202420,5,2024,13,20,202405,2024),('2024-05-14',202420,5,2024,14,20,202405,2024),('2024-05-15',202420,5,2024,15,20,202405,2024),('2024-05-16',202420,5,2024,16,20,202405,2024),('2024-05-17',202420,5,2024,17,20,202405,2024),('2024-05-18',202420,5,2024,18,20,202405,2024),('2024-05-19',202421,5,2024,19,21,202405,2024),('2024-05-20',202421,5,2024,20,21,202405,2024),('2024-05-21',202421,5,2024,21,21,202405,2024),('2024-05-22',202421,5,2024,22,21,202405,2024),('2024-05-23',202421,5,2024,23,21,202405,2024),('2024-05-24',202421,5,2024,24,21,202405,2024),('2024-05-25',202421,5,2024,25,21,202405,2024),('2024-05-26',202422,5,2024,26,22,202405,2024),('2024-05-27',202422,5,2024,27,22,202405,2024),('2024-05-28',202422,5,2024,28,22,202405,2024),('2024-05-29',202422,5,2024,29,22,202405,2024),('2024-05-30',202422,5,2024,30,22,202405,2024),('2024-05-31',202422,5,2024,31,22,202405,2024),('2024-06-01',202422,6,2024,1,22,202406,2024),('2024-06-02',202423,6,2024,2,23,202406,2024),('2024-06-03',202423,6,2024,3,23,202406,2024),('2024-06-04',202423,6,2024,4,23,202406,2024),('2024-06-05',202423,6,2024,5,23,202406,2024),('2024-06-06',202423,6,2024,6,23,202406,2024),('2024-06-07',202423,6,2024,7,23,202406,2024),('2024-06-08',202423,6,2024,8,23,202406,2024),('2024-06-09',202424,6,2024,9,24,202406,2024),('2024-06-10',202424,6,2024,10,24,202406,2024),('2024-06-11',202424,6,2024,11,24,202406,2024),('2024-06-12',202424,6,2024,12,24,202406,2024),('2024-06-13',202424,6,2024,13,24,202406,2024),('2024-06-14',202424,6,2024,14,24,202406,2024),('2024-06-15',202424,6,2024,15,24,202406,2024),('2024-06-16',202425,6,2024,16,25,202406,2024),('2024-06-17',202425,6,2024,17,25,202406,2024),('2024-06-18',202425,6,2024,18,25,202406,2024),('2024-06-19',202425,6,2024,19,25,202406,2024),('2024-06-20',202425,6,2024,20,25,202406,2024),('2024-06-21',202425,6,2024,21,25,202406,2024),('2024-06-22',202425,6,2024,22,25,202406,2024),('2024-06-23',202426,6,2024,23,26,202406,2024),('2024-06-24',202426,6,2024,24,26,202406,2024),('2024-06-25',202426,6,2024,25,26,202406,2024),('2024-06-26',202426,6,2024,26,26,202406,2024),('2024-06-27',202426,6,2024,27,26,202406,2024),('2024-06-28',202426,6,2024,28,26,202406,2024),('2024-06-29',202426,6,2024,29,26,202406,2024),('2024-06-30',202427,6,2024,30,27,202406,2024),('2024-07-01',202427,7,2024,1,27,202407,2024),('2024-07-02',202427,7,2024,2,27,202407,2024),('2024-07-03',202427,7,2024,3,27,202407,2024),('2024-07-04',202427,7,2024,4,27,202407,2024),('2024-07-05',202427,7,2024,5,27,202407,2024),('2024-07-06',202427,7,2024,6,27,202407,2024),('2024-07-07',202428,7,2024,7,28,202407,2024),('2024-07-08',202428,7,2024,8,28,202407,2024),('2024-07-09',202428,7,2024,9,28,202407,2024),('2024-07-10',202428,7,2024,10,28,202407,2024),('2024-07-11',202428,7,2024,11,28,202407,2024),('2024-07-12',202428,7,2024,12,28,202407,2024),('2024-07-13',202428,7,2024,13,28,202407,2024),('2024-07-14',202429,7,2024,14,29,202407,2024),('2024-07-15',202429,7,2024,15,29,202407,2024),('2024-07-16',202429,7,2024,16,29,202407,2024),('2024-07-17',202429,7,2024,17,29,202407,2024),('2024-07-18',202429,7,2024,18,29,202407,2024),('2024-07-19',202429,7,2024,19,29,202407,2024),('2024-07-20',202429,7,2024,20,29,202407,2024),('2024-07-21',202430,7,2024,21,30,202407,2024),('2024-07-22',202430,7,2024,22,30,202407,2024),('2024-07-23',202430,7,2024,23,30,202407,2024),('2024-07-24',202430,7,2024,24,30,202407,2024),('2024-07-25',202430,7,2024,25,30,202407,2024),('2024-07-26',202430,7,2024,26,30,202407,2024),('2024-07-27',202430,7,2024,27,30,202407,2024),('2024-07-28',202431,7,2024,28,31,202407,2024),('2024-07-29',202431,7,2024,29,31,202407,2024),('2024-07-30',202431,7,2024,30,31,202407,2024),('2024-07-31',202431,7,2024,31,31,202407,2024),('2024-08-01',202431,8,2024,1,31,202408,2024),('2024-08-02',202431,8,2024,2,31,202408,2024),('2024-08-03',202431,8,2024,3,31,202408,2024),('2024-08-04',202432,8,2024,4,32,202408,2024),('2024-08-05',202432,8,2024,5,32,202408,2024),('2024-08-06',202432,8,2024,6,32,202408,2024),('2024-08-07',202432,8,2024,7,32,202408,2024),('2024-08-08',202432,8,2024,8,32,202408,2024),('2024-08-09',202432,8,2024,9,32,202408,2024),('2024-08-10',202432,8,2024,10,32,202408,2024),('2024-08-11',202433,8,2024,11,33,202408,2024),('2024-08-12',202433,8,2024,12,33,202408,2024),('2024-08-13',202433,8,2024,13,33,202408,2024),('2024-08-14',202433,8,2024,14,33,202408,2024),('2024-08-15',202433,8,2024,15,33,202408,2024),('2024-08-16',202433,8,2024,16,33,202408,2024),('2024-08-17',202433,8,2024,17,33,202408,2024),('2024-08-18',202434,8,2024,18,34,202408,2024),('2024-08-19',202434,8,2024,19,34,202408,2024),('2024-08-20',202434,8,2024,20,34,202408,2024),('2024-08-21',202434,8,2024,21,34,202408,2024),('2024-08-22',202434,8,2024,22,34,202408,2024),('2024-08-23',202434,8,2024,23,34,202408,2024),('2024-08-24',202434,8,2024,24,34,202408,2024),('2024-08-25',202435,8,2024,25,35,202408,2024),('2024-08-26',202435,8,2024,26,35,202408,2024),('2024-08-27',202435,8,2024,27,35,202408,2024),('2024-08-28',202435,8,2024,28,35,202408,2024),('2024-08-29',202435,8,2024,29,35,202408,2024),('2024-08-30',202435,8,2024,30,35,202408,2024),('2024-08-31',202435,8,2024,31,35,202408,2024),('2024-09-01',202436,9,2024,1,36,202409,2024),('2024-09-02',202436,9,2024,2,36,202409,2024),('2024-09-03',202436,9,2024,3,36,202409,2024),('2024-09-04',202436,9,2024,4,36,202409,2024),('2024-09-05',202436,9,2024,5,36,202409,2024),('2024-09-06',202436,9,2024,6,36,202409,2024),('2024-09-07',202436,9,2024,7,36,202409,2024),('2024-09-08',202437,9,2024,8,37,202409,2024),('2024-09-09',202437,9,2024,9,37,202409,2024),('2024-09-10',202437,9,2024,10,37,202409,2024),('2024-09-11',202437,9,2024,11,37,202409,2024),('2024-09-12',202437,9,2024,12,37,202409,2024),('2024-09-13',202437,9,2024,13,37,202409,2024),('2024-09-14',202437,9,2024,14,37,202409,2024),('2024-09-15',202438,9,2024,15,38,202409,2024),('2024-09-16',202438,9,2024,16,38,202409,2024),('2024-09-17',202438,9,2024,17,38,202409,2024),('2024-09-18',202438,9,2024,18,38,202409,2024),('2024-09-19',202438,9,2024,19,38,202409,2024),('2024-09-20',202438,9,2024,20,38,202409,2024),('2024-09-21',202438,9,2024,21,38,202409,2024),('2024-09-22',202439,9,2024,22,39,202409,2024),('2024-09-23',202439,9,2024,23,39,202409,2024),('2024-09-24',202439,9,2024,24,39,202409,2024),('2024-09-25',202439,9,2024,25,39,202409,2024),('2024-09-26',202439,9,2024,26,39,202409,2024),('2024-09-27',202439,9,2024,27,39,202409,2024),('2024-09-28',202439,9,2024,28,39,202409,2024),('2024-09-29',202440,9,2024,29,40,202409,2024),('2024-09-30',202440,9,2024,30,40,202409,2024),('2024-10-01',202440,10,2024,1,40,202410,2024),('2024-10-02',202440,10,2024,2,40,202410,2024),('2024-10-03',202440,10,2024,3,40,202410,2024),('2024-10-04',202440,10,2024,4,40,202410,2024),('2024-10-05',202440,10,2024,5,40,202410,2024),('2024-10-06',202441,10,2024,6,41,202410,2024),('2024-10-07',202441,10,2024,7,41,202410,2024),('2024-10-08',202441,10,2024,8,41,202410,2024),('2024-10-09',202441,10,2024,9,41,202410,2024),('2024-10-10',202441,10,2024,10,41,202410,2024),('2024-10-11',202441,10,2024,11,41,202410,2024),('2024-10-12',202441,10,2024,12,41,202410,2024),('2024-10-13',202442,10,2024,13,42,202410,2024),('2024-10-14',202442,10,2024,14,42,202410,2024),('2024-10-15',202442,10,2024,15,42,202410,2024),('2024-10-16',202442,10,2024,16,42,202410,2024),('2024-10-17',202442,10,2024,17,42,202410,2024),('2024-10-18',202442,10,2024,18,42,202410,2024),('2024-10-19',202442,10,2024,19,42,202410,2024),('2024-10-20',202443,10,2024,20,43,202410,2024),('2024-10-21',202443,10,2024,21,43,202410,2024),('2024-10-22',202443,10,2024,22,43,202410,2024),('2024-10-23',202443,10,2024,23,43,202410,2024),('2024-10-24',202443,10,2024,24,43,202410,2024),('2024-10-25',202443,10,2024,25,43,202410,2024),('2024-10-26',202443,10,2024,26,43,202410,2024),('2024-10-27',202444,10,2024,27,44,202410,2024),('2024-10-28',202444,10,2024,28,44,202410,2024),('2024-10-29',202444,10,2024,29,44,202410,2024),('2024-10-30',202444,10,2024,30,44,202410,2024),('2024-10-31',202444,10,2024,31,44,202410,2024),('2024-11-01',202444,11,2024,1,44,202411,2024),('2024-11-02',202444,11,2024,2,44,202411,2024),('2024-11-03',202445,11,2024,3,45,202411,2024),('2024-11-04',202445,11,2024,4,45,202411,2024),('2024-11-05',202445,11,2024,5,45,202411,2024),('2024-11-06',202445,11,2024,6,45,202411,2024),('2024-11-07',202445,11,2024,7,45,202411,2024),('2024-11-08',202445,11,2024,8,45,202411,2024),('2024-11-09',202445,11,2024,9,45,202411,2024),('2024-11-10',202446,11,2024,10,46,202411,2024),('2024-11-11',202446,11,2024,11,46,202411,2024),('2024-11-12',202446,11,2024,12,46,202411,2024),('2024-11-13',202446,11,2024,13,46,202411,2024),('2024-11-14',202446,11,2024,14,46,202411,2024),('2024-11-15',202446,11,2024,15,46,202411,2024),('2024-11-16',202446,11,2024,16,46,202411,2024),('2024-11-17',202447,11,2024,17,47,202411,2024),('2024-11-18',202447,11,2024,18,47,202411,2024),('2024-11-19',202447,11,2024,19,47,202411,2024),('2024-11-20',202447,11,2024,20,47,202411,2024),('2024-11-21',202447,11,2024,21,47,202411,2024),('2024-11-22',202447,11,2024,22,47,202411,2024),('2024-11-23',202447,11,2024,23,47,202411,2024),('2024-11-24',202448,11,2024,24,48,202411,2024),('2024-11-25',202448,11,2024,25,48,202411,2024),('2024-11-26',202448,11,2024,26,48,202411,2024),('2024-11-27',202448,11,2024,27,48,202411,2024),('2024-11-28',202448,11,2024,28,48,202411,2024),('2024-11-29',202448,11,2024,29,48,202411,2024),('2024-11-30',202448,11,2024,30,48,202411,2024),('2024-12-01',202449,12,2024,1,49,202412,2025),('2024-12-02',202449,12,2024,2,49,202412,2025),('2024-12-03',202449,12,2024,3,49,202412,2025),('2024-12-04',202449,12,2024,4,49,202412,2025),('2024-12-05',202449,12,2024,5,49,202412,2025),('2024-12-06',202449,12,2024,6,49,202412,2025),('2024-12-07',202449,12,2024,7,49,202412,2025),('2024-12-08',202450,12,2024,8,50,202412,2025),('2024-12-09',202450,12,2024,9,50,202412,2025),('2024-12-10',202450,12,2024,10,50,202412,2025),('2024-12-11',202450,12,2024,11,50,202412,2025),('2024-12-12',202450,12,2024,12,50,202412,2025),('2024-12-13',202450,12,2024,13,50,202412,2025),('2024-12-14',202450,12,2024,14,50,202412,2025),('2024-12-15',202451,12,2024,15,51,202412,2025),('2024-12-16',202451,12,2024,16,51,202412,2025),('2024-12-17',202451,12,2024,17,51,202412,2025),('2024-12-18',202451,12,2024,18,51,202412,2025),('2024-12-19',202451,12,2024,19,51,202412,2025),('2024-12-20',202451,12,2024,20,51,202412,2025),('2024-12-21',202451,12,2024,21,51,202412,2025),('2024-12-22',202452,12,2024,22,52,202412,2025),('2024-12-23',202452,12,2024,23,52,202412,2025),('2024-12-24',202452,12,2024,24,52,202412,2025),('2024-12-25',202452,12,2024,25,52,202412,2025),('2024-12-26',202452,12,2024,26,52,202412,2025),('2024-12-27',202452,12,2024,27,52,202412,2025),('2024-12-28',202452,12,2024,28,52,202412,2025),('2024-12-29',202453,12,2024,29,1,202412,2025),('2024-12-30',202401,12,2024,30,1,202412,2025),('2024-12-31',202401,12,2024,31,1,202412,2025),('2025-01-01',202501,1,2025,1,1,202501,2025),('2025-01-02',202501,1,2025,2,1,202501,2025),('2025-01-03',202501,1,2025,3,1,202501,2025),('2025-01-04',202501,1,2025,4,1,202501,2025),('2025-01-05',202502,1,2025,5,2,202501,2025),('2025-01-06',202502,1,2025,6,2,202501,2025),('2025-01-07',202502,1,2025,7,2,202501,2025),('2025-01-08',202502,1,2025,8,2,202501,2025),('2025-01-09',202502,1,2025,9,2,202501,2025),('2025-01-10',202502,1,2025,10,2,202501,2025),('2025-01-11',202502,1,2025,11,2,202501,2025),('2025-01-12',202503,1,2025,12,3,202501,2025),('2025-01-13',202503,1,2025,13,3,202501,2025),('2025-01-14',202503,1,2025,14,3,202501,2025),('2025-01-15',202503,1,2025,15,3,202501,2025),('2025-01-16',202503,1,2025,16,3,202501,2025),('2025-01-17',202503,1,2025,17,3,202501,2025),('2025-01-18',202503,1,2025,18,3,202501,2025),('2025-01-19',202504,1,2025,19,4,202501,2025),('2025-01-20',202504,1,2025,20,4,202501,2025),('2025-01-21',202504,1,2025,21,4,202501,2025),('2025-01-22',202504,1,2025,22,4,202501,2025),('2025-01-23',202504,1,2025,23,4,202501,2025),('2025-01-24',202504,1,2025,24,4,202501,2025),('2025-01-25',202504,1,2025,25,4,202501,2025),('2025-01-26',202505,1,2025,26,5,202501,2025),('2025-01-27',202505,1,2025,27,5,202501,2025),('2025-01-28',202505,1,2025,28,5,202501,2025),('2025-01-29',202505,1,2025,29,5,202501,2025),('2025-01-30',202505,1,2025,30,5,202501,2025),('2025-01-31',202505,1,2025,31,5,202501,2025),('2025-02-01',202505,2,2025,1,5,202502,2025),('2025-02-02',202506,2,2025,2,6,202502,2025),('2025-02-03',202506,2,2025,3,6,202502,2025),('2025-02-04',202506,2,2025,4,6,202502,2025),('2025-02-05',202506,2,2025,5,6,202502,2025),('2025-02-06',202506,2,2025,6,6,202502,2025),('2025-02-07',202506,2,2025,7,6,202502,2025),('2025-02-08',202506,2,2025,8,6,202502,2025),('2025-02-09',202507,2,2025,9,7,202502,2025),('2025-02-10',202507,2,2025,10,7,202502,2025),('2025-02-11',202507,2,2025,11,7,202502,2025),('2025-02-12',202507,2,2025,12,7,202502,2025),('2025-02-13',202507,2,2025,13,7,202502,2025),('2025-02-14',202507,2,2025,14,7,202502,2025),('2025-02-15',202507,2,2025,15,7,202502,2025),('2025-02-16',202508,2,2025,16,8,202502,2025),('2025-02-17',202508,2,2025,17,8,202502,2025),('2025-02-18',202508,2,2025,18,8,202502,2025),('2025-02-19',202508,2,2025,19,8,202502,2025),('2025-02-20',202508,2,2025,20,8,202502,2025),('2025-02-21',202508,2,2025,21,8,202502,2025),('2025-02-22',202508,2,2025,22,8,202502,2025),('2025-02-23',202509,2,2025,23,9,202502,2025),('2025-02-24',202509,2,2025,24,9,202502,2025),('2025-02-25',202509,2,2025,25,9,202502,2025),('2025-02-26',202509,2,2025,26,9,202502,2025),('2025-02-27',202509,2,2025,27,9,202502,2025),('2025-02-28',202509,2,2025,28,9,202502,2025),('2025-03-01',202509,3,2025,1,9,202503,2025),('2025-03-02',202510,3,2025,2,10,202503,2025),('2025-03-03',202510,3,2025,3,10,202503,2025),('2025-03-04',202510,3,2025,4,10,202503,2025),('2025-03-05',202510,3,2025,5,10,202503,2025),('2025-03-06',202510,3,2025,6,10,202503,2025),('2025-03-07',202510,3,2025,7,10,202503,2025),('2025-03-08',202510,3,2025,8,10,202503,2025),('2025-03-09',202511,3,2025,9,11,202503,2025),('2025-03-10',202511,3,2025,10,11,202503,2025),('2025-03-11',202511,3,2025,11,11,202503,2025),('2025-03-12',202511,3,2025,12,11,202503,2025),('2025-03-13',202511,3,2025,13,11,202503,2025),('2025-03-14',202511,3,2025,14,11,202503,2025),('2025-03-15',202511,3,2025,15,11,202503,2025),('2025-03-16',202512,3,2025,16,12,202503,2025),('2025-03-17',202512,3,2025,17,12,202503,2025),('2025-03-18',202512,3,2025,18,12,202503,2025),('2025-03-19',202512,3,2025,19,12,202503,2025),('2025-03-20',202512,3,2025,20,12,202503,2025),('2025-03-21',202512,3,2025,21,12,202503,2025),('2025-03-22',202512,3,2025,22,12,202503,2025),('2025-03-23',202513,3,2025,23,13,202503,2025),('2025-03-24',202513,3,2025,24,13,202503,2025),('2025-03-25',202513,3,2025,25,13,202503,2025),('2025-03-26',202513,3,2025,26,13,202503,2025),('2025-03-27',202513,3,2025,27,13,202503,2025),('2025-03-28',202513,3,2025,28,13,202503,2025),('2025-03-29',202513,3,2025,29,13,202503,2025),('2025-03-30',202514,3,2025,30,14,202503,2025),('2025-03-31',202514,3,2025,31,14,202503,2025),('2025-04-01',202514,4,2025,1,14,202504,2025),('2025-04-02',202514,4,2025,2,14,202504,2025),('2025-04-03',202514,4,2025,3,14,202504,2025),('2025-04-04',202514,4,2025,4,14,202504,2025),('2025-04-05',202514,4,2025,5,14,202504,2025),('2025-04-06',202515,4,2025,6,15,202504,2025),('2025-04-07',202515,4,2025,7,15,202504,2025),('2025-04-08',202515,4,2025,8,15,202504,2025),('2025-04-09',202515,4,2025,9,15,202504,2025),('2025-04-10',202515,4,2025,10,15,202504,2025),('2025-04-11',202515,4,2025,11,15,202504,2025),('2025-04-12',202515,4,2025,12,15,202504,2025),('2025-04-13',202516,4,2025,13,16,202504,2025),('2025-04-14',202516,4,2025,14,16,202504,2025),('2025-04-15',202516,4,2025,15,16,202504,2025),('2025-04-16',202516,4,2025,16,16,202504,2025),('2025-04-17',202516,4,2025,17,16,202504,2025),('2025-04-18',202516,4,2025,18,16,202504,2025),('2025-04-19',202516,4,2025,19,16,202504,2025),('2025-04-20',202517,4,2025,20,17,202504,2025),('2025-04-21',202517,4,2025,21,17,202504,2025),('2025-04-22',202517,4,2025,22,17,202504,2025),('2025-04-23',202517,4,2025,23,17,202504,2025),('2025-04-24',202517,4,2025,24,17,202504,2025),('2025-04-25',202517,4,2025,25,17,202504,2025),('2025-04-26',202517,4,2025,26,17,202504,2025),('2025-04-27',202518,4,2025,27,18,202504,2025),('2025-04-28',202518,4,2025,28,18,202504,2025),('2025-04-29',202518,4,2025,29,18,202504,2025),('2025-04-30',202518,4,2025,30,18,202504,2025),('2025-05-01',202518,5,2025,1,18,202505,2025),('2025-05-02',202518,5,2025,2,18,202505,2025),('2025-05-03',202518,5,2025,3,18,202505,2025),('2025-05-04',202519,5,2025,4,19,202505,2025),('2025-05-05',202519,5,2025,5,19,202505,2025),('2025-05-06',202519,5,2025,6,19,202505,2025),('2025-05-07',202519,5,2025,7,19,202505,2025),('2025-05-08',202519,5,2025,8,19,202505,2025),('2025-05-09',202519,5,2025,9,19,202505,2025),('2025-05-10',202519,5,2025,10,19,202505,2025),('2025-05-11',202520,5,2025,11,20,202505,2025),('2025-05-12',202520,5,2025,12,20,202505,2025),('2025-05-13',202520,5,2025,13,20,202505,2025),('2025-05-14',202520,5,2025,14,20,202505,2025),('2025-05-15',202520,5,2025,15,20,202505,2025),('2025-05-16',202520,5,2025,16,20,202505,2025),('2025-05-17',202520,5,2025,17,20,202505,2025),('2025-05-18',202521,5,2025,18,21,202505,2025),('2025-05-19',202521,5,2025,19,21,202505,2025),('2025-05-20',202521,5,2025,20,21,202505,2025),('2025-05-21',202521,5,2025,21,21,202505,2025),('2025-05-22',202521,5,2025,22,21,202505,2025),('2025-05-23',202521,5,2025,23,21,202505,2025),('2025-05-24',202521,5,2025,24,21,202505,2025),('2025-05-25',202522,5,2025,25,22,202505,2025),('2025-05-26',202522,5,2025,26,22,202505,2025),('2025-05-27',202522,5,2025,27,22,202505,2025),('2025-05-28',202522,5,2025,28,22,202505,2025),('2025-05-29',202522,5,2025,29,22,202505,2025),('2025-05-30',202522,5,2025,30,22,202505,2025),('2025-05-31',202522,5,2025,31,22,202505,2025),('2025-06-01',202523,6,2025,1,23,202506,2025),('2025-06-02',202523,6,2025,2,23,202506,2025),('2025-06-03',202523,6,2025,3,23,202506,2025),('2025-06-04',202523,6,2025,4,23,202506,2025),('2025-06-05',202523,6,2025,5,23,202506,2025),('2025-06-06',202523,6,2025,6,23,202506,2025),('2025-06-07',202523,6,2025,7,23,202506,2025),('2025-06-08',202524,6,2025,8,24,202506,2025),('2025-06-09',202524,6,2025,9,24,202506,2025),('2025-06-10',202524,6,2025,10,24,202506,2025),('2025-06-11',202524,6,2025,11,24,202506,2025),('2025-06-12',202524,6,2025,12,24,202506,2025),('2025-06-13',202524,6,2025,13,24,202506,2025),('2025-06-14',202524,6,2025,14,24,202506,2025),('2025-06-15',202525,6,2025,15,25,202506,2025),('2025-06-16',202525,6,2025,16,25,202506,2025),('2025-06-17',202525,6,2025,17,25,202506,2025),('2025-06-18',202525,6,2025,18,25,202506,2025),('2025-06-19',202525,6,2025,19,25,202506,2025),('2025-06-20',202525,6,2025,20,25,202506,2025),('2025-06-21',202525,6,2025,21,25,202506,2025),('2025-06-22',202526,6,2025,22,26,202506,2025),('2025-06-23',202526,6,2025,23,26,202506,2025),('2025-06-24',202526,6,2025,24,26,202506,2025),('2025-06-25',202526,6,2025,25,26,202506,2025),('2025-06-26',202526,6,2025,26,26,202506,2025),('2025-06-27',202526,6,2025,27,26,202506,2025),('2025-06-28',202526,6,2025,28,26,202506,2025),('2025-06-29',202527,6,2025,29,27,202506,2025),('2025-06-30',202527,6,2025,30,27,202506,2025),('2025-07-01',202527,7,2025,1,27,202507,2025),('2025-07-02',202527,7,2025,2,27,202507,2025),('2025-07-03',202527,7,2025,3,27,202507,2025),('2025-07-04',202527,7,2025,4,27,202507,2025),('2025-07-05',202527,7,2025,5,27,202507,2025),('2025-07-06',202528,7,2025,6,28,202507,2025),('2025-07-07',202528,7,2025,7,28,202507,2025),('2025-07-08',202528,7,2025,8,28,202507,2025),('2025-07-09',202528,7,2025,9,28,202507,2025),('2025-07-10',202528,7,2025,10,28,202507,2025),('2025-07-11',202528,7,2025,11,28,202507,2025),('2025-07-12',202528,7,2025,12,28,202507,2025),('2025-07-13',202529,7,2025,13,29,202507,2025),('2025-07-14',202529,7,2025,14,29,202507,2025),('2025-07-15',202529,7,2025,15,29,202507,2025),('2025-07-16',202529,7,2025,16,29,202507,2025),('2025-07-17',202529,7,2025,17,29,202507,2025),('2025-07-18',202529,7,2025,18,29,202507,2025),('2025-07-19',202529,7,2025,19,29,202507,2025),('2025-07-20',202530,7,2025,20,30,202507,2025),('2025-07-21',202530,7,2025,21,30,202507,2025),('2025-07-22',202530,7,2025,22,30,202507,2025),('2025-07-23',202530,7,2025,23,30,202507,2025),('2025-07-24',202530,7,2025,24,30,202507,2025),('2025-07-25',202530,7,2025,25,30,202507,2025),('2025-07-26',202530,7,2025,26,30,202507,2025),('2025-07-27',202531,7,2025,27,31,202507,2025),('2025-07-28',202531,7,2025,28,31,202507,2025),('2025-07-29',202531,7,2025,29,31,202507,2025),('2025-07-30',202531,7,2025,30,31,202507,2025),('2025-07-31',202531,7,2025,31,31,202507,2025),('2025-08-01',202531,8,2025,1,31,202508,2025),('2025-08-02',202531,8,2025,2,31,202508,2025),('2025-08-03',202532,8,2025,3,32,202508,2025),('2025-08-04',202532,8,2025,4,32,202508,2025),('2025-08-05',202532,8,2025,5,32,202508,2025),('2025-08-06',202532,8,2025,6,32,202508,2025),('2025-08-07',202532,8,2025,7,32,202508,2025),('2025-08-08',202532,8,2025,8,32,202508,2025),('2025-08-09',202532,8,2025,9,32,202508,2025),('2025-08-10',202533,8,2025,10,33,202508,2025),('2025-08-11',202533,8,2025,11,33,202508,2025),('2025-08-12',202533,8,2025,12,33,202508,2025),('2025-08-13',202533,8,2025,13,33,202508,2025),('2025-08-14',202533,8,2025,14,33,202508,2025),('2025-08-15',202533,8,2025,15,33,202508,2025),('2025-08-16',202533,8,2025,16,33,202508,2025),('2025-08-17',202534,8,2025,17,34,202508,2025),('2025-08-18',202534,8,2025,18,34,202508,2025),('2025-08-19',202534,8,2025,19,34,202508,2025),('2025-08-20',202534,8,2025,20,34,202508,2025),('2025-08-21',202534,8,2025,21,34,202508,2025),('2025-08-22',202534,8,2025,22,34,202508,2025),('2025-08-23',202534,8,2025,23,34,202508,2025),('2025-08-24',202535,8,2025,24,35,202508,2025),('2025-08-25',202535,8,2025,25,35,202508,2025),('2025-08-26',202535,8,2025,26,35,202508,2025),('2025-08-27',202535,8,2025,27,35,202508,2025),('2025-08-28',202535,8,2025,28,35,202508,2025),('2025-08-29',202535,8,2025,29,35,202508,2025),('2025-08-30',202535,8,2025,30,35,202508,2025),('2025-08-31',202536,8,2025,31,36,202508,2025),('2025-09-01',202536,9,2025,1,36,202509,2025),('2025-09-02',202536,9,2025,2,36,202509,2025),('2025-09-03',202536,9,2025,3,36,202509,2025),('2025-09-04',202536,9,2025,4,36,202509,2025),('2025-09-05',202536,9,2025,5,36,202509,2025),('2025-09-06',202536,9,2025,6,36,202509,2025),('2025-09-07',202537,9,2025,7,37,202509,2025),('2025-09-08',202537,9,2025,8,37,202509,2025),('2025-09-09',202537,9,2025,9,37,202509,2025),('2025-09-10',202537,9,2025,10,37,202509,2025),('2025-09-11',202537,9,2025,11,37,202509,2025),('2025-09-12',202537,9,2025,12,37,202509,2025),('2025-09-13',202537,9,2025,13,37,202509,2025),('2025-09-14',202538,9,2025,14,38,202509,2025),('2025-09-15',202538,9,2025,15,38,202509,2025),('2025-09-16',202538,9,2025,16,38,202509,2025),('2025-09-17',202538,9,2025,17,38,202509,2025),('2025-09-18',202538,9,2025,18,38,202509,2025),('2025-09-19',202538,9,2025,19,38,202509,2025),('2025-09-20',202538,9,2025,20,38,202509,2025),('2025-09-21',202539,9,2025,21,39,202509,2025),('2025-09-22',202539,9,2025,22,39,202509,2025),('2025-09-23',202539,9,2025,23,39,202509,2025),('2025-09-24',202539,9,2025,24,39,202509,2025),('2025-09-25',202539,9,2025,25,39,202509,2025),('2025-09-26',202539,9,2025,26,39,202509,2025),('2025-09-27',202539,9,2025,27,39,202509,2025),('2025-09-28',202540,9,2025,28,40,202509,2025),('2025-09-29',202540,9,2025,29,40,202509,2025),('2025-09-30',202540,9,2025,30,40,202509,2025),('2025-10-01',202540,10,2025,1,40,202510,2025),('2025-10-02',202540,10,2025,2,40,202510,2025),('2025-10-03',202540,10,2025,3,40,202510,2025),('2025-10-04',202540,10,2025,4,40,202510,2025),('2025-10-05',202541,10,2025,5,41,202510,2025),('2025-10-06',202541,10,2025,6,41,202510,2025),('2025-10-07',202541,10,2025,7,41,202510,2025),('2025-10-08',202541,10,2025,8,41,202510,2025),('2025-10-09',202541,10,2025,9,41,202510,2025),('2025-10-10',202541,10,2025,10,41,202510,2025),('2025-10-11',202541,10,2025,11,41,202510,2025),('2025-10-12',202542,10,2025,12,42,202510,2025),('2025-10-13',202542,10,2025,13,42,202510,2025),('2025-10-14',202542,10,2025,14,42,202510,2025),('2025-10-15',202542,10,2025,15,42,202510,2025),('2025-10-16',202542,10,2025,16,42,202510,2025),('2025-10-17',202542,10,2025,17,42,202510,2025),('2025-10-18',202542,10,2025,18,42,202510,2025),('2025-10-19',202543,10,2025,19,43,202510,2025),('2025-10-20',202543,10,2025,20,43,202510,2025),('2025-10-21',202543,10,2025,21,43,202510,2025),('2025-10-22',202543,10,2025,22,43,202510,2025),('2025-10-23',202543,10,2025,23,43,202510,2025),('2025-10-24',202543,10,2025,24,43,202510,2025),('2025-10-25',202543,10,2025,25,43,202510,2025),('2025-10-26',202544,10,2025,26,44,202510,2025),('2025-10-27',202544,10,2025,27,44,202510,2025),('2025-10-28',202544,10,2025,28,44,202510,2025),('2025-10-29',202544,10,2025,29,44,202510,2025),('2025-10-30',202544,10,2025,30,44,202510,2025),('2025-10-31',202544,10,2025,31,44,202510,2025),('2025-11-01',202544,11,2025,1,44,202511,2025),('2025-11-02',202545,11,2025,2,45,202511,2025),('2025-11-03',202545,11,2025,3,45,202511,2025),('2025-11-04',202545,11,2025,4,45,202511,2025),('2025-11-05',202545,11,2025,5,45,202511,2025),('2025-11-06',202545,11,2025,6,45,202511,2025),('2025-11-07',202545,11,2025,7,45,202511,2025),('2025-11-08',202545,11,2025,8,45,202511,2025),('2025-11-09',202546,11,2025,9,46,202511,2025),('2025-11-10',202546,11,2025,10,46,202511,2025),('2025-11-11',202546,11,2025,11,46,202511,2025),('2025-11-12',202546,11,2025,12,46,202511,2025),('2025-11-13',202546,11,2025,13,46,202511,2025),('2025-11-14',202546,11,2025,14,46,202511,2025),('2025-11-15',202546,11,2025,15,46,202511,2025),('2025-11-16',202547,11,2025,16,47,202511,2025),('2025-11-17',202547,11,2025,17,47,202511,2025),('2025-11-18',202547,11,2025,18,47,202511,2025),('2025-11-19',202547,11,2025,19,47,202511,2025),('2025-11-20',202547,11,2025,20,47,202511,2025),('2025-11-21',202547,11,2025,21,47,202511,2025),('2025-11-22',202547,11,2025,22,47,202511,2025),('2025-11-23',202548,11,2025,23,48,202511,2025),('2025-11-24',202548,11,2025,24,48,202511,2025),('2025-11-25',202548,11,2025,25,48,202511,2025),('2025-11-26',202548,11,2025,26,48,202511,2025),('2025-11-27',202548,11,2025,27,48,202511,2025),('2025-11-28',202548,11,2025,28,48,202511,2025),('2025-11-29',202548,11,2025,29,48,202511,2025),('2025-11-30',202549,11,2025,30,49,202511,2025),('2025-12-01',202549,12,2025,1,49,202512,2026),('2025-12-02',202549,12,2025,2,49,202512,2026),('2025-12-03',202549,12,2025,3,49,202512,2026),('2025-12-04',202549,12,2025,4,49,202512,2026),('2025-12-05',202549,12,2025,5,49,202512,2026),('2025-12-06',202549,12,2025,6,49,202512,2026),('2025-12-07',202550,12,2025,7,50,202512,2026),('2025-12-08',202550,12,2025,8,50,202512,2026),('2025-12-09',202550,12,2025,9,50,202512,2026),('2025-12-10',202550,12,2025,10,50,202512,2026),('2025-12-11',202550,12,2025,11,50,202512,2026),('2025-12-12',202550,12,2025,12,50,202512,2026),('2025-12-13',202550,12,2025,13,50,202512,2026),('2025-12-14',202551,12,2025,14,51,202512,2026),('2025-12-15',202551,12,2025,15,51,202512,2026),('2025-12-16',202551,12,2025,16,51,202512,2026),('2025-12-17',202551,12,2025,17,51,202512,2026),('2025-12-18',202551,12,2025,18,51,202512,2026),('2025-12-19',202551,12,2025,19,51,202512,2026),('2025-12-20',202551,12,2025,20,51,202512,2026),('2025-12-21',202552,12,2025,21,52,202512,2026),('2025-12-22',202552,12,2025,22,52,202512,2026),('2025-12-23',202552,12,2025,23,52,202512,2026),('2025-12-24',202552,12,2025,24,52,202512,2026),('2025-12-25',202552,12,2025,25,52,202512,2026),('2025-12-26',202552,12,2025,26,52,202512,2026),('2025-12-27',202552,12,2025,27,52,202512,2026),('2025-12-28',202553,12,2025,28,53,202512,2026),('2025-12-29',202501,12,2025,29,53,202512,2026),('2025-12-30',202501,12,2025,30,53,202512,2026),('2025-12-31',202501,12,2025,31,53,202512,2026),('2026-01-01',202601,1,2026,1,53,202601,2026),('2026-01-02',202601,1,2026,2,53,202601,2026),('2026-01-03',202601,1,2026,3,53,202601,2026),('2026-01-04',202602,1,2026,4,1,202601,2026),('2026-01-05',202602,1,2026,5,1,202601,2026),('2026-01-06',202602,1,2026,6,1,202601,2026),('2026-01-07',202602,1,2026,7,1,202601,2026),('2026-01-08',202602,1,2026,8,1,202601,2026),('2026-01-09',202602,1,2026,9,1,202601,2026),('2026-01-10',202602,1,2026,10,1,202601,2026),('2026-01-11',202603,1,2026,11,2,202601,2026),('2026-01-12',202603,1,2026,12,2,202601,2026),('2026-01-13',202603,1,2026,13,2,202601,2026),('2026-01-14',202603,1,2026,14,2,202601,2026),('2026-01-15',202603,1,2026,15,2,202601,2026),('2026-01-16',202603,1,2026,16,2,202601,2026),('2026-01-17',202603,1,2026,17,2,202601,2026),('2026-01-18',202604,1,2026,18,3,202601,2026),('2026-01-19',202604,1,2026,19,3,202601,2026),('2026-01-20',202604,1,2026,20,3,202601,2026),('2026-01-21',202604,1,2026,21,3,202601,2026),('2026-01-22',202604,1,2026,22,3,202601,2026),('2026-01-23',202604,1,2026,23,3,202601,2026),('2026-01-24',202604,1,2026,24,3,202601,2026),('2026-01-25',202605,1,2026,25,4,202601,2026),('2026-01-26',202605,1,2026,26,4,202601,2026),('2026-01-27',202605,1,2026,27,4,202601,2026),('2026-01-28',202605,1,2026,28,4,202601,2026),('2026-01-29',202605,1,2026,29,4,202601,2026),('2026-01-30',202605,1,2026,30,4,202601,2026),('2026-01-31',202605,1,2026,31,4,202601,2026),('2026-02-01',202606,2,2026,1,5,202602,2026),('2026-02-02',202606,2,2026,2,5,202602,2026),('2026-02-03',202606,2,2026,3,5,202602,2026),('2026-02-04',202606,2,2026,4,5,202602,2026),('2026-02-05',202606,2,2026,5,5,202602,2026),('2026-02-06',202606,2,2026,6,5,202602,2026),('2026-02-07',202606,2,2026,7,5,202602,2026),('2026-02-08',202607,2,2026,8,6,202602,2026),('2026-02-09',202607,2,2026,9,6,202602,2026),('2026-02-10',202607,2,2026,10,6,202602,2026),('2026-02-11',202607,2,2026,11,6,202602,2026),('2026-02-12',202607,2,2026,12,6,202602,2026),('2026-02-13',202607,2,2026,13,6,202602,2026),('2026-02-14',202607,2,2026,14,6,202602,2026),('2026-02-15',202608,2,2026,15,7,202602,2026),('2026-02-16',202608,2,2026,16,7,202602,2026),('2026-02-17',202608,2,2026,17,7,202602,2026),('2026-02-18',202608,2,2026,18,7,202602,2026),('2026-02-19',202608,2,2026,19,7,202602,2026),('2026-02-20',202608,2,2026,20,7,202602,2026),('2026-02-21',202608,2,2026,21,7,202602,2026),('2026-02-22',202609,2,2026,22,8,202602,2026),('2026-02-23',202609,2,2026,23,8,202602,2026),('2026-02-24',202609,2,2026,24,8,202602,2026),('2026-02-25',202609,2,2026,25,8,202602,2026),('2026-02-26',202609,2,2026,26,8,202602,2026),('2026-02-27',202609,2,2026,27,8,202602,2026),('2026-02-28',202609,2,2026,28,8,202602,2026),('2026-03-01',202610,3,2026,1,9,202603,2026),('2026-03-02',202610,3,2026,2,9,202603,2026),('2026-03-03',202610,3,2026,3,9,202603,2026),('2026-03-04',202610,3,2026,4,9,202603,2026),('2026-03-05',202610,3,2026,5,9,202603,2026),('2026-03-06',202610,3,2026,6,9,202603,2026),('2026-03-07',202610,3,2026,7,9,202603,2026),('2026-03-08',202611,3,2026,8,10,202603,2026),('2026-03-09',202611,3,2026,9,10,202603,2026),('2026-03-10',202611,3,2026,10,10,202603,2026),('2026-03-11',202611,3,2026,11,10,202603,2026),('2026-03-12',202611,3,2026,12,10,202603,2026),('2026-03-13',202611,3,2026,13,10,202603,2026),('2026-03-14',202611,3,2026,14,10,202603,2026),('2026-03-15',202612,3,2026,15,11,202603,2026),('2026-03-16',202612,3,2026,16,11,202603,2026),('2026-03-17',202612,3,2026,17,11,202603,2026),('2026-03-18',202612,3,2026,18,11,202603,2026),('2026-03-19',202612,3,2026,19,11,202603,2026),('2026-03-20',202612,3,2026,20,11,202603,2026),('2026-03-21',202612,3,2026,21,11,202603,2026),('2026-03-22',202613,3,2026,22,12,202603,2026),('2026-03-23',202613,3,2026,23,12,202603,2026),('2026-03-24',202613,3,2026,24,12,202603,2026),('2026-03-25',202613,3,2026,25,12,202603,2026),('2026-03-26',202613,3,2026,26,12,202603,2026),('2026-03-27',202613,3,2026,27,12,202603,2026),('2026-03-28',202613,3,2026,28,12,202603,2026),('2026-03-29',202614,3,2026,29,13,202603,2026),('2026-03-30',202614,3,2026,30,13,202603,2026),('2026-03-31',202614,3,2026,31,13,202603,2026),('2026-04-01',202614,4,2026,1,13,202604,2026),('2026-04-02',202614,4,2026,2,13,202604,2026),('2026-04-03',202614,4,2026,3,13,202604,2026),('2026-04-04',202614,4,2026,4,13,202604,2026),('2026-04-05',202615,4,2026,5,14,202604,2026),('2026-04-06',202615,4,2026,6,14,202604,2026),('2026-04-07',202615,4,2026,7,14,202604,2026),('2026-04-08',202615,4,2026,8,14,202604,2026),('2026-04-09',202615,4,2026,9,14,202604,2026),('2026-04-10',202615,4,2026,10,14,202604,2026),('2026-04-11',202615,4,2026,11,14,202604,2026),('2026-04-12',202616,4,2026,12,15,202604,2026),('2026-04-13',202616,4,2026,13,15,202604,2026),('2026-04-14',202616,4,2026,14,15,202604,2026),('2026-04-15',202616,4,2026,15,15,202604,2026),('2026-04-16',202616,4,2026,16,15,202604,2026),('2026-04-17',202616,4,2026,17,15,202604,2026),('2026-04-18',202616,4,2026,18,15,202604,2026),('2026-04-19',202617,4,2026,19,16,202604,2026),('2026-04-20',202617,4,2026,20,16,202604,2026),('2026-04-21',202617,4,2026,21,16,202604,2026),('2026-04-22',202617,4,2026,22,16,202604,2026),('2026-04-23',202617,4,2026,23,16,202604,2026),('2026-04-24',202617,4,2026,24,16,202604,2026),('2026-04-25',202617,4,2026,25,16,202604,2026),('2026-04-26',202618,4,2026,26,17,202604,2026),('2026-04-27',202618,4,2026,27,17,202604,2026),('2026-04-28',202618,4,2026,28,17,202604,2026),('2026-04-29',202618,4,2026,29,17,202604,2026),('2026-04-30',202618,4,2026,30,17,202604,2026),('2026-05-01',202618,5,2026,1,17,202605,2026),('2026-05-02',202618,5,2026,2,17,202605,2026),('2026-05-03',202619,5,2026,3,18,202605,2026),('2026-05-04',202619,5,2026,4,18,202605,2026),('2026-05-05',202619,5,2026,5,18,202605,2026),('2026-05-06',202619,5,2026,6,18,202605,2026),('2026-05-07',202619,5,2026,7,18,202605,2026),('2026-05-08',202619,5,2026,8,18,202605,2026),('2026-05-09',202619,5,2026,9,18,202605,2026),('2026-05-10',202620,5,2026,10,19,202605,2026),('2026-05-11',202620,5,2026,11,19,202605,2026),('2026-05-12',202620,5,2026,12,19,202605,2026),('2026-05-13',202620,5,2026,13,19,202605,2026),('2026-05-14',202620,5,2026,14,19,202605,2026),('2026-05-15',202620,5,2026,15,19,202605,2026),('2026-05-16',202620,5,2026,16,19,202605,2026),('2026-05-17',202621,5,2026,17,20,202605,2026),('2026-05-18',202621,5,2026,18,20,202605,2026),('2026-05-19',202621,5,2026,19,20,202605,2026),('2026-05-20',202621,5,2026,20,20,202605,2026),('2026-05-21',202621,5,2026,21,20,202605,2026),('2026-05-22',202621,5,2026,22,20,202605,2026),('2026-05-23',202621,5,2026,23,20,202605,2026),('2026-05-24',202622,5,2026,24,21,202605,2026),('2026-05-25',202622,5,2026,25,21,202605,2026),('2026-05-26',202622,5,2026,26,21,202605,2026),('2026-05-27',202622,5,2026,27,21,202605,2026),('2026-05-28',202622,5,2026,28,21,202605,2026),('2026-05-29',202622,5,2026,29,21,202605,2026),('2026-05-30',202622,5,2026,30,21,202605,2026),('2026-05-31',202623,5,2026,31,22,202605,2026),('2026-06-01',202623,6,2026,1,22,202606,2026),('2026-06-02',202623,6,2026,2,22,202606,2026),('2026-06-03',202623,6,2026,3,22,202606,2026),('2026-06-04',202623,6,2026,4,22,202606,2026),('2026-06-05',202623,6,2026,5,22,202606,2026),('2026-06-06',202623,6,2026,6,22,202606,2026),('2026-06-07',202624,6,2026,7,23,202606,2026),('2026-06-08',202624,6,2026,8,23,202606,2026),('2026-06-09',202624,6,2026,9,23,202606,2026),('2026-06-10',202624,6,2026,10,23,202606,2026),('2026-06-11',202624,6,2026,11,23,202606,2026),('2026-06-12',202624,6,2026,12,23,202606,2026),('2026-06-13',202624,6,2026,13,23,202606,2026),('2026-06-14',202625,6,2026,14,24,202606,2026),('2026-06-15',202625,6,2026,15,24,202606,2026),('2026-06-16',202625,6,2026,16,24,202606,2026),('2026-06-17',202625,6,2026,17,24,202606,2026),('2026-06-18',202625,6,2026,18,24,202606,2026),('2026-06-19',202625,6,2026,19,24,202606,2026),('2026-06-20',202625,6,2026,20,24,202606,2026),('2026-06-21',202626,6,2026,21,25,202606,2026),('2026-06-22',202626,6,2026,22,25,202606,2026),('2026-06-23',202626,6,2026,23,25,202606,2026),('2026-06-24',202626,6,2026,24,25,202606,2026),('2026-06-25',202626,6,2026,25,25,202606,2026),('2026-06-26',202626,6,2026,26,25,202606,2026),('2026-06-27',202626,6,2026,27,25,202606,2026),('2026-06-28',202627,6,2026,28,26,202606,2026),('2026-06-29',202627,6,2026,29,26,202606,2026),('2026-06-30',202627,6,2026,30,26,202606,2026),('2026-07-01',202627,7,2026,1,26,202607,2026),('2026-07-02',202627,7,2026,2,26,202607,2026),('2026-07-03',202627,7,2026,3,26,202607,2026),('2026-07-04',202627,7,2026,4,26,202607,2026),('2026-07-05',202628,7,2026,5,27,202607,2026),('2026-07-06',202628,7,2026,6,27,202607,2026),('2026-07-07',202628,7,2026,7,27,202607,2026),('2026-07-08',202628,7,2026,8,27,202607,2026),('2026-07-09',202628,7,2026,9,27,202607,2026),('2026-07-10',202628,7,2026,10,27,202607,2026),('2026-07-11',202628,7,2026,11,27,202607,2026),('2026-07-12',202629,7,2026,12,28,202607,2026),('2026-07-13',202629,7,2026,13,28,202607,2026),('2026-07-14',202629,7,2026,14,28,202607,2026),('2026-07-15',202629,7,2026,15,28,202607,2026),('2026-07-16',202629,7,2026,16,28,202607,2026),('2026-07-17',202629,7,2026,17,28,202607,2026),('2026-07-18',202629,7,2026,18,28,202607,2026),('2026-07-19',202630,7,2026,19,29,202607,2026),('2026-07-20',202630,7,2026,20,29,202607,2026),('2026-07-21',202630,7,2026,21,29,202607,2026),('2026-07-22',202630,7,2026,22,29,202607,2026),('2026-07-23',202630,7,2026,23,29,202607,2026),('2026-07-24',202630,7,2026,24,29,202607,2026),('2026-07-25',202630,7,2026,25,29,202607,2026),('2026-07-26',202631,7,2026,26,30,202607,2026),('2026-07-27',202631,7,2026,27,30,202607,2026),('2026-07-28',202631,7,2026,28,30,202607,2026),('2026-07-29',202631,7,2026,29,30,202607,2026),('2026-07-30',202631,7,2026,30,30,202607,2026),('2026-07-31',202631,7,2026,31,30,202607,2026),('2026-08-01',202631,8,2026,1,30,202608,2026),('2026-08-02',202632,8,2026,2,31,202608,2026),('2026-08-03',202632,8,2026,3,31,202608,2026),('2026-08-04',202632,8,2026,4,31,202608,2026),('2026-08-05',202632,8,2026,5,31,202608,2026),('2026-08-06',202632,8,2026,6,31,202608,2026),('2026-08-07',202632,8,2026,7,31,202608,2026),('2026-08-08',202632,8,2026,8,31,202608,2026),('2026-08-09',202633,8,2026,9,32,202608,2026),('2026-08-10',202633,8,2026,10,32,202608,2026),('2026-08-11',202633,8,2026,11,32,202608,2026),('2026-08-12',202633,8,2026,12,32,202608,2026),('2026-08-13',202633,8,2026,13,32,202608,2026),('2026-08-14',202633,8,2026,14,32,202608,2026),('2026-08-15',202633,8,2026,15,32,202608,2026),('2026-08-16',202634,8,2026,16,33,202608,2026),('2026-08-17',202634,8,2026,17,33,202608,2026),('2026-08-18',202634,8,2026,18,33,202608,2026),('2026-08-19',202634,8,2026,19,33,202608,2026),('2026-08-20',202634,8,2026,20,33,202608,2026),('2026-08-21',202634,8,2026,21,33,202608,2026),('2026-08-22',202634,8,2026,22,33,202608,2026),('2026-08-23',202635,8,2026,23,34,202608,2026),('2026-08-24',202635,8,2026,24,34,202608,2026),('2026-08-25',202635,8,2026,25,34,202608,2026),('2026-08-26',202635,8,2026,26,34,202608,2026),('2026-08-27',202635,8,2026,27,34,202608,2026),('2026-08-28',202635,8,2026,28,34,202608,2026),('2026-08-29',202635,8,2026,29,34,202608,2026),('2026-08-30',202636,8,2026,30,35,202608,2026),('2026-08-31',202636,8,2026,31,35,202608,2026),('2026-09-01',202636,9,2026,1,35,202609,2026),('2026-09-02',202636,9,2026,2,35,202609,2026),('2026-09-03',202636,9,2026,3,35,202609,2026),('2026-09-04',202636,9,2026,4,35,202609,2026),('2026-09-05',202636,9,2026,5,35,202609,2026),('2026-09-06',202637,9,2026,6,36,202609,2026),('2026-09-07',202637,9,2026,7,36,202609,2026),('2026-09-08',202637,9,2026,8,36,202609,2026),('2026-09-09',202637,9,2026,9,36,202609,2026),('2026-09-10',202637,9,2026,10,36,202609,2026),('2026-09-11',202637,9,2026,11,36,202609,2026),('2026-09-12',202637,9,2026,12,36,202609,2026),('2026-09-13',202638,9,2026,13,37,202609,2026),('2026-09-14',202638,9,2026,14,37,202609,2026),('2026-09-15',202638,9,2026,15,37,202609,2026),('2026-09-16',202638,9,2026,16,37,202609,2026),('2026-09-17',202638,9,2026,17,37,202609,2026),('2026-09-18',202638,9,2026,18,37,202609,2026),('2026-09-19',202638,9,2026,19,37,202609,2026),('2026-09-20',202639,9,2026,20,38,202609,2026),('2026-09-21',202639,9,2026,21,38,202609,2026),('2026-09-22',202639,9,2026,22,38,202609,2026),('2026-09-23',202639,9,2026,23,38,202609,2026),('2026-09-24',202639,9,2026,24,38,202609,2026),('2026-09-25',202639,9,2026,25,38,202609,2026),('2026-09-26',202639,9,2026,26,38,202609,2026),('2026-09-27',202640,9,2026,27,39,202609,2026),('2026-09-28',202640,9,2026,28,39,202609,2026),('2026-09-29',202640,9,2026,29,39,202609,2026),('2026-09-30',202640,9,2026,30,39,202609,2026),('2026-10-01',202640,10,2026,1,39,202610,2026),('2026-10-02',202640,10,2026,2,39,202610,2026),('2026-10-03',202640,10,2026,3,39,202610,2026),('2026-10-04',202641,10,2026,4,40,202610,2026),('2026-10-05',202641,10,2026,5,40,202610,2026),('2026-10-06',202641,10,2026,6,40,202610,2026),('2026-10-07',202641,10,2026,7,40,202610,2026),('2026-10-08',202641,10,2026,8,40,202610,2026),('2026-10-09',202641,10,2026,9,40,202610,2026),('2026-10-10',202641,10,2026,10,40,202610,2026),('2026-10-11',202642,10,2026,11,41,202610,2026),('2026-10-12',202642,10,2026,12,41,202610,2026),('2026-10-13',202642,10,2026,13,41,202610,2026),('2026-10-14',202642,10,2026,14,41,202610,2026),('2026-10-15',202642,10,2026,15,41,202610,2026),('2026-10-16',202642,10,2026,16,41,202610,2026),('2026-10-17',202642,10,2026,17,41,202610,2026),('2026-10-18',202643,10,2026,18,42,202610,2026),('2026-10-19',202643,10,2026,19,42,202610,2026),('2026-10-20',202643,10,2026,20,42,202610,2026),('2026-10-21',202643,10,2026,21,42,202610,2026),('2026-10-22',202643,10,2026,22,42,202610,2026),('2026-10-23',202643,10,2026,23,42,202610,2026),('2026-10-24',202643,10,2026,24,42,202610,2026),('2026-10-25',202644,10,2026,25,43,202610,2026),('2026-10-26',202644,10,2026,26,43,202610,2026),('2026-10-27',202644,10,2026,27,43,202610,2026),('2026-10-28',202644,10,2026,28,43,202610,2026),('2026-10-29',202644,10,2026,29,43,202610,2026),('2026-10-30',202644,10,2026,30,43,202610,2026),('2026-10-31',202644,10,2026,31,43,202610,2026),('2026-11-01',202645,11,2026,1,44,202611,2026),('2026-11-02',202645,11,2026,2,44,202611,2026),('2026-11-03',202645,11,2026,3,44,202611,2026),('2026-11-04',202645,11,2026,4,44,202611,2026),('2026-11-05',202645,11,2026,5,44,202611,2026),('2026-11-06',202645,11,2026,6,44,202611,2026),('2026-11-07',202645,11,2026,7,44,202611,2026),('2026-11-08',202646,11,2026,8,45,202611,2026),('2026-11-09',202646,11,2026,9,45,202611,2026),('2026-11-10',202646,11,2026,10,45,202611,2026),('2026-11-11',202646,11,2026,11,45,202611,2026),('2026-11-12',202646,11,2026,12,45,202611,2026),('2026-11-13',202646,11,2026,13,45,202611,2026),('2026-11-14',202646,11,2026,14,45,202611,2026),('2026-11-15',202647,11,2026,15,46,202611,2026),('2026-11-16',202647,11,2026,16,46,202611,2026),('2026-11-17',202647,11,2026,17,46,202611,2026),('2026-11-18',202647,11,2026,18,46,202611,2026),('2026-11-19',202647,11,2026,19,46,202611,2026),('2026-11-20',202647,11,2026,20,46,202611,2026),('2026-11-21',202647,11,2026,21,46,202611,2026),('2026-11-22',202648,11,2026,22,47,202611,2026),('2026-11-23',202648,11,2026,23,47,202611,2026),('2026-11-24',202648,11,2026,24,47,202611,2026),('2026-11-25',202648,11,2026,25,47,202611,2026),('2026-11-26',202648,11,2026,26,47,202611,2026),('2026-11-27',202648,11,2026,27,47,202611,2026),('2026-11-28',202648,11,2026,28,47,202611,2026),('2026-11-29',202649,11,2026,29,48,202611,2026),('2026-11-30',202649,11,2026,30,48,202611,2026),('2026-12-01',202649,12,2026,1,48,202612,2027),('2026-12-02',202649,12,2026,2,48,202612,2027),('2026-12-03',202649,12,2026,3,48,202612,2027),('2026-12-04',202649,12,2026,4,48,202612,2027),('2026-12-05',202649,12,2026,5,48,202612,2027),('2026-12-06',202650,12,2026,6,49,202612,2027),('2026-12-07',202650,12,2026,7,49,202612,2027),('2026-12-08',202650,12,2026,8,49,202612,2027),('2026-12-09',202650,12,2026,9,49,202612,2027),('2026-12-10',202650,12,2026,10,49,202612,2027),('2026-12-11',202650,12,2026,11,49,202612,2027),('2026-12-12',202650,12,2026,12,49,202612,2027),('2026-12-13',202651,12,2026,13,50,202612,2027),('2026-12-14',202651,12,2026,14,50,202612,2027),('2026-12-15',202651,12,2026,15,50,202612,2027),('2026-12-16',202651,12,2026,16,50,202612,2027),('2026-12-17',202651,12,2026,17,50,202612,2027),('2026-12-18',202651,12,2026,18,50,202612,2027),('2026-12-19',202651,12,2026,19,50,202612,2027),('2026-12-20',202652,12,2026,20,51,202612,2027),('2026-12-21',202652,12,2026,21,51,202612,2027),('2026-12-22',202652,12,2026,22,51,202612,2027),('2026-12-23',202652,12,2026,23,51,202612,2027),('2026-12-24',202652,12,2026,24,51,202612,2027),('2026-12-25',202652,12,2026,25,51,202612,2027),('2026-12-26',202652,12,2026,26,51,202612,2027),('2026-12-27',202653,12,2026,27,52,202612,2027),('2026-12-28',202653,12,2026,28,52,202612,2027),('2026-12-29',202653,12,2026,29,52,202612,2027),('2026-12-30',202653,12,2026,30,52,202612,2027),('2026-12-31',202653,12,2026,31,52,202612,2027),('2027-01-01',202753,1,2027,1,52,202701,2027),('2027-01-02',202753,1,2027,2,52,202701,2027),('2027-01-03',202754,1,2027,3,1,202701,2027),('2027-01-04',202701,1,2027,4,1,202701,2027),('2027-01-05',202701,1,2027,5,1,202701,2027),('2027-01-06',202701,1,2027,6,1,202701,2027),('2027-01-07',202701,1,2027,7,1,202701,2027),('2027-01-08',202701,1,2027,8,1,202701,2027),('2027-01-09',202701,1,2027,9,1,202701,2027),('2027-01-10',202702,1,2027,10,2,202701,2027),('2027-01-11',202702,1,2027,11,2,202701,2027),('2027-01-12',202702,1,2027,12,2,202701,2027),('2027-01-13',202702,1,2027,13,2,202701,2027),('2027-01-14',202702,1,2027,14,2,202701,2027),('2027-01-15',202702,1,2027,15,2,202701,2027),('2027-01-16',202702,1,2027,16,2,202701,2027),('2027-01-17',202703,1,2027,17,3,202701,2027),('2027-01-18',202703,1,2027,18,3,202701,2027),('2027-01-19',202703,1,2027,19,3,202701,2027),('2027-01-20',202703,1,2027,20,3,202701,2027),('2027-01-21',202703,1,2027,21,3,202701,2027),('2027-01-22',202703,1,2027,22,3,202701,2027),('2027-01-23',202703,1,2027,23,3,202701,2027),('2027-01-24',202704,1,2027,24,4,202701,2027),('2027-01-25',202704,1,2027,25,4,202701,2027),('2027-01-26',202704,1,2027,26,4,202701,2027),('2027-01-27',202704,1,2027,27,4,202701,2027),('2027-01-28',202704,1,2027,28,4,202701,2027),('2027-01-29',202704,1,2027,29,4,202701,2027),('2027-01-30',202704,1,2027,30,4,202701,2027),('2027-01-31',202705,1,2027,31,5,202701,2027),('2027-02-01',202705,2,2027,1,5,202702,2027),('2027-02-02',202705,2,2027,2,5,202702,2027),('2027-02-03',202705,2,2027,3,5,202702,2027),('2027-02-04',202705,2,2027,4,5,202702,2027),('2027-02-05',202705,2,2027,5,5,202702,2027),('2027-02-06',202705,2,2027,6,5,202702,2027),('2027-02-07',202706,2,2027,7,6,202702,2027),('2027-02-08',202706,2,2027,8,6,202702,2027),('2027-02-09',202706,2,2027,9,6,202702,2027),('2027-02-10',202706,2,2027,10,6,202702,2027),('2027-02-11',202706,2,2027,11,6,202702,2027),('2027-02-12',202706,2,2027,12,6,202702,2027),('2027-02-13',202706,2,2027,13,6,202702,2027),('2027-02-14',202707,2,2027,14,7,202702,2027),('2027-02-15',202707,2,2027,15,7,202702,2027),('2027-02-16',202707,2,2027,16,7,202702,2027),('2027-02-17',202707,2,2027,17,7,202702,2027),('2027-02-18',202707,2,2027,18,7,202702,2027),('2027-02-19',202707,2,2027,19,7,202702,2027),('2027-02-20',202707,2,2027,20,7,202702,2027),('2027-02-21',202708,2,2027,21,8,202702,2027),('2027-02-22',202708,2,2027,22,8,202702,2027),('2027-02-23',202708,2,2027,23,8,202702,2027),('2027-02-24',202708,2,2027,24,8,202702,2027),('2027-02-25',202708,2,2027,25,8,202702,2027),('2027-02-26',202708,2,2027,26,8,202702,2027),('2027-02-27',202708,2,2027,27,8,202702,2027),('2027-02-28',202709,2,2027,28,9,202702,2027),('2027-03-01',202709,3,2027,1,9,202703,2027),('2027-03-02',202709,3,2027,2,9,202703,2027),('2027-03-03',202709,3,2027,3,9,202703,2027),('2027-03-04',202709,3,2027,4,9,202703,2027),('2027-03-05',202709,3,2027,5,9,202703,2027),('2027-03-06',202709,3,2027,6,9,202703,2027),('2027-03-07',202710,3,2027,7,10,202703,2027),('2027-03-08',202710,3,2027,8,10,202703,2027),('2027-03-09',202710,3,2027,9,10,202703,2027),('2027-03-10',202710,3,2027,10,10,202703,2027),('2027-03-11',202710,3,2027,11,10,202703,2027),('2027-03-12',202710,3,2027,12,10,202703,2027),('2027-03-13',202710,3,2027,13,10,202703,2027),('2027-03-14',202711,3,2027,14,11,202703,2027),('2027-03-15',202711,3,2027,15,11,202703,2027),('2027-03-16',202711,3,2027,16,11,202703,2027),('2027-03-17',202711,3,2027,17,11,202703,2027),('2027-03-18',202711,3,2027,18,11,202703,2027),('2027-03-19',202711,3,2027,19,11,202703,2027),('2027-03-20',202711,3,2027,20,11,202703,2027),('2027-03-21',202712,3,2027,21,12,202703,2027),('2027-03-22',202712,3,2027,22,12,202703,2027),('2027-03-23',202712,3,2027,23,12,202703,2027),('2027-03-24',202712,3,2027,24,12,202703,2027),('2027-03-25',202712,3,2027,25,12,202703,2027),('2027-03-26',202712,3,2027,26,12,202703,2027),('2027-03-27',202712,3,2027,27,12,202703,2027),('2027-03-28',202713,3,2027,28,13,202703,2027),('2027-03-29',202713,3,2027,29,13,202703,2027),('2027-03-30',202713,3,2027,30,13,202703,2027),('2027-03-31',202713,3,2027,31,13,202703,2027),('2027-04-01',202713,4,2027,1,13,202704,2027),('2027-04-02',202713,4,2027,2,13,202704,2027),('2027-04-03',202713,4,2027,3,13,202704,2027),('2027-04-04',202714,4,2027,4,14,202704,2027),('2027-04-05',202714,4,2027,5,14,202704,2027),('2027-04-06',202714,4,2027,6,14,202704,2027),('2027-04-07',202714,4,2027,7,14,202704,2027),('2027-04-08',202714,4,2027,8,14,202704,2027),('2027-04-09',202714,4,2027,9,14,202704,2027),('2027-04-10',202714,4,2027,10,14,202704,2027),('2027-04-11',202715,4,2027,11,15,202704,2027),('2027-04-12',202715,4,2027,12,15,202704,2027),('2027-04-13',202715,4,2027,13,15,202704,2027),('2027-04-14',202715,4,2027,14,15,202704,2027),('2027-04-15',202715,4,2027,15,15,202704,2027),('2027-04-16',202715,4,2027,16,15,202704,2027),('2027-04-17',202715,4,2027,17,15,202704,2027),('2027-04-18',202716,4,2027,18,16,202704,2027),('2027-04-19',202716,4,2027,19,16,202704,2027),('2027-04-20',202716,4,2027,20,16,202704,2027),('2027-04-21',202716,4,2027,21,16,202704,2027),('2027-04-22',202716,4,2027,22,16,202704,2027),('2027-04-23',202716,4,2027,23,16,202704,2027),('2027-04-24',202716,4,2027,24,16,202704,2027),('2027-04-25',202717,4,2027,25,17,202704,2027),('2027-04-26',202717,4,2027,26,17,202704,2027),('2027-04-27',202717,4,2027,27,17,202704,2027),('2027-04-28',202717,4,2027,28,17,202704,2027),('2027-04-29',202717,4,2027,29,17,202704,2027),('2027-04-30',202717,4,2027,30,17,202704,2027),('2027-05-01',202717,5,2027,1,17,202705,2027),('2027-05-02',202718,5,2027,2,18,202705,2027),('2027-05-03',202718,5,2027,3,18,202705,2027),('2027-05-04',202718,5,2027,4,18,202705,2027),('2027-05-05',202718,5,2027,5,18,202705,2027),('2027-05-06',202718,5,2027,6,18,202705,2027),('2027-05-07',202718,5,2027,7,18,202705,2027),('2027-05-08',202718,5,2027,8,18,202705,2027),('2027-05-09',202719,5,2027,9,19,202705,2027),('2027-05-10',202719,5,2027,10,19,202705,2027),('2027-05-11',202719,5,2027,11,19,202705,2027),('2027-05-12',202719,5,2027,12,19,202705,2027),('2027-05-13',202719,5,2027,13,19,202705,2027),('2027-05-14',202719,5,2027,14,19,202705,2027),('2027-05-15',202719,5,2027,15,19,202705,2027),('2027-05-16',202720,5,2027,16,20,202705,2027),('2027-05-17',202720,5,2027,17,20,202705,2027),('2027-05-18',202720,5,2027,18,20,202705,2027),('2027-05-19',202720,5,2027,19,20,202705,2027),('2027-05-20',202720,5,2027,20,20,202705,2027),('2027-05-21',202720,5,2027,21,20,202705,2027),('2027-05-22',202720,5,2027,22,20,202705,2027),('2027-05-23',202721,5,2027,23,21,202705,2027),('2027-05-24',202721,5,2027,24,21,202705,2027),('2027-05-25',202721,5,2027,25,21,202705,2027),('2027-05-26',202721,5,2027,26,21,202705,2027),('2027-05-27',202721,5,2027,27,21,202705,2027),('2027-05-28',202721,5,2027,28,21,202705,2027),('2027-05-29',202721,5,2027,29,21,202705,2027),('2027-05-30',202722,5,2027,30,22,202705,2027),('2027-05-31',202722,5,2027,31,22,202705,2027),('2027-06-01',202722,6,2027,1,22,202706,2027),('2027-06-02',202722,6,2027,2,22,202706,2027),('2027-06-03',202722,6,2027,3,22,202706,2027),('2027-06-04',202722,6,2027,4,22,202706,2027),('2027-06-05',202722,6,2027,5,22,202706,2027),('2027-06-06',202723,6,2027,6,23,202706,2027),('2027-06-07',202723,6,2027,7,23,202706,2027),('2027-06-08',202723,6,2027,8,23,202706,2027),('2027-06-09',202723,6,2027,9,23,202706,2027),('2027-06-10',202723,6,2027,10,23,202706,2027),('2027-06-11',202723,6,2027,11,23,202706,2027),('2027-06-12',202723,6,2027,12,23,202706,2027),('2027-06-13',202724,6,2027,13,24,202706,2027),('2027-06-14',202724,6,2027,14,24,202706,2027),('2027-06-15',202724,6,2027,15,24,202706,2027),('2027-06-16',202724,6,2027,16,24,202706,2027),('2027-06-17',202724,6,2027,17,24,202706,2027),('2027-06-18',202724,6,2027,18,24,202706,2027),('2027-06-19',202724,6,2027,19,24,202706,2027),('2027-06-20',202725,6,2027,20,25,202706,2027),('2027-06-21',202725,6,2027,21,25,202706,2027),('2027-06-22',202725,6,2027,22,25,202706,2027),('2027-06-23',202725,6,2027,23,25,202706,2027),('2027-06-24',202725,6,2027,24,25,202706,2027),('2027-06-25',202725,6,2027,25,25,202706,2027),('2027-06-26',202725,6,2027,26,25,202706,2027),('2027-06-27',202726,6,2027,27,26,202706,2027),('2027-06-28',202726,6,2027,28,26,202706,2027),('2027-06-29',202726,6,2027,29,26,202706,2027),('2027-06-30',202726,6,2027,30,26,202706,2027),('2027-07-01',202726,7,2027,1,26,202707,2027),('2027-07-02',202726,7,2027,2,26,202707,2027),('2027-07-03',202726,7,2027,3,26,202707,2027),('2027-07-04',202727,7,2027,4,27,202707,2027),('2027-07-05',202727,7,2027,5,27,202707,2027),('2027-07-06',202727,7,2027,6,27,202707,2027),('2027-07-07',202727,7,2027,7,27,202707,2027),('2027-07-08',202727,7,2027,8,27,202707,2027),('2027-07-09',202727,7,2027,9,27,202707,2027),('2027-07-10',202727,7,2027,10,27,202707,2027),('2027-07-11',202728,7,2027,11,28,202707,2027),('2027-07-12',202728,7,2027,12,28,202707,2027),('2027-07-13',202728,7,2027,13,28,202707,2027),('2027-07-14',202728,7,2027,14,28,202707,2027),('2027-07-15',202728,7,2027,15,28,202707,2027),('2027-07-16',202728,7,2027,16,28,202707,2027),('2027-07-17',202728,7,2027,17,28,202707,2027),('2027-07-18',202729,7,2027,18,29,202707,2027),('2027-07-19',202729,7,2027,19,29,202707,2027),('2027-07-20',202729,7,2027,20,29,202707,2027),('2027-07-21',202729,7,2027,21,29,202707,2027),('2027-07-22',202729,7,2027,22,29,202707,2027),('2027-07-23',202729,7,2027,23,29,202707,2027),('2027-07-24',202729,7,2027,24,29,202707,2027),('2027-07-25',202730,7,2027,25,30,202707,2027),('2027-07-26',202730,7,2027,26,30,202707,2027),('2027-07-27',202730,7,2027,27,30,202707,2027),('2027-07-28',202730,7,2027,28,30,202707,2027),('2027-07-29',202730,7,2027,29,30,202707,2027),('2027-07-30',202730,7,2027,30,30,202707,2027),('2027-07-31',202730,7,2027,31,30,202707,2027),('2027-08-01',202731,8,2027,1,31,202708,2027),('2027-08-02',202731,8,2027,2,31,202708,2027),('2027-08-03',202731,8,2027,3,31,202708,2027),('2027-08-04',202731,8,2027,4,31,202708,2027),('2027-08-05',202731,8,2027,5,31,202708,2027),('2027-08-06',202731,8,2027,6,31,202708,2027),('2027-08-07',202731,8,2027,7,31,202708,2027),('2027-08-08',202732,8,2027,8,32,202708,2027),('2027-08-09',202732,8,2027,9,32,202708,2027),('2027-08-10',202732,8,2027,10,32,202708,2027),('2027-08-11',202732,8,2027,11,32,202708,2027),('2027-08-12',202732,8,2027,12,32,202708,2027),('2027-08-13',202732,8,2027,13,32,202708,2027),('2027-08-14',202732,8,2027,14,32,202708,2027),('2027-08-15',202733,8,2027,15,33,202708,2027),('2027-08-16',202733,8,2027,16,33,202708,2027),('2027-08-17',202733,8,2027,17,33,202708,2027),('2027-08-18',202733,8,2027,18,33,202708,2027),('2027-08-19',202733,8,2027,19,33,202708,2027),('2027-08-20',202733,8,2027,20,33,202708,2027),('2027-08-21',202733,8,2027,21,33,202708,2027),('2027-08-22',202734,8,2027,22,34,202708,2027),('2027-08-23',202734,8,2027,23,34,202708,2027),('2027-08-24',202734,8,2027,24,34,202708,2027),('2027-08-25',202734,8,2027,25,34,202708,2027),('2027-08-26',202734,8,2027,26,34,202708,2027),('2027-08-27',202734,8,2027,27,34,202708,2027),('2027-08-28',202734,8,2027,28,34,202708,2027),('2027-08-29',202735,8,2027,29,35,202708,2027),('2027-08-30',202735,8,2027,30,35,202708,2027),('2027-08-31',202735,8,2027,31,35,202708,2027),('2027-09-01',202735,9,2027,1,35,202709,2027),('2027-09-02',202735,9,2027,2,35,202709,2027),('2027-09-03',202735,9,2027,3,35,202709,2027),('2027-09-04',202735,9,2027,4,35,202709,2027),('2027-09-05',202736,9,2027,5,36,202709,2027),('2027-09-06',202736,9,2027,6,36,202709,2027),('2027-09-07',202736,9,2027,7,36,202709,2027),('2027-09-08',202736,9,2027,8,36,202709,2027),('2027-09-09',202736,9,2027,9,36,202709,2027),('2027-09-10',202736,9,2027,10,36,202709,2027),('2027-09-11',202736,9,2027,11,36,202709,2027),('2027-09-12',202737,9,2027,12,37,202709,2027),('2027-09-13',202737,9,2027,13,37,202709,2027),('2027-09-14',202737,9,2027,14,37,202709,2027),('2027-09-15',202737,9,2027,15,37,202709,2027),('2027-09-16',202737,9,2027,16,37,202709,2027),('2027-09-17',202737,9,2027,17,37,202709,2027),('2027-09-18',202737,9,2027,18,37,202709,2027),('2027-09-19',202738,9,2027,19,38,202709,2027),('2027-09-20',202738,9,2027,20,38,202709,2027),('2027-09-21',202738,9,2027,21,38,202709,2027),('2027-09-22',202738,9,2027,22,38,202709,2027),('2027-09-23',202738,9,2027,23,38,202709,2027),('2027-09-24',202738,9,2027,24,38,202709,2027),('2027-09-25',202738,9,2027,25,38,202709,2027),('2027-09-26',202739,9,2027,26,39,202709,2027),('2027-09-27',202739,9,2027,27,39,202709,2027),('2027-09-28',202739,9,2027,28,39,202709,2027),('2027-09-29',202739,9,2027,29,39,202709,2027),('2027-09-30',202739,9,2027,30,39,202709,2027),('2027-10-01',202739,10,2027,1,39,202710,2027),('2027-10-02',202739,10,2027,2,39,202710,2027),('2027-10-03',202740,10,2027,3,40,202710,2027),('2027-10-04',202740,10,2027,4,40,202710,2027),('2027-10-05',202740,10,2027,5,40,202710,2027),('2027-10-06',202740,10,2027,6,40,202710,2027),('2027-10-07',202740,10,2027,7,40,202710,2027),('2027-10-08',202740,10,2027,8,40,202710,2027),('2027-10-09',202740,10,2027,9,40,202710,2027),('2027-10-10',202741,10,2027,10,41,202710,2027),('2027-10-11',202741,10,2027,11,41,202710,2027),('2027-10-12',202741,10,2027,12,41,202710,2027),('2027-10-13',202741,10,2027,13,41,202710,2027),('2027-10-14',202741,10,2027,14,41,202710,2027),('2027-10-15',202741,10,2027,15,41,202710,2027),('2027-10-16',202741,10,2027,16,41,202710,2027),('2027-10-17',202742,10,2027,17,42,202710,2027),('2027-10-18',202742,10,2027,18,42,202710,2027),('2027-10-19',202742,10,2027,19,42,202710,2027),('2027-10-20',202742,10,2027,20,42,202710,2027),('2027-10-21',202742,10,2027,21,42,202710,2027),('2027-10-22',202742,10,2027,22,42,202710,2027),('2027-10-23',202742,10,2027,23,42,202710,2027),('2027-10-24',202743,10,2027,24,43,202710,2027),('2027-10-25',202743,10,2027,25,43,202710,2027),('2027-10-26',202743,10,2027,26,43,202710,2027),('2027-10-27',202743,10,2027,27,43,202710,2027),('2027-10-28',202743,10,2027,28,43,202710,2027),('2027-10-29',202743,10,2027,29,43,202710,2027),('2027-10-30',202743,10,2027,30,43,202710,2027),('2027-10-31',202744,10,2027,31,44,202710,2027),('2027-11-01',202744,11,2027,1,44,202711,2027),('2027-11-02',202744,11,2027,2,44,202711,2027),('2027-11-03',202744,11,2027,3,44,202711,2027),('2027-11-04',202744,11,2027,4,44,202711,2027),('2027-11-05',202744,11,2027,5,44,202711,2027),('2027-11-06',202744,11,2027,6,44,202711,2027),('2027-11-07',202745,11,2027,7,45,202711,2027),('2027-11-08',202745,11,2027,8,45,202711,2027),('2027-11-09',202745,11,2027,9,45,202711,2027),('2027-11-10',202745,11,2027,10,45,202711,2027),('2027-11-11',202745,11,2027,11,45,202711,2027),('2027-11-12',202745,11,2027,12,45,202711,2027),('2027-11-13',202745,11,2027,13,45,202711,2027),('2027-11-14',202746,11,2027,14,46,202711,2027),('2027-11-15',202746,11,2027,15,46,202711,2027),('2027-11-16',202746,11,2027,16,46,202711,2027),('2027-11-17',202746,11,2027,17,46,202711,2027),('2027-11-18',202746,11,2027,18,46,202711,2027),('2027-11-19',202746,11,2027,19,46,202711,2027),('2027-11-20',202746,11,2027,20,46,202711,2027),('2027-11-21',202747,11,2027,21,47,202711,2027),('2027-11-22',202747,11,2027,22,47,202711,2027),('2027-11-23',202747,11,2027,23,47,202711,2027),('2027-11-24',202747,11,2027,24,47,202711,2027),('2027-11-25',202747,11,2027,25,47,202711,2027),('2027-11-26',202747,11,2027,26,47,202711,2027),('2027-11-27',202747,11,2027,27,47,202711,2027),('2027-11-28',202748,11,2027,28,48,202711,2027),('2027-11-29',202748,11,2027,29,48,202711,2027),('2027-11-30',202748,11,2027,30,48,202711,2027),('2027-12-01',202748,12,2027,1,48,202712,2028),('2027-12-02',202748,12,2027,2,48,202712,2028),('2027-12-03',202748,12,2027,3,48,202712,2028),('2027-12-04',202748,12,2027,4,48,202712,2028),('2027-12-05',202749,12,2027,5,49,202712,2028),('2027-12-06',202749,12,2027,6,49,202712,2028),('2027-12-07',202749,12,2027,7,49,202712,2028),('2027-12-08',202749,12,2027,8,49,202712,2028),('2027-12-09',202749,12,2027,9,49,202712,2028),('2027-12-10',202749,12,2027,10,49,202712,2028),('2027-12-11',202749,12,2027,11,49,202712,2028),('2027-12-12',202750,12,2027,12,50,202712,2028),('2027-12-13',202750,12,2027,13,50,202712,2028),('2027-12-14',202750,12,2027,14,50,202712,2028),('2027-12-15',202750,12,2027,15,50,202712,2028),('2027-12-16',202750,12,2027,16,50,202712,2028),('2027-12-17',202750,12,2027,17,50,202712,2028),('2027-12-18',202750,12,2027,18,50,202712,2028),('2027-12-19',202751,12,2027,19,51,202712,2028),('2027-12-20',202751,12,2027,20,51,202712,2028),('2027-12-21',202751,12,2027,21,51,202712,2028),('2027-12-22',202751,12,2027,22,51,202712,2028),('2027-12-23',202751,12,2027,23,51,202712,2028),('2027-12-24',202751,12,2027,24,51,202712,2028),('2027-12-25',202751,12,2027,25,51,202712,2028),('2027-12-26',202752,12,2027,26,52,202712,2028),('2027-12-27',202752,12,2027,27,52,202712,2028),('2027-12-28',202752,12,2027,28,52,202712,2028),('2027-12-29',202752,12,2027,29,52,202712,2028),('2027-12-30',202752,12,2027,30,52,202712,2028),('2027-12-31',202752,12,2027,31,52,202712,2028),('2028-01-01',202852,1,2028,1,52,202801,2028),('2028-01-02',202853,1,2028,2,1,202801,2028),('2028-01-03',202801,1,2028,3,1,202801,2028),('2028-01-04',202801,1,2028,4,1,202801,2028),('2028-01-05',202801,1,2028,5,1,202801,2028),('2028-01-06',202801,1,2028,6,1,202801,2028),('2028-01-07',202801,1,2028,7,1,202801,2028),('2028-01-08',202801,1,2028,8,1,202801,2028),('2028-01-09',202802,1,2028,9,2,202801,2028),('2028-01-10',202802,1,2028,10,2,202801,2028),('2028-01-11',202802,1,2028,11,2,202801,2028),('2028-01-12',202802,1,2028,12,2,202801,2028),('2028-01-13',202802,1,2028,13,2,202801,2028),('2028-01-14',202802,1,2028,14,2,202801,2028),('2028-01-15',202802,1,2028,15,2,202801,2028),('2028-01-16',202803,1,2028,16,3,202801,2028),('2028-01-17',202803,1,2028,17,3,202801,2028),('2028-01-18',202803,1,2028,18,3,202801,2028),('2028-01-19',202803,1,2028,19,3,202801,2028),('2028-01-20',202803,1,2028,20,3,202801,2028),('2028-01-21',202803,1,2028,21,3,202801,2028),('2028-01-22',202803,1,2028,22,3,202801,2028),('2028-01-23',202804,1,2028,23,4,202801,2028),('2028-01-24',202804,1,2028,24,4,202801,2028),('2028-01-25',202804,1,2028,25,4,202801,2028),('2028-01-26',202804,1,2028,26,4,202801,2028),('2028-01-27',202804,1,2028,27,4,202801,2028),('2028-01-28',202804,1,2028,28,4,202801,2028),('2028-01-29',202804,1,2028,29,4,202801,2028),('2028-01-30',202805,1,2028,30,5,202801,2028),('2028-01-31',202805,1,2028,31,5,202801,2028),('2028-02-01',202805,2,2028,1,5,202802,2028),('2028-02-02',202805,2,2028,2,5,202802,2028),('2028-02-03',202805,2,2028,3,5,202802,2028),('2028-02-04',202805,2,2028,4,5,202802,2028),('2028-02-05',202805,2,2028,5,5,202802,2028),('2028-02-06',202806,2,2028,6,6,202802,2028),('2028-02-07',202806,2,2028,7,6,202802,2028),('2028-02-08',202806,2,2028,8,6,202802,2028),('2028-02-09',202806,2,2028,9,6,202802,2028),('2028-02-10',202806,2,2028,10,6,202802,2028),('2028-02-11',202806,2,2028,11,6,202802,2028),('2028-02-12',202806,2,2028,12,6,202802,2028),('2028-02-13',202807,2,2028,13,7,202802,2028),('2028-02-14',202807,2,2028,14,7,202802,2028),('2028-02-15',202807,2,2028,15,7,202802,2028),('2028-02-16',202807,2,2028,16,7,202802,2028),('2028-02-17',202807,2,2028,17,7,202802,2028),('2028-02-18',202807,2,2028,18,7,202802,2028),('2028-02-19',202807,2,2028,19,7,202802,2028),('2028-02-20',202808,2,2028,20,8,202802,2028),('2028-02-21',202808,2,2028,21,8,202802,2028),('2028-02-22',202808,2,2028,22,8,202802,2028),('2028-02-23',202808,2,2028,23,8,202802,2028),('2028-02-24',202808,2,2028,24,8,202802,2028),('2028-02-25',202808,2,2028,25,8,202802,2028),('2028-02-26',202808,2,2028,26,8,202802,2028),('2028-02-27',202809,2,2028,27,9,202802,2028),('2028-02-28',202809,2,2028,28,9,202802,2028),('2028-02-29',202809,2,2028,29,9,202802,2028),('2028-03-01',202809,3,2028,1,9,202803,2028),('2028-03-02',202809,3,2028,2,9,202803,2028),('2028-03-03',202809,3,2028,3,9,202803,2028),('2028-03-04',202809,3,2028,4,9,202803,2028),('2028-03-05',202810,3,2028,5,10,202803,2028),('2028-03-06',202810,3,2028,6,10,202803,2028),('2028-03-07',202810,3,2028,7,10,202803,2028),('2028-03-08',202810,3,2028,8,10,202803,2028),('2028-03-09',202810,3,2028,9,10,202803,2028),('2028-03-10',202810,3,2028,10,10,202803,2028),('2028-03-11',202810,3,2028,11,10,202803,2028),('2028-03-12',202811,3,2028,12,11,202803,2028),('2028-03-13',202811,3,2028,13,11,202803,2028),('2028-03-14',202811,3,2028,14,11,202803,2028),('2028-03-15',202811,3,2028,15,11,202803,2028),('2028-03-16',202811,3,2028,16,11,202803,2028),('2028-03-17',202811,3,2028,17,11,202803,2028),('2028-03-18',202811,3,2028,18,11,202803,2028),('2028-03-19',202812,3,2028,19,12,202803,2028),('2028-03-20',202812,3,2028,20,12,202803,2028),('2028-03-21',202812,3,2028,21,12,202803,2028),('2028-03-22',202812,3,2028,22,12,202803,2028),('2028-03-23',202812,3,2028,23,12,202803,2028),('2028-03-24',202812,3,2028,24,12,202803,2028),('2028-03-25',202812,3,2028,25,12,202803,2028),('2028-03-26',202813,3,2028,26,13,202803,2028),('2028-03-27',202813,3,2028,27,13,202803,2028),('2028-03-28',202813,3,2028,28,13,202803,2028),('2028-03-29',202813,3,2028,29,13,202803,2028),('2028-03-30',202813,3,2028,30,13,202803,2028),('2028-03-31',202813,3,2028,31,13,202803,2028),('2028-04-01',202813,4,2028,1,13,202804,2028),('2028-04-02',202814,4,2028,2,14,202804,2028),('2028-04-03',202814,4,2028,3,14,202804,2028),('2028-04-04',202814,4,2028,4,14,202804,2028),('2028-04-05',202814,4,2028,5,14,202804,2028),('2028-04-06',202814,4,2028,6,14,202804,2028),('2028-04-07',202814,4,2028,7,14,202804,2028),('2028-04-08',202814,4,2028,8,14,202804,2028),('2028-04-09',202815,4,2028,9,15,202804,2028),('2028-04-10',202815,4,2028,10,15,202804,2028),('2028-04-11',202815,4,2028,11,15,202804,2028),('2028-04-12',202815,4,2028,12,15,202804,2028),('2028-04-13',202815,4,2028,13,15,202804,2028),('2028-04-14',202815,4,2028,14,15,202804,2028),('2028-04-15',202815,4,2028,15,15,202804,2028),('2028-04-16',202816,4,2028,16,16,202804,2028),('2028-04-17',202816,4,2028,17,16,202804,2028),('2028-04-18',202816,4,2028,18,16,202804,2028),('2028-04-19',202816,4,2028,19,16,202804,2028),('2028-04-20',202816,4,2028,20,16,202804,2028),('2028-04-21',202816,4,2028,21,16,202804,2028),('2028-04-22',202816,4,2028,22,16,202804,2028),('2028-04-23',202817,4,2028,23,17,202804,2028),('2028-04-24',202817,4,2028,24,17,202804,2028),('2028-04-25',202817,4,2028,25,17,202804,2028),('2028-04-26',202817,4,2028,26,17,202804,2028),('2028-04-27',202817,4,2028,27,17,202804,2028),('2028-04-28',202817,4,2028,28,17,202804,2028),('2028-04-29',202817,4,2028,29,17,202804,2028),('2028-04-30',202818,4,2028,30,18,202804,2028),('2028-05-01',202818,5,2028,1,18,202805,2028),('2028-05-02',202818,5,2028,2,18,202805,2028),('2028-05-03',202818,5,2028,3,18,202805,2028),('2028-05-04',202818,5,2028,4,18,202805,2028),('2028-05-05',202818,5,2028,5,18,202805,2028),('2028-05-06',202818,5,2028,6,18,202805,2028),('2028-05-07',202819,5,2028,7,19,202805,2028),('2028-05-08',202819,5,2028,8,19,202805,2028),('2028-05-09',202819,5,2028,9,19,202805,2028),('2028-05-10',202819,5,2028,10,19,202805,2028),('2028-05-11',202819,5,2028,11,19,202805,2028),('2028-05-12',202819,5,2028,12,19,202805,2028),('2028-05-13',202819,5,2028,13,19,202805,2028),('2028-05-14',202820,5,2028,14,20,202805,2028),('2028-05-15',202820,5,2028,15,20,202805,2028),('2028-05-16',202820,5,2028,16,20,202805,2028),('2028-05-17',202820,5,2028,17,20,202805,2028),('2028-05-18',202820,5,2028,18,20,202805,2028),('2028-05-19',202820,5,2028,19,20,202805,2028),('2028-05-20',202820,5,2028,20,20,202805,2028),('2028-05-21',202821,5,2028,21,21,202805,2028),('2028-05-22',202821,5,2028,22,21,202805,2028),('2028-05-23',202821,5,2028,23,21,202805,2028),('2028-05-24',202821,5,2028,24,21,202805,2028),('2028-05-25',202821,5,2028,25,21,202805,2028),('2028-05-26',202821,5,2028,26,21,202805,2028),('2028-05-27',202821,5,2028,27,21,202805,2028),('2028-05-28',202822,5,2028,28,22,202805,2028),('2028-05-29',202822,5,2028,29,22,202805,2028),('2028-05-30',202822,5,2028,30,22,202805,2028),('2028-05-31',202822,5,2028,31,22,202805,2028),('2028-06-01',202822,6,2028,1,22,202806,2028),('2028-06-02',202822,6,2028,2,22,202806,2028),('2028-06-03',202822,6,2028,3,22,202806,2028),('2028-06-04',202823,6,2028,4,23,202806,2028),('2028-06-05',202823,6,2028,5,23,202806,2028),('2028-06-06',202823,6,2028,6,23,202806,2028),('2028-06-07',202823,6,2028,7,23,202806,2028),('2028-06-08',202823,6,2028,8,23,202806,2028),('2028-06-09',202823,6,2028,9,23,202806,2028),('2028-06-10',202823,6,2028,10,23,202806,2028),('2028-06-11',202824,6,2028,11,24,202806,2028),('2028-06-12',202824,6,2028,12,24,202806,2028),('2028-06-13',202824,6,2028,13,24,202806,2028),('2028-06-14',202824,6,2028,14,24,202806,2028),('2028-06-15',202824,6,2028,15,24,202806,2028),('2028-06-16',202824,6,2028,16,24,202806,2028),('2028-06-17',202824,6,2028,17,24,202806,2028),('2028-06-18',202825,6,2028,18,25,202806,2028),('2028-06-19',202825,6,2028,19,25,202806,2028),('2028-06-20',202825,6,2028,20,25,202806,2028),('2028-06-21',202825,6,2028,21,25,202806,2028),('2028-06-22',202825,6,2028,22,25,202806,2028),('2028-06-23',202825,6,2028,23,25,202806,2028),('2028-06-24',202825,6,2028,24,25,202806,2028),('2028-06-25',202826,6,2028,25,26,202806,2028),('2028-06-26',202826,6,2028,26,26,202806,2028),('2028-06-27',202826,6,2028,27,26,202806,2028),('2028-06-28',202826,6,2028,28,26,202806,2028),('2028-06-29',202826,6,2028,29,26,202806,2028),('2028-06-30',202826,6,2028,30,26,202806,2028),('2028-07-01',202826,7,2028,1,26,202807,2028),('2028-07-02',202827,7,2028,2,27,202807,2028),('2028-07-03',202827,7,2028,3,27,202807,2028),('2028-07-04',202827,7,2028,4,27,202807,2028),('2028-07-05',202827,7,2028,5,27,202807,2028),('2028-07-06',202827,7,2028,6,27,202807,2028),('2028-07-07',202827,7,2028,7,27,202807,2028),('2028-07-08',202827,7,2028,8,27,202807,2028),('2028-07-09',202828,7,2028,9,28,202807,2028),('2028-07-10',202828,7,2028,10,28,202807,2028),('2028-07-11',202828,7,2028,11,28,202807,2028),('2028-07-12',202828,7,2028,12,28,202807,2028),('2028-07-13',202828,7,2028,13,28,202807,2028),('2028-07-14',202828,7,2028,14,28,202807,2028),('2028-07-15',202828,7,2028,15,28,202807,2028),('2028-07-16',202829,7,2028,16,29,202807,2028),('2028-07-17',202829,7,2028,17,29,202807,2028),('2028-07-18',202829,7,2028,18,29,202807,2028),('2028-07-19',202829,7,2028,19,29,202807,2028),('2028-07-20',202829,7,2028,20,29,202807,2028),('2028-07-21',202829,7,2028,21,29,202807,2028),('2028-07-22',202829,7,2028,22,29,202807,2028),('2028-07-23',202830,7,2028,23,30,202807,2028),('2028-07-24',202830,7,2028,24,30,202807,2028),('2028-07-25',202830,7,2028,25,30,202807,2028),('2028-07-26',202830,7,2028,26,30,202807,2028),('2028-07-27',202830,7,2028,27,30,202807,2028),('2028-07-28',202830,7,2028,28,30,202807,2028),('2028-07-29',202830,7,2028,29,30,202807,2028),('2028-07-30',202831,7,2028,30,31,202807,2028),('2028-07-31',202831,7,2028,31,31,202807,2028),('2028-08-01',202831,8,2028,1,31,202808,2028),('2028-08-02',202831,8,2028,2,31,202808,2028),('2028-08-03',202831,8,2028,3,31,202808,2028),('2028-08-04',202831,8,2028,4,31,202808,2028),('2028-08-05',202831,8,2028,5,31,202808,2028),('2028-08-06',202832,8,2028,6,32,202808,2028),('2028-08-07',202832,8,2028,7,32,202808,2028),('2028-08-08',202832,8,2028,8,32,202808,2028),('2028-08-09',202832,8,2028,9,32,202808,2028),('2028-08-10',202832,8,2028,10,32,202808,2028),('2028-08-11',202832,8,2028,11,32,202808,2028),('2028-08-12',202832,8,2028,12,32,202808,2028),('2028-08-13',202833,8,2028,13,33,202808,2028),('2028-08-14',202833,8,2028,14,33,202808,2028),('2028-08-15',202833,8,2028,15,33,202808,2028),('2028-08-16',202833,8,2028,16,33,202808,2028),('2028-08-17',202833,8,2028,17,33,202808,2028),('2028-08-18',202833,8,2028,18,33,202808,2028),('2028-08-19',202833,8,2028,19,33,202808,2028),('2028-08-20',202834,8,2028,20,34,202808,2028),('2028-08-21',202834,8,2028,21,34,202808,2028),('2028-08-22',202834,8,2028,22,34,202808,2028),('2028-08-23',202834,8,2028,23,34,202808,2028),('2028-08-24',202834,8,2028,24,34,202808,2028),('2028-08-25',202834,8,2028,25,34,202808,2028),('2028-08-26',202834,8,2028,26,34,202808,2028),('2028-08-27',202835,8,2028,27,35,202808,2028),('2028-08-28',202835,8,2028,28,35,202808,2028),('2028-08-29',202835,8,2028,29,35,202808,2028),('2028-08-30',202835,8,2028,30,35,202808,2028),('2028-08-31',202835,8,2028,31,35,202808,2028),('2028-09-01',202835,9,2028,1,35,202809,2028),('2028-09-02',202835,9,2028,2,35,202809,2028),('2028-09-03',202836,9,2028,3,36,202809,2028),('2028-09-04',202836,9,2028,4,36,202809,2028),('2028-09-05',202836,9,2028,5,36,202809,2028),('2028-09-06',202836,9,2028,6,36,202809,2028),('2028-09-07',202836,9,2028,7,36,202809,2028),('2028-09-08',202836,9,2028,8,36,202809,2028),('2028-09-09',202836,9,2028,9,36,202809,2028),('2028-09-10',202837,9,2028,10,37,202809,2028),('2028-09-11',202837,9,2028,11,37,202809,2028),('2028-09-12',202837,9,2028,12,37,202809,2028),('2028-09-13',202837,9,2028,13,37,202809,2028),('2028-09-14',202837,9,2028,14,37,202809,2028),('2028-09-15',202837,9,2028,15,37,202809,2028),('2028-09-16',202837,9,2028,16,37,202809,2028),('2028-09-17',202838,9,2028,17,38,202809,2028),('2028-09-18',202838,9,2028,18,38,202809,2028),('2028-09-19',202838,9,2028,19,38,202809,2028),('2028-09-20',202838,9,2028,20,38,202809,2028),('2028-09-21',202838,9,2028,21,38,202809,2028),('2028-09-22',202838,9,2028,22,38,202809,2028),('2028-09-23',202838,9,2028,23,38,202809,2028),('2028-09-24',202839,9,2028,24,39,202809,2028),('2028-09-25',202839,9,2028,25,39,202809,2028),('2028-09-26',202839,9,2028,26,39,202809,2028),('2028-09-27',202839,9,2028,27,39,202809,2028),('2028-09-28',202839,9,2028,28,39,202809,2028),('2028-09-29',202839,9,2028,29,39,202809,2028),('2028-09-30',202839,9,2028,30,39,202809,2028),('2028-10-01',202840,10,2028,1,40,202810,2028),('2028-10-02',202840,10,2028,2,40,202810,2028),('2028-10-03',202840,10,2028,3,40,202810,2028),('2028-10-04',202840,10,2028,4,40,202810,2028),('2028-10-05',202840,10,2028,5,40,202810,2028),('2028-10-06',202840,10,2028,6,40,202810,2028),('2028-10-07',202840,10,2028,7,40,202810,2028),('2028-10-08',202841,10,2028,8,41,202810,2028),('2028-10-09',202841,10,2028,9,41,202810,2028),('2028-10-10',202841,10,2028,10,41,202810,2028),('2028-10-11',202841,10,2028,11,41,202810,2028),('2028-10-12',202841,10,2028,12,41,202810,2028),('2028-10-13',202841,10,2028,13,41,202810,2028),('2028-10-14',202841,10,2028,14,41,202810,2028),('2028-10-15',202842,10,2028,15,42,202810,2028),('2028-10-16',202842,10,2028,16,42,202810,2028),('2028-10-17',202842,10,2028,17,42,202810,2028),('2028-10-18',202842,10,2028,18,42,202810,2028),('2028-10-19',202842,10,2028,19,42,202810,2028),('2028-10-20',202842,10,2028,20,42,202810,2028),('2028-10-21',202842,10,2028,21,42,202810,2028),('2028-10-22',202843,10,2028,22,43,202810,2028),('2028-10-23',202843,10,2028,23,43,202810,2028),('2028-10-24',202843,10,2028,24,43,202810,2028),('2028-10-25',202843,10,2028,25,43,202810,2028),('2028-10-26',202843,10,2028,26,43,202810,2028),('2028-10-27',202843,10,2028,27,43,202810,2028),('2028-10-28',202843,10,2028,28,43,202810,2028),('2028-10-29',202844,10,2028,29,44,202810,2028),('2028-10-30',202844,10,2028,30,44,202810,2028),('2028-10-31',202844,10,2028,31,44,202810,2028),('2028-11-01',202844,11,2028,1,44,202811,2028),('2028-11-02',202844,11,2028,2,44,202811,2028),('2028-11-03',202844,11,2028,3,44,202811,2028),('2028-11-04',202844,11,2028,4,44,202811,2028),('2028-11-05',202845,11,2028,5,45,202811,2028),('2028-11-06',202845,11,2028,6,45,202811,2028),('2028-11-07',202845,11,2028,7,45,202811,2028),('2028-11-08',202845,11,2028,8,45,202811,2028),('2028-11-09',202845,11,2028,9,45,202811,2028),('2028-11-10',202845,11,2028,10,45,202811,2028),('2028-11-11',202845,11,2028,11,45,202811,2028),('2028-11-12',202846,11,2028,12,46,202811,2028),('2028-11-13',202846,11,2028,13,46,202811,2028),('2028-11-14',202846,11,2028,14,46,202811,2028),('2028-11-15',202846,11,2028,15,46,202811,2028),('2028-11-16',202846,11,2028,16,46,202811,2028),('2028-11-17',202846,11,2028,17,46,202811,2028),('2028-11-18',202846,11,2028,18,46,202811,2028),('2028-11-19',202847,11,2028,19,47,202811,2028),('2028-11-20',202847,11,2028,20,47,202811,2028),('2028-11-21',202847,11,2028,21,47,202811,2028),('2028-11-22',202847,11,2028,22,47,202811,2028),('2028-11-23',202847,11,2028,23,47,202811,2028),('2028-11-24',202847,11,2028,24,47,202811,2028),('2028-11-25',202847,11,2028,25,47,202811,2028),('2028-11-26',202848,11,2028,26,48,202811,2028),('2028-11-27',202848,11,2028,27,48,202811,2028),('2028-11-28',202848,11,2028,28,48,202811,2028),('2028-11-29',202848,11,2028,29,48,202811,2028),('2028-11-30',202848,11,2028,30,48,202811,2028),('2028-12-01',202848,12,2028,1,48,202812,2029),('2028-12-02',202848,12,2028,2,48,202812,2029),('2028-12-03',202849,12,2028,3,49,202812,2029),('2028-12-04',202849,12,2028,4,49,202812,2029),('2028-12-05',202849,12,2028,5,49,202812,2029),('2028-12-06',202849,12,2028,6,49,202812,2029),('2028-12-07',202849,12,2028,7,49,202812,2029),('2028-12-08',202849,12,2028,8,49,202812,2029),('2028-12-09',202849,12,2028,9,49,202812,2029),('2028-12-10',202850,12,2028,10,50,202812,2029),('2028-12-11',202850,12,2028,11,50,202812,2029),('2028-12-12',202850,12,2028,12,50,202812,2029),('2028-12-13',202850,12,2028,13,50,202812,2029),('2028-12-14',202850,12,2028,14,50,202812,2029),('2028-12-15',202850,12,2028,15,50,202812,2029),('2028-12-16',202850,12,2028,16,50,202812,2029),('2028-12-17',202851,12,2028,17,51,202812,2029),('2028-12-18',202851,12,2028,18,51,202812,2029),('2028-12-19',202851,12,2028,19,51,202812,2029),('2028-12-20',202851,12,2028,20,51,202812,2029),('2028-12-21',202851,12,2028,21,51,202812,2029),('2028-12-22',202851,12,2028,22,51,202812,2029),('2028-12-23',202851,12,2028,23,51,202812,2029),('2028-12-24',202852,12,2028,24,52,202812,2029),('2028-12-25',202852,12,2028,25,52,202812,2029),('2028-12-26',202852,12,2028,26,52,202812,2029),('2028-12-27',202852,12,2028,27,52,202812,2029),('2028-12-28',202852,12,2028,28,52,202812,2029),('2028-12-29',202852,12,2028,29,52,202812,2029),('2028-12-30',202852,12,2028,30,52,202812,2029),('2028-12-31',202853,12,2028,31,1,202812,2029),('2029-01-01',202901,1,2029,1,1,202901,2029),('2029-01-02',202901,1,2029,2,1,202901,2029),('2029-01-03',202901,1,2029,3,1,202901,2029),('2029-01-04',202901,1,2029,4,1,202901,2029),('2029-01-05',202901,1,2029,5,1,202901,2029),('2029-01-06',202901,1,2029,6,1,202901,2029),('2029-01-07',202902,1,2029,7,2,202901,2029),('2029-01-08',202902,1,2029,8,2,202901,2029),('2029-01-09',202902,1,2029,9,2,202901,2029),('2029-01-10',202902,1,2029,10,2,202901,2029),('2029-01-11',202902,1,2029,11,2,202901,2029),('2029-01-12',202902,1,2029,12,2,202901,2029),('2029-01-13',202902,1,2029,13,2,202901,2029),('2029-01-14',202903,1,2029,14,3,202901,2029),('2029-01-15',202903,1,2029,15,3,202901,2029),('2029-01-16',202903,1,2029,16,3,202901,2029),('2029-01-17',202903,1,2029,17,3,202901,2029),('2029-01-18',202903,1,2029,18,3,202901,2029),('2029-01-19',202903,1,2029,19,3,202901,2029),('2029-01-20',202903,1,2029,20,3,202901,2029),('2029-01-21',202904,1,2029,21,4,202901,2029),('2029-01-22',202904,1,2029,22,4,202901,2029),('2029-01-23',202904,1,2029,23,4,202901,2029),('2029-01-24',202904,1,2029,24,4,202901,2029),('2029-01-25',202904,1,2029,25,4,202901,2029),('2029-01-26',202904,1,2029,26,4,202901,2029),('2029-01-27',202904,1,2029,27,4,202901,2029),('2029-01-28',202905,1,2029,28,5,202901,2029),('2029-01-29',202905,1,2029,29,5,202901,2029),('2029-01-30',202905,1,2029,30,5,202901,2029),('2029-01-31',202905,1,2029,31,5,202901,2029),('2029-02-01',202905,2,2029,1,5,202902,2029),('2029-02-02',202905,2,2029,2,5,202902,2029),('2029-02-03',202905,2,2029,3,5,202902,2029),('2029-02-04',202906,2,2029,4,6,202902,2029),('2029-02-05',202906,2,2029,5,6,202902,2029),('2029-02-06',202906,2,2029,6,6,202902,2029),('2029-02-07',202906,2,2029,7,6,202902,2029),('2029-02-08',202906,2,2029,8,6,202902,2029),('2029-02-09',202906,2,2029,9,6,202902,2029),('2029-02-10',202906,2,2029,10,6,202902,2029),('2029-02-11',202907,2,2029,11,7,202902,2029),('2029-02-12',202907,2,2029,12,7,202902,2029),('2029-02-13',202907,2,2029,13,7,202902,2029),('2029-02-14',202907,2,2029,14,7,202902,2029),('2029-02-15',202907,2,2029,15,7,202902,2029),('2029-02-16',202907,2,2029,16,7,202902,2029),('2029-02-17',202907,2,2029,17,7,202902,2029),('2029-02-18',202908,2,2029,18,8,202902,2029),('2029-02-19',202908,2,2029,19,8,202902,2029),('2029-02-20',202908,2,2029,20,8,202902,2029),('2029-02-21',202908,2,2029,21,8,202902,2029),('2029-02-22',202908,2,2029,22,8,202902,2029),('2029-02-23',202908,2,2029,23,8,202902,2029),('2029-02-24',202908,2,2029,24,8,202902,2029),('2029-02-25',202909,2,2029,25,9,202902,2029),('2029-02-26',202909,2,2029,26,9,202902,2029),('2029-02-27',202909,2,2029,27,9,202902,2029),('2029-02-28',202909,2,2029,28,9,202902,2029),('2029-03-01',202909,3,2029,1,9,202903,2029),('2029-03-02',202909,3,2029,2,9,202903,2029),('2029-03-03',202909,3,2029,3,9,202903,2029),('2029-03-04',202910,3,2029,4,10,202903,2029),('2029-03-05',202910,3,2029,5,10,202903,2029),('2029-03-06',202910,3,2029,6,10,202903,2029),('2029-03-07',202910,3,2029,7,10,202903,2029),('2029-03-08',202910,3,2029,8,10,202903,2029),('2029-03-09',202910,3,2029,9,10,202903,2029),('2029-03-10',202910,3,2029,10,10,202903,2029),('2029-03-11',202911,3,2029,11,11,202903,2029),('2029-03-12',202911,3,2029,12,11,202903,2029),('2029-03-13',202911,3,2029,13,11,202903,2029),('2029-03-14',202911,3,2029,14,11,202903,2029),('2029-03-15',202911,3,2029,15,11,202903,2029),('2029-03-16',202911,3,2029,16,11,202903,2029),('2029-03-17',202911,3,2029,17,11,202903,2029),('2029-03-18',202912,3,2029,18,12,202903,2029),('2029-03-19',202912,3,2029,19,12,202903,2029),('2029-03-20',202912,3,2029,20,12,202903,2029),('2029-03-21',202912,3,2029,21,12,202903,2029),('2029-03-22',202912,3,2029,22,12,202903,2029),('2029-03-23',202912,3,2029,23,12,202903,2029),('2029-03-24',202912,3,2029,24,12,202903,2029),('2029-03-25',202913,3,2029,25,13,202903,2029),('2029-03-26',202913,3,2029,26,13,202903,2029),('2029-03-27',202913,3,2029,27,13,202903,2029),('2029-03-28',202913,3,2029,28,13,202903,2029),('2029-03-29',202913,3,2029,29,13,202903,2029),('2029-03-30',202913,3,2029,30,13,202903,2029),('2029-03-31',202913,3,2029,31,13,202903,2029),('2029-04-01',202914,4,2029,1,14,202904,2029),('2029-04-02',202914,4,2029,2,14,202904,2029),('2029-04-03',202914,4,2029,3,14,202904,2029),('2029-04-04',202914,4,2029,4,14,202904,2029),('2029-04-05',202914,4,2029,5,14,202904,2029),('2029-04-06',202914,4,2029,6,14,202904,2029),('2029-04-07',202914,4,2029,7,14,202904,2029),('2029-04-08',202915,4,2029,8,15,202904,2029),('2029-04-09',202915,4,2029,9,15,202904,2029),('2029-04-10',202915,4,2029,10,15,202904,2029),('2029-04-11',202915,4,2029,11,15,202904,2029),('2029-04-12',202915,4,2029,12,15,202904,2029),('2029-04-13',202915,4,2029,13,15,202904,2029),('2029-04-14',202915,4,2029,14,15,202904,2029),('2029-04-15',202916,4,2029,15,16,202904,2029),('2029-04-16',202916,4,2029,16,16,202904,2029),('2029-04-17',202916,4,2029,17,16,202904,2029),('2029-04-18',202916,4,2029,18,16,202904,2029),('2029-04-19',202916,4,2029,19,16,202904,2029),('2029-04-20',202916,4,2029,20,16,202904,2029),('2029-04-21',202916,4,2029,21,16,202904,2029),('2029-04-22',202917,4,2029,22,17,202904,2029),('2029-04-23',202917,4,2029,23,17,202904,2029),('2029-04-24',202917,4,2029,24,17,202904,2029),('2029-04-25',202917,4,2029,25,17,202904,2029),('2029-04-26',202917,4,2029,26,17,202904,2029),('2029-04-27',202917,4,2029,27,17,202904,2029),('2029-04-28',202917,4,2029,28,17,202904,2029),('2029-04-29',202918,4,2029,29,18,202904,2029),('2029-04-30',202918,4,2029,30,18,202904,2029),('2029-05-01',202918,5,2029,1,18,202905,2029),('2029-05-02',202918,5,2029,2,18,202905,2029),('2029-05-03',202918,5,2029,3,18,202905,2029),('2029-05-04',202918,5,2029,4,18,202905,2029),('2029-05-05',202918,5,2029,5,18,202905,2029),('2029-05-06',202919,5,2029,6,19,202905,2029),('2029-05-07',202919,5,2029,7,19,202905,2029),('2029-05-08',202919,5,2029,8,19,202905,2029),('2029-05-09',202919,5,2029,9,19,202905,2029),('2029-05-10',202919,5,2029,10,19,202905,2029),('2029-05-11',202919,5,2029,11,19,202905,2029),('2029-05-12',202919,5,2029,12,19,202905,2029),('2029-05-13',202920,5,2029,13,20,202905,2029),('2029-05-14',202920,5,2029,14,20,202905,2029),('2029-05-15',202920,5,2029,15,20,202905,2029),('2029-05-16',202920,5,2029,16,20,202905,2029),('2029-05-17',202920,5,2029,17,20,202905,2029),('2029-05-18',202920,5,2029,18,20,202905,2029),('2029-05-19',202920,5,2029,19,20,202905,2029),('2029-05-20',202921,5,2029,20,21,202905,2029),('2029-05-21',202921,5,2029,21,21,202905,2029),('2029-05-22',202921,5,2029,22,21,202905,2029),('2029-05-23',202921,5,2029,23,21,202905,2029),('2029-05-24',202921,5,2029,24,21,202905,2029),('2029-05-25',202921,5,2029,25,21,202905,2029),('2029-05-26',202921,5,2029,26,21,202905,2029),('2029-05-27',202922,5,2029,27,22,202905,2029),('2029-05-28',202922,5,2029,28,22,202905,2029),('2029-05-29',202922,5,2029,29,22,202905,2029),('2029-05-30',202922,5,2029,30,22,202905,2029),('2029-05-31',202922,5,2029,31,22,202905,2029),('2029-06-01',202922,6,2029,1,22,202906,2029),('2029-06-02',202922,6,2029,2,22,202906,2029),('2029-06-03',202923,6,2029,3,23,202906,2029),('2029-06-04',202923,6,2029,4,23,202906,2029),('2029-06-05',202923,6,2029,5,23,202906,2029),('2029-06-06',202923,6,2029,6,23,202906,2029),('2029-06-07',202923,6,2029,7,23,202906,2029),('2029-06-08',202923,6,2029,8,23,202906,2029),('2029-06-09',202923,6,2029,9,23,202906,2029),('2029-06-10',202924,6,2029,10,24,202906,2029),('2029-06-11',202924,6,2029,11,24,202906,2029),('2029-06-12',202924,6,2029,12,24,202906,2029),('2029-06-13',202924,6,2029,13,24,202906,2029),('2029-06-14',202924,6,2029,14,24,202906,2029),('2029-06-15',202924,6,2029,15,24,202906,2029),('2029-06-16',202924,6,2029,16,24,202906,2029),('2029-06-17',202925,6,2029,17,25,202906,2029),('2029-06-18',202925,6,2029,18,25,202906,2029),('2029-06-19',202925,6,2029,19,25,202906,2029),('2029-06-20',202925,6,2029,20,25,202906,2029),('2029-06-21',202925,6,2029,21,25,202906,2029),('2029-06-22',202925,6,2029,22,25,202906,2029),('2029-06-23',202925,6,2029,23,25,202906,2029),('2029-06-24',202926,6,2029,24,26,202906,2029),('2029-06-25',202926,6,2029,25,26,202906,2029),('2029-06-26',202926,6,2029,26,26,202906,2029),('2029-06-27',202926,6,2029,27,26,202906,2029),('2029-06-28',202926,6,2029,28,26,202906,2029),('2029-06-29',202926,6,2029,29,26,202906,2029),('2029-06-30',202926,6,2029,30,26,202906,2029),('2029-07-01',202927,7,2029,1,27,202907,2029),('2029-07-02',202927,7,2029,2,27,202907,2029),('2029-07-03',202927,7,2029,3,27,202907,2029),('2029-07-04',202927,7,2029,4,27,202907,2029),('2029-07-05',202927,7,2029,5,27,202907,2029),('2029-07-06',202927,7,2029,6,27,202907,2029),('2029-07-07',202927,7,2029,7,27,202907,2029),('2029-07-08',202928,7,2029,8,28,202907,2029),('2029-07-09',202928,7,2029,9,28,202907,2029),('2029-07-10',202928,7,2029,10,28,202907,2029),('2029-07-11',202928,7,2029,11,28,202907,2029),('2029-07-12',202928,7,2029,12,28,202907,2029),('2029-07-13',202928,7,2029,13,28,202907,2029),('2029-07-14',202928,7,2029,14,28,202907,2029),('2029-07-15',202929,7,2029,15,29,202907,2029),('2029-07-16',202929,7,2029,16,29,202907,2029),('2029-07-17',202929,7,2029,17,29,202907,2029),('2029-07-18',202929,7,2029,18,29,202907,2029),('2029-07-19',202929,7,2029,19,29,202907,2029),('2029-07-20',202929,7,2029,20,29,202907,2029),('2029-07-21',202929,7,2029,21,29,202907,2029),('2029-07-22',202930,7,2029,22,30,202907,2029),('2029-07-23',202930,7,2029,23,30,202907,2029),('2029-07-24',202930,7,2029,24,30,202907,2029),('2029-07-25',202930,7,2029,25,30,202907,2029),('2029-07-26',202930,7,2029,26,30,202907,2029),('2029-07-27',202930,7,2029,27,30,202907,2029),('2029-07-28',202930,7,2029,28,30,202907,2029),('2029-07-29',202931,7,2029,29,31,202907,2029),('2029-07-30',202931,7,2029,30,31,202907,2029),('2029-07-31',202931,7,2029,31,31,202907,2029),('2029-08-01',202931,8,2029,1,31,202908,2029),('2029-08-02',202931,8,2029,2,31,202908,2029),('2029-08-03',202931,8,2029,3,31,202908,2029),('2029-08-04',202931,8,2029,4,31,202908,2029),('2029-08-05',202932,8,2029,5,32,202908,2029),('2029-08-06',202932,8,2029,6,32,202908,2029),('2029-08-07',202932,8,2029,7,32,202908,2029),('2029-08-08',202932,8,2029,8,32,202908,2029),('2029-08-09',202932,8,2029,9,32,202908,2029),('2029-08-10',202932,8,2029,10,32,202908,2029),('2029-08-11',202932,8,2029,11,32,202908,2029),('2029-08-12',202933,8,2029,12,33,202908,2029),('2029-08-13',202933,8,2029,13,33,202908,2029),('2029-08-14',202933,8,2029,14,33,202908,2029),('2029-08-15',202933,8,2029,15,33,202908,2029),('2029-08-16',202933,8,2029,16,33,202908,2029),('2029-08-17',202933,8,2029,17,33,202908,2029),('2029-08-18',202933,8,2029,18,33,202908,2029),('2029-08-19',202934,8,2029,19,34,202908,2029),('2029-08-20',202934,8,2029,20,34,202908,2029),('2029-08-21',202934,8,2029,21,34,202908,2029),('2029-08-22',202934,8,2029,22,34,202908,2029),('2029-08-23',202934,8,2029,23,34,202908,2029),('2029-08-24',202934,8,2029,24,34,202908,2029),('2029-08-25',202934,8,2029,25,34,202908,2029),('2029-08-26',202935,8,2029,26,35,202908,2029),('2029-08-27',202935,8,2029,27,35,202908,2029),('2029-08-28',202935,8,2029,28,35,202908,2029),('2029-08-29',202935,8,2029,29,35,202908,2029),('2029-08-30',202935,8,2029,30,35,202908,2029),('2029-08-31',202935,8,2029,31,35,202908,2029),('2029-09-01',202935,9,2029,1,35,202909,2029),('2029-09-02',202936,9,2029,2,36,202909,2029),('2029-09-03',202936,9,2029,3,36,202909,2029),('2029-09-04',202936,9,2029,4,36,202909,2029),('2029-09-05',202936,9,2029,5,36,202909,2029),('2029-09-06',202936,9,2029,6,36,202909,2029),('2029-09-07',202936,9,2029,7,36,202909,2029),('2029-09-08',202936,9,2029,8,36,202909,2029),('2029-09-09',202937,9,2029,9,37,202909,2029),('2029-09-10',202937,9,2029,10,37,202909,2029),('2029-09-11',202937,9,2029,11,37,202909,2029),('2029-09-12',202937,9,2029,12,37,202909,2029),('2029-09-13',202937,9,2029,13,37,202909,2029),('2029-09-14',202937,9,2029,14,37,202909,2029),('2029-09-15',202937,9,2029,15,37,202909,2029),('2029-09-16',202938,9,2029,16,38,202909,2029),('2029-09-17',202938,9,2029,17,38,202909,2029),('2029-09-18',202938,9,2029,18,38,202909,2029),('2029-09-19',202938,9,2029,19,38,202909,2029),('2029-09-20',202938,9,2029,20,38,202909,2029),('2029-09-21',202938,9,2029,21,38,202909,2029),('2029-09-22',202938,9,2029,22,38,202909,2029),('2029-09-23',202939,9,2029,23,39,202909,2029),('2029-09-24',202939,9,2029,24,39,202909,2029),('2029-09-25',202939,9,2029,25,39,202909,2029),('2029-09-26',202939,9,2029,26,39,202909,2029),('2029-09-27',202939,9,2029,27,39,202909,2029),('2029-09-28',202939,9,2029,28,39,202909,2029),('2029-09-29',202939,9,2029,29,39,202909,2029),('2029-09-30',202940,9,2029,30,40,202909,2029),('2029-10-01',202940,10,2029,1,40,202910,2029),('2029-10-02',202940,10,2029,2,40,202910,2029),('2029-10-03',202940,10,2029,3,40,202910,2029),('2029-10-04',202940,10,2029,4,40,202910,2029),('2029-10-05',202940,10,2029,5,40,202910,2029),('2029-10-06',202940,10,2029,6,40,202910,2029),('2029-10-07',202941,10,2029,7,41,202910,2029),('2029-10-08',202941,10,2029,8,41,202910,2029),('2029-10-09',202941,10,2029,9,41,202910,2029),('2029-10-10',202941,10,2029,10,41,202910,2029),('2029-10-11',202941,10,2029,11,41,202910,2029),('2029-10-12',202941,10,2029,12,41,202910,2029),('2029-10-13',202941,10,2029,13,41,202910,2029),('2029-10-14',202942,10,2029,14,42,202910,2029),('2029-10-15',202942,10,2029,15,42,202910,2029),('2029-10-16',202942,10,2029,16,42,202910,2029),('2029-10-17',202942,10,2029,17,42,202910,2029),('2029-10-18',202942,10,2029,18,42,202910,2029),('2029-10-19',202942,10,2029,19,42,202910,2029),('2029-10-20',202942,10,2029,20,42,202910,2029),('2029-10-21',202943,10,2029,21,43,202910,2029),('2029-10-22',202943,10,2029,22,43,202910,2029),('2029-10-23',202943,10,2029,23,43,202910,2029),('2029-10-24',202943,10,2029,24,43,202910,2029),('2029-10-25',202943,10,2029,25,43,202910,2029),('2029-10-26',202943,10,2029,26,43,202910,2029),('2029-10-27',202943,10,2029,27,43,202910,2029),('2029-10-28',202944,10,2029,28,44,202910,2029),('2029-10-29',202944,10,2029,29,44,202910,2029),('2029-10-30',202944,10,2029,30,44,202910,2029),('2029-10-31',202944,10,2029,31,44,202910,2029),('2029-11-01',202944,11,2029,1,44,202911,2029),('2029-11-02',202944,11,2029,2,44,202911,2029),('2029-11-03',202944,11,2029,3,44,202911,2029),('2029-11-04',202945,11,2029,4,45,202911,2029),('2029-11-05',202945,11,2029,5,45,202911,2029),('2029-11-06',202945,11,2029,6,45,202911,2029),('2029-11-07',202945,11,2029,7,45,202911,2029),('2029-11-08',202945,11,2029,8,45,202911,2029),('2029-11-09',202945,11,2029,9,45,202911,2029),('2029-11-10',202945,11,2029,10,45,202911,2029),('2029-11-11',202946,11,2029,11,46,202911,2029),('2029-11-12',202946,11,2029,12,46,202911,2029),('2029-11-13',202946,11,2029,13,46,202911,2029),('2029-11-14',202946,11,2029,14,46,202911,2029),('2029-11-15',202946,11,2029,15,46,202911,2029),('2029-11-16',202946,11,2029,16,46,202911,2029),('2029-11-17',202946,11,2029,17,46,202911,2029),('2029-11-18',202947,11,2029,18,47,202911,2029),('2029-11-19',202947,11,2029,19,47,202911,2029),('2029-11-20',202947,11,2029,20,47,202911,2029),('2029-11-21',202947,11,2029,21,47,202911,2029),('2029-11-22',202947,11,2029,22,47,202911,2029),('2029-11-23',202947,11,2029,23,47,202911,2029),('2029-11-24',202947,11,2029,24,47,202911,2029),('2029-11-25',202948,11,2029,25,48,202911,2029),('2029-11-26',202948,11,2029,26,48,202911,2029),('2029-11-27',202948,11,2029,27,48,202911,2029),('2029-11-28',202948,11,2029,28,48,202911,2029),('2029-11-29',202948,11,2029,29,48,202911,2029),('2029-11-30',202948,11,2029,30,48,202911,2029),('2029-12-01',202948,12,2029,1,48,202912,2030),('2029-12-02',202949,12,2029,2,49,202912,2030),('2029-12-03',202949,12,2029,3,49,202912,2030),('2029-12-04',202949,12,2029,4,49,202912,2030),('2029-12-05',202949,12,2029,5,49,202912,2030),('2029-12-06',202949,12,2029,6,49,202912,2030),('2029-12-07',202949,12,2029,7,49,202912,2030),('2029-12-08',202949,12,2029,8,49,202912,2030),('2029-12-09',202950,12,2029,9,50,202912,2030),('2029-12-10',202950,12,2029,10,50,202912,2030),('2029-12-11',202950,12,2029,11,50,202912,2030),('2029-12-12',202950,12,2029,12,50,202912,2030),('2029-12-13',202950,12,2029,13,50,202912,2030),('2029-12-14',202950,12,2029,14,50,202912,2030),('2029-12-15',202950,12,2029,15,50,202912,2030),('2029-12-16',202951,12,2029,16,51,202912,2030),('2029-12-17',202951,12,2029,17,51,202912,2030),('2029-12-18',202951,12,2029,18,51,202912,2030),('2029-12-19',202951,12,2029,19,51,202912,2030),('2029-12-20',202951,12,2029,20,51,202912,2030),('2029-12-21',202951,12,2029,21,51,202912,2030),('2029-12-22',202951,12,2029,22,51,202912,2030),('2029-12-23',202952,12,2029,23,52,202912,2030),('2029-12-24',202952,12,2029,24,52,202912,2030),('2029-12-25',202952,12,2029,25,52,202912,2030),('2029-12-26',202952,12,2029,26,52,202912,2030),('2029-12-27',202952,12,2029,27,52,202912,2030),('2029-12-28',202952,12,2029,28,52,202912,2030),('2029-12-29',202952,12,2029,29,52,202912,2030),('2029-12-30',202953,12,2029,30,1,202912,2030),('2029-12-31',202901,12,2029,31,1,202912,2030),('2030-01-01',203001,1,2030,1,1,203001,2030),('2030-01-02',203001,1,2030,2,1,203001,2030),('2030-01-03',203001,1,2030,3,1,203001,2030),('2030-01-04',203001,1,2030,4,1,203001,2030),('2030-01-05',203001,1,2030,5,1,203001,2030),('2030-01-06',203002,1,2030,6,2,203001,2030),('2030-01-07',203002,1,2030,7,2,203001,2030),('2030-01-08',203002,1,2030,8,2,203001,2030),('2030-01-09',203002,1,2030,9,2,203001,2030),('2030-01-10',203002,1,2030,10,2,203001,2030),('2030-01-11',203002,1,2030,11,2,203001,2030),('2030-01-12',203002,1,2030,12,2,203001,2030),('2030-01-13',203003,1,2030,13,3,203001,2030),('2030-01-14',203003,1,2030,14,3,203001,2030),('2030-01-15',203003,1,2030,15,3,203001,2030),('2030-01-16',203003,1,2030,16,3,203001,2030),('2030-01-17',203003,1,2030,17,3,203001,2030),('2030-01-18',203003,1,2030,18,3,203001,2030),('2030-01-19',203003,1,2030,19,3,203001,2030),('2030-01-20',203004,1,2030,20,4,203001,2030),('2030-01-21',203004,1,2030,21,4,203001,2030),('2030-01-22',203004,1,2030,22,4,203001,2030),('2030-01-23',203004,1,2030,23,4,203001,2030),('2030-01-24',203004,1,2030,24,4,203001,2030),('2030-01-25',203004,1,2030,25,4,203001,2030),('2030-01-26',203004,1,2030,26,4,203001,2030),('2030-01-27',203005,1,2030,27,5,203001,2030),('2030-01-28',203005,1,2030,28,5,203001,2030),('2030-01-29',203005,1,2030,29,5,203001,2030),('2030-01-30',203005,1,2030,30,5,203001,2030),('2030-01-31',203005,1,2030,31,5,203001,2030),('2030-02-01',203005,2,2030,1,5,203002,2030),('2030-02-02',203005,2,2030,2,5,203002,2030),('2030-02-03',203006,2,2030,3,6,203002,2030),('2030-02-04',203006,2,2030,4,6,203002,2030),('2030-02-05',203006,2,2030,5,6,203002,2030),('2030-02-06',203006,2,2030,6,6,203002,2030),('2030-02-07',203006,2,2030,7,6,203002,2030),('2030-02-08',203006,2,2030,8,6,203002,2030),('2030-02-09',203006,2,2030,9,6,203002,2030),('2030-02-10',203007,2,2030,10,7,203002,2030),('2030-02-11',203007,2,2030,11,7,203002,2030),('2030-02-12',203007,2,2030,12,7,203002,2030),('2030-02-13',203007,2,2030,13,7,203002,2030),('2030-02-14',203007,2,2030,14,7,203002,2030),('2030-02-15',203007,2,2030,15,7,203002,2030),('2030-02-16',203007,2,2030,16,7,203002,2030),('2030-02-17',203008,2,2030,17,8,203002,2030),('2030-02-18',203008,2,2030,18,8,203002,2030),('2030-02-19',203008,2,2030,19,8,203002,2030),('2030-02-20',203008,2,2030,20,8,203002,2030),('2030-02-21',203008,2,2030,21,8,203002,2030),('2030-02-22',203008,2,2030,22,8,203002,2030),('2030-02-23',203008,2,2030,23,8,203002,2030),('2030-02-24',203009,2,2030,24,9,203002,2030),('2030-02-25',203009,2,2030,25,9,203002,2030),('2030-02-26',203009,2,2030,26,9,203002,2030),('2030-02-27',203009,2,2030,27,9,203002,2030),('2030-02-28',203009,2,2030,28,9,203002,2030),('2030-03-01',203009,3,2030,1,9,203003,2030),('2030-03-02',203009,3,2030,2,9,203003,2030),('2030-03-03',203010,3,2030,3,10,203003,2030),('2030-03-04',203010,3,2030,4,10,203003,2030),('2030-03-05',203010,3,2030,5,10,203003,2030),('2030-03-06',203010,3,2030,6,10,203003,2030),('2030-03-07',203010,3,2030,7,10,203003,2030),('2030-03-08',203010,3,2030,8,10,203003,2030),('2030-03-09',203010,3,2030,9,10,203003,2030),('2030-03-10',203011,3,2030,10,11,203003,2030),('2030-03-11',203011,3,2030,11,11,203003,2030),('2030-03-12',203011,3,2030,12,11,203003,2030),('2030-03-13',203011,3,2030,13,11,203003,2030),('2030-03-14',203011,3,2030,14,11,203003,2030),('2030-03-15',203011,3,2030,15,11,203003,2030),('2030-03-16',203011,3,2030,16,11,203003,2030),('2030-03-17',203012,3,2030,17,12,203003,2030),('2030-03-18',203012,3,2030,18,12,203003,2030),('2030-03-19',203012,3,2030,19,12,203003,2030),('2030-03-20',203012,3,2030,20,12,203003,2030),('2030-03-21',203012,3,2030,21,12,203003,2030),('2030-03-22',203012,3,2030,22,12,203003,2030),('2030-03-23',203012,3,2030,23,12,203003,2030),('2030-03-24',203013,3,2030,24,13,203003,2030),('2030-03-25',203013,3,2030,25,13,203003,2030),('2030-03-26',203013,3,2030,26,13,203003,2030),('2030-03-27',203013,3,2030,27,13,203003,2030),('2030-03-28',203013,3,2030,28,13,203003,2030),('2030-03-29',203013,3,2030,29,13,203003,2030),('2030-03-30',203013,3,2030,30,13,203003,2030),('2030-03-31',203014,3,2030,31,14,203003,2030),('2030-04-01',203014,4,2030,1,14,203004,2030),('2030-04-02',203014,4,2030,2,14,203004,2030),('2030-04-03',203014,4,2030,3,14,203004,2030),('2030-04-04',203014,4,2030,4,14,203004,2030),('2030-04-05',203014,4,2030,5,14,203004,2030),('2030-04-06',203014,4,2030,6,14,203004,2030),('2030-04-07',203015,4,2030,7,15,203004,2030),('2030-04-08',203015,4,2030,8,15,203004,2030),('2030-04-09',203015,4,2030,9,15,203004,2030),('2030-04-10',203015,4,2030,10,15,203004,2030),('2030-04-11',203015,4,2030,11,15,203004,2030),('2030-04-12',203015,4,2030,12,15,203004,2030),('2030-04-13',203015,4,2030,13,15,203004,2030),('2030-04-14',203016,4,2030,14,16,203004,2030),('2030-04-15',203016,4,2030,15,16,203004,2030),('2030-04-16',203016,4,2030,16,16,203004,2030),('2030-04-17',203016,4,2030,17,16,203004,2030),('2030-04-18',203016,4,2030,18,16,203004,2030),('2030-04-19',203016,4,2030,19,16,203004,2030),('2030-04-20',203016,4,2030,20,16,203004,2030),('2030-04-21',203017,4,2030,21,17,203004,2030),('2030-04-22',203017,4,2030,22,17,203004,2030),('2030-04-23',203017,4,2030,23,17,203004,2030),('2030-04-24',203017,4,2030,24,17,203004,2030),('2030-04-25',203017,4,2030,25,17,203004,2030),('2030-04-26',203017,4,2030,26,17,203004,2030),('2030-04-27',203017,4,2030,27,17,203004,2030),('2030-04-28',203018,4,2030,28,18,203004,2030),('2030-04-29',203018,4,2030,29,18,203004,2030),('2030-04-30',203018,4,2030,30,18,203004,2030),('2030-05-01',203018,5,2030,1,18,203005,2030),('2030-05-02',203018,5,2030,2,18,203005,2030),('2030-05-03',203018,5,2030,3,18,203005,2030),('2030-05-04',203018,5,2030,4,18,203005,2030),('2030-05-05',203019,5,2030,5,19,203005,2030),('2030-05-06',203019,5,2030,6,19,203005,2030),('2030-05-07',203019,5,2030,7,19,203005,2030),('2030-05-08',203019,5,2030,8,19,203005,2030),('2030-05-09',203019,5,2030,9,19,203005,2030),('2030-05-10',203019,5,2030,10,19,203005,2030),('2030-05-11',203019,5,2030,11,19,203005,2030),('2030-05-12',203020,5,2030,12,20,203005,2030),('2030-05-13',203020,5,2030,13,20,203005,2030),('2030-05-14',203020,5,2030,14,20,203005,2030),('2030-05-15',203020,5,2030,15,20,203005,2030),('2030-05-16',203020,5,2030,16,20,203005,2030),('2030-05-17',203020,5,2030,17,20,203005,2030),('2030-05-18',203020,5,2030,18,20,203005,2030),('2030-05-19',203021,5,2030,19,21,203005,2030),('2030-05-20',203021,5,2030,20,21,203005,2030),('2030-05-21',203021,5,2030,21,21,203005,2030),('2030-05-22',203021,5,2030,22,21,203005,2030),('2030-05-23',203021,5,2030,23,21,203005,2030),('2030-05-24',203021,5,2030,24,21,203005,2030),('2030-05-25',203021,5,2030,25,21,203005,2030),('2030-05-26',203022,5,2030,26,22,203005,2030),('2030-05-27',203022,5,2030,27,22,203005,2030),('2030-05-28',203022,5,2030,28,22,203005,2030),('2030-05-29',203022,5,2030,29,22,203005,2030),('2030-05-30',203022,5,2030,30,22,203005,2030),('2030-05-31',203022,5,2030,31,22,203005,2030),('2030-06-01',203022,6,2030,1,22,203006,2030),('2030-06-02',203023,6,2030,2,23,203006,2030),('2030-06-03',203023,6,2030,3,23,203006,2030),('2030-06-04',203023,6,2030,4,23,203006,2030),('2030-06-05',203023,6,2030,5,23,203006,2030),('2030-06-06',203023,6,2030,6,23,203006,2030),('2030-06-07',203023,6,2030,7,23,203006,2030),('2030-06-08',203023,6,2030,8,23,203006,2030),('2030-06-09',203024,6,2030,9,24,203006,2030),('2030-06-10',203024,6,2030,10,24,203006,2030),('2030-06-11',203024,6,2030,11,24,203006,2030),('2030-06-12',203024,6,2030,12,24,203006,2030),('2030-06-13',203024,6,2030,13,24,203006,2030),('2030-06-14',203024,6,2030,14,24,203006,2030),('2030-06-15',203024,6,2030,15,24,203006,2030),('2030-06-16',203025,6,2030,16,25,203006,2030),('2030-06-17',203025,6,2030,17,25,203006,2030),('2030-06-18',203025,6,2030,18,25,203006,2030),('2030-06-19',203025,6,2030,19,25,203006,2030),('2030-06-20',203025,6,2030,20,25,203006,2030),('2030-06-21',203025,6,2030,21,25,203006,2030),('2030-06-22',203025,6,2030,22,25,203006,2030),('2030-06-23',203026,6,2030,23,26,203006,2030),('2030-06-24',203026,6,2030,24,26,203006,2030),('2030-06-25',203026,6,2030,25,26,203006,2030),('2030-06-26',203026,6,2030,26,26,203006,2030),('2030-06-27',203026,6,2030,27,26,203006,2030),('2030-06-28',203026,6,2030,28,26,203006,2030),('2030-06-29',203026,6,2030,29,26,203006,2030),('2030-06-30',203027,6,2030,30,27,203006,2030),('2030-07-01',203027,7,2030,1,27,203007,2030),('2030-07-02',203027,7,2030,2,27,203007,2030),('2030-07-03',203027,7,2030,3,27,203007,2030),('2030-07-04',203027,7,2030,4,27,203007,2030),('2030-07-05',203027,7,2030,5,27,203007,2030),('2030-07-06',203027,7,2030,6,27,203007,2030),('2030-07-07',203028,7,2030,7,28,203007,2030),('2030-07-08',203028,7,2030,8,28,203007,2030),('2030-07-09',203028,7,2030,9,28,203007,2030),('2030-07-10',203028,7,2030,10,28,203007,2030),('2030-07-11',203028,7,2030,11,28,203007,2030),('2030-07-12',203028,7,2030,12,28,203007,2030),('2030-07-13',203028,7,2030,13,28,203007,2030),('2030-07-14',203029,7,2030,14,29,203007,2030),('2030-07-15',203029,7,2030,15,29,203007,2030),('2030-07-16',203029,7,2030,16,29,203007,2030),('2030-07-17',203029,7,2030,17,29,203007,2030),('2030-07-18',203029,7,2030,18,29,203007,2030),('2030-07-19',203029,7,2030,19,29,203007,2030),('2030-07-20',203029,7,2030,20,29,203007,2030),('2030-07-21',203030,7,2030,21,30,203007,2030),('2030-07-22',203030,7,2030,22,30,203007,2030),('2030-07-23',203030,7,2030,23,30,203007,2030),('2030-07-24',203030,7,2030,24,30,203007,2030),('2030-07-25',203030,7,2030,25,30,203007,2030),('2030-07-26',203030,7,2030,26,30,203007,2030),('2030-07-27',203030,7,2030,27,30,203007,2030),('2030-07-28',203031,7,2030,28,31,203007,2030),('2030-07-29',203031,7,2030,29,31,203007,2030),('2030-07-30',203031,7,2030,30,31,203007,2030),('2030-07-31',203031,7,2030,31,31,203007,2030),('2030-08-01',203031,8,2030,1,31,203008,2030),('2030-08-02',203031,8,2030,2,31,203008,2030),('2030-08-03',203031,8,2030,3,31,203008,2030),('2030-08-04',203032,8,2030,4,32,203008,2030),('2030-08-05',203032,8,2030,5,32,203008,2030),('2030-08-06',203032,8,2030,6,32,203008,2030),('2030-08-07',203032,8,2030,7,32,203008,2030),('2030-08-08',203032,8,2030,8,32,203008,2030),('2030-08-09',203032,8,2030,9,32,203008,2030),('2030-08-10',203032,8,2030,10,32,203008,2030),('2030-08-11',203033,8,2030,11,33,203008,2030),('2030-08-12',203033,8,2030,12,33,203008,2030),('2030-08-13',203033,8,2030,13,33,203008,2030),('2030-08-14',203033,8,2030,14,33,203008,2030),('2030-08-15',203033,8,2030,15,33,203008,2030),('2030-08-16',203033,8,2030,16,33,203008,2030),('2030-08-17',203033,8,2030,17,33,203008,2030),('2030-08-18',203034,8,2030,18,34,203008,2030),('2030-08-19',203034,8,2030,19,34,203008,2030),('2030-08-20',203034,8,2030,20,34,203008,2030),('2030-08-21',203034,8,2030,21,34,203008,2030),('2030-08-22',203034,8,2030,22,34,203008,2030),('2030-08-23',203034,8,2030,23,34,203008,2030),('2030-08-24',203034,8,2030,24,34,203008,2030),('2030-08-25',203035,8,2030,25,35,203008,2030),('2030-08-26',203035,8,2030,26,35,203008,2030),('2030-08-27',203035,8,2030,27,35,203008,2030),('2030-08-28',203035,8,2030,28,35,203008,2030),('2030-08-29',203035,8,2030,29,35,203008,2030),('2030-08-30',203035,8,2030,30,35,203008,2030),('2030-08-31',203035,8,2030,31,35,203008,2030),('2030-09-01',203036,9,2030,1,36,203009,2030),('2030-09-02',203036,9,2030,2,36,203009,2030),('2030-09-03',203036,9,2030,3,36,203009,2030),('2030-09-04',203036,9,2030,4,36,203009,2030),('2030-09-05',203036,9,2030,5,36,203009,2030),('2030-09-06',203036,9,2030,6,36,203009,2030),('2030-09-07',203036,9,2030,7,36,203009,2030),('2030-09-08',203037,9,2030,8,37,203009,2030),('2030-09-09',203037,9,2030,9,37,203009,2030),('2030-09-10',203037,9,2030,10,37,203009,2030),('2030-09-11',203037,9,2030,11,37,203009,2030),('2030-09-12',203037,9,2030,12,37,203009,2030),('2030-09-13',203037,9,2030,13,37,203009,2030),('2030-09-14',203037,9,2030,14,37,203009,2030),('2030-09-15',203038,9,2030,15,38,203009,2030),('2030-09-16',203038,9,2030,16,38,203009,2030),('2030-09-17',203038,9,2030,17,38,203009,2030),('2030-09-18',203038,9,2030,18,38,203009,2030),('2030-09-19',203038,9,2030,19,38,203009,2030),('2030-09-20',203038,9,2030,20,38,203009,2030),('2030-09-21',203038,9,2030,21,38,203009,2030),('2030-09-22',203039,9,2030,22,39,203009,2030),('2030-09-23',203039,9,2030,23,39,203009,2030),('2030-09-24',203039,9,2030,24,39,203009,2030),('2030-09-25',203039,9,2030,25,39,203009,2030),('2030-09-26',203039,9,2030,26,39,203009,2030),('2030-09-27',203039,9,2030,27,39,203009,2030),('2030-09-28',203039,9,2030,28,39,203009,2030),('2030-09-29',203040,9,2030,29,40,203009,2030),('2030-09-30',203040,9,2030,30,40,203009,2030),('2030-10-01',203040,10,2030,1,40,203010,2030),('2030-10-02',203040,10,2030,2,40,203010,2030),('2030-10-03',203040,10,2030,3,40,203010,2030),('2030-10-04',203040,10,2030,4,40,203010,2030),('2030-10-05',203040,10,2030,5,40,203010,2030),('2030-10-06',203041,10,2030,6,41,203010,2030),('2030-10-07',203041,10,2030,7,41,203010,2030),('2030-10-08',203041,10,2030,8,41,203010,2030),('2030-10-09',203041,10,2030,9,41,203010,2030),('2030-10-10',203041,10,2030,10,41,203010,2030),('2030-10-11',203041,10,2030,11,41,203010,2030),('2030-10-12',203041,10,2030,12,41,203010,2030),('2030-10-13',203042,10,2030,13,42,203010,2030),('2030-10-14',203042,10,2030,14,42,203010,2030),('2030-10-15',203042,10,2030,15,42,203010,2030),('2030-10-16',203042,10,2030,16,42,203010,2030),('2030-10-17',203042,10,2030,17,42,203010,2030),('2030-10-18',203042,10,2030,18,42,203010,2030),('2030-10-19',203042,10,2030,19,42,203010,2030),('2030-10-20',203043,10,2030,20,43,203010,2030),('2030-10-21',203043,10,2030,21,43,203010,2030),('2030-10-22',203043,10,2030,22,43,203010,2030),('2030-10-23',203043,10,2030,23,43,203010,2030),('2030-10-24',203043,10,2030,24,43,203010,2030),('2030-10-25',203043,10,2030,25,43,203010,2030),('2030-10-26',203043,10,2030,26,43,203010,2030),('2030-10-27',203044,10,2030,27,44,203010,2030),('2030-10-28',203044,10,2030,28,44,203010,2030),('2030-10-29',203044,10,2030,29,44,203010,2030),('2030-10-30',203044,10,2030,30,44,203010,2030),('2030-10-31',203044,10,2030,31,44,203010,2030),('2030-11-01',203044,11,2030,1,44,203011,2030),('2030-11-02',203044,11,2030,2,44,203011,2030),('2030-11-03',203045,11,2030,3,45,203011,2030),('2030-11-04',203045,11,2030,4,45,203011,2030),('2030-11-05',203045,11,2030,5,45,203011,2030),('2030-11-06',203045,11,2030,6,45,203011,2030),('2030-11-07',203045,11,2030,7,45,203011,2030),('2030-11-08',203045,11,2030,8,45,203011,2030),('2030-11-09',203045,11,2030,9,45,203011,2030),('2030-11-10',203046,11,2030,10,46,203011,2030),('2030-11-11',203046,11,2030,11,46,203011,2030),('2030-11-12',203046,11,2030,12,46,203011,2030),('2030-11-13',203046,11,2030,13,46,203011,2030),('2030-11-14',203046,11,2030,14,46,203011,2030),('2030-11-15',203046,11,2030,15,46,203011,2030),('2030-11-16',203046,11,2030,16,46,203011,2030),('2030-11-17',203047,11,2030,17,47,203011,2030),('2030-11-18',203047,11,2030,18,47,203011,2030),('2030-11-19',203047,11,2030,19,47,203011,2030),('2030-11-20',203047,11,2030,20,47,203011,2030),('2030-11-21',203047,11,2030,21,47,203011,2030),('2030-11-22',203047,11,2030,22,47,203011,2030),('2030-11-23',203047,11,2030,23,47,203011,2030),('2030-11-24',203048,11,2030,24,48,203011,2030),('2030-11-25',203048,11,2030,25,48,203011,2030),('2030-11-26',203048,11,2030,26,48,203011,2030),('2030-11-27',203048,11,2030,27,48,203011,2030),('2030-11-28',203048,11,2030,28,48,203011,2030),('2030-11-29',203048,11,2030,29,48,203011,2030),('2030-11-30',203048,11,2030,30,48,203011,2030),('2030-12-01',203049,12,2030,1,49,203012,2031),('2030-12-02',203049,12,2030,2,49,203012,2031),('2030-12-03',203049,12,2030,3,49,203012,2031),('2030-12-04',203049,12,2030,4,49,203012,2031),('2030-12-05',203049,12,2030,5,49,203012,2031),('2030-12-06',203049,12,2030,6,49,203012,2031),('2030-12-07',203049,12,2030,7,49,203012,2031),('2030-12-08',203050,12,2030,8,50,203012,2031),('2030-12-09',203050,12,2030,9,50,203012,2031),('2030-12-10',203050,12,2030,10,50,203012,2031),('2030-12-11',203050,12,2030,11,50,203012,2031),('2030-12-12',203050,12,2030,12,50,203012,2031),('2030-12-13',203050,12,2030,13,50,203012,2031),('2030-12-14',203050,12,2030,14,50,203012,2031),('2030-12-15',203051,12,2030,15,51,203012,2031),('2030-12-16',203051,12,2030,16,51,203012,2031),('2030-12-17',203051,12,2030,17,51,203012,2031),('2030-12-18',203051,12,2030,18,51,203012,2031),('2030-12-19',203051,12,2030,19,51,203012,2031),('2030-12-20',203051,12,2030,20,51,203012,2031),('2030-12-21',203051,12,2030,21,51,203012,2031),('2030-12-22',203052,12,2030,22,52,203012,2031),('2030-12-23',203052,12,2030,23,52,203012,2031),('2030-12-24',203052,12,2030,24,52,203012,2031),('2030-12-25',203052,12,2030,25,52,203012,2031),('2030-12-26',203052,12,2030,26,52,203012,2031),('2030-12-27',203052,12,2030,27,52,203012,2031),('2030-12-28',203052,12,2030,28,52,203012,2031),('2030-12-29',203053,12,2030,29,1,203012,2031),('2030-12-30',203001,12,2030,30,1,203012,2031),('2030-12-31',203001,12,2030,31,1,203012,2031),('2031-01-01',203101,1,2031,1,1,203101,2031),('2031-01-02',203101,1,2031,2,1,203101,2031),('2031-01-03',203101,1,2031,3,1,203101,2031),('2031-01-04',203101,1,2031,4,1,203101,2031),('2031-01-05',203102,1,2031,5,2,203101,2031),('2031-01-06',203102,1,2031,6,2,203101,2031),('2031-01-07',203102,1,2031,7,2,203101,2031),('2031-01-08',203102,1,2031,8,2,203101,2031),('2031-01-09',203102,1,2031,9,2,203101,2031),('2031-01-10',203102,1,2031,10,2,203101,2031),('2031-01-11',203102,1,2031,11,2,203101,2031),('2031-01-12',203103,1,2031,12,3,203101,2031),('2031-01-13',203103,1,2031,13,3,203101,2031),('2031-01-14',203103,1,2031,14,3,203101,2031),('2031-01-15',203103,1,2031,15,3,203101,2031),('2031-01-16',203103,1,2031,16,3,203101,2031),('2031-01-17',203103,1,2031,17,3,203101,2031),('2031-01-18',203103,1,2031,18,3,203101,2031),('2031-01-19',203104,1,2031,19,4,203101,2031),('2031-01-20',203104,1,2031,20,4,203101,2031),('2031-01-21',203104,1,2031,21,4,203101,2031),('2031-01-22',203104,1,2031,22,4,203101,2031),('2031-01-23',203104,1,2031,23,4,203101,2031),('2031-01-24',203104,1,2031,24,4,203101,2031),('2031-01-25',203104,1,2031,25,4,203101,2031),('2031-01-26',203105,1,2031,26,5,203101,2031),('2031-01-27',203105,1,2031,27,5,203101,2031),('2031-01-28',203105,1,2031,28,5,203101,2031),('2031-01-29',203105,1,2031,29,5,203101,2031),('2031-01-30',203105,1,2031,30,5,203101,2031),('2031-01-31',203105,1,2031,31,5,203101,2031),('2031-02-01',203105,2,2031,1,5,203102,2031),('2031-02-02',203106,2,2031,2,6,203102,2031),('2031-02-03',203106,2,2031,3,6,203102,2031),('2031-02-04',203106,2,2031,4,6,203102,2031),('2031-02-05',203106,2,2031,5,6,203102,2031),('2031-02-06',203106,2,2031,6,6,203102,2031),('2031-02-07',203106,2,2031,7,6,203102,2031),('2031-02-08',203106,2,2031,8,6,203102,2031),('2031-02-09',203107,2,2031,9,7,203102,2031),('2031-02-10',203107,2,2031,10,7,203102,2031),('2031-02-11',203107,2,2031,11,7,203102,2031),('2031-02-12',203107,2,2031,12,7,203102,2031),('2031-02-13',203107,2,2031,13,7,203102,2031),('2031-02-14',203107,2,2031,14,7,203102,2031),('2031-02-15',203107,2,2031,15,7,203102,2031),('2031-02-16',203108,2,2031,16,8,203102,2031),('2031-02-17',203108,2,2031,17,8,203102,2031),('2031-02-18',203108,2,2031,18,8,203102,2031),('2031-02-19',203108,2,2031,19,8,203102,2031),('2031-02-20',203108,2,2031,20,8,203102,2031),('2031-02-21',203108,2,2031,21,8,203102,2031),('2031-02-22',203108,2,2031,22,8,203102,2031),('2031-02-23',203109,2,2031,23,9,203102,2031),('2031-02-24',203109,2,2031,24,9,203102,2031),('2031-02-25',203109,2,2031,25,9,203102,2031),('2031-02-26',203109,2,2031,26,9,203102,2031),('2031-02-27',203109,2,2031,27,9,203102,2031),('2031-02-28',203109,2,2031,28,9,203102,2031),('2031-03-01',203109,3,2031,1,9,203103,2031),('2031-03-02',203110,3,2031,2,10,203103,2031),('2031-03-03',203110,3,2031,3,10,203103,2031),('2031-03-04',203110,3,2031,4,10,203103,2031),('2031-03-05',203110,3,2031,5,10,203103,2031),('2031-03-06',203110,3,2031,6,10,203103,2031),('2031-03-07',203110,3,2031,7,10,203103,2031),('2031-03-08',203110,3,2031,8,10,203103,2031),('2031-03-09',203111,3,2031,9,11,203103,2031),('2031-03-10',203111,3,2031,10,11,203103,2031),('2031-03-11',203111,3,2031,11,11,203103,2031),('2031-03-12',203111,3,2031,12,11,203103,2031),('2031-03-13',203111,3,2031,13,11,203103,2031),('2031-03-14',203111,3,2031,14,11,203103,2031),('2031-03-15',203111,3,2031,15,11,203103,2031),('2031-03-16',203112,3,2031,16,12,203103,2031),('2031-03-17',203112,3,2031,17,12,203103,2031),('2031-03-18',203112,3,2031,18,12,203103,2031),('2031-03-19',203112,3,2031,19,12,203103,2031),('2031-03-20',203112,3,2031,20,12,203103,2031),('2031-03-21',203112,3,2031,21,12,203103,2031),('2031-03-22',203112,3,2031,22,12,203103,2031),('2031-03-23',203113,3,2031,23,13,203103,2031),('2031-03-24',203113,3,2031,24,13,203103,2031),('2031-03-25',203113,3,2031,25,13,203103,2031),('2031-03-26',203113,3,2031,26,13,203103,2031),('2031-03-27',203113,3,2031,27,13,203103,2031),('2031-03-28',203113,3,2031,28,13,203103,2031),('2031-03-29',203113,3,2031,29,13,203103,2031),('2031-03-30',203114,3,2031,30,14,203103,2031),('2031-03-31',203114,3,2031,31,14,203103,2031),('2031-04-01',203114,4,2031,1,14,203104,2031),('2031-04-02',203114,4,2031,2,14,203104,2031),('2031-04-03',203114,4,2031,3,14,203104,2031),('2031-04-04',203114,4,2031,4,14,203104,2031),('2031-04-05',203114,4,2031,5,14,203104,2031),('2031-04-06',203115,4,2031,6,15,203104,2031),('2031-04-07',203115,4,2031,7,15,203104,2031),('2031-04-08',203115,4,2031,8,15,203104,2031),('2031-04-09',203115,4,2031,9,15,203104,2031),('2031-04-10',203115,4,2031,10,15,203104,2031),('2031-04-11',203115,4,2031,11,15,203104,2031),('2031-04-12',203115,4,2031,12,15,203104,2031),('2031-04-13',203116,4,2031,13,16,203104,2031),('2031-04-14',203116,4,2031,14,16,203104,2031),('2031-04-15',203116,4,2031,15,16,203104,2031),('2031-04-16',203116,4,2031,16,16,203104,2031),('2031-04-17',203116,4,2031,17,16,203104,2031),('2031-04-18',203116,4,2031,18,16,203104,2031),('2031-04-19',203116,4,2031,19,16,203104,2031),('2031-04-20',203117,4,2031,20,17,203104,2031),('2031-04-21',203117,4,2031,21,17,203104,2031),('2031-04-22',203117,4,2031,22,17,203104,2031),('2031-04-23',203117,4,2031,23,17,203104,2031),('2031-04-24',203117,4,2031,24,17,203104,2031),('2031-04-25',203117,4,2031,25,17,203104,2031),('2031-04-26',203117,4,2031,26,17,203104,2031),('2031-04-27',203118,4,2031,27,18,203104,2031),('2031-04-28',203118,4,2031,28,18,203104,2031),('2031-04-29',203118,4,2031,29,18,203104,2031),('2031-04-30',203118,4,2031,30,18,203104,2031),('2031-05-01',203118,5,2031,1,18,203105,2031),('2031-05-02',203118,5,2031,2,18,203105,2031),('2031-05-03',203118,5,2031,3,18,203105,2031),('2031-05-04',203119,5,2031,4,19,203105,2031),('2031-05-05',203119,5,2031,5,19,203105,2031),('2031-05-06',203119,5,2031,6,19,203105,2031),('2031-05-07',203119,5,2031,7,19,203105,2031),('2031-05-08',203119,5,2031,8,19,203105,2031),('2031-05-09',203119,5,2031,9,19,203105,2031),('2031-05-10',203119,5,2031,10,19,203105,2031),('2031-05-11',203120,5,2031,11,20,203105,2031),('2031-05-12',203120,5,2031,12,20,203105,2031),('2031-05-13',203120,5,2031,13,20,203105,2031),('2031-05-14',203120,5,2031,14,20,203105,2031),('2031-05-15',203120,5,2031,15,20,203105,2031),('2031-05-16',203120,5,2031,16,20,203105,2031),('2031-05-17',203120,5,2031,17,20,203105,2031),('2031-05-18',203121,5,2031,18,21,203105,2031),('2031-05-19',203121,5,2031,19,21,203105,2031),('2031-05-20',203121,5,2031,20,21,203105,2031),('2031-05-21',203121,5,2031,21,21,203105,2031),('2031-05-22',203121,5,2031,22,21,203105,2031),('2031-05-23',203121,5,2031,23,21,203105,2031),('2031-05-24',203121,5,2031,24,21,203105,2031),('2031-05-25',203122,5,2031,25,22,203105,2031),('2031-05-26',203122,5,2031,26,22,203105,2031),('2031-05-27',203122,5,2031,27,22,203105,2031),('2031-05-28',203122,5,2031,28,22,203105,2031),('2031-05-29',203122,5,2031,29,22,203105,2031),('2031-05-30',203122,5,2031,30,22,203105,2031),('2031-05-31',203122,5,2031,31,22,203105,2031),('2031-06-01',203123,6,2031,1,23,203106,2031),('2031-06-02',203123,6,2031,2,23,203106,2031),('2031-06-03',203123,6,2031,3,23,203106,2031),('2031-06-04',203123,6,2031,4,23,203106,2031),('2031-06-05',203123,6,2031,5,23,203106,2031),('2031-06-06',203123,6,2031,6,23,203106,2031),('2031-06-07',203123,6,2031,7,23,203106,2031),('2031-06-08',203124,6,2031,8,24,203106,2031),('2031-06-09',203124,6,2031,9,24,203106,2031),('2031-06-10',203124,6,2031,10,24,203106,2031),('2031-06-11',203124,6,2031,11,24,203106,2031),('2031-06-12',203124,6,2031,12,24,203106,2031),('2031-06-13',203124,6,2031,13,24,203106,2031),('2031-06-14',203124,6,2031,14,24,203106,2031),('2031-06-15',203125,6,2031,15,25,203106,2031),('2031-06-16',203125,6,2031,16,25,203106,2031),('2031-06-17',203125,6,2031,17,25,203106,2031),('2031-06-18',203125,6,2031,18,25,203106,2031),('2031-06-19',203125,6,2031,19,25,203106,2031),('2031-06-20',203125,6,2031,20,25,203106,2031),('2031-06-21',203125,6,2031,21,25,203106,2031),('2031-06-22',203126,6,2031,22,26,203106,2031),('2031-06-23',203126,6,2031,23,26,203106,2031),('2031-06-24',203126,6,2031,24,26,203106,2031),('2031-06-25',203126,6,2031,25,26,203106,2031),('2031-06-26',203126,6,2031,26,26,203106,2031),('2031-06-27',203126,6,2031,27,26,203106,2031),('2031-06-28',203126,6,2031,28,26,203106,2031),('2031-06-29',203127,6,2031,29,27,203106,2031),('2031-06-30',203127,6,2031,30,27,203106,2031),('2031-07-01',203127,7,2031,1,27,203107,2031),('2031-07-02',203127,7,2031,2,27,203107,2031),('2031-07-03',203127,7,2031,3,27,203107,2031),('2031-07-04',203127,7,2031,4,27,203107,2031),('2031-07-05',203127,7,2031,5,27,203107,2031),('2031-07-06',203128,7,2031,6,28,203107,2031),('2031-07-07',203128,7,2031,7,28,203107,2031),('2031-07-08',203128,7,2031,8,28,203107,2031),('2031-07-09',203128,7,2031,9,28,203107,2031),('2031-07-10',203128,7,2031,10,28,203107,2031),('2031-07-11',203128,7,2031,11,28,203107,2031),('2031-07-12',203128,7,2031,12,28,203107,2031),('2031-07-13',203129,7,2031,13,29,203107,2031),('2031-07-14',203129,7,2031,14,29,203107,2031),('2031-07-15',203129,7,2031,15,29,203107,2031),('2031-07-16',203129,7,2031,16,29,203107,2031),('2031-07-17',203129,7,2031,17,29,203107,2031),('2031-07-18',203129,7,2031,18,29,203107,2031),('2031-07-19',203129,7,2031,19,29,203107,2031),('2031-07-20',203130,7,2031,20,30,203107,2031),('2031-07-21',203130,7,2031,21,30,203107,2031),('2031-07-22',203130,7,2031,22,30,203107,2031),('2031-07-23',203130,7,2031,23,30,203107,2031),('2031-07-24',203130,7,2031,24,30,203107,2031),('2031-07-25',203130,7,2031,25,30,203107,2031),('2031-07-26',203130,7,2031,26,30,203107,2031),('2031-07-27',203131,7,2031,27,31,203107,2031),('2031-07-28',203131,7,2031,28,31,203107,2031),('2031-07-29',203131,7,2031,29,31,203107,2031),('2031-07-30',203131,7,2031,30,31,203107,2031),('2031-07-31',203131,7,2031,31,31,203107,2031),('2031-08-01',203131,8,2031,1,31,203108,2031),('2031-08-02',203131,8,2031,2,31,203108,2031),('2031-08-03',203132,8,2031,3,32,203108,2031),('2031-08-04',203132,8,2031,4,32,203108,2031),('2031-08-05',203132,8,2031,5,32,203108,2031),('2031-08-06',203132,8,2031,6,32,203108,2031),('2031-08-07',203132,8,2031,7,32,203108,2031),('2031-08-08',203132,8,2031,8,32,203108,2031),('2031-08-09',203132,8,2031,9,32,203108,2031),('2031-08-10',203133,8,2031,10,33,203108,2031),('2031-08-11',203133,8,2031,11,33,203108,2031),('2031-08-12',203133,8,2031,12,33,203108,2031),('2031-08-13',203133,8,2031,13,33,203108,2031),('2031-08-14',203133,8,2031,14,33,203108,2031),('2031-08-15',203133,8,2031,15,33,203108,2031),('2031-08-16',203133,8,2031,16,33,203108,2031),('2031-08-17',203134,8,2031,17,34,203108,2031),('2031-08-18',203134,8,2031,18,34,203108,2031),('2031-08-19',203134,8,2031,19,34,203108,2031),('2031-08-20',203134,8,2031,20,34,203108,2031),('2031-08-21',203134,8,2031,21,34,203108,2031),('2031-08-22',203134,8,2031,22,34,203108,2031),('2031-08-23',203134,8,2031,23,34,203108,2031),('2031-08-24',203135,8,2031,24,35,203108,2031),('2031-08-25',203135,8,2031,25,35,203108,2031),('2031-08-26',203135,8,2031,26,35,203108,2031),('2031-08-27',203135,8,2031,27,35,203108,2031),('2031-08-28',203135,8,2031,28,35,203108,2031),('2031-08-29',203135,8,2031,29,35,203108,2031),('2031-08-30',203135,8,2031,30,35,203108,2031),('2031-08-31',203136,8,2031,31,36,203108,2031),('2031-09-01',203136,9,2031,1,36,203109,2031),('2031-09-02',203136,9,2031,2,36,203109,2031),('2031-09-03',203136,9,2031,3,36,203109,2031),('2031-09-04',203136,9,2031,4,36,203109,2031),('2031-09-05',203136,9,2031,5,36,203109,2031),('2031-09-06',203136,9,2031,6,36,203109,2031),('2031-09-07',203137,9,2031,7,37,203109,2031),('2031-09-08',203137,9,2031,8,37,203109,2031),('2031-09-09',203137,9,2031,9,37,203109,2031),('2031-09-10',203137,9,2031,10,37,203109,2031),('2031-09-11',203137,9,2031,11,37,203109,2031),('2031-09-12',203137,9,2031,12,37,203109,2031),('2031-09-13',203137,9,2031,13,37,203109,2031),('2031-09-14',203138,9,2031,14,38,203109,2031),('2031-09-15',203138,9,2031,15,38,203109,2031),('2031-09-16',203138,9,2031,16,38,203109,2031),('2031-09-17',203138,9,2031,17,38,203109,2031),('2031-09-18',203138,9,2031,18,38,203109,2031),('2031-09-19',203138,9,2031,19,38,203109,2031),('2031-09-20',203138,9,2031,20,38,203109,2031),('2031-09-21',203139,9,2031,21,39,203109,2031),('2031-09-22',203139,9,2031,22,39,203109,2031),('2031-09-23',203139,9,2031,23,39,203109,2031),('2031-09-24',203139,9,2031,24,39,203109,2031),('2031-09-25',203139,9,2031,25,39,203109,2031),('2031-09-26',203139,9,2031,26,39,203109,2031),('2031-09-27',203139,9,2031,27,39,203109,2031),('2031-09-28',203140,9,2031,28,40,203109,2031),('2031-09-29',203140,9,2031,29,40,203109,2031),('2031-09-30',203140,9,2031,30,40,203109,2031),('2031-10-01',203140,10,2031,1,40,203110,2031),('2031-10-02',203140,10,2031,2,40,203110,2031),('2031-10-03',203140,10,2031,3,40,203110,2031),('2031-10-04',203140,10,2031,4,40,203110,2031),('2031-10-05',203141,10,2031,5,41,203110,2031),('2031-10-06',203141,10,2031,6,41,203110,2031),('2031-10-07',203141,10,2031,7,41,203110,2031),('2031-10-08',203141,10,2031,8,41,203110,2031),('2031-10-09',203141,10,2031,9,41,203110,2031),('2031-10-10',203141,10,2031,10,41,203110,2031),('2031-10-11',203141,10,2031,11,41,203110,2031),('2031-10-12',203142,10,2031,12,42,203110,2031),('2031-10-13',203142,10,2031,13,42,203110,2031),('2031-10-14',203142,10,2031,14,42,203110,2031),('2031-10-15',203142,10,2031,15,42,203110,2031),('2031-10-16',203142,10,2031,16,42,203110,2031),('2031-10-17',203142,10,2031,17,42,203110,2031),('2031-10-18',203142,10,2031,18,42,203110,2031),('2031-10-19',203143,10,2031,19,43,203110,2031),('2031-10-20',203143,10,2031,20,43,203110,2031),('2031-10-21',203143,10,2031,21,43,203110,2031),('2031-10-22',203143,10,2031,22,43,203110,2031),('2031-10-23',203143,10,2031,23,43,203110,2031),('2031-10-24',203143,10,2031,24,43,203110,2031),('2031-10-25',203143,10,2031,25,43,203110,2031),('2031-10-26',203144,10,2031,26,44,203110,2031),('2031-10-27',203144,10,2031,27,44,203110,2031),('2031-10-28',203144,10,2031,28,44,203110,2031),('2031-10-29',203144,10,2031,29,44,203110,2031),('2031-10-30',203144,10,2031,30,44,203110,2031),('2031-10-31',203144,10,2031,31,44,203110,2031),('2031-11-01',203144,11,2031,1,44,203111,2031),('2031-11-02',203145,11,2031,2,45,203111,2031),('2031-11-03',203145,11,2031,3,45,203111,2031),('2031-11-04',203145,11,2031,4,45,203111,2031),('2031-11-05',203145,11,2031,5,45,203111,2031),('2031-11-06',203145,11,2031,6,45,203111,2031),('2031-11-07',203145,11,2031,7,45,203111,2031),('2031-11-08',203145,11,2031,8,45,203111,2031),('2031-11-09',203146,11,2031,9,46,203111,2031),('2031-11-10',203146,11,2031,10,46,203111,2031),('2031-11-11',203146,11,2031,11,46,203111,2031),('2031-11-12',203146,11,2031,12,46,203111,2031),('2031-11-13',203146,11,2031,13,46,203111,2031),('2031-11-14',203146,11,2031,14,46,203111,2031),('2031-11-15',203146,11,2031,15,46,203111,2031),('2031-11-16',203147,11,2031,16,47,203111,2031),('2031-11-17',203147,11,2031,17,47,203111,2031),('2031-11-18',203147,11,2031,18,47,203111,2031),('2031-11-19',203147,11,2031,19,47,203111,2031),('2031-11-20',203147,11,2031,20,47,203111,2031),('2031-11-21',203147,11,2031,21,47,203111,2031),('2031-11-22',203147,11,2031,22,47,203111,2031),('2031-11-23',203148,11,2031,23,48,203111,2031),('2031-11-24',203148,11,2031,24,48,203111,2031),('2031-11-25',203148,11,2031,25,48,203111,2031),('2031-11-26',203148,11,2031,26,48,203111,2031),('2031-11-27',203148,11,2031,27,48,203111,2031),('2031-11-28',203148,11,2031,28,48,203111,2031),('2031-11-29',203148,11,2031,29,48,203111,2031),('2031-11-30',203149,11,2031,30,49,203111,2031),('2031-12-01',203149,12,2031,1,49,203112,2032),('2031-12-02',203149,12,2031,2,49,203112,2032),('2031-12-03',203149,12,2031,3,49,203112,2032),('2031-12-04',203149,12,2031,4,49,203112,2032),('2031-12-05',203149,12,2031,5,49,203112,2032),('2031-12-06',203149,12,2031,6,49,203112,2032),('2031-12-07',203150,12,2031,7,50,203112,2032),('2031-12-08',203150,12,2031,8,50,203112,2032),('2031-12-09',203150,12,2031,9,50,203112,2032),('2031-12-10',203150,12,2031,10,50,203112,2032),('2031-12-11',203150,12,2031,11,50,203112,2032),('2031-12-12',203150,12,2031,12,50,203112,2032),('2031-12-13',203150,12,2031,13,50,203112,2032),('2031-12-14',203151,12,2031,14,51,203112,2032),('2031-12-15',203151,12,2031,15,51,203112,2032),('2031-12-16',203151,12,2031,16,51,203112,2032),('2031-12-17',203151,12,2031,17,51,203112,2032),('2031-12-18',203151,12,2031,18,51,203112,2032),('2031-12-19',203151,12,2031,19,51,203112,2032),('2031-12-20',203151,12,2031,20,51,203112,2032),('2031-12-21',203152,12,2031,21,52,203112,2032),('2031-12-22',203152,12,2031,22,52,203112,2032),('2031-12-23',203152,12,2031,23,52,203112,2032),('2031-12-24',203152,12,2031,24,52,203112,2032),('2031-12-25',203152,12,2031,25,52,203112,2032),('2031-12-26',203152,12,2031,26,52,203112,2032),('2031-12-27',203152,12,2031,27,52,203112,2032),('2031-12-28',203153,12,2031,28,53,203112,2032),('2031-12-29',203101,12,2031,29,53,203112,2032),('2031-12-30',203101,12,2031,30,53,203112,2032),('2031-12-31',203101,12,2031,31,53,203112,2032),('2032-01-01',203201,1,2032,1,53,203201,2032),('2032-01-02',203201,1,2032,2,53,203201,2032),('2032-01-03',203201,1,2032,3,53,203201,2032),('2032-01-04',203202,1,2032,4,1,203201,2032),('2032-01-05',203202,1,2032,5,1,203201,2032),('2032-01-06',203202,1,2032,6,1,203201,2032),('2032-01-07',203202,1,2032,7,1,203201,2032),('2032-01-08',203202,1,2032,8,1,203201,2032),('2032-01-09',203202,1,2032,9,1,203201,2032),('2032-01-10',203202,1,2032,10,1,203201,2032),('2032-01-11',203203,1,2032,11,2,203201,2032),('2032-01-12',203203,1,2032,12,2,203201,2032),('2032-01-13',203203,1,2032,13,2,203201,2032),('2032-01-14',203203,1,2032,14,2,203201,2032),('2032-01-15',203203,1,2032,15,2,203201,2032),('2032-01-16',203203,1,2032,16,2,203201,2032),('2032-01-17',203203,1,2032,17,2,203201,2032),('2032-01-18',203204,1,2032,18,3,203201,2032),('2032-01-19',203204,1,2032,19,3,203201,2032),('2032-01-20',203204,1,2032,20,3,203201,2032),('2032-01-21',203204,1,2032,21,3,203201,2032),('2032-01-22',203204,1,2032,22,3,203201,2032),('2032-01-23',203204,1,2032,23,3,203201,2032),('2032-01-24',203204,1,2032,24,3,203201,2032),('2032-01-25',203205,1,2032,25,4,203201,2032),('2032-01-26',203205,1,2032,26,4,203201,2032),('2032-01-27',203205,1,2032,27,4,203201,2032),('2032-01-28',203205,1,2032,28,4,203201,2032),('2032-01-29',203205,1,2032,29,4,203201,2032),('2032-01-30',203205,1,2032,30,4,203201,2032),('2032-01-31',203205,1,2032,31,4,203201,2032),('2032-02-01',203206,2,2032,1,5,203202,2032),('2032-02-02',203206,2,2032,2,5,203202,2032),('2032-02-03',203206,2,2032,3,5,203202,2032),('2032-02-04',203206,2,2032,4,5,203202,2032),('2032-02-05',203206,2,2032,5,5,203202,2032),('2032-02-06',203206,2,2032,6,5,203202,2032),('2032-02-07',203206,2,2032,7,5,203202,2032),('2032-02-08',203207,2,2032,8,6,203202,2032),('2032-02-09',203207,2,2032,9,6,203202,2032),('2032-02-10',203207,2,2032,10,6,203202,2032),('2032-02-11',203207,2,2032,11,6,203202,2032),('2032-02-12',203207,2,2032,12,6,203202,2032),('2032-02-13',203207,2,2032,13,6,203202,2032),('2032-02-14',203207,2,2032,14,6,203202,2032),('2032-02-15',203208,2,2032,15,7,203202,2032),('2032-02-16',203208,2,2032,16,7,203202,2032),('2032-02-17',203208,2,2032,17,7,203202,2032),('2032-02-18',203208,2,2032,18,7,203202,2032),('2032-02-19',203208,2,2032,19,7,203202,2032),('2032-02-20',203208,2,2032,20,7,203202,2032),('2032-02-21',203208,2,2032,21,7,203202,2032),('2032-02-22',203209,2,2032,22,8,203202,2032),('2032-02-23',203209,2,2032,23,8,203202,2032),('2032-02-24',203209,2,2032,24,8,203202,2032),('2032-02-25',203209,2,2032,25,8,203202,2032),('2032-02-26',203209,2,2032,26,8,203202,2032),('2032-02-27',203209,2,2032,27,8,203202,2032),('2032-02-28',203209,2,2032,28,8,203202,2032),('2032-02-29',203210,2,2032,29,9,203202,2032),('2032-03-01',203210,3,2032,1,9,203203,2032),('2032-03-02',203210,3,2032,2,9,203203,2032),('2032-03-03',203210,3,2032,3,9,203203,2032),('2032-03-04',203210,3,2032,4,9,203203,2032),('2032-03-05',203210,3,2032,5,9,203203,2032),('2032-03-06',203210,3,2032,6,9,203203,2032),('2032-03-07',203211,3,2032,7,10,203203,2032),('2032-03-08',203211,3,2032,8,10,203203,2032),('2032-03-09',203211,3,2032,9,10,203203,2032),('2032-03-10',203211,3,2032,10,10,203203,2032),('2032-03-11',203211,3,2032,11,10,203203,2032),('2032-03-12',203211,3,2032,12,10,203203,2032),('2032-03-13',203211,3,2032,13,10,203203,2032),('2032-03-14',203212,3,2032,14,11,203203,2032),('2032-03-15',203212,3,2032,15,11,203203,2032),('2032-03-16',203212,3,2032,16,11,203203,2032),('2032-03-17',203212,3,2032,17,11,203203,2032),('2032-03-18',203212,3,2032,18,11,203203,2032),('2032-03-19',203212,3,2032,19,11,203203,2032),('2032-03-20',203212,3,2032,20,11,203203,2032),('2032-03-21',203213,3,2032,21,12,203203,2032),('2032-03-22',203213,3,2032,22,12,203203,2032),('2032-03-23',203213,3,2032,23,12,203203,2032),('2032-03-24',203213,3,2032,24,12,203203,2032),('2032-03-25',203213,3,2032,25,12,203203,2032),('2032-03-26',203213,3,2032,26,12,203203,2032),('2032-03-27',203213,3,2032,27,12,203203,2032),('2032-03-28',203214,3,2032,28,13,203203,2032),('2032-03-29',203214,3,2032,29,13,203203,2032),('2032-03-30',203214,3,2032,30,13,203203,2032),('2032-03-31',203214,3,2032,31,13,203203,2032),('2032-04-01',203214,4,2032,1,13,203204,2032),('2032-04-02',203214,4,2032,2,13,203204,2032),('2032-04-03',203214,4,2032,3,13,203204,2032),('2032-04-04',203215,4,2032,4,14,203204,2032),('2032-04-05',203215,4,2032,5,14,203204,2032),('2032-04-06',203215,4,2032,6,14,203204,2032),('2032-04-07',203215,4,2032,7,14,203204,2032),('2032-04-08',203215,4,2032,8,14,203204,2032),('2032-04-09',203215,4,2032,9,14,203204,2032),('2032-04-10',203215,4,2032,10,14,203204,2032),('2032-04-11',203216,4,2032,11,15,203204,2032),('2032-04-12',203216,4,2032,12,15,203204,2032),('2032-04-13',203216,4,2032,13,15,203204,2032),('2032-04-14',203216,4,2032,14,15,203204,2032),('2032-04-15',203216,4,2032,15,15,203204,2032),('2032-04-16',203216,4,2032,16,15,203204,2032),('2032-04-17',203216,4,2032,17,15,203204,2032),('2032-04-18',203217,4,2032,18,16,203204,2032),('2032-04-19',203217,4,2032,19,16,203204,2032),('2032-04-20',203217,4,2032,20,16,203204,2032),('2032-04-21',203217,4,2032,21,16,203204,2032),('2032-04-22',203217,4,2032,22,16,203204,2032),('2032-04-23',203217,4,2032,23,16,203204,2032),('2032-04-24',203217,4,2032,24,16,203204,2032),('2032-04-25',203218,4,2032,25,17,203204,2032),('2032-04-26',203218,4,2032,26,17,203204,2032),('2032-04-27',203218,4,2032,27,17,203204,2032),('2032-04-28',203218,4,2032,28,17,203204,2032),('2032-04-29',203218,4,2032,29,17,203204,2032),('2032-04-30',203218,4,2032,30,17,203204,2032),('2032-05-01',203218,5,2032,1,17,203205,2032),('2032-05-02',203219,5,2032,2,18,203205,2032),('2032-05-03',203219,5,2032,3,18,203205,2032),('2032-05-04',203219,5,2032,4,18,203205,2032),('2032-05-05',203219,5,2032,5,18,203205,2032),('2032-05-06',203219,5,2032,6,18,203205,2032),('2032-05-07',203219,5,2032,7,18,203205,2032),('2032-05-08',203219,5,2032,8,18,203205,2032),('2032-05-09',203220,5,2032,9,19,203205,2032),('2032-05-10',203220,5,2032,10,19,203205,2032),('2032-05-11',203220,5,2032,11,19,203205,2032),('2032-05-12',203220,5,2032,12,19,203205,2032),('2032-05-13',203220,5,2032,13,19,203205,2032),('2032-05-14',203220,5,2032,14,19,203205,2032),('2032-05-15',203220,5,2032,15,19,203205,2032),('2032-05-16',203221,5,2032,16,20,203205,2032),('2032-05-17',203221,5,2032,17,20,203205,2032),('2032-05-18',203221,5,2032,18,20,203205,2032),('2032-05-19',203221,5,2032,19,20,203205,2032),('2032-05-20',203221,5,2032,20,20,203205,2032),('2032-05-21',203221,5,2032,21,20,203205,2032),('2032-05-22',203221,5,2032,22,20,203205,2032),('2032-05-23',203222,5,2032,23,21,203205,2032),('2032-05-24',203222,5,2032,24,21,203205,2032),('2032-05-25',203222,5,2032,25,21,203205,2032),('2032-05-26',203222,5,2032,26,21,203205,2032),('2032-05-27',203222,5,2032,27,21,203205,2032),('2032-05-28',203222,5,2032,28,21,203205,2032),('2032-05-29',203222,5,2032,29,21,203205,2032),('2032-05-30',203223,5,2032,30,22,203205,2032),('2032-05-31',203223,5,2032,31,22,203205,2032),('2032-06-01',203223,6,2032,1,22,203206,2032),('2032-06-02',203223,6,2032,2,22,203206,2032),('2032-06-03',203223,6,2032,3,22,203206,2032),('2032-06-04',203223,6,2032,4,22,203206,2032),('2032-06-05',203223,6,2032,5,22,203206,2032),('2032-06-06',203224,6,2032,6,23,203206,2032),('2032-06-07',203224,6,2032,7,23,203206,2032),('2032-06-08',203224,6,2032,8,23,203206,2032),('2032-06-09',203224,6,2032,9,23,203206,2032),('2032-06-10',203224,6,2032,10,23,203206,2032),('2032-06-11',203224,6,2032,11,23,203206,2032),('2032-06-12',203224,6,2032,12,23,203206,2032),('2032-06-13',203225,6,2032,13,24,203206,2032),('2032-06-14',203225,6,2032,14,24,203206,2032),('2032-06-15',203225,6,2032,15,24,203206,2032),('2032-06-16',203225,6,2032,16,24,203206,2032),('2032-06-17',203225,6,2032,17,24,203206,2032),('2032-06-18',203225,6,2032,18,24,203206,2032),('2032-06-19',203225,6,2032,19,24,203206,2032),('2032-06-20',203226,6,2032,20,25,203206,2032),('2032-06-21',203226,6,2032,21,25,203206,2032),('2032-06-22',203226,6,2032,22,25,203206,2032),('2032-06-23',203226,6,2032,23,25,203206,2032),('2032-06-24',203226,6,2032,24,25,203206,2032),('2032-06-25',203226,6,2032,25,25,203206,2032),('2032-06-26',203226,6,2032,26,25,203206,2032),('2032-06-27',203227,6,2032,27,26,203206,2032),('2032-06-28',203227,6,2032,28,26,203206,2032),('2032-06-29',203227,6,2032,29,26,203206,2032),('2032-06-30',203227,6,2032,30,26,203206,2032),('2032-07-01',203227,7,2032,1,26,203207,2032),('2032-07-02',203227,7,2032,2,26,203207,2032),('2032-07-03',203227,7,2032,3,26,203207,2032),('2032-07-04',203228,7,2032,4,27,203207,2032),('2032-07-05',203228,7,2032,5,27,203207,2032),('2032-07-06',203228,7,2032,6,27,203207,2032),('2032-07-07',203228,7,2032,7,27,203207,2032),('2032-07-08',203228,7,2032,8,27,203207,2032),('2032-07-09',203228,7,2032,9,27,203207,2032),('2032-07-10',203228,7,2032,10,27,203207,2032),('2032-07-11',203229,7,2032,11,28,203207,2032),('2032-07-12',203229,7,2032,12,28,203207,2032),('2032-07-13',203229,7,2032,13,28,203207,2032),('2032-07-14',203229,7,2032,14,28,203207,2032),('2032-07-15',203229,7,2032,15,28,203207,2032),('2032-07-16',203229,7,2032,16,28,203207,2032),('2032-07-17',203229,7,2032,17,28,203207,2032),('2032-07-18',203230,7,2032,18,29,203207,2032),('2032-07-19',203230,7,2032,19,29,203207,2032),('2032-07-20',203230,7,2032,20,29,203207,2032),('2032-07-21',203230,7,2032,21,29,203207,2032),('2032-07-22',203230,7,2032,22,29,203207,2032),('2032-07-23',203230,7,2032,23,29,203207,2032),('2032-07-24',203230,7,2032,24,29,203207,2032),('2032-07-25',203231,7,2032,25,30,203207,2032),('2032-07-26',203231,7,2032,26,30,203207,2032),('2032-07-27',203231,7,2032,27,30,203207,2032),('2032-07-28',203231,7,2032,28,30,203207,2032),('2032-07-29',203231,7,2032,29,30,203207,2032),('2032-07-30',203231,7,2032,30,30,203207,2032),('2032-07-31',203231,7,2032,31,30,203207,2032),('2032-08-01',203232,8,2032,1,31,203208,2032),('2032-08-02',203232,8,2032,2,31,203208,2032),('2032-08-03',203232,8,2032,3,31,203208,2032),('2032-08-04',203232,8,2032,4,31,203208,2032),('2032-08-05',203232,8,2032,5,31,203208,2032),('2032-08-06',203232,8,2032,6,31,203208,2032),('2032-08-07',203232,8,2032,7,31,203208,2032),('2032-08-08',203233,8,2032,8,32,203208,2032),('2032-08-09',203233,8,2032,9,32,203208,2032),('2032-08-10',203233,8,2032,10,32,203208,2032),('2032-08-11',203233,8,2032,11,32,203208,2032),('2032-08-12',203233,8,2032,12,32,203208,2032),('2032-08-13',203233,8,2032,13,32,203208,2032),('2032-08-14',203233,8,2032,14,32,203208,2032),('2032-08-15',203234,8,2032,15,33,203208,2032),('2032-08-16',203234,8,2032,16,33,203208,2032),('2032-08-17',203234,8,2032,17,33,203208,2032),('2032-08-18',203234,8,2032,18,33,203208,2032),('2032-08-19',203234,8,2032,19,33,203208,2032),('2032-08-20',203234,8,2032,20,33,203208,2032),('2032-08-21',203234,8,2032,21,33,203208,2032),('2032-08-22',203235,8,2032,22,34,203208,2032),('2032-08-23',203235,8,2032,23,34,203208,2032),('2032-08-24',203235,8,2032,24,34,203208,2032),('2032-08-25',203235,8,2032,25,34,203208,2032),('2032-08-26',203235,8,2032,26,34,203208,2032),('2032-08-27',203235,8,2032,27,34,203208,2032),('2032-08-28',203235,8,2032,28,34,203208,2032),('2032-08-29',203236,8,2032,29,35,203208,2032),('2032-08-30',203236,8,2032,30,35,203208,2032),('2032-08-31',203236,8,2032,31,35,203208,2032),('2032-09-01',203236,9,2032,1,35,203209,2032),('2032-09-02',203236,9,2032,2,35,203209,2032),('2032-09-03',203236,9,2032,3,35,203209,2032),('2032-09-04',203236,9,2032,4,35,203209,2032),('2032-09-05',203237,9,2032,5,36,203209,2032),('2032-09-06',203237,9,2032,6,36,203209,2032),('2032-09-07',203237,9,2032,7,36,203209,2032),('2032-09-08',203237,9,2032,8,36,203209,2032),('2032-09-09',203237,9,2032,9,36,203209,2032),('2032-09-10',203237,9,2032,10,36,203209,2032),('2032-09-11',203237,9,2032,11,36,203209,2032),('2032-09-12',203238,9,2032,12,37,203209,2032),('2032-09-13',203238,9,2032,13,37,203209,2032),('2032-09-14',203238,9,2032,14,37,203209,2032),('2032-09-15',203238,9,2032,15,37,203209,2032),('2032-09-16',203238,9,2032,16,37,203209,2032),('2032-09-17',203238,9,2032,17,37,203209,2032),('2032-09-18',203238,9,2032,18,37,203209,2032),('2032-09-19',203239,9,2032,19,38,203209,2032),('2032-09-20',203239,9,2032,20,38,203209,2032),('2032-09-21',203239,9,2032,21,38,203209,2032),('2032-09-22',203239,9,2032,22,38,203209,2032),('2032-09-23',203239,9,2032,23,38,203209,2032),('2032-09-24',203239,9,2032,24,38,203209,2032),('2032-09-25',203239,9,2032,25,38,203209,2032),('2032-09-26',203240,9,2032,26,39,203209,2032),('2032-09-27',203240,9,2032,27,39,203209,2032),('2032-09-28',203240,9,2032,28,39,203209,2032),('2032-09-29',203240,9,2032,29,39,203209,2032),('2032-09-30',203240,9,2032,30,39,203209,2032),('2032-10-01',203240,10,2032,1,39,203210,2032),('2032-10-02',203240,10,2032,2,39,203210,2032),('2032-10-03',203241,10,2032,3,40,203210,2032),('2032-10-04',203241,10,2032,4,40,203210,2032),('2032-10-05',203241,10,2032,5,40,203210,2032),('2032-10-06',203241,10,2032,6,40,203210,2032),('2032-10-07',203241,10,2032,7,40,203210,2032),('2032-10-08',203241,10,2032,8,40,203210,2032),('2032-10-09',203241,10,2032,9,40,203210,2032),('2032-10-10',203242,10,2032,10,41,203210,2032),('2032-10-11',203242,10,2032,11,41,203210,2032),('2032-10-12',203242,10,2032,12,41,203210,2032),('2032-10-13',203242,10,2032,13,41,203210,2032),('2032-10-14',203242,10,2032,14,41,203210,2032),('2032-10-15',203242,10,2032,15,41,203210,2032),('2032-10-16',203242,10,2032,16,41,203210,2032),('2032-10-17',203243,10,2032,17,42,203210,2032),('2032-10-18',203243,10,2032,18,42,203210,2032),('2032-10-19',203243,10,2032,19,42,203210,2032),('2032-10-20',203243,10,2032,20,42,203210,2032),('2032-10-21',203243,10,2032,21,42,203210,2032),('2032-10-22',203243,10,2032,22,42,203210,2032),('2032-10-23',203243,10,2032,23,42,203210,2032),('2032-10-24',203244,10,2032,24,43,203210,2032),('2032-10-25',203244,10,2032,25,43,203210,2032),('2032-10-26',203244,10,2032,26,43,203210,2032),('2032-10-27',203244,10,2032,27,43,203210,2032),('2032-10-28',203244,10,2032,28,43,203210,2032),('2032-10-29',203244,10,2032,29,43,203210,2032),('2032-10-30',203244,10,2032,30,43,203210,2032),('2032-10-31',203245,10,2032,31,44,203210,2032),('2032-11-01',203245,11,2032,1,44,203211,2032),('2032-11-02',203245,11,2032,2,44,203211,2032),('2032-11-03',203245,11,2032,3,44,203211,2032),('2032-11-04',203245,11,2032,4,44,203211,2032),('2032-11-05',203245,11,2032,5,44,203211,2032),('2032-11-06',203245,11,2032,6,44,203211,2032),('2032-11-07',203246,11,2032,7,45,203211,2032),('2032-11-08',203246,11,2032,8,45,203211,2032),('2032-11-09',203246,11,2032,9,45,203211,2032),('2032-11-10',203246,11,2032,10,45,203211,2032),('2032-11-11',203246,11,2032,11,45,203211,2032),('2032-11-12',203246,11,2032,12,45,203211,2032),('2032-11-13',203246,11,2032,13,45,203211,2032),('2032-11-14',203247,11,2032,14,46,203211,2032),('2032-11-15',203247,11,2032,15,46,203211,2032),('2032-11-16',203247,11,2032,16,46,203211,2032),('2032-11-17',203247,11,2032,17,46,203211,2032),('2032-11-18',203247,11,2032,18,46,203211,2032),('2032-11-19',203247,11,2032,19,46,203211,2032),('2032-11-20',203247,11,2032,20,46,203211,2032),('2032-11-21',203248,11,2032,21,47,203211,2032),('2032-11-22',203248,11,2032,22,47,203211,2032),('2032-11-23',203248,11,2032,23,47,203211,2032),('2032-11-24',203248,11,2032,24,47,203211,2032),('2032-11-25',203248,11,2032,25,47,203211,2032),('2032-11-26',203248,11,2032,26,47,203211,2032),('2032-11-27',203248,11,2032,27,47,203211,2032),('2032-11-28',203249,11,2032,28,48,203211,2032),('2032-11-29',203249,11,2032,29,48,203211,2032),('2032-11-30',203249,11,2032,30,48,203211,2032),('2032-12-01',203249,12,2032,1,48,203212,2033),('2032-12-02',203249,12,2032,2,48,203212,2033),('2032-12-03',203249,12,2032,3,48,203212,2033),('2032-12-04',203249,12,2032,4,48,203212,2033),('2032-12-05',203250,12,2032,5,49,203212,2033),('2032-12-06',203250,12,2032,6,49,203212,2033),('2032-12-07',203250,12,2032,7,49,203212,2033),('2032-12-08',203250,12,2032,8,49,203212,2033),('2032-12-09',203250,12,2032,9,49,203212,2033),('2032-12-10',203250,12,2032,10,49,203212,2033),('2032-12-11',203250,12,2032,11,49,203212,2033),('2032-12-12',203251,12,2032,12,50,203212,2033),('2032-12-13',203251,12,2032,13,50,203212,2033),('2032-12-14',203251,12,2032,14,50,203212,2033),('2032-12-15',203251,12,2032,15,50,203212,2033),('2032-12-16',203251,12,2032,16,50,203212,2033),('2032-12-17',203251,12,2032,17,50,203212,2033),('2032-12-18',203251,12,2032,18,50,203212,2033),('2032-12-19',203252,12,2032,19,51,203212,2033),('2032-12-20',203252,12,2032,20,51,203212,2033),('2032-12-21',203252,12,2032,21,51,203212,2033),('2032-12-22',203252,12,2032,22,51,203212,2033),('2032-12-23',203252,12,2032,23,51,203212,2033),('2032-12-24',203252,12,2032,24,51,203212,2033),('2032-12-25',203252,12,2032,25,51,203212,2033),('2032-12-26',203253,12,2032,26,52,203212,2033),('2032-12-27',203253,12,2032,27,52,203212,2033),('2032-12-28',203253,12,2032,28,52,203212,2033),('2032-12-29',203253,12,2032,29,52,203212,2033),('2032-12-30',203253,12,2032,30,52,203212,2033),('2032-12-31',203253,12,2032,31,52,203212,2033),('2033-01-01',203353,1,2033,1,52,203301,2033),('2033-01-02',203354,1,2033,2,1,203301,2033),('2033-01-03',203301,1,2033,3,1,203301,2033),('2033-01-04',203301,1,2033,4,1,203301,2033),('2033-01-05',203301,1,2033,5,1,203301,2033),('2033-01-06',203301,1,2033,6,1,203301,2033),('2033-01-07',203301,1,2033,7,1,203301,2033),('2033-01-08',203301,1,2033,8,1,203301,2033),('2033-01-09',203302,1,2033,9,2,203301,2033),('2033-01-10',203302,1,2033,10,2,203301,2033),('2033-01-11',203302,1,2033,11,2,203301,2033),('2033-01-12',203302,1,2033,12,2,203301,2033),('2033-01-13',203302,1,2033,13,2,203301,2033),('2033-01-14',203302,1,2033,14,2,203301,2033),('2033-01-15',203302,1,2033,15,2,203301,2033),('2033-01-16',203303,1,2033,16,3,203301,2033),('2033-01-17',203303,1,2033,17,3,203301,2033),('2033-01-18',203303,1,2033,18,3,203301,2033),('2033-01-19',203303,1,2033,19,3,203301,2033),('2033-01-20',203303,1,2033,20,3,203301,2033),('2033-01-21',203303,1,2033,21,3,203301,2033),('2033-01-22',203303,1,2033,22,3,203301,2033),('2033-01-23',203304,1,2033,23,4,203301,2033),('2033-01-24',203304,1,2033,24,4,203301,2033),('2033-01-25',203304,1,2033,25,4,203301,2033),('2033-01-26',203304,1,2033,26,4,203301,2033),('2033-01-27',203304,1,2033,27,4,203301,2033),('2033-01-28',203304,1,2033,28,4,203301,2033),('2033-01-29',203304,1,2033,29,4,203301,2033),('2033-01-30',203305,1,2033,30,5,203301,2033),('2033-01-31',203305,1,2033,31,5,203301,2033),('2033-02-01',203305,2,2033,1,5,203302,2033),('2033-02-02',203305,2,2033,2,5,203302,2033),('2033-02-03',203305,2,2033,3,5,203302,2033),('2033-02-04',203305,2,2033,4,5,203302,2033),('2033-02-05',203305,2,2033,5,5,203302,2033),('2033-02-06',203306,2,2033,6,6,203302,2033),('2033-02-07',203306,2,2033,7,6,203302,2033),('2033-02-08',203306,2,2033,8,6,203302,2033),('2033-02-09',203306,2,2033,9,6,203302,2033),('2033-02-10',203306,2,2033,10,6,203302,2033),('2033-02-11',203306,2,2033,11,6,203302,2033),('2033-02-12',203306,2,2033,12,6,203302,2033),('2033-02-13',203307,2,2033,13,7,203302,2033),('2033-02-14',203307,2,2033,14,7,203302,2033),('2033-02-15',203307,2,2033,15,7,203302,2033),('2033-02-16',203307,2,2033,16,7,203302,2033),('2033-02-17',203307,2,2033,17,7,203302,2033),('2033-02-18',203307,2,2033,18,7,203302,2033),('2033-02-19',203307,2,2033,19,7,203302,2033),('2033-02-20',203308,2,2033,20,8,203302,2033),('2033-02-21',203308,2,2033,21,8,203302,2033),('2033-02-22',203308,2,2033,22,8,203302,2033),('2033-02-23',203308,2,2033,23,8,203302,2033),('2033-02-24',203308,2,2033,24,8,203302,2033),('2033-02-25',203308,2,2033,25,8,203302,2033),('2033-02-26',203308,2,2033,26,8,203302,2033),('2033-02-27',203309,2,2033,27,9,203302,2033),('2033-02-28',203309,2,2033,28,9,203302,2033),('2033-03-01',203309,3,2033,1,9,203303,2033),('2033-03-02',203309,3,2033,2,9,203303,2033),('2033-03-03',203309,3,2033,3,9,203303,2033),('2033-03-04',203309,3,2033,4,9,203303,2033),('2033-03-05',203309,3,2033,5,9,203303,2033),('2033-03-06',203310,3,2033,6,10,203303,2033),('2033-03-07',203310,3,2033,7,10,203303,2033),('2033-03-08',203310,3,2033,8,10,203303,2033),('2033-03-09',203310,3,2033,9,10,203303,2033),('2033-03-10',203310,3,2033,10,10,203303,2033),('2033-03-11',203310,3,2033,11,10,203303,2033),('2033-03-12',203310,3,2033,12,10,203303,2033),('2033-03-13',203311,3,2033,13,11,203303,2033),('2033-03-14',203311,3,2033,14,11,203303,2033),('2033-03-15',203311,3,2033,15,11,203303,2033),('2033-03-16',203311,3,2033,16,11,203303,2033),('2033-03-17',203311,3,2033,17,11,203303,2033),('2033-03-18',203311,3,2033,18,11,203303,2033),('2033-03-19',203311,3,2033,19,11,203303,2033),('2033-03-20',203312,3,2033,20,12,203303,2033),('2033-03-21',203312,3,2033,21,12,203303,2033),('2033-03-22',203312,3,2033,22,12,203303,2033),('2033-03-23',203312,3,2033,23,12,203303,2033),('2033-03-24',203312,3,2033,24,12,203303,2033),('2033-03-25',203312,3,2033,25,12,203303,2033),('2033-03-26',203312,3,2033,26,12,203303,2033),('2033-03-27',203313,3,2033,27,13,203303,2033),('2033-03-28',203313,3,2033,28,13,203303,2033),('2033-03-29',203313,3,2033,29,13,203303,2033),('2033-03-30',203313,3,2033,30,13,203303,2033),('2033-03-31',203313,3,2033,31,13,203303,2033),('2033-04-01',203313,4,2033,1,13,203304,2033),('2033-04-02',203313,4,2033,2,13,203304,2033),('2033-04-03',203314,4,2033,3,14,203304,2033),('2033-04-04',203314,4,2033,4,14,203304,2033),('2033-04-05',203314,4,2033,5,14,203304,2033),('2033-04-06',203314,4,2033,6,14,203304,2033),('2033-04-07',203314,4,2033,7,14,203304,2033),('2033-04-08',203314,4,2033,8,14,203304,2033),('2033-04-09',203314,4,2033,9,14,203304,2033),('2033-04-10',203315,4,2033,10,15,203304,2033),('2033-04-11',203315,4,2033,11,15,203304,2033),('2033-04-12',203315,4,2033,12,15,203304,2033),('2033-04-13',203315,4,2033,13,15,203304,2033),('2033-04-14',203315,4,2033,14,15,203304,2033),('2033-04-15',203315,4,2033,15,15,203304,2033),('2033-04-16',203315,4,2033,16,15,203304,2033),('2033-04-17',203316,4,2033,17,16,203304,2033),('2033-04-18',203316,4,2033,18,16,203304,2033),('2033-04-19',203316,4,2033,19,16,203304,2033),('2033-04-20',203316,4,2033,20,16,203304,2033),('2033-04-21',203316,4,2033,21,16,203304,2033),('2033-04-22',203316,4,2033,22,16,203304,2033),('2033-04-23',203316,4,2033,23,16,203304,2033),('2033-04-24',203317,4,2033,24,17,203304,2033),('2033-04-25',203317,4,2033,25,17,203304,2033),('2033-04-26',203317,4,2033,26,17,203304,2033),('2033-04-27',203317,4,2033,27,17,203304,2033),('2033-04-28',203317,4,2033,28,17,203304,2033),('2033-04-29',203317,4,2033,29,17,203304,2033),('2033-04-30',203317,4,2033,30,17,203304,2033),('2033-05-01',203318,5,2033,1,18,203305,2033),('2033-05-02',203318,5,2033,2,18,203305,2033),('2033-05-03',203318,5,2033,3,18,203305,2033),('2033-05-04',203318,5,2033,4,18,203305,2033),('2033-05-05',203318,5,2033,5,18,203305,2033),('2033-05-06',203318,5,2033,6,18,203305,2033),('2033-05-07',203318,5,2033,7,18,203305,2033),('2033-05-08',203319,5,2033,8,19,203305,2033),('2033-05-09',203319,5,2033,9,19,203305,2033),('2033-05-10',203319,5,2033,10,19,203305,2033),('2033-05-11',203319,5,2033,11,19,203305,2033),('2033-05-12',203319,5,2033,12,19,203305,2033),('2033-05-13',203319,5,2033,13,19,203305,2033),('2033-05-14',203319,5,2033,14,19,203305,2033),('2033-05-15',203320,5,2033,15,20,203305,2033),('2033-05-16',203320,5,2033,16,20,203305,2033),('2033-05-17',203320,5,2033,17,20,203305,2033),('2033-05-18',203320,5,2033,18,20,203305,2033),('2033-05-19',203320,5,2033,19,20,203305,2033),('2033-05-20',203320,5,2033,20,20,203305,2033),('2033-05-21',203320,5,2033,21,20,203305,2033),('2033-05-22',203321,5,2033,22,21,203305,2033),('2033-05-23',203321,5,2033,23,21,203305,2033),('2033-05-24',203321,5,2033,24,21,203305,2033),('2033-05-25',203321,5,2033,25,21,203305,2033),('2033-05-26',203321,5,2033,26,21,203305,2033),('2033-05-27',203321,5,2033,27,21,203305,2033),('2033-05-28',203321,5,2033,28,21,203305,2033),('2033-05-29',203322,5,2033,29,22,203305,2033),('2033-05-30',203322,5,2033,30,22,203305,2033),('2033-05-31',203322,5,2033,31,22,203305,2033),('2033-06-01',203322,6,2033,1,22,203306,2033),('2033-06-02',203322,6,2033,2,22,203306,2033),('2033-06-03',203322,6,2033,3,22,203306,2033),('2033-06-04',203322,6,2033,4,22,203306,2033),('2033-06-05',203323,6,2033,5,23,203306,2033),('2033-06-06',203323,6,2033,6,23,203306,2033),('2033-06-07',203323,6,2033,7,23,203306,2033),('2033-06-08',203323,6,2033,8,23,203306,2033),('2033-06-09',203323,6,2033,9,23,203306,2033),('2033-06-10',203323,6,2033,10,23,203306,2033),('2033-06-11',203323,6,2033,11,23,203306,2033),('2033-06-12',203324,6,2033,12,24,203306,2033),('2033-06-13',203324,6,2033,13,24,203306,2033),('2033-06-14',203324,6,2033,14,24,203306,2033),('2033-06-15',203324,6,2033,15,24,203306,2033),('2033-06-16',203324,6,2033,16,24,203306,2033),('2033-06-17',203324,6,2033,17,24,203306,2033),('2033-06-18',203324,6,2033,18,24,203306,2033),('2033-06-19',203325,6,2033,19,25,203306,2033),('2033-06-20',203325,6,2033,20,25,203306,2033),('2033-06-21',203325,6,2033,21,25,203306,2033),('2033-06-22',203325,6,2033,22,25,203306,2033),('2033-06-23',203325,6,2033,23,25,203306,2033),('2033-06-24',203325,6,2033,24,25,203306,2033),('2033-06-25',203325,6,2033,25,25,203306,2033),('2033-06-26',203326,6,2033,26,26,203306,2033),('2033-06-27',203326,6,2033,27,26,203306,2033),('2033-06-28',203326,6,2033,28,26,203306,2033),('2033-06-29',203326,6,2033,29,26,203306,2033),('2033-06-30',203326,6,2033,30,26,203306,2033),('2033-07-01',203326,7,2033,1,26,203307,2033),('2033-07-02',203326,7,2033,2,26,203307,2033),('2033-07-03',203327,7,2033,3,27,203307,2033),('2033-07-04',203327,7,2033,4,27,203307,2033),('2033-07-05',203327,7,2033,5,27,203307,2033),('2033-07-06',203327,7,2033,6,27,203307,2033),('2033-07-07',203327,7,2033,7,27,203307,2033),('2033-07-08',203327,7,2033,8,27,203307,2033),('2033-07-09',203327,7,2033,9,27,203307,2033),('2033-07-10',203328,7,2033,10,28,203307,2033),('2033-07-11',203328,7,2033,11,28,203307,2033),('2033-07-12',203328,7,2033,12,28,203307,2033),('2033-07-13',203328,7,2033,13,28,203307,2033),('2033-07-14',203328,7,2033,14,28,203307,2033),('2033-07-15',203328,7,2033,15,28,203307,2033),('2033-07-16',203328,7,2033,16,28,203307,2033),('2033-07-17',203329,7,2033,17,29,203307,2033),('2033-07-18',203329,7,2033,18,29,203307,2033),('2033-07-19',203329,7,2033,19,29,203307,2033),('2033-07-20',203329,7,2033,20,29,203307,2033),('2033-07-21',203329,7,2033,21,29,203307,2033),('2033-07-22',203329,7,2033,22,29,203307,2033),('2033-07-23',203329,7,2033,23,29,203307,2033),('2033-07-24',203330,7,2033,24,30,203307,2033),('2033-07-25',203330,7,2033,25,30,203307,2033),('2033-07-26',203330,7,2033,26,30,203307,2033),('2033-07-27',203330,7,2033,27,30,203307,2033),('2033-07-28',203330,7,2033,28,30,203307,2033),('2033-07-29',203330,7,2033,29,30,203307,2033),('2033-07-30',203330,7,2033,30,30,203307,2033),('2033-07-31',203331,7,2033,31,31,203307,2033),('2033-08-01',203331,8,2033,1,31,203308,2033),('2033-08-02',203331,8,2033,2,31,203308,2033),('2033-08-03',203331,8,2033,3,31,203308,2033),('2033-08-04',203331,8,2033,4,31,203308,2033),('2033-08-05',203331,8,2033,5,31,203308,2033),('2033-08-06',203331,8,2033,6,31,203308,2033),('2033-08-07',203332,8,2033,7,32,203308,2033),('2033-08-08',203332,8,2033,8,32,203308,2033),('2033-08-09',203332,8,2033,9,32,203308,2033),('2033-08-10',203332,8,2033,10,32,203308,2033),('2033-08-11',203332,8,2033,11,32,203308,2033),('2033-08-12',203332,8,2033,12,32,203308,2033),('2033-08-13',203332,8,2033,13,32,203308,2033),('2033-08-14',203333,8,2033,14,33,203308,2033),('2033-08-15',203333,8,2033,15,33,203308,2033),('2033-08-16',203333,8,2033,16,33,203308,2033),('2033-08-17',203333,8,2033,17,33,203308,2033),('2033-08-18',203333,8,2033,18,33,203308,2033),('2033-08-19',203333,8,2033,19,33,203308,2033),('2033-08-20',203333,8,2033,20,33,203308,2033),('2033-08-21',203334,8,2033,21,34,203308,2033),('2033-08-22',203334,8,2033,22,34,203308,2033),('2033-08-23',203334,8,2033,23,34,203308,2033),('2033-08-24',203334,8,2033,24,34,203308,2033),('2033-08-25',203334,8,2033,25,34,203308,2033),('2033-08-26',203334,8,2033,26,34,203308,2033),('2033-08-27',203334,8,2033,27,34,203308,2033),('2033-08-28',203335,8,2033,28,35,203308,2033),('2033-08-29',203335,8,2033,29,35,203308,2033),('2033-08-30',203335,8,2033,30,35,203308,2033),('2033-08-31',203335,8,2033,31,35,203308,2033),('2033-09-01',203335,9,2033,1,35,203309,2033),('2033-09-02',203335,9,2033,2,35,203309,2033),('2033-09-03',203335,9,2033,3,35,203309,2033),('2033-09-04',203336,9,2033,4,36,203309,2033),('2033-09-05',203336,9,2033,5,36,203309,2033),('2033-09-06',203336,9,2033,6,36,203309,2033),('2033-09-07',203336,9,2033,7,36,203309,2033),('2033-09-08',203336,9,2033,8,36,203309,2033),('2033-09-09',203336,9,2033,9,36,203309,2033),('2033-09-10',203336,9,2033,10,36,203309,2033),('2033-09-11',203337,9,2033,11,37,203309,2033),('2033-09-12',203337,9,2033,12,37,203309,2033),('2033-09-13',203337,9,2033,13,37,203309,2033),('2033-09-14',203337,9,2033,14,37,203309,2033),('2033-09-15',203337,9,2033,15,37,203309,2033),('2033-09-16',203337,9,2033,16,37,203309,2033),('2033-09-17',203337,9,2033,17,37,203309,2033),('2033-09-18',203338,9,2033,18,38,203309,2033),('2033-09-19',203338,9,2033,19,38,203309,2033),('2033-09-20',203338,9,2033,20,38,203309,2033),('2033-09-21',203338,9,2033,21,38,203309,2033),('2033-09-22',203338,9,2033,22,38,203309,2033),('2033-09-23',203338,9,2033,23,38,203309,2033),('2033-09-24',203338,9,2033,24,38,203309,2033),('2033-09-25',203339,9,2033,25,39,203309,2033),('2033-09-26',203339,9,2033,26,39,203309,2033),('2033-09-27',203339,9,2033,27,39,203309,2033),('2033-09-28',203339,9,2033,28,39,203309,2033),('2033-09-29',203339,9,2033,29,39,203309,2033),('2033-09-30',203339,9,2033,30,39,203309,2033),('2033-10-01',203339,10,2033,1,39,203310,2033),('2033-10-02',203340,10,2033,2,40,203310,2033),('2033-10-03',203340,10,2033,3,40,203310,2033),('2033-10-04',203340,10,2033,4,40,203310,2033),('2033-10-05',203340,10,2033,5,40,203310,2033),('2033-10-06',203340,10,2033,6,40,203310,2033),('2033-10-07',203340,10,2033,7,40,203310,2033),('2033-10-08',203340,10,2033,8,40,203310,2033),('2033-10-09',203341,10,2033,9,41,203310,2033),('2033-10-10',203341,10,2033,10,41,203310,2033),('2033-10-11',203341,10,2033,11,41,203310,2033),('2033-10-12',203341,10,2033,12,41,203310,2033),('2033-10-13',203341,10,2033,13,41,203310,2033),('2033-10-14',203341,10,2033,14,41,203310,2033),('2033-10-15',203341,10,2033,15,41,203310,2033),('2033-10-16',203342,10,2033,16,42,203310,2033),('2033-10-17',203342,10,2033,17,42,203310,2033),('2033-10-18',203342,10,2033,18,42,203310,2033),('2033-10-19',203342,10,2033,19,42,203310,2033),('2033-10-20',203342,10,2033,20,42,203310,2033),('2033-10-21',203342,10,2033,21,42,203310,2033),('2033-10-22',203342,10,2033,22,42,203310,2033),('2033-10-23',203343,10,2033,23,43,203310,2033),('2033-10-24',203343,10,2033,24,43,203310,2033),('2033-10-25',203343,10,2033,25,43,203310,2033),('2033-10-26',203343,10,2033,26,43,203310,2033),('2033-10-27',203343,10,2033,27,43,203310,2033),('2033-10-28',203343,10,2033,28,43,203310,2033),('2033-10-29',203343,10,2033,29,43,203310,2033),('2033-10-30',203344,10,2033,30,44,203310,2033),('2033-10-31',203344,10,2033,31,44,203310,2033),('2033-11-01',203344,11,2033,1,44,203311,2033),('2033-11-02',203344,11,2033,2,44,203311,2033),('2033-11-03',203344,11,2033,3,44,203311,2033),('2033-11-04',203344,11,2033,4,44,203311,2033),('2033-11-05',203344,11,2033,5,44,203311,2033),('2033-11-06',203345,11,2033,6,45,203311,2033),('2033-11-07',203345,11,2033,7,45,203311,2033),('2033-11-08',203345,11,2033,8,45,203311,2033),('2033-11-09',203345,11,2033,9,45,203311,2033),('2033-11-10',203345,11,2033,10,45,203311,2033),('2033-11-11',203345,11,2033,11,45,203311,2033),('2033-11-12',203345,11,2033,12,45,203311,2033),('2033-11-13',203346,11,2033,13,46,203311,2033),('2033-11-14',203346,11,2033,14,46,203311,2033),('2033-11-15',203346,11,2033,15,46,203311,2033),('2033-11-16',203346,11,2033,16,46,203311,2033),('2033-11-17',203346,11,2033,17,46,203311,2033),('2033-11-18',203346,11,2033,18,46,203311,2033),('2033-11-19',203346,11,2033,19,46,203311,2033),('2033-11-20',203347,11,2033,20,47,203311,2033),('2033-11-21',203347,11,2033,21,47,203311,2033),('2033-11-22',203347,11,2033,22,47,203311,2033),('2033-11-23',203347,11,2033,23,47,203311,2033),('2033-11-24',203347,11,2033,24,47,203311,2033),('2033-11-25',203347,11,2033,25,47,203311,2033),('2033-11-26',203347,11,2033,26,47,203311,2033),('2033-11-27',203348,11,2033,27,48,203311,2033),('2033-11-28',203348,11,2033,28,48,203311,2033),('2033-11-29',203348,11,2033,29,48,203311,2033),('2033-11-30',203348,11,2033,30,48,203311,2033),('2033-12-01',203348,12,2033,1,48,203312,2034),('2033-12-02',203348,12,2033,2,48,203312,2034),('2033-12-03',203348,12,2033,3,48,203312,2034),('2033-12-04',203349,12,2033,4,49,203312,2034),('2033-12-05',203349,12,2033,5,49,203312,2034),('2033-12-06',203349,12,2033,6,49,203312,2034),('2033-12-07',203349,12,2033,7,49,203312,2034),('2033-12-08',203349,12,2033,8,49,203312,2034),('2033-12-09',203349,12,2033,9,49,203312,2034),('2033-12-10',203349,12,2033,10,49,203312,2034),('2033-12-11',203350,12,2033,11,50,203312,2034),('2033-12-12',203350,12,2033,12,50,203312,2034),('2033-12-13',203350,12,2033,13,50,203312,2034),('2033-12-14',203350,12,2033,14,50,203312,2034),('2033-12-15',203350,12,2033,15,50,203312,2034),('2033-12-16',203350,12,2033,16,50,203312,2034),('2033-12-17',203350,12,2033,17,50,203312,2034),('2033-12-18',203351,12,2033,18,51,203312,2034),('2033-12-19',203351,12,2033,19,51,203312,2034),('2033-12-20',203351,12,2033,20,51,203312,2034),('2033-12-21',203351,12,2033,21,51,203312,2034),('2033-12-22',203351,12,2033,22,51,203312,2034),('2033-12-23',203351,12,2033,23,51,203312,2034),('2033-12-24',203351,12,2033,24,51,203312,2034),('2033-12-25',203352,12,2033,25,52,203312,2034),('2033-12-26',203352,12,2033,26,52,203312,2034),('2033-12-27',203352,12,2033,27,52,203312,2034),('2033-12-28',203352,12,2033,28,52,203312,2034),('2033-12-29',203352,12,2033,29,52,203312,2034),('2033-12-30',203352,12,2033,30,52,203312,2034),('2033-12-31',203352,12,2033,31,52,203312,2034),('2034-01-01',203453,1,2034,1,1,203401,2034),('2034-01-02',203401,1,2034,2,1,203401,2034),('2034-01-03',203401,1,2034,3,1,203401,2034),('2034-01-04',203401,1,2034,4,1,203401,2034),('2034-01-05',203401,1,2034,5,1,203401,2034),('2034-01-06',203401,1,2034,6,1,203401,2034),('2034-01-07',203401,1,2034,7,1,203401,2034),('2034-01-08',203402,1,2034,8,2,203401,2034),('2034-01-09',203402,1,2034,9,2,203401,2034),('2034-01-10',203402,1,2034,10,2,203401,2034),('2034-01-11',203402,1,2034,11,2,203401,2034),('2034-01-12',203402,1,2034,12,2,203401,2034),('2034-01-13',203402,1,2034,13,2,203401,2034),('2034-01-14',203402,1,2034,14,2,203401,2034),('2034-01-15',203403,1,2034,15,3,203401,2034),('2034-01-16',203403,1,2034,16,3,203401,2034),('2034-01-17',203403,1,2034,17,3,203401,2034),('2034-01-18',203403,1,2034,18,3,203401,2034),('2034-01-19',203403,1,2034,19,3,203401,2034),('2034-01-20',203403,1,2034,20,3,203401,2034),('2034-01-21',203403,1,2034,21,3,203401,2034),('2034-01-22',203404,1,2034,22,4,203401,2034),('2034-01-23',203404,1,2034,23,4,203401,2034),('2034-01-24',203404,1,2034,24,4,203401,2034),('2034-01-25',203404,1,2034,25,4,203401,2034),('2034-01-26',203404,1,2034,26,4,203401,2034),('2034-01-27',203404,1,2034,27,4,203401,2034),('2034-01-28',203404,1,2034,28,4,203401,2034),('2034-01-29',203405,1,2034,29,5,203401,2034),('2034-01-30',203405,1,2034,30,5,203401,2034),('2034-01-31',203405,1,2034,31,5,203401,2034),('2034-02-01',203405,2,2034,1,5,203402,2034),('2034-02-02',203405,2,2034,2,5,203402,2034),('2034-02-03',203405,2,2034,3,5,203402,2034),('2034-02-04',203405,2,2034,4,5,203402,2034),('2034-02-05',203406,2,2034,5,6,203402,2034),('2034-02-06',203406,2,2034,6,6,203402,2034),('2034-02-07',203406,2,2034,7,6,203402,2034),('2034-02-08',203406,2,2034,8,6,203402,2034),('2034-02-09',203406,2,2034,9,6,203402,2034),('2034-02-10',203406,2,2034,10,6,203402,2034),('2034-02-11',203406,2,2034,11,6,203402,2034),('2034-02-12',203407,2,2034,12,7,203402,2034),('2034-02-13',203407,2,2034,13,7,203402,2034),('2034-02-14',203407,2,2034,14,7,203402,2034),('2034-02-15',203407,2,2034,15,7,203402,2034),('2034-02-16',203407,2,2034,16,7,203402,2034),('2034-02-17',203407,2,2034,17,7,203402,2034),('2034-02-18',203407,2,2034,18,7,203402,2034),('2034-02-19',203408,2,2034,19,8,203402,2034),('2034-02-20',203408,2,2034,20,8,203402,2034),('2034-02-21',203408,2,2034,21,8,203402,2034),('2034-02-22',203408,2,2034,22,8,203402,2034),('2034-02-23',203408,2,2034,23,8,203402,2034),('2034-02-24',203408,2,2034,24,8,203402,2034),('2034-02-25',203408,2,2034,25,8,203402,2034),('2034-02-26',203409,2,2034,26,9,203402,2034),('2034-02-27',203409,2,2034,27,9,203402,2034),('2034-02-28',203409,2,2034,28,9,203402,2034),('2034-03-01',203409,3,2034,1,9,203403,2034),('2034-03-02',203409,3,2034,2,9,203403,2034),('2034-03-03',203409,3,2034,3,9,203403,2034),('2034-03-04',203409,3,2034,4,9,203403,2034),('2034-03-05',203410,3,2034,5,10,203403,2034),('2034-03-06',203410,3,2034,6,10,203403,2034),('2034-03-07',203410,3,2034,7,10,203403,2034),('2034-03-08',203410,3,2034,8,10,203403,2034),('2034-03-09',203410,3,2034,9,10,203403,2034),('2034-03-10',203410,3,2034,10,10,203403,2034),('2034-03-11',203410,3,2034,11,10,203403,2034),('2034-03-12',203411,3,2034,12,11,203403,2034),('2034-03-13',203411,3,2034,13,11,203403,2034),('2034-03-14',203411,3,2034,14,11,203403,2034),('2034-03-15',203411,3,2034,15,11,203403,2034),('2034-03-16',203411,3,2034,16,11,203403,2034),('2034-03-17',203411,3,2034,17,11,203403,2034),('2034-03-18',203411,3,2034,18,11,203403,2034),('2034-03-19',203412,3,2034,19,12,203403,2034),('2034-03-20',203412,3,2034,20,12,203403,2034),('2034-03-21',203412,3,2034,21,12,203403,2034),('2034-03-22',203412,3,2034,22,12,203403,2034),('2034-03-23',203412,3,2034,23,12,203403,2034),('2034-03-24',203412,3,2034,24,12,203403,2034),('2034-03-25',203412,3,2034,25,12,203403,2034),('2034-03-26',203413,3,2034,26,13,203403,2034),('2034-03-27',203413,3,2034,27,13,203403,2034),('2034-03-28',203413,3,2034,28,13,203403,2034),('2034-03-29',203413,3,2034,29,13,203403,2034),('2034-03-30',203413,3,2034,30,13,203403,2034),('2034-03-31',203413,3,2034,31,13,203403,2034),('2034-04-01',203413,4,2034,1,13,203404,2034),('2034-04-02',203414,4,2034,2,14,203404,2034),('2034-04-03',203414,4,2034,3,14,203404,2034),('2034-04-04',203414,4,2034,4,14,203404,2034),('2034-04-05',203414,4,2034,5,14,203404,2034),('2034-04-06',203414,4,2034,6,14,203404,2034),('2034-04-07',203414,4,2034,7,14,203404,2034),('2034-04-08',203414,4,2034,8,14,203404,2034),('2034-04-09',203415,4,2034,9,15,203404,2034),('2034-04-10',203415,4,2034,10,15,203404,2034),('2034-04-11',203415,4,2034,11,15,203404,2034),('2034-04-12',203415,4,2034,12,15,203404,2034),('2034-04-13',203415,4,2034,13,15,203404,2034),('2034-04-14',203415,4,2034,14,15,203404,2034),('2034-04-15',203415,4,2034,15,15,203404,2034),('2034-04-16',203416,4,2034,16,16,203404,2034),('2034-04-17',203416,4,2034,17,16,203404,2034),('2034-04-18',203416,4,2034,18,16,203404,2034),('2034-04-19',203416,4,2034,19,16,203404,2034),('2034-04-20',203416,4,2034,20,16,203404,2034),('2034-04-21',203416,4,2034,21,16,203404,2034),('2034-04-22',203416,4,2034,22,16,203404,2034),('2034-04-23',203417,4,2034,23,17,203404,2034),('2034-04-24',203417,4,2034,24,17,203404,2034),('2034-04-25',203417,4,2034,25,17,203404,2034),('2034-04-26',203417,4,2034,26,17,203404,2034),('2034-04-27',203417,4,2034,27,17,203404,2034),('2034-04-28',203417,4,2034,28,17,203404,2034),('2034-04-29',203417,4,2034,29,17,203404,2034),('2034-04-30',203418,4,2034,30,18,203404,2034),('2034-05-01',203418,5,2034,1,18,203405,2034),('2034-05-02',203418,5,2034,2,18,203405,2034),('2034-05-03',203418,5,2034,3,18,203405,2034),('2034-05-04',203418,5,2034,4,18,203405,2034),('2034-05-05',203418,5,2034,5,18,203405,2034),('2034-05-06',203418,5,2034,6,18,203405,2034),('2034-05-07',203419,5,2034,7,19,203405,2034),('2034-05-08',203419,5,2034,8,19,203405,2034),('2034-05-09',203419,5,2034,9,19,203405,2034),('2034-05-10',203419,5,2034,10,19,203405,2034),('2034-05-11',203419,5,2034,11,19,203405,2034),('2034-05-12',203419,5,2034,12,19,203405,2034),('2034-05-13',203419,5,2034,13,19,203405,2034),('2034-05-14',203420,5,2034,14,20,203405,2034),('2034-05-15',203420,5,2034,15,20,203405,2034),('2034-05-16',203420,5,2034,16,20,203405,2034),('2034-05-17',203420,5,2034,17,20,203405,2034),('2034-05-18',203420,5,2034,18,20,203405,2034),('2034-05-19',203420,5,2034,19,20,203405,2034),('2034-05-20',203420,5,2034,20,20,203405,2034),('2034-05-21',203421,5,2034,21,21,203405,2034),('2034-05-22',203421,5,2034,22,21,203405,2034),('2034-05-23',203421,5,2034,23,21,203405,2034),('2034-05-24',203421,5,2034,24,21,203405,2034),('2034-05-25',203421,5,2034,25,21,203405,2034),('2034-05-26',203421,5,2034,26,21,203405,2034),('2034-05-27',203421,5,2034,27,21,203405,2034),('2034-05-28',203422,5,2034,28,22,203405,2034),('2034-05-29',203422,5,2034,29,22,203405,2034),('2034-05-30',203422,5,2034,30,22,203405,2034),('2034-05-31',203422,5,2034,31,22,203405,2034),('2034-06-01',203422,6,2034,1,22,203406,2034),('2034-06-02',203422,6,2034,2,22,203406,2034),('2034-06-03',203422,6,2034,3,22,203406,2034),('2034-06-04',203423,6,2034,4,23,203406,2034),('2034-06-05',203423,6,2034,5,23,203406,2034),('2034-06-06',203423,6,2034,6,23,203406,2034),('2034-06-07',203423,6,2034,7,23,203406,2034),('2034-06-08',203423,6,2034,8,23,203406,2034),('2034-06-09',203423,6,2034,9,23,203406,2034),('2034-06-10',203423,6,2034,10,23,203406,2034),('2034-06-11',203424,6,2034,11,24,203406,2034),('2034-06-12',203424,6,2034,12,24,203406,2034),('2034-06-13',203424,6,2034,13,24,203406,2034),('2034-06-14',203424,6,2034,14,24,203406,2034),('2034-06-15',203424,6,2034,15,24,203406,2034),('2034-06-16',203424,6,2034,16,24,203406,2034),('2034-06-17',203424,6,2034,17,24,203406,2034),('2034-06-18',203425,6,2034,18,25,203406,2034),('2034-06-19',203425,6,2034,19,25,203406,2034),('2034-06-20',203425,6,2034,20,25,203406,2034),('2034-06-21',203425,6,2034,21,25,203406,2034),('2034-06-22',203425,6,2034,22,25,203406,2034),('2034-06-23',203425,6,2034,23,25,203406,2034),('2034-06-24',203425,6,2034,24,25,203406,2034),('2034-06-25',203426,6,2034,25,26,203406,2034),('2034-06-26',203426,6,2034,26,26,203406,2034),('2034-06-27',203426,6,2034,27,26,203406,2034),('2034-06-28',203426,6,2034,28,26,203406,2034),('2034-06-29',203426,6,2034,29,26,203406,2034),('2034-06-30',203426,6,2034,30,26,203406,2034),('2034-07-01',203426,7,2034,1,26,203407,2034),('2034-07-02',203427,7,2034,2,27,203407,2034),('2034-07-03',203427,7,2034,3,27,203407,2034),('2034-07-04',203427,7,2034,4,27,203407,2034),('2034-07-05',203427,7,2034,5,27,203407,2034),('2034-07-06',203427,7,2034,6,27,203407,2034),('2034-07-07',203427,7,2034,7,27,203407,2034),('2034-07-08',203427,7,2034,8,27,203407,2034),('2034-07-09',203428,7,2034,9,28,203407,2034),('2034-07-10',203428,7,2034,10,28,203407,2034),('2034-07-11',203428,7,2034,11,28,203407,2034),('2034-07-12',203428,7,2034,12,28,203407,2034),('2034-07-13',203428,7,2034,13,28,203407,2034),('2034-07-14',203428,7,2034,14,28,203407,2034),('2034-07-15',203428,7,2034,15,28,203407,2034),('2034-07-16',203429,7,2034,16,29,203407,2034),('2034-07-17',203429,7,2034,17,29,203407,2034),('2034-07-18',203429,7,2034,18,29,203407,2034),('2034-07-19',203429,7,2034,19,29,203407,2034),('2034-07-20',203429,7,2034,20,29,203407,2034),('2034-07-21',203429,7,2034,21,29,203407,2034),('2034-07-22',203429,7,2034,22,29,203407,2034),('2034-07-23',203430,7,2034,23,30,203407,2034),('2034-07-24',203430,7,2034,24,30,203407,2034),('2034-07-25',203430,7,2034,25,30,203407,2034),('2034-07-26',203430,7,2034,26,30,203407,2034),('2034-07-27',203430,7,2034,27,30,203407,2034),('2034-07-28',203430,7,2034,28,30,203407,2034),('2034-07-29',203430,7,2034,29,30,203407,2034),('2034-07-30',203431,7,2034,30,31,203407,2034),('2034-07-31',203431,7,2034,31,31,203407,2034),('2034-08-01',203431,8,2034,1,31,203408,2034),('2034-08-02',203431,8,2034,2,31,203408,2034),('2034-08-03',203431,8,2034,3,31,203408,2034),('2034-08-04',203431,8,2034,4,31,203408,2034),('2034-08-05',203431,8,2034,5,31,203408,2034),('2034-08-06',203432,8,2034,6,32,203408,2034),('2034-08-07',203432,8,2034,7,32,203408,2034),('2034-08-08',203432,8,2034,8,32,203408,2034),('2034-08-09',203432,8,2034,9,32,203408,2034),('2034-08-10',203432,8,2034,10,32,203408,2034),('2034-08-11',203432,8,2034,11,32,203408,2034),('2034-08-12',203432,8,2034,12,32,203408,2034),('2034-08-13',203433,8,2034,13,33,203408,2034),('2034-08-14',203433,8,2034,14,33,203408,2034),('2034-08-15',203433,8,2034,15,33,203408,2034),('2034-08-16',203433,8,2034,16,33,203408,2034),('2034-08-17',203433,8,2034,17,33,203408,2034),('2034-08-18',203433,8,2034,18,33,203408,2034),('2034-08-19',203433,8,2034,19,33,203408,2034),('2034-08-20',203434,8,2034,20,34,203408,2034),('2034-08-21',203434,8,2034,21,34,203408,2034),('2034-08-22',203434,8,2034,22,34,203408,2034),('2034-08-23',203434,8,2034,23,34,203408,2034),('2034-08-24',203434,8,2034,24,34,203408,2034),('2034-08-25',203434,8,2034,25,34,203408,2034),('2034-08-26',203434,8,2034,26,34,203408,2034),('2034-08-27',203435,8,2034,27,35,203408,2034),('2034-08-28',203435,8,2034,28,35,203408,2034),('2034-08-29',203435,8,2034,29,35,203408,2034),('2034-08-30',203435,8,2034,30,35,203408,2034),('2034-08-31',203435,8,2034,31,35,203408,2034),('2034-09-01',203435,9,2034,1,35,203409,2034),('2034-09-02',203435,9,2034,2,35,203409,2034),('2034-09-03',203436,9,2034,3,36,203409,2034),('2034-09-04',203436,9,2034,4,36,203409,2034),('2034-09-05',203436,9,2034,5,36,203409,2034),('2034-09-06',203436,9,2034,6,36,203409,2034),('2034-09-07',203436,9,2034,7,36,203409,2034),('2034-09-08',203436,9,2034,8,36,203409,2034),('2034-09-09',203436,9,2034,9,36,203409,2034),('2034-09-10',203437,9,2034,10,37,203409,2034),('2034-09-11',203437,9,2034,11,37,203409,2034),('2034-09-12',203437,9,2034,12,37,203409,2034),('2034-09-13',203437,9,2034,13,37,203409,2034),('2034-09-14',203437,9,2034,14,37,203409,2034),('2034-09-15',203437,9,2034,15,37,203409,2034),('2034-09-16',203437,9,2034,16,37,203409,2034),('2034-09-17',203438,9,2034,17,38,203409,2034),('2034-09-18',203438,9,2034,18,38,203409,2034),('2034-09-19',203438,9,2034,19,38,203409,2034),('2034-09-20',203438,9,2034,20,38,203409,2034),('2034-09-21',203438,9,2034,21,38,203409,2034),('2034-09-22',203438,9,2034,22,38,203409,2034),('2034-09-23',203438,9,2034,23,38,203409,2034),('2034-09-24',203439,9,2034,24,39,203409,2034),('2034-09-25',203439,9,2034,25,39,203409,2034),('2034-09-26',203439,9,2034,26,39,203409,2034),('2034-09-27',203439,9,2034,27,39,203409,2034),('2034-09-28',203439,9,2034,28,39,203409,2034),('2034-09-29',203439,9,2034,29,39,203409,2034),('2034-09-30',203439,9,2034,30,39,203409,2034),('2034-10-01',203440,10,2034,1,40,203410,2034),('2034-10-02',203440,10,2034,2,40,203410,2034),('2034-10-03',203440,10,2034,3,40,203410,2034),('2034-10-04',203440,10,2034,4,40,203410,2034),('2034-10-05',203440,10,2034,5,40,203410,2034),('2034-10-06',203440,10,2034,6,40,203410,2034),('2034-10-07',203440,10,2034,7,40,203410,2034),('2034-10-08',203441,10,2034,8,41,203410,2034),('2034-10-09',203441,10,2034,9,41,203410,2034),('2034-10-10',203441,10,2034,10,41,203410,2034),('2034-10-11',203441,10,2034,11,41,203410,2034),('2034-10-12',203441,10,2034,12,41,203410,2034),('2034-10-13',203441,10,2034,13,41,203410,2034),('2034-10-14',203441,10,2034,14,41,203410,2034),('2034-10-15',203442,10,2034,15,42,203410,2034),('2034-10-16',203442,10,2034,16,42,203410,2034),('2034-10-17',203442,10,2034,17,42,203410,2034),('2034-10-18',203442,10,2034,18,42,203410,2034),('2034-10-19',203442,10,2034,19,42,203410,2034),('2034-10-20',203442,10,2034,20,42,203410,2034),('2034-10-21',203442,10,2034,21,42,203410,2034),('2034-10-22',203443,10,2034,22,43,203410,2034),('2034-10-23',203443,10,2034,23,43,203410,2034),('2034-10-24',203443,10,2034,24,43,203410,2034),('2034-10-25',203443,10,2034,25,43,203410,2034),('2034-10-26',203443,10,2034,26,43,203410,2034),('2034-10-27',203443,10,2034,27,43,203410,2034),('2034-10-28',203443,10,2034,28,43,203410,2034),('2034-10-29',203444,10,2034,29,44,203410,2034),('2034-10-30',203444,10,2034,30,44,203410,2034),('2034-10-31',203444,10,2034,31,44,203410,2034),('2034-11-01',203444,11,2034,1,44,203411,2034),('2034-11-02',203444,11,2034,2,44,203411,2034),('2034-11-03',203444,11,2034,3,44,203411,2034),('2034-11-04',203444,11,2034,4,44,203411,2034),('2034-11-05',203445,11,2034,5,45,203411,2034),('2034-11-06',203445,11,2034,6,45,203411,2034),('2034-11-07',203445,11,2034,7,45,203411,2034),('2034-11-08',203445,11,2034,8,45,203411,2034),('2034-11-09',203445,11,2034,9,45,203411,2034),('2034-11-10',203445,11,2034,10,45,203411,2034),('2034-11-11',203445,11,2034,11,45,203411,2034),('2034-11-12',203446,11,2034,12,46,203411,2034),('2034-11-13',203446,11,2034,13,46,203411,2034),('2034-11-14',203446,11,2034,14,46,203411,2034),('2034-11-15',203446,11,2034,15,46,203411,2034),('2034-11-16',203446,11,2034,16,46,203411,2034),('2034-11-17',203446,11,2034,17,46,203411,2034),('2034-11-18',203446,11,2034,18,46,203411,2034),('2034-11-19',203447,11,2034,19,47,203411,2034),('2034-11-20',203447,11,2034,20,47,203411,2034),('2034-11-21',203447,11,2034,21,47,203411,2034),('2034-11-22',203447,11,2034,22,47,203411,2034),('2034-11-23',203447,11,2034,23,47,203411,2034),('2034-11-24',203447,11,2034,24,47,203411,2034),('2034-11-25',203447,11,2034,25,47,203411,2034),('2034-11-26',203448,11,2034,26,48,203411,2034),('2034-11-27',203448,11,2034,27,48,203411,2034),('2034-11-28',203448,11,2034,28,48,203411,2034),('2034-11-29',203448,11,2034,29,48,203411,2034),('2034-11-30',203448,11,2034,30,48,203411,2034),('2034-12-01',203448,12,2034,1,48,203412,2035),('2034-12-02',203448,12,2034,2,48,203412,2035),('2034-12-03',203449,12,2034,3,49,203412,2035),('2034-12-04',203449,12,2034,4,49,203412,2035),('2034-12-05',203449,12,2034,5,49,203412,2035),('2034-12-06',203449,12,2034,6,49,203412,2035),('2034-12-07',203449,12,2034,7,49,203412,2035),('2034-12-08',203449,12,2034,8,49,203412,2035),('2034-12-09',203449,12,2034,9,49,203412,2035),('2034-12-10',203450,12,2034,10,50,203412,2035),('2034-12-11',203450,12,2034,11,50,203412,2035),('2034-12-12',203450,12,2034,12,50,203412,2035),('2034-12-13',203450,12,2034,13,50,203412,2035),('2034-12-14',203450,12,2034,14,50,203412,2035),('2034-12-15',203450,12,2034,15,50,203412,2035),('2034-12-16',203450,12,2034,16,50,203412,2035),('2034-12-17',203451,12,2034,17,51,203412,2035),('2034-12-18',203451,12,2034,18,51,203412,2035),('2034-12-19',203451,12,2034,19,51,203412,2035),('2034-12-20',203451,12,2034,20,51,203412,2035),('2034-12-21',203451,12,2034,21,51,203412,2035),('2034-12-22',203451,12,2034,22,51,203412,2035),('2034-12-23',203451,12,2034,23,51,203412,2035),('2034-12-24',203452,12,2034,24,52,203412,2035),('2034-12-25',203452,12,2034,25,52,203412,2035),('2034-12-26',203452,12,2034,26,52,203412,2035),('2034-12-27',203452,12,2034,27,52,203412,2035),('2034-12-28',203452,12,2034,28,52,203412,2035),('2034-12-29',203452,12,2034,29,52,203412,2035),('2034-12-30',203452,12,2034,30,52,203412,2035),('2034-12-31',203453,12,2034,31,1,203412,2035),('2035-01-01',203501,1,2035,1,1,203501,2035),('2035-01-02',203501,1,2035,2,1,203501,2035),('2035-01-03',203501,1,2035,3,1,203501,2035),('2035-01-04',203501,1,2035,4,1,203501,2035),('2035-01-05',203501,1,2035,5,1,203501,2035),('2035-01-06',203501,1,2035,6,1,203501,2035),('2035-01-07',203502,1,2035,7,2,203501,2035),('2035-01-08',203502,1,2035,8,2,203501,2035),('2035-01-09',203502,1,2035,9,2,203501,2035),('2035-01-10',203502,1,2035,10,2,203501,2035),('2035-01-11',203502,1,2035,11,2,203501,2035),('2035-01-12',203502,1,2035,12,2,203501,2035),('2035-01-13',203502,1,2035,13,2,203501,2035),('2035-01-14',203503,1,2035,14,3,203501,2035),('2035-01-15',203503,1,2035,15,3,203501,2035),('2035-01-16',203503,1,2035,16,3,203501,2035),('2035-01-17',203503,1,2035,17,3,203501,2035),('2035-01-18',203503,1,2035,18,3,203501,2035),('2035-01-19',203503,1,2035,19,3,203501,2035),('2035-01-20',203503,1,2035,20,3,203501,2035),('2035-01-21',203504,1,2035,21,4,203501,2035),('2035-01-22',203504,1,2035,22,4,203501,2035),('2035-01-23',203504,1,2035,23,4,203501,2035),('2035-01-24',203504,1,2035,24,4,203501,2035),('2035-01-25',203504,1,2035,25,4,203501,2035),('2035-01-26',203504,1,2035,26,4,203501,2035),('2035-01-27',203504,1,2035,27,4,203501,2035),('2035-01-28',203505,1,2035,28,5,203501,2035),('2035-01-29',203505,1,2035,29,5,203501,2035),('2035-01-30',203505,1,2035,30,5,203501,2035),('2035-01-31',203505,1,2035,31,5,203501,2035),('2035-02-01',203505,2,2035,1,5,203502,2035),('2035-02-02',203505,2,2035,2,5,203502,2035),('2035-02-03',203505,2,2035,3,5,203502,2035),('2035-02-04',203506,2,2035,4,6,203502,2035),('2035-02-05',203506,2,2035,5,6,203502,2035),('2035-02-06',203506,2,2035,6,6,203502,2035),('2035-02-07',203506,2,2035,7,6,203502,2035),('2035-02-08',203506,2,2035,8,6,203502,2035),('2035-02-09',203506,2,2035,9,6,203502,2035),('2035-02-10',203506,2,2035,10,6,203502,2035),('2035-02-11',203507,2,2035,11,7,203502,2035),('2035-02-12',203507,2,2035,12,7,203502,2035),('2035-02-13',203507,2,2035,13,7,203502,2035),('2035-02-14',203507,2,2035,14,7,203502,2035),('2035-02-15',203507,2,2035,15,7,203502,2035),('2035-02-16',203507,2,2035,16,7,203502,2035),('2035-02-17',203507,2,2035,17,7,203502,2035),('2035-02-18',203508,2,2035,18,8,203502,2035),('2035-02-19',203508,2,2035,19,8,203502,2035),('2035-02-20',203508,2,2035,20,8,203502,2035),('2035-02-21',203508,2,2035,21,8,203502,2035),('2035-02-22',203508,2,2035,22,8,203502,2035),('2035-02-23',203508,2,2035,23,8,203502,2035),('2035-02-24',203508,2,2035,24,8,203502,2035),('2035-02-25',203509,2,2035,25,9,203502,2035),('2035-02-26',203509,2,2035,26,9,203502,2035),('2035-02-27',203509,2,2035,27,9,203502,2035),('2035-02-28',203509,2,2035,28,9,203502,2035),('2035-03-01',203509,3,2035,1,9,203503,2035),('2035-03-02',203509,3,2035,2,9,203503,2035),('2035-03-03',203509,3,2035,3,9,203503,2035),('2035-03-04',203510,3,2035,4,10,203503,2035),('2035-03-05',203510,3,2035,5,10,203503,2035),('2035-03-06',203510,3,2035,6,10,203503,2035),('2035-03-07',203510,3,2035,7,10,203503,2035),('2035-03-08',203510,3,2035,8,10,203503,2035),('2035-03-09',203510,3,2035,9,10,203503,2035),('2035-03-10',203510,3,2035,10,10,203503,2035),('2035-03-11',203511,3,2035,11,11,203503,2035),('2035-03-12',203511,3,2035,12,11,203503,2035),('2035-03-13',203511,3,2035,13,11,203503,2035),('2035-03-14',203511,3,2035,14,11,203503,2035),('2035-03-15',203511,3,2035,15,11,203503,2035),('2035-03-16',203511,3,2035,16,11,203503,2035),('2035-03-17',203511,3,2035,17,11,203503,2035),('2035-03-18',203512,3,2035,18,12,203503,2035),('2035-03-19',203512,3,2035,19,12,203503,2035),('2035-03-20',203512,3,2035,20,12,203503,2035),('2035-03-21',203512,3,2035,21,12,203503,2035),('2035-03-22',203512,3,2035,22,12,203503,2035),('2035-03-23',203512,3,2035,23,12,203503,2035),('2035-03-24',203512,3,2035,24,12,203503,2035),('2035-03-25',203513,3,2035,25,13,203503,2035),('2035-03-26',203513,3,2035,26,13,203503,2035),('2035-03-27',203513,3,2035,27,13,203503,2035),('2035-03-28',203513,3,2035,28,13,203503,2035),('2035-03-29',203513,3,2035,29,13,203503,2035),('2035-03-30',203513,3,2035,30,13,203503,2035),('2035-03-31',203513,3,2035,31,13,203503,2035),('2035-04-01',203514,4,2035,1,14,203504,2035),('2035-04-02',203514,4,2035,2,14,203504,2035),('2035-04-03',203514,4,2035,3,14,203504,2035),('2035-04-04',203514,4,2035,4,14,203504,2035),('2035-04-05',203514,4,2035,5,14,203504,2035),('2035-04-06',203514,4,2035,6,14,203504,2035),('2035-04-07',203514,4,2035,7,14,203504,2035),('2035-04-08',203515,4,2035,8,15,203504,2035),('2035-04-09',203515,4,2035,9,15,203504,2035),('2035-04-10',203515,4,2035,10,15,203504,2035),('2035-04-11',203515,4,2035,11,15,203504,2035),('2035-04-12',203515,4,2035,12,15,203504,2035),('2035-04-13',203515,4,2035,13,15,203504,2035),('2035-04-14',203515,4,2035,14,15,203504,2035),('2035-04-15',203516,4,2035,15,16,203504,2035),('2035-04-16',203516,4,2035,16,16,203504,2035),('2035-04-17',203516,4,2035,17,16,203504,2035),('2035-04-18',203516,4,2035,18,16,203504,2035),('2035-04-19',203516,4,2035,19,16,203504,2035),('2035-04-20',203516,4,2035,20,16,203504,2035),('2035-04-21',203516,4,2035,21,16,203504,2035),('2035-04-22',203517,4,2035,22,17,203504,2035),('2035-04-23',203517,4,2035,23,17,203504,2035),('2035-04-24',203517,4,2035,24,17,203504,2035),('2035-04-25',203517,4,2035,25,17,203504,2035),('2035-04-26',203517,4,2035,26,17,203504,2035),('2035-04-27',203517,4,2035,27,17,203504,2035),('2035-04-28',203517,4,2035,28,17,203504,2035),('2035-04-29',203518,4,2035,29,18,203504,2035),('2035-04-30',203518,4,2035,30,18,203504,2035),('2035-05-01',203518,5,2035,1,18,203505,2035),('2035-05-02',203518,5,2035,2,18,203505,2035),('2035-05-03',203518,5,2035,3,18,203505,2035),('2035-05-04',203518,5,2035,4,18,203505,2035),('2035-05-05',203518,5,2035,5,18,203505,2035),('2035-05-06',203519,5,2035,6,19,203505,2035),('2035-05-07',203519,5,2035,7,19,203505,2035),('2035-05-08',203519,5,2035,8,19,203505,2035),('2035-05-09',203519,5,2035,9,19,203505,2035),('2035-05-10',203519,5,2035,10,19,203505,2035),('2035-05-11',203519,5,2035,11,19,203505,2035),('2035-05-12',203519,5,2035,12,19,203505,2035),('2035-05-13',203520,5,2035,13,20,203505,2035),('2035-05-14',203520,5,2035,14,20,203505,2035),('2035-05-15',203520,5,2035,15,20,203505,2035),('2035-05-16',203520,5,2035,16,20,203505,2035),('2035-05-17',203520,5,2035,17,20,203505,2035),('2035-05-18',203520,5,2035,18,20,203505,2035),('2035-05-19',203520,5,2035,19,20,203505,2035),('2035-05-20',203521,5,2035,20,21,203505,2035),('2035-05-21',203521,5,2035,21,21,203505,2035),('2035-05-22',203521,5,2035,22,21,203505,2035),('2035-05-23',203521,5,2035,23,21,203505,2035),('2035-05-24',203521,5,2035,24,21,203505,2035),('2035-05-25',203521,5,2035,25,21,203505,2035),('2035-05-26',203521,5,2035,26,21,203505,2035),('2035-05-27',203522,5,2035,27,22,203505,2035),('2035-05-28',203522,5,2035,28,22,203505,2035),('2035-05-29',203522,5,2035,29,22,203505,2035),('2035-05-30',203522,5,2035,30,22,203505,2035),('2035-05-31',203522,5,2035,31,22,203505,2035),('2035-06-01',203522,6,2035,1,22,203506,2035),('2035-06-02',203522,6,2035,2,22,203506,2035),('2035-06-03',203523,6,2035,3,23,203506,2035),('2035-06-04',203523,6,2035,4,23,203506,2035),('2035-06-05',203523,6,2035,5,23,203506,2035),('2035-06-06',203523,6,2035,6,23,203506,2035),('2035-06-07',203523,6,2035,7,23,203506,2035),('2035-06-08',203523,6,2035,8,23,203506,2035),('2035-06-09',203523,6,2035,9,23,203506,2035),('2035-06-10',203524,6,2035,10,24,203506,2035),('2035-06-11',203524,6,2035,11,24,203506,2035),('2035-06-12',203524,6,2035,12,24,203506,2035),('2035-06-13',203524,6,2035,13,24,203506,2035),('2035-06-14',203524,6,2035,14,24,203506,2035),('2035-06-15',203524,6,2035,15,24,203506,2035),('2035-06-16',203524,6,2035,16,24,203506,2035),('2035-06-17',203525,6,2035,17,25,203506,2035),('2035-06-18',203525,6,2035,18,25,203506,2035),('2035-06-19',203525,6,2035,19,25,203506,2035),('2035-06-20',203525,6,2035,20,25,203506,2035),('2035-06-21',203525,6,2035,21,25,203506,2035),('2035-06-22',203525,6,2035,22,25,203506,2035),('2035-06-23',203525,6,2035,23,25,203506,2035),('2035-06-24',203526,6,2035,24,26,203506,2035),('2035-06-25',203526,6,2035,25,26,203506,2035),('2035-06-26',203526,6,2035,26,26,203506,2035),('2035-06-27',203526,6,2035,27,26,203506,2035),('2035-06-28',203526,6,2035,28,26,203506,2035),('2035-06-29',203526,6,2035,29,26,203506,2035),('2035-06-30',203526,6,2035,30,26,203506,2035),('2035-07-01',203527,7,2035,1,27,203507,2035),('2035-07-02',203527,7,2035,2,27,203507,2035),('2035-07-03',203527,7,2035,3,27,203507,2035),('2035-07-04',203527,7,2035,4,27,203507,2035),('2035-07-05',203527,7,2035,5,27,203507,2035),('2035-07-06',203527,7,2035,6,27,203507,2035),('2035-07-07',203527,7,2035,7,27,203507,2035),('2035-07-08',203528,7,2035,8,28,203507,2035),('2035-07-09',203528,7,2035,9,28,203507,2035),('2035-07-10',203528,7,2035,10,28,203507,2035),('2035-07-11',203528,7,2035,11,28,203507,2035),('2035-07-12',203528,7,2035,12,28,203507,2035),('2035-07-13',203528,7,2035,13,28,203507,2035),('2035-07-14',203528,7,2035,14,28,203507,2035),('2035-07-15',203529,7,2035,15,29,203507,2035),('2035-07-16',203529,7,2035,16,29,203507,2035),('2035-07-17',203529,7,2035,17,29,203507,2035),('2035-07-18',203529,7,2035,18,29,203507,2035),('2035-07-19',203529,7,2035,19,29,203507,2035),('2035-07-20',203529,7,2035,20,29,203507,2035),('2035-07-21',203529,7,2035,21,29,203507,2035),('2035-07-22',203530,7,2035,22,30,203507,2035),('2035-07-23',203530,7,2035,23,30,203507,2035),('2035-07-24',203530,7,2035,24,30,203507,2035),('2035-07-25',203530,7,2035,25,30,203507,2035),('2035-07-26',203530,7,2035,26,30,203507,2035),('2035-07-27',203530,7,2035,27,30,203507,2035),('2035-07-28',203530,7,2035,28,30,203507,2035),('2035-07-29',203531,7,2035,29,31,203507,2035),('2035-07-30',203531,7,2035,30,31,203507,2035),('2035-07-31',203531,7,2035,31,31,203507,2035),('2035-08-01',203531,8,2035,1,31,203508,2035),('2035-08-02',203531,8,2035,2,31,203508,2035),('2035-08-03',203531,8,2035,3,31,203508,2035),('2035-08-04',203531,8,2035,4,31,203508,2035),('2035-08-05',203532,8,2035,5,32,203508,2035),('2035-08-06',203532,8,2035,6,32,203508,2035),('2035-08-07',203532,8,2035,7,32,203508,2035),('2035-08-08',203532,8,2035,8,32,203508,2035),('2035-08-09',203532,8,2035,9,32,203508,2035),('2035-08-10',203532,8,2035,10,32,203508,2035),('2035-08-11',203532,8,2035,11,32,203508,2035),('2035-08-12',203533,8,2035,12,33,203508,2035),('2035-08-13',203533,8,2035,13,33,203508,2035),('2035-08-14',203533,8,2035,14,33,203508,2035),('2035-08-15',203533,8,2035,15,33,203508,2035),('2035-08-16',203533,8,2035,16,33,203508,2035),('2035-08-17',203533,8,2035,17,33,203508,2035),('2035-08-18',203533,8,2035,18,33,203508,2035),('2035-08-19',203534,8,2035,19,34,203508,2035),('2035-08-20',203534,8,2035,20,34,203508,2035),('2035-08-21',203534,8,2035,21,34,203508,2035),('2035-08-22',203534,8,2035,22,34,203508,2035),('2035-08-23',203534,8,2035,23,34,203508,2035),('2035-08-24',203534,8,2035,24,34,203508,2035),('2035-08-25',203534,8,2035,25,34,203508,2035),('2035-08-26',203535,8,2035,26,35,203508,2035),('2035-08-27',203535,8,2035,27,35,203508,2035),('2035-08-28',203535,8,2035,28,35,203508,2035),('2035-08-29',203535,8,2035,29,35,203508,2035),('2035-08-30',203535,8,2035,30,35,203508,2035),('2035-08-31',203535,8,2035,31,35,203508,2035),('2035-09-01',203535,9,2035,1,35,203509,2035),('2035-09-02',203536,9,2035,2,36,203509,2035),('2035-09-03',203536,9,2035,3,36,203509,2035),('2035-09-04',203536,9,2035,4,36,203509,2035),('2035-09-05',203536,9,2035,5,36,203509,2035),('2035-09-06',203536,9,2035,6,36,203509,2035),('2035-09-07',203536,9,2035,7,36,203509,2035),('2035-09-08',203536,9,2035,8,36,203509,2035),('2035-09-09',203537,9,2035,9,37,203509,2035),('2035-09-10',203537,9,2035,10,37,203509,2035),('2035-09-11',203537,9,2035,11,37,203509,2035),('2035-09-12',203537,9,2035,12,37,203509,2035),('2035-09-13',203537,9,2035,13,37,203509,2035),('2035-09-14',203537,9,2035,14,37,203509,2035),('2035-09-15',203537,9,2035,15,37,203509,2035),('2035-09-16',203538,9,2035,16,38,203509,2035),('2035-09-17',203538,9,2035,17,38,203509,2035),('2035-09-18',203538,9,2035,18,38,203509,2035),('2035-09-19',203538,9,2035,19,38,203509,2035),('2035-09-20',203538,9,2035,20,38,203509,2035),('2035-09-21',203538,9,2035,21,38,203509,2035),('2035-09-22',203538,9,2035,22,38,203509,2035),('2035-09-23',203539,9,2035,23,39,203509,2035),('2035-09-24',203539,9,2035,24,39,203509,2035),('2035-09-25',203539,9,2035,25,39,203509,2035),('2035-09-26',203539,9,2035,26,39,203509,2035),('2035-09-27',203539,9,2035,27,39,203509,2035),('2035-09-28',203539,9,2035,28,39,203509,2035),('2035-09-29',203539,9,2035,29,39,203509,2035),('2035-09-30',203540,9,2035,30,40,203509,2035),('2035-10-01',203540,10,2035,1,40,203510,2035),('2035-10-02',203540,10,2035,2,40,203510,2035),('2035-10-03',203540,10,2035,3,40,203510,2035),('2035-10-04',203540,10,2035,4,40,203510,2035),('2035-10-05',203540,10,2035,5,40,203510,2035),('2035-10-06',203540,10,2035,6,40,203510,2035),('2035-10-07',203541,10,2035,7,41,203510,2035),('2035-10-08',203541,10,2035,8,41,203510,2035),('2035-10-09',203541,10,2035,9,41,203510,2035),('2035-10-10',203541,10,2035,10,41,203510,2035),('2035-10-11',203541,10,2035,11,41,203510,2035),('2035-10-12',203541,10,2035,12,41,203510,2035),('2035-10-13',203541,10,2035,13,41,203510,2035),('2035-10-14',203542,10,2035,14,42,203510,2035),('2035-10-15',203542,10,2035,15,42,203510,2035),('2035-10-16',203542,10,2035,16,42,203510,2035),('2035-10-17',203542,10,2035,17,42,203510,2035),('2035-10-18',203542,10,2035,18,42,203510,2035),('2035-10-19',203542,10,2035,19,42,203510,2035),('2035-10-20',203542,10,2035,20,42,203510,2035),('2035-10-21',203543,10,2035,21,43,203510,2035),('2035-10-22',203543,10,2035,22,43,203510,2035),('2035-10-23',203543,10,2035,23,43,203510,2035),('2035-10-24',203543,10,2035,24,43,203510,2035),('2035-10-25',203543,10,2035,25,43,203510,2035),('2035-10-26',203543,10,2035,26,43,203510,2035),('2035-10-27',203543,10,2035,27,43,203510,2035),('2035-10-28',203544,10,2035,28,44,203510,2035),('2035-10-29',203544,10,2035,29,44,203510,2035),('2035-10-30',203544,10,2035,30,44,203510,2035),('2035-10-31',203544,10,2035,31,44,203510,2035),('2035-11-01',203544,11,2035,1,44,203511,2035),('2035-11-02',203544,11,2035,2,44,203511,2035),('2035-11-03',203544,11,2035,3,44,203511,2035),('2035-11-04',203545,11,2035,4,45,203511,2035),('2035-11-05',203545,11,2035,5,45,203511,2035),('2035-11-06',203545,11,2035,6,45,203511,2035),('2035-11-07',203545,11,2035,7,45,203511,2035),('2035-11-08',203545,11,2035,8,45,203511,2035),('2035-11-09',203545,11,2035,9,45,203511,2035),('2035-11-10',203545,11,2035,10,45,203511,2035),('2035-11-11',203546,11,2035,11,46,203511,2035),('2035-11-12',203546,11,2035,12,46,203511,2035),('2035-11-13',203546,11,2035,13,46,203511,2035),('2035-11-14',203546,11,2035,14,46,203511,2035),('2035-11-15',203546,11,2035,15,46,203511,2035),('2035-11-16',203546,11,2035,16,46,203511,2035),('2035-11-17',203546,11,2035,17,46,203511,2035),('2035-11-18',203547,11,2035,18,47,203511,2035),('2035-11-19',203547,11,2035,19,47,203511,2035),('2035-11-20',203547,11,2035,20,47,203511,2035),('2035-11-21',203547,11,2035,21,47,203511,2035),('2035-11-22',203547,11,2035,22,47,203511,2035),('2035-11-23',203547,11,2035,23,47,203511,2035),('2035-11-24',203547,11,2035,24,47,203511,2035),('2035-11-25',203548,11,2035,25,48,203511,2035),('2035-11-26',203548,11,2035,26,48,203511,2035),('2035-11-27',203548,11,2035,27,48,203511,2035),('2035-11-28',203548,11,2035,28,48,203511,2035),('2035-11-29',203548,11,2035,29,48,203511,2035),('2035-11-30',203548,11,2035,30,48,203511,2035),('2035-12-01',203548,12,2035,1,48,203512,2036),('2035-12-02',203549,12,2035,2,49,203512,2036),('2035-12-03',203549,12,2035,3,49,203512,2036),('2035-12-04',203549,12,2035,4,49,203512,2036),('2035-12-05',203549,12,2035,5,49,203512,2036),('2035-12-06',203549,12,2035,6,49,203512,2036),('2035-12-07',203549,12,2035,7,49,203512,2036),('2035-12-08',203549,12,2035,8,49,203512,2036),('2035-12-09',203550,12,2035,9,50,203512,2036),('2035-12-10',203550,12,2035,10,50,203512,2036),('2035-12-11',203550,12,2035,11,50,203512,2036),('2035-12-12',203550,12,2035,12,50,203512,2036),('2035-12-13',203550,12,2035,13,50,203512,2036),('2035-12-14',203550,12,2035,14,50,203512,2036),('2035-12-15',203550,12,2035,15,50,203512,2036),('2035-12-16',203551,12,2035,16,51,203512,2036),('2035-12-17',203551,12,2035,17,51,203512,2036),('2035-12-18',203551,12,2035,18,51,203512,2036),('2035-12-19',203551,12,2035,19,51,203512,2036),('2035-12-20',203551,12,2035,20,51,203512,2036),('2035-12-21',203551,12,2035,21,51,203512,2036),('2035-12-22',203551,12,2035,22,51,203512,2036),('2035-12-23',203552,12,2035,23,52,203512,2036),('2035-12-24',203552,12,2035,24,52,203512,2036),('2035-12-25',203552,12,2035,25,52,203512,2036),('2035-12-26',203552,12,2035,26,52,203512,2036),('2035-12-27',203552,12,2035,27,52,203512,2036),('2035-12-28',203552,12,2035,28,52,203512,2036),('2035-12-29',203552,12,2035,29,52,203512,2036),('2035-12-30',203553,12,2035,30,1,203512,2036),('2035-12-31',203501,12,2035,31,1,203512,2036),('2036-01-01',203601,1,2036,1,1,203601,2036),('2036-01-02',203601,1,2036,2,1,203601,2036),('2036-01-03',203601,1,2036,3,1,203601,2036),('2036-01-04',203601,1,2036,4,1,203601,2036),('2036-01-05',203601,1,2036,5,1,203601,2036),('2036-01-06',203602,1,2036,6,2,203601,2036),('2036-01-07',203602,1,2036,7,2,203601,2036),('2036-01-08',203602,1,2036,8,2,203601,2036),('2036-01-09',203602,1,2036,9,2,203601,2036),('2036-01-10',203602,1,2036,10,2,203601,2036),('2036-01-11',203602,1,2036,11,2,203601,2036),('2036-01-12',203602,1,2036,12,2,203601,2036),('2036-01-13',203603,1,2036,13,3,203601,2036),('2036-01-14',203603,1,2036,14,3,203601,2036),('2036-01-15',203603,1,2036,15,3,203601,2036),('2036-01-16',203603,1,2036,16,3,203601,2036),('2036-01-17',203603,1,2036,17,3,203601,2036),('2036-01-18',203603,1,2036,18,3,203601,2036),('2036-01-19',203603,1,2036,19,3,203601,2036),('2036-01-20',203604,1,2036,20,4,203601,2036),('2036-01-21',203604,1,2036,21,4,203601,2036),('2036-01-22',203604,1,2036,22,4,203601,2036),('2036-01-23',203604,1,2036,23,4,203601,2036),('2036-01-24',203604,1,2036,24,4,203601,2036),('2036-01-25',203604,1,2036,25,4,203601,2036),('2036-01-26',203604,1,2036,26,4,203601,2036),('2036-01-27',203605,1,2036,27,5,203601,2036),('2036-01-28',203605,1,2036,28,5,203601,2036),('2036-01-29',203605,1,2036,29,5,203601,2036),('2036-01-30',203605,1,2036,30,5,203601,2036),('2036-01-31',203605,1,2036,31,5,203601,2036),('2036-02-01',203605,2,2036,1,5,203602,2036),('2036-02-02',203605,2,2036,2,5,203602,2036),('2036-02-03',203606,2,2036,3,6,203602,2036),('2036-02-04',203606,2,2036,4,6,203602,2036),('2036-02-05',203606,2,2036,5,6,203602,2036),('2036-02-06',203606,2,2036,6,6,203602,2036),('2036-02-07',203606,2,2036,7,6,203602,2036),('2036-02-08',203606,2,2036,8,6,203602,2036),('2036-02-09',203606,2,2036,9,6,203602,2036),('2036-02-10',203607,2,2036,10,7,203602,2036),('2036-02-11',203607,2,2036,11,7,203602,2036),('2036-02-12',203607,2,2036,12,7,203602,2036),('2036-02-13',203607,2,2036,13,7,203602,2036),('2036-02-14',203607,2,2036,14,7,203602,2036),('2036-02-15',203607,2,2036,15,7,203602,2036),('2036-02-16',203607,2,2036,16,7,203602,2036),('2036-02-17',203608,2,2036,17,8,203602,2036),('2036-02-18',203608,2,2036,18,8,203602,2036),('2036-02-19',203608,2,2036,19,8,203602,2036),('2036-02-20',203608,2,2036,20,8,203602,2036),('2036-02-21',203608,2,2036,21,8,203602,2036),('2036-02-22',203608,2,2036,22,8,203602,2036),('2036-02-23',203608,2,2036,23,8,203602,2036),('2036-02-24',203609,2,2036,24,9,203602,2036),('2036-02-25',203609,2,2036,25,9,203602,2036),('2036-02-26',203609,2,2036,26,9,203602,2036),('2036-02-27',203609,2,2036,27,9,203602,2036),('2036-02-28',203609,2,2036,28,9,203602,2036),('2036-02-29',203609,2,2036,29,9,203602,2036),('2036-03-01',203609,3,2036,1,9,203603,2036),('2036-03-02',203610,3,2036,2,10,203603,2036),('2036-03-03',203610,3,2036,3,10,203603,2036),('2036-03-04',203610,3,2036,4,10,203603,2036),('2036-03-05',203610,3,2036,5,10,203603,2036),('2036-03-06',203610,3,2036,6,10,203603,2036),('2036-03-07',203610,3,2036,7,10,203603,2036),('2036-03-08',203610,3,2036,8,10,203603,2036),('2036-03-09',203611,3,2036,9,11,203603,2036),('2036-03-10',203611,3,2036,10,11,203603,2036),('2036-03-11',203611,3,2036,11,11,203603,2036),('2036-03-12',203611,3,2036,12,11,203603,2036),('2036-03-13',203611,3,2036,13,11,203603,2036),('2036-03-14',203611,3,2036,14,11,203603,2036),('2036-03-15',203611,3,2036,15,11,203603,2036),('2036-03-16',203612,3,2036,16,12,203603,2036),('2036-03-17',203612,3,2036,17,12,203603,2036),('2036-03-18',203612,3,2036,18,12,203603,2036),('2036-03-19',203612,3,2036,19,12,203603,2036),('2036-03-20',203612,3,2036,20,12,203603,2036),('2036-03-21',203612,3,2036,21,12,203603,2036),('2036-03-22',203612,3,2036,22,12,203603,2036),('2036-03-23',203613,3,2036,23,13,203603,2036),('2036-03-24',203613,3,2036,24,13,203603,2036),('2036-03-25',203613,3,2036,25,13,203603,2036),('2036-03-26',203613,3,2036,26,13,203603,2036),('2036-03-27',203613,3,2036,27,13,203603,2036),('2036-03-28',203613,3,2036,28,13,203603,2036),('2036-03-29',203613,3,2036,29,13,203603,2036),('2036-03-30',203614,3,2036,30,14,203603,2036),('2036-03-31',203614,3,2036,31,14,203603,2036),('2036-04-01',203614,4,2036,1,14,203604,2036),('2036-04-02',203614,4,2036,2,14,203604,2036),('2036-04-03',203614,4,2036,3,14,203604,2036),('2036-04-04',203614,4,2036,4,14,203604,2036),('2036-04-05',203614,4,2036,5,14,203604,2036),('2036-04-06',203615,4,2036,6,15,203604,2036),('2036-04-07',203615,4,2036,7,15,203604,2036),('2036-04-08',203615,4,2036,8,15,203604,2036),('2036-04-09',203615,4,2036,9,15,203604,2036),('2036-04-10',203615,4,2036,10,15,203604,2036),('2036-04-11',203615,4,2036,11,15,203604,2036),('2036-04-12',203615,4,2036,12,15,203604,2036),('2036-04-13',203616,4,2036,13,16,203604,2036),('2036-04-14',203616,4,2036,14,16,203604,2036),('2036-04-15',203616,4,2036,15,16,203604,2036),('2036-04-16',203616,4,2036,16,16,203604,2036),('2036-04-17',203616,4,2036,17,16,203604,2036),('2036-04-18',203616,4,2036,18,16,203604,2036),('2036-04-19',203616,4,2036,19,16,203604,2036),('2036-04-20',203617,4,2036,20,17,203604,2036),('2036-04-21',203617,4,2036,21,17,203604,2036),('2036-04-22',203617,4,2036,22,17,203604,2036),('2036-04-23',203617,4,2036,23,17,203604,2036),('2036-04-24',203617,4,2036,24,17,203604,2036),('2036-04-25',203617,4,2036,25,17,203604,2036),('2036-04-26',203617,4,2036,26,17,203604,2036),('2036-04-27',203618,4,2036,27,18,203604,2036),('2036-04-28',203618,4,2036,28,18,203604,2036),('2036-04-29',203618,4,2036,29,18,203604,2036),('2036-04-30',203618,4,2036,30,18,203604,2036),('2036-05-01',203618,5,2036,1,18,203605,2036),('2036-05-02',203618,5,2036,2,18,203605,2036),('2036-05-03',203618,5,2036,3,18,203605,2036),('2036-05-04',203619,5,2036,4,19,203605,2036),('2036-05-05',203619,5,2036,5,19,203605,2036),('2036-05-06',203619,5,2036,6,19,203605,2036),('2036-05-07',203619,5,2036,7,19,203605,2036),('2036-05-08',203619,5,2036,8,19,203605,2036),('2036-05-09',203619,5,2036,9,19,203605,2036),('2036-05-10',203619,5,2036,10,19,203605,2036),('2036-05-11',203620,5,2036,11,20,203605,2036),('2036-05-12',203620,5,2036,12,20,203605,2036),('2036-05-13',203620,5,2036,13,20,203605,2036),('2036-05-14',203620,5,2036,14,20,203605,2036),('2036-05-15',203620,5,2036,15,20,203605,2036),('2036-05-16',203620,5,2036,16,20,203605,2036),('2036-05-17',203620,5,2036,17,20,203605,2036),('2036-05-18',203621,5,2036,18,21,203605,2036),('2036-05-19',203621,5,2036,19,21,203605,2036),('2036-05-20',203621,5,2036,20,21,203605,2036),('2036-05-21',203621,5,2036,21,21,203605,2036),('2036-05-22',203621,5,2036,22,21,203605,2036),('2036-05-23',203621,5,2036,23,21,203605,2036),('2036-05-24',203621,5,2036,24,21,203605,2036),('2036-05-25',203622,5,2036,25,22,203605,2036),('2036-05-26',203622,5,2036,26,22,203605,2036),('2036-05-27',203622,5,2036,27,22,203605,2036),('2036-05-28',203622,5,2036,28,22,203605,2036),('2036-05-29',203622,5,2036,29,22,203605,2036),('2036-05-30',203622,5,2036,30,22,203605,2036),('2036-05-31',203622,5,2036,31,22,203605,2036),('2036-06-01',203623,6,2036,1,23,203606,2036),('2036-06-02',203623,6,2036,2,23,203606,2036),('2036-06-03',203623,6,2036,3,23,203606,2036),('2036-06-04',203623,6,2036,4,23,203606,2036),('2036-06-05',203623,6,2036,5,23,203606,2036),('2036-06-06',203623,6,2036,6,23,203606,2036),('2036-06-07',203623,6,2036,7,23,203606,2036),('2036-06-08',203624,6,2036,8,24,203606,2036),('2036-06-09',203624,6,2036,9,24,203606,2036),('2036-06-10',203624,6,2036,10,24,203606,2036),('2036-06-11',203624,6,2036,11,24,203606,2036),('2036-06-12',203624,6,2036,12,24,203606,2036),('2036-06-13',203624,6,2036,13,24,203606,2036),('2036-06-14',203624,6,2036,14,24,203606,2036),('2036-06-15',203625,6,2036,15,25,203606,2036),('2036-06-16',203625,6,2036,16,25,203606,2036),('2036-06-17',203625,6,2036,17,25,203606,2036),('2036-06-18',203625,6,2036,18,25,203606,2036),('2036-06-19',203625,6,2036,19,25,203606,2036),('2036-06-20',203625,6,2036,20,25,203606,2036),('2036-06-21',203625,6,2036,21,25,203606,2036),('2036-06-22',203626,6,2036,22,26,203606,2036),('2036-06-23',203626,6,2036,23,26,203606,2036),('2036-06-24',203626,6,2036,24,26,203606,2036),('2036-06-25',203626,6,2036,25,26,203606,2036),('2036-06-26',203626,6,2036,26,26,203606,2036),('2036-06-27',203626,6,2036,27,26,203606,2036),('2036-06-28',203626,6,2036,28,26,203606,2036),('2036-06-29',203627,6,2036,29,27,203606,2036),('2036-06-30',203627,6,2036,30,27,203606,2036),('2036-07-01',203627,7,2036,1,27,203607,2036),('2036-07-02',203627,7,2036,2,27,203607,2036),('2036-07-03',203627,7,2036,3,27,203607,2036),('2036-07-04',203627,7,2036,4,27,203607,2036),('2036-07-05',203627,7,2036,5,27,203607,2036),('2036-07-06',203628,7,2036,6,28,203607,2036),('2036-07-07',203628,7,2036,7,28,203607,2036),('2036-07-08',203628,7,2036,8,28,203607,2036),('2036-07-09',203628,7,2036,9,28,203607,2036),('2036-07-10',203628,7,2036,10,28,203607,2036),('2036-07-11',203628,7,2036,11,28,203607,2036),('2036-07-12',203628,7,2036,12,28,203607,2036),('2036-07-13',203629,7,2036,13,29,203607,2036),('2036-07-14',203629,7,2036,14,29,203607,2036),('2036-07-15',203629,7,2036,15,29,203607,2036),('2036-07-16',203629,7,2036,16,29,203607,2036),('2036-07-17',203629,7,2036,17,29,203607,2036),('2036-07-18',203629,7,2036,18,29,203607,2036),('2036-07-19',203629,7,2036,19,29,203607,2036),('2036-07-20',203630,7,2036,20,30,203607,2036),('2036-07-21',203630,7,2036,21,30,203607,2036),('2036-07-22',203630,7,2036,22,30,203607,2036),('2036-07-23',203630,7,2036,23,30,203607,2036),('2036-07-24',203630,7,2036,24,30,203607,2036),('2036-07-25',203630,7,2036,25,30,203607,2036),('2036-07-26',203630,7,2036,26,30,203607,2036),('2036-07-27',203631,7,2036,27,31,203607,2036),('2036-07-28',203631,7,2036,28,31,203607,2036),('2036-07-29',203631,7,2036,29,31,203607,2036),('2036-07-30',203631,7,2036,30,31,203607,2036),('2036-07-31',203631,7,2036,31,31,203607,2036),('2036-08-01',203631,8,2036,1,31,203608,2036),('2036-08-02',203631,8,2036,2,31,203608,2036),('2036-08-03',203632,8,2036,3,32,203608,2036),('2036-08-04',203632,8,2036,4,32,203608,2036),('2036-08-05',203632,8,2036,5,32,203608,2036),('2036-08-06',203632,8,2036,6,32,203608,2036),('2036-08-07',203632,8,2036,7,32,203608,2036),('2036-08-08',203632,8,2036,8,32,203608,2036),('2036-08-09',203632,8,2036,9,32,203608,2036),('2036-08-10',203633,8,2036,10,33,203608,2036),('2036-08-11',203633,8,2036,11,33,203608,2036),('2036-08-12',203633,8,2036,12,33,203608,2036),('2036-08-13',203633,8,2036,13,33,203608,2036),('2036-08-14',203633,8,2036,14,33,203608,2036),('2036-08-15',203633,8,2036,15,33,203608,2036),('2036-08-16',203633,8,2036,16,33,203608,2036),('2036-08-17',203634,8,2036,17,34,203608,2036),('2036-08-18',203634,8,2036,18,34,203608,2036),('2036-08-19',203634,8,2036,19,34,203608,2036),('2036-08-20',203634,8,2036,20,34,203608,2036),('2036-08-21',203634,8,2036,21,34,203608,2036),('2036-08-22',203634,8,2036,22,34,203608,2036),('2036-08-23',203634,8,2036,23,34,203608,2036),('2036-08-24',203635,8,2036,24,35,203608,2036),('2036-08-25',203635,8,2036,25,35,203608,2036),('2036-08-26',203635,8,2036,26,35,203608,2036),('2036-08-27',203635,8,2036,27,35,203608,2036),('2036-08-28',203635,8,2036,28,35,203608,2036),('2036-08-29',203635,8,2036,29,35,203608,2036),('2036-08-30',203635,8,2036,30,35,203608,2036),('2036-08-31',203636,8,2036,31,36,203608,2036),('2036-09-01',203636,9,2036,1,36,203609,2036),('2036-09-02',203636,9,2036,2,36,203609,2036),('2036-09-03',203636,9,2036,3,36,203609,2036),('2036-09-04',203636,9,2036,4,36,203609,2036),('2036-09-05',203636,9,2036,5,36,203609,2036),('2036-09-06',203636,9,2036,6,36,203609,2036),('2036-09-07',203637,9,2036,7,37,203609,2036),('2036-09-08',203637,9,2036,8,37,203609,2036),('2036-09-09',203637,9,2036,9,37,203609,2036),('2036-09-10',203637,9,2036,10,37,203609,2036),('2036-09-11',203637,9,2036,11,37,203609,2036),('2036-09-12',203637,9,2036,12,37,203609,2036),('2036-09-13',203637,9,2036,13,37,203609,2036),('2036-09-14',203638,9,2036,14,38,203609,2036),('2036-09-15',203638,9,2036,15,38,203609,2036),('2036-09-16',203638,9,2036,16,38,203609,2036),('2036-09-17',203638,9,2036,17,38,203609,2036),('2036-09-18',203638,9,2036,18,38,203609,2036),('2036-09-19',203638,9,2036,19,38,203609,2036),('2036-09-20',203638,9,2036,20,38,203609,2036),('2036-09-21',203639,9,2036,21,39,203609,2036),('2036-09-22',203639,9,2036,22,39,203609,2036),('2036-09-23',203639,9,2036,23,39,203609,2036),('2036-09-24',203639,9,2036,24,39,203609,2036),('2036-09-25',203639,9,2036,25,39,203609,2036),('2036-09-26',203639,9,2036,26,39,203609,2036),('2036-09-27',203639,9,2036,27,39,203609,2036),('2036-09-28',203640,9,2036,28,40,203609,2036),('2036-09-29',203640,9,2036,29,40,203609,2036),('2036-09-30',203640,9,2036,30,40,203609,2036),('2036-10-01',203640,10,2036,1,40,203610,2036),('2036-10-02',203640,10,2036,2,40,203610,2036),('2036-10-03',203640,10,2036,3,40,203610,2036),('2036-10-04',203640,10,2036,4,40,203610,2036),('2036-10-05',203641,10,2036,5,41,203610,2036),('2036-10-06',203641,10,2036,6,41,203610,2036),('2036-10-07',203641,10,2036,7,41,203610,2036),('2036-10-08',203641,10,2036,8,41,203610,2036),('2036-10-09',203641,10,2036,9,41,203610,2036),('2036-10-10',203641,10,2036,10,41,203610,2036),('2036-10-11',203641,10,2036,11,41,203610,2036),('2036-10-12',203642,10,2036,12,42,203610,2036),('2036-10-13',203642,10,2036,13,42,203610,2036),('2036-10-14',203642,10,2036,14,42,203610,2036),('2036-10-15',203642,10,2036,15,42,203610,2036),('2036-10-16',203642,10,2036,16,42,203610,2036),('2036-10-17',203642,10,2036,17,42,203610,2036),('2036-10-18',203642,10,2036,18,42,203610,2036),('2036-10-19',203643,10,2036,19,43,203610,2036),('2036-10-20',203643,10,2036,20,43,203610,2036),('2036-10-21',203643,10,2036,21,43,203610,2036),('2036-10-22',203643,10,2036,22,43,203610,2036),('2036-10-23',203643,10,2036,23,43,203610,2036),('2036-10-24',203643,10,2036,24,43,203610,2036),('2036-10-25',203643,10,2036,25,43,203610,2036),('2036-10-26',203644,10,2036,26,44,203610,2036),('2036-10-27',203644,10,2036,27,44,203610,2036),('2036-10-28',203644,10,2036,28,44,203610,2036),('2036-10-29',203644,10,2036,29,44,203610,2036),('2036-10-30',203644,10,2036,30,44,203610,2036),('2036-10-31',203644,10,2036,31,44,203610,2036),('2036-11-01',203644,11,2036,1,44,203611,2036),('2036-11-02',203645,11,2036,2,45,203611,2036),('2036-11-03',203645,11,2036,3,45,203611,2036),('2036-11-04',203645,11,2036,4,45,203611,2036),('2036-11-05',203645,11,2036,5,45,203611,2036),('2036-11-06',203645,11,2036,6,45,203611,2036),('2036-11-07',203645,11,2036,7,45,203611,2036),('2036-11-08',203645,11,2036,8,45,203611,2036),('2036-11-09',203646,11,2036,9,46,203611,2036),('2036-11-10',203646,11,2036,10,46,203611,2036),('2036-11-11',203646,11,2036,11,46,203611,2036),('2036-11-12',203646,11,2036,12,46,203611,2036),('2036-11-13',203646,11,2036,13,46,203611,2036),('2036-11-14',203646,11,2036,14,46,203611,2036),('2036-11-15',203646,11,2036,15,46,203611,2036),('2036-11-16',203647,11,2036,16,47,203611,2036),('2036-11-17',203647,11,2036,17,47,203611,2036),('2036-11-18',203647,11,2036,18,47,203611,2036),('2036-11-19',203647,11,2036,19,47,203611,2036),('2036-11-20',203647,11,2036,20,47,203611,2036),('2036-11-21',203647,11,2036,21,47,203611,2036),('2036-11-22',203647,11,2036,22,47,203611,2036),('2036-11-23',203648,11,2036,23,48,203611,2036),('2036-11-24',203648,11,2036,24,48,203611,2036),('2036-11-25',203648,11,2036,25,48,203611,2036),('2036-11-26',203648,11,2036,26,48,203611,2036),('2036-11-27',203648,11,2036,27,48,203611,2036),('2036-11-28',203648,11,2036,28,48,203611,2036),('2036-11-29',203648,11,2036,29,48,203611,2036),('2036-11-30',203649,11,2036,30,49,203611,2036),('2036-12-01',203649,12,2036,1,49,203612,2037),('2036-12-02',203649,12,2036,2,49,203612,2037),('2036-12-03',203649,12,2036,3,49,203612,2037),('2036-12-04',203649,12,2036,4,49,203612,2037),('2036-12-05',203649,12,2036,5,49,203612,2037),('2036-12-06',203649,12,2036,6,49,203612,2037),('2036-12-07',203650,12,2036,7,50,203612,2037),('2036-12-08',203650,12,2036,8,50,203612,2037),('2036-12-09',203650,12,2036,9,50,203612,2037),('2036-12-10',203650,12,2036,10,50,203612,2037),('2036-12-11',203650,12,2036,11,50,203612,2037),('2036-12-12',203650,12,2036,12,50,203612,2037),('2036-12-13',203650,12,2036,13,50,203612,2037),('2036-12-14',203651,12,2036,14,51,203612,2037),('2036-12-15',203651,12,2036,15,51,203612,2037),('2036-12-16',203651,12,2036,16,51,203612,2037),('2036-12-17',203651,12,2036,17,51,203612,2037),('2036-12-18',203651,12,2036,18,51,203612,2037),('2036-12-19',203651,12,2036,19,51,203612,2037),('2036-12-20',203651,12,2036,20,51,203612,2037),('2036-12-21',203652,12,2036,21,52,203612,2037),('2036-12-22',203652,12,2036,22,52,203612,2037),('2036-12-23',203652,12,2036,23,52,203612,2037),('2036-12-24',203652,12,2036,24,52,203612,2037),('2036-12-25',203652,12,2036,25,52,203612,2037),('2036-12-26',203652,12,2036,26,52,203612,2037),('2036-12-27',203652,12,2036,27,52,203612,2037),('2036-12-28',203653,12,2036,28,53,203612,2037),('2036-12-29',203601,12,2036,29,53,203612,2037),('2036-12-30',203601,12,2036,30,53,203612,2037);
+INSERT INTO `time` VALUES ('2007-12-31',200801,12,2007,31,1,200712,2008),('2008-01-01',200801,1,2008,1,1,200801,2008),('2008-01-02',200801,1,2008,2,1,200801,2008),('2008-01-03',200801,1,2008,3,1,200801,2008),('2008-01-04',200801,1,2008,4,1,200801,2008),('2008-01-05',200801,1,2008,5,1,200801,2008),('2008-01-06',200802,1,2008,6,2,200801,2008),('2008-01-07',200802,1,2008,7,2,200801,2008),('2008-01-08',200802,1,2008,8,2,200801,2008),('2008-01-09',200802,1,2008,9,2,200801,2008),('2008-01-10',200802,1,2008,10,2,200801,2008),('2008-01-11',200802,1,2008,11,2,200801,2008),('2008-01-12',200802,1,2008,12,2,200801,2008),('2008-01-13',200803,1,2008,13,3,200801,2008),('2008-01-14',200803,1,2008,14,3,200801,2008),('2008-01-15',200803,1,2008,15,3,200801,2008),('2008-01-16',200803,1,2008,16,3,200801,2008),('2008-01-17',200803,1,2008,17,3,200801,2008),('2008-01-18',200803,1,2008,18,3,200801,2008),('2008-01-19',200803,1,2008,19,3,200801,2008),('2008-01-20',200804,1,2008,20,4,200801,2008),('2008-01-21',200804,1,2008,21,4,200801,2008),('2008-01-22',200804,1,2008,22,4,200801,2008),('2008-01-23',200804,1,2008,23,4,200801,2008),('2008-01-24',200804,1,2008,24,4,200801,2008),('2008-01-25',200804,1,2008,25,4,200801,2008),('2008-01-26',200804,1,2008,26,4,200801,2008),('2008-01-27',200805,1,2008,27,5,200801,2008),('2008-01-28',200805,1,2008,28,5,200801,2008),('2008-01-29',200805,1,2008,29,5,200801,2008),('2008-01-30',200805,1,2008,30,5,200801,2008),('2008-01-31',200805,1,2008,31,5,200801,2008),('2008-02-01',200805,2,2008,1,5,200802,2008),('2008-02-02',200805,2,2008,2,5,200802,2008),('2008-02-03',200806,2,2008,3,6,200802,2008),('2008-02-04',200806,2,2008,4,6,200802,2008),('2008-02-05',200806,2,2008,5,6,200802,2008),('2008-02-06',200806,2,2008,6,6,200802,2008),('2008-02-07',200806,2,2008,7,6,200802,2008),('2008-02-08',200806,2,2008,8,6,200802,2008),('2008-02-09',200806,2,2008,9,6,200802,2008),('2008-02-10',200807,2,2008,10,7,200802,2008),('2008-02-11',200807,2,2008,11,7,200802,2008),('2008-02-12',200807,2,2008,12,7,200802,2008),('2008-02-13',200807,2,2008,13,7,200802,2008),('2008-02-14',200807,2,2008,14,7,200802,2008),('2008-02-15',200807,2,2008,15,7,200802,2008),('2008-02-16',200807,2,2008,16,7,200802,2008),('2008-02-17',200808,2,2008,17,8,200802,2008),('2008-02-18',200808,2,2008,18,8,200802,2008),('2008-02-19',200808,2,2008,19,8,200802,2008),('2008-02-20',200808,2,2008,20,8,200802,2008),('2008-02-21',200808,2,2008,21,8,200802,2008),('2008-02-22',200808,2,2008,22,8,200802,2008),('2008-02-23',200808,2,2008,23,8,200802,2008),('2008-02-24',200809,2,2008,24,9,200802,2008),('2008-02-25',200809,2,2008,25,9,200802,2008),('2008-02-26',200809,2,2008,26,9,200802,2008),('2008-02-27',200809,2,2008,27,9,200802,2008),('2008-02-28',200809,2,2008,28,9,200802,2008),('2008-02-29',200809,2,2008,29,9,200802,2008),('2008-03-01',200809,3,2008,1,9,200803,2008),('2008-03-02',200810,3,2008,2,10,200803,2008),('2008-03-03',200810,3,2008,3,10,200803,2008),('2008-03-04',200810,3,2008,4,10,200803,2008),('2008-03-05',200810,3,2008,5,10,200803,2008),('2008-03-06',200810,3,2008,6,10,200803,2008),('2008-03-07',200810,3,2008,7,10,200803,2008),('2008-03-08',200810,3,2008,8,10,200803,2008),('2008-03-09',200811,3,2008,9,11,200803,2008),('2008-03-10',200811,3,2008,10,11,200803,2008),('2008-03-11',200811,3,2008,11,11,200803,2008),('2008-03-12',200811,3,2008,12,11,200803,2008),('2008-03-13',200811,3,2008,13,11,200803,2008),('2008-03-14',200811,3,2008,14,11,200803,2008),('2008-03-15',200811,3,2008,15,11,200803,2008),('2008-03-16',200812,3,2008,16,12,200803,2008),('2008-03-17',200812,3,2008,17,12,200803,2008),('2008-03-18',200812,3,2008,18,12,200803,2008),('2008-03-19',200812,3,2008,19,12,200803,2008),('2008-03-20',200812,3,2008,20,12,200803,2008),('2008-03-21',200812,3,2008,21,12,200803,2008),('2008-03-22',200812,3,2008,22,12,200803,2008),('2008-03-23',200813,3,2008,23,13,200803,2008),('2008-03-24',200813,3,2008,24,13,200803,2008),('2008-03-25',200813,3,2008,25,13,200803,2008),('2008-03-26',200813,3,2008,26,13,200803,2008),('2008-03-27',200813,3,2008,27,13,200803,2008),('2008-03-28',200813,3,2008,28,13,200803,2008),('2008-03-29',200813,3,2008,29,13,200803,2008),('2008-03-30',200814,3,2008,30,14,200803,2008),('2008-03-31',200814,3,2008,31,14,200803,2008),('2008-04-01',200814,4,2008,1,14,200804,2008),('2008-04-02',200814,4,2008,2,14,200804,2008),('2008-04-03',200814,4,2008,3,14,200804,2008),('2008-04-04',200814,4,2008,4,14,200804,2008),('2008-04-05',200814,4,2008,5,14,200804,2008),('2008-04-06',200815,4,2008,6,15,200804,2008),('2008-04-07',200815,4,2008,7,15,200804,2008),('2008-04-08',200815,4,2008,8,15,200804,2008),('2008-04-09',200815,4,2008,9,15,200804,2008),('2008-04-10',200815,4,2008,10,15,200804,2008),('2008-04-11',200815,4,2008,11,15,200804,2008),('2008-04-12',200815,4,2008,12,15,200804,2008),('2008-04-13',200816,4,2008,13,16,200804,2008),('2008-04-14',200816,4,2008,14,16,200804,2008),('2008-04-15',200816,4,2008,15,16,200804,2008),('2008-04-16',200816,4,2008,16,16,200804,2008),('2008-04-17',200816,4,2008,17,16,200804,2008),('2008-04-18',200816,4,2008,18,16,200804,2008),('2008-04-19',200816,4,2008,19,16,200804,2008),('2008-04-20',200817,4,2008,20,17,200804,2008),('2008-04-21',200817,4,2008,21,17,200804,2008),('2008-04-22',200817,4,2008,22,17,200804,2008),('2008-04-23',200817,4,2008,23,17,200804,2008),('2008-04-24',200817,4,2008,24,17,200804,2008),('2008-04-25',200817,4,2008,25,17,200804,2008),('2008-04-26',200817,4,2008,26,17,200804,2008),('2008-04-27',200818,4,2008,27,18,200804,2008),('2008-04-28',200818,4,2008,28,18,200804,2008),('2008-04-29',200818,4,2008,29,18,200804,2008),('2008-04-30',200818,4,2008,30,18,200804,2008),('2008-05-01',200818,5,2008,1,18,200805,2008),('2008-05-02',200818,5,2008,2,18,200805,2008),('2008-05-03',200818,5,2008,3,18,200805,2008),('2008-05-04',200819,5,2008,4,19,200805,2008),('2008-05-05',200819,5,2008,5,19,200805,2008),('2008-05-06',200819,5,2008,6,19,200805,2008),('2008-05-07',200819,5,2008,7,19,200805,2008),('2008-05-08',200819,5,2008,8,19,200805,2008),('2008-05-09',200819,5,2008,9,19,200805,2008),('2008-05-10',200819,5,2008,10,19,200805,2008),('2008-05-11',200820,5,2008,11,20,200805,2008),('2008-05-12',200820,5,2008,12,20,200805,2008),('2008-05-13',200820,5,2008,13,20,200805,2008),('2008-05-14',200820,5,2008,14,20,200805,2008),('2008-05-15',200820,5,2008,15,20,200805,2008),('2008-05-16',200820,5,2008,16,20,200805,2008),('2008-05-17',200820,5,2008,17,20,200805,2008),('2008-05-18',200821,5,2008,18,21,200805,2008),('2008-05-19',200821,5,2008,19,21,200805,2008),('2008-05-20',200821,5,2008,20,21,200805,2008),('2008-05-21',200821,5,2008,21,21,200805,2008),('2008-05-22',200821,5,2008,22,21,200805,2008),('2008-05-23',200821,5,2008,23,21,200805,2008),('2008-05-24',200821,5,2008,24,21,200805,2008),('2008-05-25',200822,5,2008,25,22,200805,2008),('2008-05-26',200822,5,2008,26,22,200805,2008),('2008-05-27',200822,5,2008,27,22,200805,2008),('2008-05-28',200822,5,2008,28,22,200805,2008),('2008-05-29',200822,5,2008,29,22,200805,2008),('2008-05-30',200822,5,2008,30,22,200805,2008),('2008-05-31',200822,5,2008,31,22,200805,2008),('2008-06-01',200823,6,2008,1,23,200806,2008),('2008-06-02',200823,6,2008,2,23,200806,2008),('2008-06-03',200823,6,2008,3,23,200806,2008),('2008-06-04',200823,6,2008,4,23,200806,2008),('2008-06-05',200823,6,2008,5,23,200806,2008),('2008-06-06',200823,6,2008,6,23,200806,2008),('2008-06-07',200823,6,2008,7,23,200806,2008),('2008-06-08',200824,6,2008,8,24,200806,2008),('2008-06-09',200824,6,2008,9,24,200806,2008),('2008-06-10',200824,6,2008,10,24,200806,2008),('2008-06-11',200824,6,2008,11,24,200806,2008),('2008-06-12',200824,6,2008,12,24,200806,2008),('2008-06-13',200824,6,2008,13,24,200806,2008),('2008-06-14',200824,6,2008,14,24,200806,2008),('2008-06-15',200825,6,2008,15,25,200806,2008),('2008-06-16',200825,6,2008,16,25,200806,2008),('2008-06-17',200825,6,2008,17,25,200806,2008),('2008-06-18',200825,6,2008,18,25,200806,2008),('2008-06-19',200825,6,2008,19,25,200806,2008),('2008-06-20',200825,6,2008,20,25,200806,2008),('2008-06-21',200825,6,2008,21,25,200806,2008),('2008-06-22',200826,6,2008,22,26,200806,2008),('2008-06-23',200826,6,2008,23,26,200806,2008),('2008-06-24',200826,6,2008,24,26,200806,2008),('2008-06-25',200826,6,2008,25,26,200806,2008),('2008-06-26',200826,6,2008,26,26,200806,2008),('2008-06-27',200826,6,2008,27,26,200806,2008),('2008-06-28',200826,6,2008,28,26,200806,2008),('2008-06-29',200827,6,2008,29,27,200806,2008),('2008-06-30',200827,6,2008,30,27,200806,2008),('2008-07-01',200827,7,2008,1,27,200807,2008),('2008-07-02',200827,7,2008,2,27,200807,2008),('2008-07-03',200827,7,2008,3,27,200807,2008),('2008-07-04',200827,7,2008,4,27,200807,2008),('2008-07-05',200827,7,2008,5,27,200807,2008),('2008-07-06',200828,7,2008,6,28,200807,2008),('2008-07-07',200828,7,2008,7,28,200807,2008),('2008-07-08',200828,7,2008,8,28,200807,2008),('2008-07-09',200828,7,2008,9,28,200807,2008),('2008-07-10',200828,7,2008,10,28,200807,2008),('2008-07-11',200828,7,2008,11,28,200807,2008),('2008-07-12',200828,7,2008,12,28,200807,2008),('2008-07-13',200829,7,2008,13,29,200807,2008),('2008-07-14',200829,7,2008,14,29,200807,2008),('2008-07-15',200829,7,2008,15,29,200807,2008),('2008-07-16',200829,7,2008,16,29,200807,2008),('2008-07-17',200829,7,2008,17,29,200807,2008),('2008-07-18',200829,7,2008,18,29,200807,2008),('2008-07-19',200829,7,2008,19,29,200807,2008),('2008-07-20',200830,7,2008,20,30,200807,2008),('2008-07-21',200830,7,2008,21,30,200807,2008),('2008-07-22',200830,7,2008,22,30,200807,2008),('2008-07-23',200830,7,2008,23,30,200807,2008),('2008-07-24',200830,7,2008,24,30,200807,2008),('2008-07-25',200830,7,2008,25,30,200807,2008),('2008-07-26',200830,7,2008,26,30,200807,2008),('2008-07-27',200831,7,2008,27,31,200807,2008),('2008-07-28',200831,7,2008,28,31,200807,2008),('2008-07-29',200831,7,2008,29,31,200807,2008),('2008-07-30',200831,7,2008,30,31,200807,2008),('2008-07-31',200831,7,2008,31,31,200807,2008),('2008-08-01',200831,8,2008,1,31,200808,2008),('2008-08-02',200831,8,2008,2,31,200808,2008),('2008-08-03',200832,8,2008,3,32,200808,2008),('2008-08-04',200832,8,2008,4,32,200808,2008),('2008-08-05',200832,8,2008,5,32,200808,2008),('2008-08-06',200832,8,2008,6,32,200808,2008),('2008-08-07',200832,8,2008,7,32,200808,2008),('2008-08-08',200832,8,2008,8,32,200808,2008),('2008-08-09',200832,8,2008,9,32,200808,2008),('2008-08-10',200833,8,2008,10,33,200808,2008),('2008-08-11',200833,8,2008,11,33,200808,2008),('2008-08-12',200833,8,2008,12,33,200808,2008),('2008-08-13',200833,8,2008,13,33,200808,2008),('2008-08-14',200833,8,2008,14,33,200808,2008),('2008-08-15',200833,8,2008,15,33,200808,2008),('2008-08-16',200833,8,2008,16,33,200808,2008),('2008-08-17',200834,8,2008,17,34,200808,2008),('2008-08-18',200834,8,2008,18,34,200808,2008),('2008-08-19',200834,8,2008,19,34,200808,2008),('2008-08-20',200834,8,2008,20,34,200808,2008),('2008-08-21',200834,8,2008,21,34,200808,2008),('2008-08-22',200834,8,2008,22,34,200808,2008),('2008-08-23',200834,8,2008,23,34,200808,2008),('2008-08-24',200835,8,2008,24,35,200808,2008),('2008-08-25',200835,8,2008,25,35,200808,2008),('2008-08-26',200835,8,2008,26,35,200808,2008),('2008-08-27',200835,8,2008,27,35,200808,2008),('2008-08-28',200835,8,2008,28,35,200808,2008),('2008-08-29',200835,8,2008,29,35,200808,2008),('2008-08-30',200835,8,2008,30,35,200808,2008),('2008-08-31',200836,8,2008,31,36,200808,2008),('2008-09-01',200836,9,2008,1,36,200809,2008),('2008-09-02',200836,9,2008,2,36,200809,2008),('2008-09-03',200836,9,2008,3,36,200809,2008),('2008-09-04',200836,9,2008,4,36,200809,2008),('2008-09-05',200836,9,2008,5,36,200809,2008),('2008-09-06',200836,9,2008,6,36,200809,2008),('2008-09-07',200837,9,2008,7,37,200809,2008),('2008-09-08',200837,9,2008,8,37,200809,2008),('2008-09-09',200837,9,2008,9,37,200809,2008),('2008-09-10',200837,9,2008,10,37,200809,2008),('2008-09-11',200837,9,2008,11,37,200809,2008),('2008-09-12',200837,9,2008,12,37,200809,2008),('2008-09-13',200837,9,2008,13,37,200809,2008),('2008-09-14',200838,9,2008,14,38,200809,2008),('2008-09-15',200838,9,2008,15,38,200809,2008),('2008-09-16',200838,9,2008,16,38,200809,2008),('2008-09-17',200838,9,2008,17,38,200809,2008),('2008-09-18',200838,9,2008,18,38,200809,2008),('2008-09-19',200838,9,2008,19,38,200809,2008),('2008-09-20',200838,9,2008,20,38,200809,2008),('2008-09-21',200839,9,2008,21,39,200809,2008),('2008-09-22',200839,9,2008,22,39,200809,2008),('2008-09-23',200839,9,2008,23,39,200809,2008),('2008-09-24',200839,9,2008,24,39,200809,2008),('2008-09-25',200839,9,2008,25,39,200809,2008),('2008-09-26',200839,9,2008,26,39,200809,2008),('2008-09-27',200839,9,2008,27,39,200809,2008),('2008-09-28',200840,9,2008,28,40,200809,2008),('2008-09-29',200840,9,2008,29,40,200809,2008),('2008-09-30',200840,9,2008,30,40,200809,2008),('2008-10-01',200840,10,2008,1,40,200810,2008),('2008-10-02',200840,10,2008,2,40,200810,2008),('2008-10-03',200840,10,2008,3,40,200810,2008),('2008-10-04',200840,10,2008,4,40,200810,2008),('2008-10-05',200841,10,2008,5,41,200810,2008),('2008-10-06',200841,10,2008,6,41,200810,2008),('2008-10-07',200841,10,2008,7,41,200810,2008),('2008-10-08',200841,10,2008,8,41,200810,2008),('2008-10-09',200841,10,2008,9,41,200810,2008),('2008-10-10',200841,10,2008,10,41,200810,2008),('2008-10-11',200841,10,2008,11,41,200810,2008),('2008-10-12',200842,10,2008,12,42,200810,2008),('2008-10-13',200842,10,2008,13,42,200810,2008),('2008-10-14',200842,10,2008,14,42,200810,2008),('2008-10-15',200842,10,2008,15,42,200810,2008),('2008-10-16',200842,10,2008,16,42,200810,2008),('2008-10-17',200842,10,2008,17,42,200810,2008),('2008-10-18',200842,10,2008,18,42,200810,2008),('2008-10-19',200843,10,2008,19,43,200810,2008),('2008-10-20',200843,10,2008,20,43,200810,2008),('2008-10-21',200843,10,2008,21,43,200810,2008),('2008-10-22',200843,10,2008,22,43,200810,2008),('2008-10-23',200843,10,2008,23,43,200810,2008),('2008-10-24',200843,10,2008,24,43,200810,2008),('2008-10-25',200843,10,2008,25,43,200810,2008),('2008-10-26',200844,10,2008,26,44,200810,2008),('2008-10-27',200844,10,2008,27,44,200810,2008),('2008-10-28',200844,10,2008,28,44,200810,2008),('2008-10-29',200844,10,2008,29,44,200810,2008),('2008-10-30',200844,10,2008,30,44,200810,2008),('2008-10-31',200844,10,2008,31,44,200810,2008),('2008-11-01',200844,11,2008,1,44,200811,2008),('2008-11-02',200845,11,2008,2,45,200811,2008),('2008-11-03',200845,11,2008,3,45,200811,2008),('2008-11-04',200845,11,2008,4,45,200811,2008),('2008-11-05',200845,11,2008,5,45,200811,2008),('2008-11-06',200845,11,2008,6,45,200811,2008),('2008-11-07',200845,11,2008,7,45,200811,2008),('2008-11-08',200845,11,2008,8,45,200811,2008),('2008-11-09',200846,11,2008,9,46,200811,2008),('2008-11-10',200846,11,2008,10,46,200811,2008),('2008-11-11',200846,11,2008,11,46,200811,2008),('2008-11-12',200846,11,2008,12,46,200811,2008),('2008-11-13',200846,11,2008,13,46,200811,2008),('2008-11-14',200846,11,2008,14,46,200811,2008),('2008-11-15',200846,11,2008,15,46,200811,2008),('2008-11-16',200847,11,2008,16,47,200811,2008),('2008-11-17',200847,11,2008,17,47,200811,2008),('2008-11-18',200847,11,2008,18,47,200811,2008),('2008-11-19',200847,11,2008,19,47,200811,2008),('2008-11-20',200847,11,2008,20,47,200811,2008),('2008-11-21',200847,11,2008,21,47,200811,2008),('2008-11-22',200847,11,2008,22,47,200811,2008),('2008-11-23',200848,11,2008,23,48,200811,2008),('2008-11-24',200848,11,2008,24,48,200811,2008),('2008-11-25',200848,11,2008,25,48,200811,2008),('2008-11-26',200848,11,2008,26,48,200811,2008),('2008-11-27',200848,11,2008,27,48,200811,2008),('2008-11-28',200848,11,2008,28,48,200811,2008),('2008-11-29',200848,11,2008,29,48,200811,2008),('2008-11-30',200849,11,2008,30,49,200811,2008),('2008-12-01',200849,12,2008,1,49,200812,2009),('2008-12-02',200849,12,2008,2,49,200812,2009),('2008-12-03',200849,12,2008,3,49,200812,2009),('2008-12-04',200849,12,2008,4,49,200812,2009),('2008-12-05',200849,12,2008,5,49,200812,2009),('2008-12-06',200849,12,2008,6,49,200812,2009),('2008-12-07',200850,12,2008,7,50,200812,2009),('2008-12-08',200850,12,2008,8,50,200812,2009),('2008-12-09',200850,12,2008,9,50,200812,2009),('2008-12-10',200850,12,2008,10,50,200812,2009),('2008-12-11',200850,12,2008,11,50,200812,2009),('2008-12-12',200850,12,2008,12,50,200812,2009),('2008-12-13',200850,12,2008,13,50,200812,2009),('2008-12-14',200851,12,2008,14,51,200812,2009),('2008-12-15',200851,12,2008,15,51,200812,2009),('2008-12-16',200851,12,2008,16,51,200812,2009),('2008-12-17',200851,12,2008,17,51,200812,2009),('2008-12-18',200851,12,2008,18,51,200812,2009),('2008-12-19',200851,12,2008,19,51,200812,2009),('2008-12-20',200851,12,2008,20,51,200812,2009),('2008-12-21',200852,12,2008,21,52,200812,2009),('2008-12-22',200852,12,2008,22,52,200812,2009),('2008-12-23',200852,12,2008,23,52,200812,2009),('2008-12-24',200852,12,2008,24,52,200812,2009),('2008-12-25',200852,12,2008,25,52,200812,2009),('2008-12-26',200852,12,2008,26,52,200812,2009),('2008-12-27',200852,12,2008,27,52,200812,2009),('2008-12-28',200853,12,2008,28,53,200812,2009),('2008-12-29',200901,12,2008,29,53,200812,2009),('2008-12-30',200901,12,2008,30,53,200812,2009),('2008-12-31',200901,12,2008,31,53,200812,2009),('2009-01-01',200901,1,2009,1,53,200901,2009),('2009-01-02',200901,1,2009,2,53,200901,2009),('2009-01-03',200901,1,2009,3,53,200901,2009),('2009-01-04',200902,1,2009,4,1,200901,2009),('2009-01-05',200902,1,2009,5,1,200901,2009),('2009-01-06',200902,1,2009,6,1,200901,2009),('2009-01-07',200902,1,2009,7,1,200901,2009),('2009-01-08',200902,1,2009,8,1,200901,2009),('2009-01-09',200902,1,2009,9,1,200901,2009),('2009-01-10',200902,1,2009,10,1,200901,2009),('2009-01-11',200903,1,2009,11,2,200901,2009),('2009-01-12',200903,1,2009,12,2,200901,2009),('2009-01-13',200903,1,2009,13,2,200901,2009),('2009-01-14',200903,1,2009,14,2,200901,2009),('2009-01-15',200903,1,2009,15,2,200901,2009),('2009-01-16',200903,1,2009,16,2,200901,2009),('2009-01-17',200903,1,2009,17,2,200901,2009),('2009-01-18',200904,1,2009,18,3,200901,2009),('2009-01-19',200904,1,2009,19,3,200901,2009),('2009-01-20',200904,1,2009,20,3,200901,2009),('2009-01-21',200904,1,2009,21,3,200901,2009),('2009-01-22',200904,1,2009,22,3,200901,2009),('2009-01-23',200904,1,2009,23,3,200901,2009),('2009-01-24',200904,1,2009,24,3,200901,2009),('2009-01-25',200905,1,2009,25,4,200901,2009),('2009-01-26',200905,1,2009,26,4,200901,2009),('2009-01-27',200905,1,2009,27,4,200901,2009),('2009-01-28',200905,1,2009,28,4,200901,2009),('2009-01-29',200905,1,2009,29,4,200901,2009),('2009-01-30',200905,1,2009,30,4,200901,2009),('2009-01-31',200905,1,2009,31,4,200901,2009),('2009-02-01',200906,2,2009,1,5,200902,2009),('2009-02-02',200906,2,2009,2,5,200902,2009),('2009-02-03',200906,2,2009,3,5,200902,2009),('2009-02-04',200906,2,2009,4,5,200902,2009),('2009-02-05',200906,2,2009,5,5,200902,2009),('2009-02-06',200906,2,2009,6,5,200902,2009),('2009-02-07',200906,2,2009,7,5,200902,2009),('2009-02-08',200907,2,2009,8,6,200902,2009),('2009-02-09',200907,2,2009,9,6,200902,2009),('2009-02-10',200907,2,2009,10,6,200902,2009),('2009-02-11',200907,2,2009,11,6,200902,2009),('2009-02-12',200907,2,2009,12,6,200902,2009),('2009-02-13',200907,2,2009,13,6,200902,2009),('2009-02-14',200907,2,2009,14,6,200902,2009),('2009-02-15',200908,2,2009,15,7,200902,2009),('2009-02-16',200908,2,2009,16,7,200902,2009),('2009-02-17',200908,2,2009,17,7,200902,2009),('2009-02-18',200908,2,2009,18,7,200902,2009),('2009-02-19',200908,2,2009,19,7,200902,2009),('2009-02-20',200908,2,2009,20,7,200902,2009),('2009-02-21',200908,2,2009,21,7,200902,2009),('2009-02-22',200909,2,2009,22,8,200902,2009),('2009-02-23',200909,2,2009,23,8,200902,2009),('2009-02-24',200909,2,2009,24,8,200902,2009),('2009-02-25',200909,2,2009,25,8,200902,2009),('2009-02-26',200909,2,2009,26,8,200902,2009),('2009-02-27',200909,2,2009,27,8,200902,2009),('2009-02-28',200909,2,2009,28,8,200902,2009),('2009-03-01',200910,3,2009,1,9,200903,2009),('2009-03-02',200910,3,2009,2,9,200903,2009),('2009-03-03',200910,3,2009,3,9,200903,2009),('2009-03-04',200910,3,2009,4,9,200903,2009),('2009-03-05',200910,3,2009,5,9,200903,2009),('2009-03-06',200910,3,2009,6,9,200903,2009),('2009-03-07',200910,3,2009,7,9,200903,2009),('2009-03-08',200911,3,2009,8,10,200903,2009),('2009-03-09',200911,3,2009,9,10,200903,2009),('2009-03-10',200911,3,2009,10,10,200903,2009),('2009-03-11',200911,3,2009,11,10,200903,2009),('2009-03-12',200911,3,2009,12,10,200903,2009),('2009-03-13',200911,3,2009,13,10,200903,2009),('2009-03-14',200911,3,2009,14,10,200903,2009),('2009-03-15',200912,3,2009,15,11,200903,2009),('2009-03-16',200912,3,2009,16,11,200903,2009),('2009-03-17',200912,3,2009,17,11,200903,2009),('2009-03-18',200912,3,2009,18,11,200903,2009),('2009-03-19',200912,3,2009,19,11,200903,2009),('2009-03-20',200912,3,2009,20,11,200903,2009),('2009-03-21',200912,3,2009,21,11,200903,2009),('2009-03-22',200913,3,2009,22,12,200903,2009),('2009-03-23',200913,3,2009,23,12,200903,2009),('2009-03-24',200913,3,2009,24,12,200903,2009),('2009-03-25',200913,3,2009,25,12,200903,2009),('2009-03-26',200913,3,2009,26,12,200903,2009),('2009-03-27',200913,3,2009,27,12,200903,2009),('2009-03-28',200913,3,2009,28,12,200903,2009),('2009-03-29',200914,3,2009,29,13,200903,2009),('2009-03-30',200914,3,2009,30,13,200903,2009),('2009-03-31',200914,3,2009,31,13,200903,2009),('2009-04-01',200914,4,2009,1,13,200904,2009),('2009-04-02',200914,4,2009,2,13,200904,2009),('2009-04-03',200914,4,2009,3,13,200904,2009),('2009-04-04',200914,4,2009,4,13,200904,2009),('2009-04-05',200915,4,2009,5,14,200904,2009),('2009-04-06',200915,4,2009,6,14,200904,2009),('2009-04-07',200915,4,2009,7,14,200904,2009),('2009-04-08',200915,4,2009,8,14,200904,2009),('2009-04-09',200915,4,2009,9,14,200904,2009),('2009-04-10',200915,4,2009,10,14,200904,2009),('2009-04-11',200915,4,2009,11,14,200904,2009),('2009-04-12',200916,4,2009,12,15,200904,2009),('2009-04-13',200916,4,2009,13,15,200904,2009),('2009-04-14',200916,4,2009,14,15,200904,2009),('2009-04-15',200916,4,2009,15,15,200904,2009),('2009-04-16',200916,4,2009,16,15,200904,2009),('2009-04-17',200916,4,2009,17,15,200904,2009),('2009-04-18',200916,4,2009,18,15,200904,2009),('2009-04-19',200917,4,2009,19,16,200904,2009),('2009-04-20',200917,4,2009,20,16,200904,2009),('2009-04-21',200917,4,2009,21,16,200904,2009),('2009-04-22',200917,4,2009,22,16,200904,2009),('2009-04-23',200917,4,2009,23,16,200904,2009),('2009-04-24',200917,4,2009,24,16,200904,2009),('2009-04-25',200917,4,2009,25,16,200904,2009),('2009-04-26',200918,4,2009,26,17,200904,2009),('2009-04-27',200918,4,2009,27,17,200904,2009),('2009-04-28',200918,4,2009,28,17,200904,2009),('2009-04-29',200918,4,2009,29,17,200904,2009),('2009-04-30',200918,4,2009,30,17,200904,2009),('2009-05-01',200918,5,2009,1,17,200905,2009),('2009-05-02',200918,5,2009,2,17,200905,2009),('2009-05-03',200919,5,2009,3,18,200905,2009),('2009-05-04',200919,5,2009,4,18,200905,2009),('2009-05-05',200919,5,2009,5,18,200905,2009),('2009-05-06',200919,5,2009,6,18,200905,2009),('2009-05-07',200919,5,2009,7,18,200905,2009),('2009-05-08',200919,5,2009,8,18,200905,2009),('2009-05-09',200919,5,2009,9,18,200905,2009),('2009-05-10',200920,5,2009,10,19,200905,2009),('2009-05-11',200920,5,2009,11,19,200905,2009),('2009-05-12',200920,5,2009,12,19,200905,2009),('2009-05-13',200920,5,2009,13,19,200905,2009),('2009-05-14',200920,5,2009,14,19,200905,2009),('2009-05-15',200920,5,2009,15,19,200905,2009),('2009-05-16',200920,5,2009,16,19,200905,2009),('2009-05-17',200921,5,2009,17,20,200905,2009),('2009-05-18',200921,5,2009,18,20,200905,2009),('2009-05-19',200921,5,2009,19,20,200905,2009),('2009-05-20',200921,5,2009,20,20,200905,2009),('2009-05-21',200921,5,2009,21,20,200905,2009),('2009-05-22',200921,5,2009,22,20,200905,2009),('2009-05-23',200921,5,2009,23,20,200905,2009),('2009-05-24',200922,5,2009,24,21,200905,2009),('2009-05-25',200922,5,2009,25,21,200905,2009),('2009-05-26',200922,5,2009,26,21,200905,2009),('2009-05-27',200922,5,2009,27,21,200905,2009),('2009-05-28',200922,5,2009,28,21,200905,2009),('2009-05-29',200922,5,2009,29,21,200905,2009),('2009-05-30',200922,5,2009,30,21,200905,2009),('2009-05-31',200923,5,2009,31,22,200905,2009),('2009-06-01',200923,6,2009,1,22,200906,2009),('2009-06-02',200923,6,2009,2,22,200906,2009),('2009-06-03',200923,6,2009,3,22,200906,2009),('2009-06-04',200923,6,2009,4,22,200906,2009),('2009-06-05',200923,6,2009,5,22,200906,2009),('2009-06-06',200923,6,2009,6,22,200906,2009),('2009-06-07',200924,6,2009,7,23,200906,2009),('2009-06-08',200924,6,2009,8,23,200906,2009),('2009-06-09',200924,6,2009,9,23,200906,2009),('2009-06-10',200924,6,2009,10,23,200906,2009),('2009-06-11',200924,6,2009,11,23,200906,2009),('2009-06-12',200924,6,2009,12,23,200906,2009),('2009-06-13',200924,6,2009,13,23,200906,2009),('2009-06-14',200925,6,2009,14,24,200906,2009),('2009-06-15',200925,6,2009,15,24,200906,2009),('2009-06-16',200925,6,2009,16,24,200906,2009),('2009-06-17',200925,6,2009,17,24,200906,2009),('2009-06-18',200925,6,2009,18,24,200906,2009),('2009-06-19',200925,6,2009,19,24,200906,2009),('2009-06-20',200925,6,2009,20,24,200906,2009),('2009-06-21',200926,6,2009,21,25,200906,2009),('2009-06-22',200926,6,2009,22,25,200906,2009),('2009-06-23',200926,6,2009,23,25,200906,2009),('2009-06-24',200926,6,2009,24,25,200906,2009),('2009-06-25',200926,6,2009,25,25,200906,2009),('2009-06-26',200926,6,2009,26,25,200906,2009),('2009-06-27',200926,6,2009,27,25,200906,2009),('2009-06-28',200927,6,2009,28,26,200906,2009),('2009-06-29',200927,6,2009,29,26,200906,2009),('2009-06-30',200927,6,2009,30,26,200906,2009),('2009-07-01',200927,7,2009,1,26,200907,2009),('2009-07-02',200927,7,2009,2,26,200907,2009),('2009-07-03',200927,7,2009,3,26,200907,2009),('2009-07-04',200927,7,2009,4,26,200907,2009),('2009-07-05',200928,7,2009,5,27,200907,2009),('2009-07-06',200928,7,2009,6,27,200907,2009),('2009-07-07',200928,7,2009,7,27,200907,2009),('2009-07-08',200928,7,2009,8,27,200907,2009),('2009-07-09',200928,7,2009,9,27,200907,2009),('2009-07-10',200928,7,2009,10,27,200907,2009),('2009-07-11',200928,7,2009,11,27,200907,2009),('2009-07-12',200929,7,2009,12,28,200907,2009),('2009-07-13',200929,7,2009,13,28,200907,2009),('2009-07-14',200929,7,2009,14,28,200907,2009),('2009-07-15',200929,7,2009,15,28,200907,2009),('2009-07-16',200929,7,2009,16,28,200907,2009),('2009-07-17',200929,7,2009,17,28,200907,2009),('2009-07-18',200929,7,2009,18,28,200907,2009),('2009-07-19',200930,7,2009,19,29,200907,2009),('2009-07-20',200930,7,2009,20,29,200907,2009),('2009-07-21',200930,7,2009,21,29,200907,2009),('2009-07-22',200930,7,2009,22,29,200907,2009),('2009-07-23',200930,7,2009,23,29,200907,2009),('2009-07-24',200930,7,2009,24,29,200907,2009),('2009-07-25',200930,7,2009,25,29,200907,2009),('2009-07-26',200931,7,2009,26,30,200907,2009),('2009-07-27',200931,7,2009,27,30,200907,2009),('2009-07-28',200931,7,2009,28,30,200907,2009),('2009-07-29',200931,7,2009,29,30,200907,2009),('2009-07-30',200931,7,2009,30,30,200907,2009),('2009-07-31',200931,7,2009,31,30,200907,2009),('2009-08-01',200931,8,2009,1,30,200908,2009),('2009-08-02',200932,8,2009,2,31,200908,2009),('2009-08-03',200932,8,2009,3,31,200908,2009),('2009-08-04',200932,8,2009,4,31,200908,2009),('2009-08-05',200932,8,2009,5,31,200908,2009),('2009-08-06',200932,8,2009,6,31,200908,2009),('2009-08-07',200932,8,2009,7,31,200908,2009),('2009-08-08',200932,8,2009,8,31,200908,2009),('2009-08-09',200933,8,2009,9,32,200908,2009),('2009-08-10',200933,8,2009,10,32,200908,2009),('2009-08-11',200933,8,2009,11,32,200908,2009),('2009-08-12',200933,8,2009,12,32,200908,2009),('2009-08-13',200933,8,2009,13,32,200908,2009),('2009-08-14',200933,8,2009,14,32,200908,2009),('2009-08-15',200933,8,2009,15,32,200908,2009),('2009-08-16',200934,8,2009,16,33,200908,2009),('2009-08-17',200934,8,2009,17,33,200908,2009),('2009-08-18',200934,8,2009,18,33,200908,2009),('2009-08-19',200934,8,2009,19,33,200908,2009),('2009-08-20',200934,8,2009,20,33,200908,2009),('2009-08-21',200934,8,2009,21,33,200908,2009),('2009-08-22',200934,8,2009,22,33,200908,2009),('2009-08-23',200935,8,2009,23,34,200908,2009),('2009-08-24',200935,8,2009,24,34,200908,2009),('2009-08-25',200935,8,2009,25,34,200908,2009),('2009-08-26',200935,8,2009,26,34,200908,2009),('2009-08-27',200935,8,2009,27,34,200908,2009),('2009-08-28',200935,8,2009,28,34,200908,2009),('2009-08-29',200935,8,2009,29,34,200908,2009),('2009-08-30',200936,8,2009,30,35,200908,2009),('2009-08-31',200936,8,2009,31,35,200908,2009),('2009-09-01',200936,9,2009,1,35,200909,2009),('2009-09-02',200936,9,2009,2,35,200909,2009),('2009-09-03',200936,9,2009,3,35,200909,2009),('2009-09-04',200936,9,2009,4,35,200909,2009),('2009-09-05',200936,9,2009,5,35,200909,2009),('2009-09-06',200937,9,2009,6,36,200909,2009),('2009-09-07',200937,9,2009,7,36,200909,2009),('2009-09-08',200937,9,2009,8,36,200909,2009),('2009-09-09',200937,9,2009,9,36,200909,2009),('2009-09-10',200937,9,2009,10,36,200909,2009),('2009-09-11',200937,9,2009,11,36,200909,2009),('2009-09-12',200937,9,2009,12,36,200909,2009),('2009-09-13',200938,9,2009,13,37,200909,2009),('2009-09-14',200938,9,2009,14,37,200909,2009),('2009-09-15',200938,9,2009,15,37,200909,2009),('2009-09-16',200938,9,2009,16,37,200909,2009),('2009-09-17',200938,9,2009,17,37,200909,2009),('2009-09-18',200938,9,2009,18,37,200909,2009),('2009-09-19',200938,9,2009,19,37,200909,2009),('2009-09-20',200939,9,2009,20,38,200909,2009),('2009-09-21',200939,9,2009,21,38,200909,2009),('2009-09-22',200939,9,2009,22,38,200909,2009),('2009-09-23',200939,9,2009,23,38,200909,2009),('2009-09-24',200939,9,2009,24,38,200909,2009),('2009-09-25',200939,9,2009,25,38,200909,2009),('2009-09-26',200939,9,2009,26,38,200909,2009),('2009-09-27',200940,9,2009,27,39,200909,2009),('2009-09-28',200940,9,2009,28,39,200909,2009),('2009-09-29',200940,9,2009,29,39,200909,2009),('2009-09-30',200940,9,2009,30,39,200909,2009),('2009-10-01',200940,10,2009,1,39,200910,2009),('2009-10-02',200940,10,2009,2,39,200910,2009),('2009-10-03',200940,10,2009,3,39,200910,2009),('2009-10-04',200941,10,2009,4,40,200910,2009),('2009-10-05',200941,10,2009,5,40,200910,2009),('2009-10-06',200941,10,2009,6,40,200910,2009),('2009-10-07',200941,10,2009,7,40,200910,2009),('2009-10-08',200941,10,2009,8,40,200910,2009),('2009-10-09',200941,10,2009,9,40,200910,2009),('2009-10-10',200941,10,2009,10,40,200910,2009),('2009-10-11',200942,10,2009,11,41,200910,2009),('2009-10-12',200942,10,2009,12,41,200910,2009),('2009-10-13',200942,10,2009,13,41,200910,2009),('2009-10-14',200942,10,2009,14,41,200910,2009),('2009-10-15',200942,10,2009,15,41,200910,2009),('2009-10-16',200942,10,2009,16,41,200910,2009),('2009-10-17',200942,10,2009,17,41,200910,2009),('2009-10-18',200943,10,2009,18,42,200910,2009),('2009-10-19',200943,10,2009,19,42,200910,2009),('2009-10-20',200943,10,2009,20,42,200910,2009),('2009-10-21',200943,10,2009,21,42,200910,2009),('2009-10-22',200943,10,2009,22,42,200910,2009),('2009-10-23',200943,10,2009,23,42,200910,2009),('2009-10-24',200943,10,2009,24,42,200910,2009),('2009-10-25',200944,10,2009,25,43,200910,2009),('2009-10-26',200944,10,2009,26,43,200910,2009),('2009-10-27',200944,10,2009,27,43,200910,2009),('2009-10-28',200944,10,2009,28,43,200910,2009),('2009-10-29',200944,10,2009,29,43,200910,2009),('2009-10-30',200944,10,2009,30,43,200910,2009),('2009-10-31',200944,10,2009,31,43,200910,2009),('2009-11-01',200945,11,2009,1,44,200911,2009),('2009-11-02',200945,11,2009,2,44,200911,2009),('2009-11-03',200945,11,2009,3,44,200911,2009),('2009-11-04',200945,11,2009,4,44,200911,2009),('2009-11-05',200945,11,2009,5,44,200911,2009),('2009-11-06',200945,11,2009,6,44,200911,2009),('2009-11-07',200945,11,2009,7,44,200911,2009),('2009-11-08',200946,11,2009,8,45,200911,2009),('2009-11-09',200946,11,2009,9,45,200911,2009),('2009-11-10',200946,11,2009,10,45,200911,2009),('2009-11-11',200946,11,2009,11,45,200911,2009),('2009-11-12',200946,11,2009,12,45,200911,2009),('2009-11-13',200946,11,2009,13,45,200911,2009),('2009-11-14',200946,11,2009,14,45,200911,2009),('2009-11-15',200947,11,2009,15,46,200911,2009),('2009-11-16',200947,11,2009,16,46,200911,2009),('2009-11-17',200947,11,2009,17,46,200911,2009),('2009-11-18',200947,11,2009,18,46,200911,2009),('2009-11-19',200947,11,2009,19,46,200911,2009),('2009-11-20',200947,11,2009,20,46,200911,2009),('2009-11-21',200947,11,2009,21,46,200911,2009),('2009-11-22',200948,11,2009,22,47,200911,2009),('2009-11-23',200948,11,2009,23,47,200911,2009),('2009-11-24',200948,11,2009,24,47,200911,2009),('2009-11-25',200948,11,2009,25,47,200911,2009),('2009-11-26',200948,11,2009,26,47,200911,2009),('2009-11-27',200948,11,2009,27,47,200911,2009),('2009-11-28',200948,11,2009,28,47,200911,2009),('2009-11-29',200949,11,2009,29,48,200911,2009),('2009-11-30',200949,11,2009,30,48,200911,2009),('2009-12-01',200949,12,2009,1,48,200912,2010),('2009-12-02',200949,12,2009,2,48,200912,2010),('2009-12-03',200949,12,2009,3,48,200912,2010),('2009-12-04',200949,12,2009,4,48,200912,2010),('2009-12-05',200949,12,2009,5,48,200912,2010),('2009-12-06',200950,12,2009,6,49,200912,2010),('2009-12-07',200950,12,2009,7,49,200912,2010),('2009-12-08',200950,12,2009,8,49,200912,2010),('2009-12-09',200950,12,2009,9,49,200912,2010),('2009-12-10',200950,12,2009,10,49,200912,2010),('2009-12-11',200950,12,2009,11,49,200912,2010),('2009-12-12',200950,12,2009,12,49,200912,2010),('2009-12-13',200951,12,2009,13,50,200912,2010),('2009-12-14',200951,12,2009,14,50,200912,2010),('2009-12-15',200951,12,2009,15,50,200912,2010),('2009-12-16',200951,12,2009,16,50,200912,2010),('2009-12-17',200951,12,2009,17,50,200912,2010),('2009-12-18',200951,12,2009,18,50,200912,2010),('2009-12-19',200951,12,2009,19,50,200912,2010),('2009-12-20',200952,12,2009,20,51,200912,2010),('2009-12-21',200952,12,2009,21,51,200912,2010),('2009-12-22',200952,12,2009,22,51,200912,2010),('2009-12-23',200952,12,2009,23,51,200912,2010),('2009-12-24',200952,12,2009,24,51,200912,2010),('2009-12-25',200952,12,2009,25,51,200912,2010),('2009-12-26',200952,12,2009,26,51,200912,2010),('2009-12-27',200953,12,2009,27,52,200912,2010),('2009-12-28',200952,12,2009,28,52,200912,2010),('2009-12-29',200952,12,2009,29,52,200912,2010),('2009-12-30',200952,12,2009,30,52,200912,2010),('2009-12-31',200952,12,2009,31,52,200912,2010),('2010-01-01',201001,1,2010,1,52,201001,2010),('2010-01-02',201001,1,2010,2,52,201001,2010),('2010-01-03',201002,1,2010,3,1,201001,2010),('2010-01-04',201001,1,2010,4,1,201001,2010),('2010-01-05',201001,1,2010,5,1,201001,2010),('2010-01-06',201001,1,2010,6,1,201001,2010),('2010-01-07',201001,1,2010,7,1,201001,2010),('2010-01-08',201001,1,2010,8,1,201001,2010),('2010-01-09',201001,1,2010,9,1,201001,2010),('2010-01-10',201002,1,2010,10,2,201001,2010),('2010-01-11',201002,1,2010,11,2,201001,2010),('2010-01-12',201002,1,2010,12,2,201001,2010),('2010-01-13',201002,1,2010,13,2,201001,2010),('2010-01-14',201002,1,2010,14,2,201001,2010),('2010-01-15',201002,1,2010,15,2,201001,2010),('2010-01-16',201002,1,2010,16,2,201001,2010),('2010-01-17',201003,1,2010,17,3,201001,2010),('2010-01-18',201003,1,2010,18,3,201001,2010),('2010-01-19',201003,1,2010,19,3,201001,2010),('2010-01-20',201003,1,2010,20,3,201001,2010),('2010-01-21',201003,1,2010,21,3,201001,2010),('2010-01-22',201003,1,2010,22,3,201001,2010),('2010-01-23',201003,1,2010,23,3,201001,2010),('2010-01-24',201004,1,2010,24,4,201001,2010),('2010-01-25',201004,1,2010,25,4,201001,2010),('2010-01-26',201004,1,2010,26,4,201001,2010),('2010-01-27',201004,1,2010,27,4,201001,2010),('2010-01-28',201004,1,2010,28,4,201001,2010),('2010-01-29',201004,1,2010,29,4,201001,2010),('2010-01-30',201004,1,2010,30,4,201001,2010),('2010-01-31',201005,1,2010,31,5,201001,2010),('2010-02-01',201005,2,2010,1,5,201002,2010),('2010-02-02',201005,2,2010,2,5,201002,2010),('2010-02-03',201005,2,2010,3,5,201002,2010),('2010-02-04',201005,2,2010,4,5,201002,2010),('2010-02-05',201005,2,2010,5,5,201002,2010),('2010-02-06',201005,2,2010,6,5,201002,2010),('2010-02-07',201006,2,2010,7,6,201002,2010),('2010-02-08',201006,2,2010,8,6,201002,2010),('2010-02-09',201006,2,2010,9,6,201002,2010),('2010-02-10',201006,2,2010,10,6,201002,2010),('2010-02-11',201006,2,2010,11,6,201002,2010),('2010-02-12',201006,2,2010,12,6,201002,2010),('2010-02-13',201006,2,2010,13,6,201002,2010),('2010-02-14',201007,2,2010,14,7,201002,2010),('2010-02-15',201007,2,2010,15,7,201002,2010),('2010-02-16',201007,2,2010,16,7,201002,2010),('2010-02-17',201007,2,2010,17,7,201002,2010),('2010-02-18',201007,2,2010,18,7,201002,2010),('2010-02-19',201007,2,2010,19,7,201002,2010),('2010-02-20',201007,2,2010,20,7,201002,2010),('2010-02-21',201008,2,2010,21,8,201002,2010),('2010-02-22',201008,2,2010,22,8,201002,2010),('2010-02-23',201008,2,2010,23,8,201002,2010),('2010-02-24',201008,2,2010,24,8,201002,2010),('2010-02-25',201008,2,2010,25,8,201002,2010),('2010-02-26',201008,2,2010,26,8,201002,2010),('2010-02-27',201008,2,2010,27,8,201002,2010),('2010-02-28',201009,2,2010,28,9,201002,2010),('2010-03-01',201009,3,2010,1,9,201003,2010),('2010-03-02',201009,3,2010,2,9,201003,2010),('2010-03-03',201009,3,2010,3,9,201003,2010),('2010-03-04',201009,3,2010,4,9,201003,2010),('2010-03-05',201009,3,2010,5,9,201003,2010),('2010-03-06',201009,3,2010,6,9,201003,2010),('2010-03-07',201010,3,2010,7,10,201003,2010),('2010-03-08',201010,3,2010,8,10,201003,2010),('2010-03-09',201010,3,2010,9,10,201003,2010),('2010-03-10',201010,3,2010,10,10,201003,2010),('2010-03-11',201010,3,2010,11,10,201003,2010),('2010-03-12',201010,3,2010,12,10,201003,2010),('2010-03-13',201010,3,2010,13,10,201003,2010),('2010-03-14',201011,3,2010,14,11,201003,2010),('2010-03-15',201011,3,2010,15,11,201003,2010),('2010-03-16',201011,3,2010,16,11,201003,2010),('2010-03-17',201011,3,2010,17,11,201003,2010),('2010-03-18',201011,3,2010,18,11,201003,2010),('2010-03-19',201011,3,2010,19,11,201003,2010),('2010-03-20',201011,3,2010,20,11,201003,2010),('2010-03-21',201012,3,2010,21,12,201003,2010),('2010-03-22',201012,3,2010,22,12,201003,2010),('2010-03-23',201012,3,2010,23,12,201003,2010),('2010-03-24',201012,3,2010,24,12,201003,2010),('2010-03-25',201012,3,2010,25,12,201003,2010),('2010-03-26',201012,3,2010,26,12,201003,2010),('2010-03-27',201012,3,2010,27,12,201003,2010),('2010-03-28',201013,3,2010,28,13,201003,2010),('2010-03-29',201013,3,2010,29,13,201003,2010),('2010-03-30',201013,3,2010,30,13,201003,2010),('2010-03-31',201013,3,2010,31,13,201003,2010),('2010-04-01',201013,4,2010,1,13,201004,2010),('2010-04-02',201013,4,2010,2,13,201004,2010),('2010-04-03',201013,4,2010,3,13,201004,2010),('2010-04-04',201014,4,2010,4,14,201004,2010),('2010-04-05',201014,4,2010,5,14,201004,2010),('2010-04-06',201014,4,2010,6,14,201004,2010),('2010-04-07',201014,4,2010,7,14,201004,2010),('2010-04-08',201014,4,2010,8,14,201004,2010),('2010-04-09',201014,4,2010,9,14,201004,2010),('2010-04-10',201014,4,2010,10,14,201004,2010),('2010-04-11',201015,4,2010,11,15,201004,2010),('2010-04-12',201015,4,2010,12,15,201004,2010),('2010-04-13',201015,4,2010,13,15,201004,2010),('2010-04-14',201015,4,2010,14,15,201004,2010),('2010-04-15',201015,4,2010,15,15,201004,2010),('2010-04-16',201015,4,2010,16,15,201004,2010),('2010-04-17',201015,4,2010,17,15,201004,2010),('2010-04-18',201016,4,2010,18,16,201004,2010),('2010-04-19',201016,4,2010,19,16,201004,2010),('2010-04-20',201016,4,2010,20,16,201004,2010),('2010-04-21',201016,4,2010,21,16,201004,2010),('2010-04-22',201016,4,2010,22,16,201004,2010),('2010-04-23',201016,4,2010,23,16,201004,2010),('2010-04-24',201016,4,2010,24,16,201004,2010),('2010-04-25',201017,4,2010,25,17,201004,2010),('2010-04-26',201017,4,2010,26,17,201004,2010),('2010-04-27',201017,4,2010,27,17,201004,2010),('2010-04-28',201017,4,2010,28,17,201004,2010),('2010-04-29',201017,4,2010,29,17,201004,2010),('2010-04-30',201017,4,2010,30,17,201004,2010),('2010-05-01',201017,5,2010,1,17,201005,2010),('2010-05-02',201018,5,2010,2,18,201005,2010),('2010-05-03',201018,5,2010,3,18,201005,2010),('2010-05-04',201018,5,2010,4,18,201005,2010),('2010-05-05',201018,5,2010,5,18,201005,2010),('2010-05-06',201018,5,2010,6,18,201005,2010),('2010-05-07',201018,5,2010,7,18,201005,2010),('2010-05-08',201018,5,2010,8,18,201005,2010),('2010-05-09',201019,5,2010,9,19,201005,2010),('2010-05-10',201019,5,2010,10,19,201005,2010),('2010-05-11',201019,5,2010,11,19,201005,2010),('2010-05-12',201019,5,2010,12,19,201005,2010),('2010-05-13',201019,5,2010,13,19,201005,2010),('2010-05-14',201019,5,2010,14,19,201005,2010),('2010-05-15',201019,5,2010,15,19,201005,2010),('2010-05-16',201020,5,2010,16,20,201005,2010),('2010-05-17',201020,5,2010,17,20,201005,2010),('2010-05-18',201020,5,2010,18,20,201005,2010),('2010-05-19',201020,5,2010,19,20,201005,2010),('2010-05-20',201020,5,2010,20,20,201005,2010),('2010-05-21',201020,5,2010,21,20,201005,2010),('2010-05-22',201020,5,2010,22,20,201005,2010),('2010-05-23',201021,5,2010,23,21,201005,2010),('2010-05-24',201021,5,2010,24,21,201005,2010),('2010-05-25',201021,5,2010,25,21,201005,2010),('2010-05-26',201021,5,2010,26,21,201005,2010),('2010-05-27',201021,5,2010,27,21,201005,2010),('2010-05-28',201021,5,2010,28,21,201005,2010),('2010-05-29',201021,5,2010,29,21,201005,2010),('2010-05-30',201022,5,2010,30,22,201005,2010),('2010-05-31',201022,5,2010,31,22,201005,2010),('2010-06-01',201022,6,2010,1,22,201006,2010),('2010-06-02',201022,6,2010,2,22,201006,2010),('2010-06-03',201022,6,2010,3,22,201006,2010),('2010-06-04',201022,6,2010,4,22,201006,2010),('2010-06-05',201022,6,2010,5,22,201006,2010),('2010-06-06',201023,6,2010,6,23,201006,2010),('2010-06-07',201023,6,2010,7,23,201006,2010),('2010-06-08',201023,6,2010,8,23,201006,2010),('2010-06-09',201023,6,2010,9,23,201006,2010),('2010-06-10',201023,6,2010,10,23,201006,2010),('2010-06-11',201023,6,2010,11,23,201006,2010),('2010-06-12',201023,6,2010,12,23,201006,2010),('2010-06-13',201024,6,2010,13,24,201006,2010),('2010-06-14',201024,6,2010,14,24,201006,2010),('2010-06-15',201024,6,2010,15,24,201006,2010),('2010-06-16',201024,6,2010,16,24,201006,2010),('2010-06-17',201024,6,2010,17,24,201006,2010),('2010-06-18',201024,6,2010,18,24,201006,2010),('2010-06-19',201024,6,2010,19,24,201006,2010),('2010-06-20',201025,6,2010,20,25,201006,2010),('2010-06-21',201025,6,2010,21,25,201006,2010),('2010-06-22',201025,6,2010,22,25,201006,2010),('2010-06-23',201025,6,2010,23,25,201006,2010),('2010-06-24',201025,6,2010,24,25,201006,2010),('2010-06-25',201025,6,2010,25,25,201006,2010),('2010-06-26',201025,6,2010,26,25,201006,2010),('2010-06-27',201026,6,2010,27,26,201006,2010),('2010-06-28',201026,6,2010,28,26,201006,2010),('2010-06-29',201026,6,2010,29,26,201006,2010),('2010-06-30',201026,6,2010,30,26,201006,2010),('2010-07-01',201026,7,2010,1,26,201007,2010),('2010-07-02',201026,7,2010,2,26,201007,2010),('2010-07-03',201026,7,2010,3,26,201007,2010),('2010-07-04',201027,7,2010,4,27,201007,2010),('2010-07-05',201027,7,2010,5,27,201007,2010),('2010-07-06',201027,7,2010,6,27,201007,2010),('2010-07-07',201027,7,2010,7,27,201007,2010),('2010-07-08',201027,7,2010,8,27,201007,2010),('2010-07-09',201027,7,2010,9,27,201007,2010),('2010-07-10',201027,7,2010,10,27,201007,2010),('2010-07-11',201028,7,2010,11,28,201007,2010),('2010-07-12',201028,7,2010,12,28,201007,2010),('2010-07-13',201028,7,2010,13,28,201007,2010),('2010-07-14',201028,7,2010,14,28,201007,2010),('2010-07-15',201028,7,2010,15,28,201007,2010),('2010-07-16',201028,7,2010,16,28,201007,2010),('2010-07-17',201028,7,2010,17,28,201007,2010),('2010-07-18',201029,7,2010,18,29,201007,2010),('2010-07-19',201029,7,2010,19,29,201007,2010),('2010-07-20',201029,7,2010,20,29,201007,2010),('2010-07-21',201029,7,2010,21,29,201007,2010),('2010-07-22',201029,7,2010,22,29,201007,2010),('2010-07-23',201029,7,2010,23,29,201007,2010),('2010-07-24',201029,7,2010,24,29,201007,2010),('2010-07-25',201030,7,2010,25,30,201007,2010),('2010-07-26',201030,7,2010,26,30,201007,2010),('2010-07-27',201030,7,2010,27,30,201007,2010),('2010-07-28',201030,7,2010,28,30,201007,2010),('2010-07-29',201030,7,2010,29,30,201007,2010),('2010-07-30',201030,7,2010,30,30,201007,2010),('2010-07-31',201030,7,2010,31,30,201007,2010),('2010-08-01',201031,8,2010,1,31,201008,2010),('2010-08-02',201031,8,2010,2,31,201008,2010),('2010-08-03',201031,8,2010,3,31,201008,2010),('2010-08-04',201031,8,2010,4,31,201008,2010),('2010-08-05',201031,8,2010,5,31,201008,2010),('2010-08-06',201031,8,2010,6,31,201008,2010),('2010-08-07',201031,8,2010,7,31,201008,2010),('2010-08-08',201032,8,2010,8,32,201008,2010),('2010-08-09',201032,8,2010,9,32,201008,2010),('2010-08-10',201032,8,2010,10,32,201008,2010),('2010-08-11',201032,8,2010,11,32,201008,2010),('2010-08-12',201032,8,2010,12,32,201008,2010),('2010-08-13',201032,8,2010,13,32,201008,2010),('2010-08-14',201032,8,2010,14,32,201008,2010),('2010-08-15',201033,8,2010,15,33,201008,2010),('2010-08-16',201033,8,2010,16,33,201008,2010),('2010-08-17',201033,8,2010,17,33,201008,2010),('2010-08-18',201033,8,2010,18,33,201008,2010),('2010-08-19',201033,8,2010,19,33,201008,2010),('2010-08-20',201033,8,2010,20,33,201008,2010),('2010-08-21',201033,8,2010,21,33,201008,2010),('2010-08-22',201034,8,2010,22,34,201008,2010),('2010-08-23',201034,8,2010,23,34,201008,2010),('2010-08-24',201034,8,2010,24,34,201008,2010),('2010-08-25',201034,8,2010,25,34,201008,2010),('2010-08-26',201034,8,2010,26,34,201008,2010),('2010-08-27',201034,8,2010,27,34,201008,2010),('2010-08-28',201034,8,2010,28,34,201008,2010),('2010-08-29',201035,8,2010,29,35,201008,2010),('2010-08-30',201035,8,2010,30,35,201008,2010),('2010-08-31',201035,8,2010,31,35,201008,2010),('2010-09-01',201035,9,2010,1,35,201009,2010),('2010-09-02',201035,9,2010,2,35,201009,2010),('2010-09-03',201035,9,2010,3,35,201009,2010),('2010-09-04',201035,9,2010,4,35,201009,2010),('2010-09-05',201036,9,2010,5,36,201009,2010),('2010-09-06',201036,9,2010,6,36,201009,2010),('2010-09-07',201036,9,2010,7,36,201009,2010),('2010-09-08',201036,9,2010,8,36,201009,2010),('2010-09-09',201036,9,2010,9,36,201009,2010),('2010-09-10',201036,9,2010,10,36,201009,2010),('2010-09-11',201036,9,2010,11,36,201009,2010),('2010-09-12',201037,9,2010,12,37,201009,2010),('2010-09-13',201037,9,2010,13,37,201009,2010),('2010-09-14',201037,9,2010,14,37,201009,2010),('2010-09-15',201037,9,2010,15,37,201009,2010),('2010-09-16',201037,9,2010,16,37,201009,2010),('2010-09-17',201037,9,2010,17,37,201009,2010),('2010-09-18',201037,9,2010,18,37,201009,2010),('2010-09-19',201038,9,2010,19,38,201009,2010),('2010-09-20',201038,9,2010,20,38,201009,2010),('2010-09-21',201038,9,2010,21,38,201009,2010),('2010-09-22',201038,9,2010,22,38,201009,2010),('2010-09-23',201038,9,2010,23,38,201009,2010),('2010-09-24',201038,9,2010,24,38,201009,2010),('2010-09-25',201038,9,2010,25,38,201009,2010),('2010-09-26',201039,9,2010,26,39,201009,2010),('2010-09-27',201039,9,2010,27,39,201009,2010),('2010-09-28',201039,9,2010,28,39,201009,2010),('2010-09-29',201039,9,2010,29,39,201009,2010),('2010-09-30',201039,9,2010,30,39,201009,2010),('2010-10-01',201039,10,2010,1,39,201010,2010),('2010-10-02',201039,10,2010,2,39,201010,2010),('2010-10-03',201040,10,2010,3,40,201010,2010),('2010-10-04',201040,10,2010,4,40,201010,2010),('2010-10-05',201040,10,2010,5,40,201010,2010),('2010-10-06',201040,10,2010,6,40,201010,2010),('2010-10-07',201040,10,2010,7,40,201010,2010),('2010-10-08',201040,10,2010,8,40,201010,2010),('2010-10-09',201040,10,2010,9,40,201010,2010),('2010-10-10',201041,10,2010,10,41,201010,2010),('2010-10-11',201041,10,2010,11,41,201010,2010),('2010-10-12',201041,10,2010,12,41,201010,2010),('2010-10-13',201041,10,2010,13,41,201010,2010),('2010-10-14',201041,10,2010,14,41,201010,2010),('2010-10-15',201041,10,2010,15,41,201010,2010),('2010-10-16',201041,10,2010,16,41,201010,2010),('2010-10-17',201042,10,2010,17,42,201010,2010),('2010-10-18',201042,10,2010,18,42,201010,2010),('2010-10-19',201042,10,2010,19,42,201010,2010),('2010-10-20',201042,10,2010,20,42,201010,2010),('2010-10-21',201042,10,2010,21,42,201010,2010),('2010-10-22',201042,10,2010,22,42,201010,2010),('2010-10-23',201042,10,2010,23,42,201010,2010),('2010-10-24',201043,10,2010,24,43,201010,2010),('2010-10-25',201043,10,2010,25,43,201010,2010),('2010-10-26',201043,10,2010,26,43,201010,2010),('2010-10-27',201043,10,2010,27,43,201010,2010),('2010-10-28',201043,10,2010,28,43,201010,2010),('2010-10-29',201043,10,2010,29,43,201010,2010),('2010-10-30',201043,10,2010,30,43,201010,2010),('2010-10-31',201044,10,2010,31,44,201010,2010),('2010-11-01',201044,11,2010,1,44,201011,2010),('2010-11-02',201044,11,2010,2,44,201011,2010),('2010-11-03',201044,11,2010,3,44,201011,2010),('2010-11-04',201044,11,2010,4,44,201011,2010),('2010-11-05',201044,11,2010,5,44,201011,2010),('2010-11-06',201044,11,2010,6,44,201011,2010),('2010-11-07',201045,11,2010,7,45,201011,2010),('2010-11-08',201045,11,2010,8,45,201011,2010),('2010-11-09',201045,11,2010,9,45,201011,2010),('2010-11-10',201045,11,2010,10,45,201011,2010),('2010-11-11',201045,11,2010,11,45,201011,2010),('2010-11-12',201045,11,2010,12,45,201011,2010),('2010-11-13',201045,11,2010,13,45,201011,2010),('2010-11-14',201046,11,2010,14,46,201011,2010),('2010-11-15',201046,11,2010,15,46,201011,2010),('2010-11-16',201046,11,2010,16,46,201011,2010),('2010-11-17',201046,11,2010,17,46,201011,2010),('2010-11-18',201046,11,2010,18,46,201011,2010),('2010-11-19',201046,11,2010,19,46,201011,2010),('2010-11-20',201046,11,2010,20,46,201011,2010),('2010-11-21',201047,11,2010,21,47,201011,2010),('2010-11-22',201047,11,2010,22,47,201011,2010),('2010-11-23',201047,11,2010,23,47,201011,2010),('2010-11-24',201047,11,2010,24,47,201011,2010),('2010-11-25',201047,11,2010,25,47,201011,2010),('2010-11-26',201047,11,2010,26,47,201011,2010),('2010-11-27',201047,11,2010,27,47,201011,2010),('2010-11-28',201048,11,2010,28,48,201011,2010),('2010-11-29',201048,11,2010,29,48,201011,2010),('2010-11-30',201048,11,2010,30,48,201011,2010),('2010-12-01',201048,12,2010,1,48,201012,2011),('2010-12-02',201048,12,2010,2,48,201012,2011),('2010-12-03',201048,12,2010,3,48,201012,2011),('2010-12-04',201048,12,2010,4,48,201012,2011),('2010-12-05',201049,12,2010,5,49,201012,2011),('2010-12-06',201049,12,2010,6,49,201012,2011),('2010-12-07',201049,12,2010,7,49,201012,2011),('2010-12-08',201049,12,2010,8,49,201012,2011),('2010-12-09',201049,12,2010,9,49,201012,2011),('2010-12-10',201049,12,2010,10,49,201012,2011),('2010-12-11',201049,12,2010,11,49,201012,2011),('2010-12-12',201050,12,2010,12,50,201012,2011),('2010-12-13',201050,12,2010,13,50,201012,2011),('2010-12-14',201050,12,2010,14,50,201012,2011),('2010-12-15',201050,12,2010,15,50,201012,2011),('2010-12-16',201050,12,2010,16,50,201012,2011),('2010-12-17',201050,12,2010,17,50,201012,2011),('2010-12-18',201050,12,2010,18,50,201012,2011),('2010-12-19',201051,12,2010,19,51,201012,2011),('2010-12-20',201051,12,2010,20,51,201012,2011),('2010-12-21',201051,12,2010,21,51,201012,2011),('2010-12-22',201051,12,2010,22,51,201012,2011),('2010-12-23',201051,12,2010,23,51,201012,2011),('2010-12-24',201051,12,2010,24,51,201012,2011),('2010-12-25',201051,12,2010,25,51,201012,2011),('2010-12-26',201052,12,2010,26,52,201012,2011),('2010-12-27',201052,12,2010,27,52,201012,2011),('2010-12-28',201052,12,2010,28,52,201012,2011),('2010-12-29',201052,12,2010,29,52,201012,2011),('2010-12-30',201052,12,2010,30,52,201012,2011),('2010-12-31',201052,12,2010,31,52,201012,2011),('2011-01-01',201052,1,2011,1,52,201101,2011),('2011-01-02',201053,1,2011,2,1,201101,2011),('2011-01-03',201101,1,2011,3,1,201101,2011),('2011-01-04',201101,1,2011,4,1,201101,2011),('2011-01-05',201101,1,2011,5,1,201101,2011),('2011-01-06',201101,1,2011,6,1,201101,2011),('2011-01-07',201101,1,2011,7,1,201101,2011),('2011-01-08',201101,1,2011,8,1,201101,2011),('2011-01-09',201102,1,2011,9,2,201101,2011),('2011-01-10',201102,1,2011,10,2,201101,2011),('2011-01-11',201102,1,2011,11,2,201101,2011),('2011-01-12',201102,1,2011,12,2,201101,2011),('2011-01-13',201102,1,2011,13,2,201101,2011),('2011-01-14',201102,1,2011,14,2,201101,2011),('2011-01-15',201102,1,2011,15,2,201101,2011),('2011-01-16',201103,1,2011,16,3,201101,2011),('2011-01-17',201103,1,2011,17,3,201101,2011),('2011-01-18',201103,1,2011,18,3,201101,2011),('2011-01-19',201103,1,2011,19,3,201101,2011),('2011-01-20',201103,1,2011,20,3,201101,2011),('2011-01-21',201103,1,2011,21,3,201101,2011),('2011-01-22',201103,1,2011,22,3,201101,2011),('2011-01-23',201104,1,2011,23,4,201101,2011),('2011-01-24',201104,1,2011,24,4,201101,2011),('2011-01-25',201104,1,2011,25,4,201101,2011),('2011-01-26',201104,1,2011,26,4,201101,2011),('2011-01-27',201104,1,2011,27,4,201101,2011),('2011-01-28',201104,1,2011,28,4,201101,2011),('2011-01-29',201104,1,2011,29,4,201101,2011),('2011-01-30',201105,1,2011,30,5,201101,2011),('2011-01-31',201105,1,2011,31,5,201101,2011),('2011-02-01',201105,2,2011,1,5,201102,2011),('2011-02-02',201105,2,2011,2,5,201102,2011),('2011-02-03',201105,2,2011,3,5,201102,2011),('2011-02-04',201105,2,2011,4,5,201102,2011),('2011-02-05',201105,2,2011,5,5,201102,2011),('2011-02-06',201106,2,2011,6,6,201102,2011),('2011-02-07',201106,2,2011,7,6,201102,2011),('2011-02-08',201106,2,2011,8,6,201102,2011),('2011-02-09',201106,2,2011,9,6,201102,2011),('2011-02-10',201106,2,2011,10,6,201102,2011),('2011-02-11',201106,2,2011,11,6,201102,2011),('2011-02-12',201106,2,2011,12,6,201102,2011),('2011-02-13',201107,2,2011,13,7,201102,2011),('2011-02-14',201107,2,2011,14,7,201102,2011),('2011-02-15',201107,2,2011,15,7,201102,2011),('2011-02-16',201107,2,2011,16,7,201102,2011),('2011-02-17',201107,2,2011,17,7,201102,2011),('2011-02-18',201107,2,2011,18,7,201102,2011),('2011-02-19',201107,2,2011,19,7,201102,2011),('2011-02-20',201108,2,2011,20,8,201102,2011),('2011-02-21',201108,2,2011,21,8,201102,2011),('2011-02-22',201108,2,2011,22,8,201102,2011),('2011-02-23',201108,2,2011,23,8,201102,2011),('2011-02-24',201108,2,2011,24,8,201102,2011),('2011-02-25',201108,2,2011,25,8,201102,2011),('2011-02-26',201108,2,2011,26,8,201102,2011),('2011-02-27',201109,2,2011,27,9,201102,2011),('2011-02-28',201109,2,2011,28,9,201102,2011),('2011-03-01',201109,3,2011,1,9,201103,2011),('2011-03-02',201109,3,2011,2,9,201103,2011),('2011-03-03',201109,3,2011,3,9,201103,2011),('2011-03-04',201109,3,2011,4,9,201103,2011),('2011-03-05',201109,3,2011,5,9,201103,2011),('2011-03-06',201110,3,2011,6,10,201103,2011),('2011-03-07',201110,3,2011,7,10,201103,2011),('2011-03-08',201110,3,2011,8,10,201103,2011),('2011-03-09',201110,3,2011,9,10,201103,2011),('2011-03-10',201110,3,2011,10,10,201103,2011),('2011-03-11',201110,3,2011,11,10,201103,2011),('2011-03-12',201110,3,2011,12,10,201103,2011),('2011-03-13',201111,3,2011,13,11,201103,2011),('2011-03-14',201111,3,2011,14,11,201103,2011),('2011-03-15',201111,3,2011,15,11,201103,2011),('2011-03-16',201111,3,2011,16,11,201103,2011),('2011-03-17',201111,3,2011,17,11,201103,2011),('2011-03-18',201111,3,2011,18,11,201103,2011),('2011-03-19',201111,3,2011,19,11,201103,2011),('2011-03-20',201112,3,2011,20,12,201103,2011),('2011-03-21',201112,3,2011,21,12,201103,2011),('2011-03-22',201112,3,2011,22,12,201103,2011),('2011-03-23',201112,3,2011,23,12,201103,2011),('2011-03-24',201112,3,2011,24,12,201103,2011),('2011-03-25',201112,3,2011,25,12,201103,2011),('2011-03-26',201112,3,2011,26,12,201103,2011),('2011-03-27',201113,3,2011,27,13,201103,2011),('2011-03-28',201113,3,2011,28,13,201103,2011),('2011-03-29',201113,3,2011,29,13,201103,2011),('2011-03-30',201113,3,2011,30,13,201103,2011),('2011-03-31',201113,3,2011,31,13,201103,2011),('2011-04-01',201113,4,2011,1,13,201104,2011),('2011-04-02',201113,4,2011,2,13,201104,2011),('2011-04-03',201114,4,2011,3,14,201104,2011),('2011-04-04',201114,4,2011,4,14,201104,2011),('2011-04-05',201114,4,2011,5,14,201104,2011),('2011-04-06',201114,4,2011,6,14,201104,2011),('2011-04-07',201114,4,2011,7,14,201104,2011),('2011-04-08',201114,4,2011,8,14,201104,2011),('2011-04-09',201114,4,2011,9,14,201104,2011),('2011-04-10',201115,4,2011,10,15,201104,2011),('2011-04-11',201115,4,2011,11,15,201104,2011),('2011-04-12',201115,4,2011,12,15,201104,2011),('2011-04-13',201115,4,2011,13,15,201104,2011),('2011-04-14',201115,4,2011,14,15,201104,2011),('2011-04-15',201115,4,2011,15,15,201104,2011),('2011-04-16',201115,4,2011,16,15,201104,2011),('2011-04-17',201116,4,2011,17,16,201104,2011),('2011-04-18',201116,4,2011,18,16,201104,2011),('2011-04-19',201116,4,2011,19,16,201104,2011),('2011-04-20',201116,4,2011,20,16,201104,2011),('2011-04-21',201116,4,2011,21,16,201104,2011),('2011-04-22',201116,4,2011,22,16,201104,2011),('2011-04-23',201116,4,2011,23,16,201104,2011),('2011-04-24',201117,4,2011,24,17,201104,2011),('2011-04-25',201117,4,2011,25,17,201104,2011),('2011-04-26',201117,4,2011,26,17,201104,2011),('2011-04-27',201117,4,2011,27,17,201104,2011),('2011-04-28',201117,4,2011,28,17,201104,2011),('2011-04-29',201117,4,2011,29,17,201104,2011),('2011-04-30',201117,4,2011,30,17,201104,2011),('2011-05-01',201118,5,2011,1,18,201105,2011),('2011-05-02',201118,5,2011,2,18,201105,2011),('2011-05-03',201118,5,2011,3,18,201105,2011),('2011-05-04',201118,5,2011,4,18,201105,2011),('2011-05-05',201118,5,2011,5,18,201105,2011),('2011-05-06',201118,5,2011,6,18,201105,2011),('2011-05-07',201118,5,2011,7,18,201105,2011),('2011-05-08',201119,5,2011,8,19,201105,2011),('2011-05-09',201119,5,2011,9,19,201105,2011),('2011-05-10',201119,5,2011,10,19,201105,2011),('2011-05-11',201119,5,2011,11,19,201105,2011),('2011-05-12',201119,5,2011,12,19,201105,2011),('2011-05-13',201119,5,2011,13,19,201105,2011),('2011-05-14',201119,5,2011,14,19,201105,2011),('2011-05-15',201120,5,2011,15,20,201105,2011),('2011-05-16',201120,5,2011,16,20,201105,2011),('2011-05-17',201120,5,2011,17,20,201105,2011),('2011-05-18',201120,5,2011,18,20,201105,2011),('2011-05-19',201120,5,2011,19,20,201105,2011),('2011-05-20',201120,5,2011,20,20,201105,2011),('2011-05-21',201120,5,2011,21,20,201105,2011),('2011-05-22',201121,5,2011,22,21,201105,2011),('2011-05-23',201121,5,2011,23,21,201105,2011),('2011-05-24',201121,5,2011,24,21,201105,2011),('2011-05-25',201121,5,2011,25,21,201105,2011),('2011-05-26',201121,5,2011,26,21,201105,2011),('2011-05-27',201121,5,2011,27,21,201105,2011),('2011-05-28',201121,5,2011,28,21,201105,2011),('2011-05-29',201122,5,2011,29,22,201105,2011),('2011-05-30',201122,5,2011,30,22,201105,2011),('2011-05-31',201122,5,2011,31,22,201105,2011),('2011-06-01',201122,6,2011,1,22,201106,2011),('2011-06-02',201122,6,2011,2,22,201106,2011),('2011-06-03',201122,6,2011,3,22,201106,2011),('2011-06-04',201122,6,2011,4,22,201106,2011),('2011-06-05',201123,6,2011,5,23,201106,2011),('2011-06-06',201123,6,2011,6,23,201106,2011),('2011-06-07',201123,6,2011,7,23,201106,2011),('2011-06-08',201123,6,2011,8,23,201106,2011),('2011-06-09',201123,6,2011,9,23,201106,2011),('2011-06-10',201123,6,2011,10,23,201106,2011),('2011-06-11',201123,6,2011,11,23,201106,2011),('2011-06-12',201124,6,2011,12,24,201106,2011),('2011-06-13',201124,6,2011,13,24,201106,2011),('2011-06-14',201124,6,2011,14,24,201106,2011),('2011-06-15',201124,6,2011,15,24,201106,2011),('2011-06-16',201124,6,2011,16,24,201106,2011),('2011-06-17',201124,6,2011,17,24,201106,2011),('2011-06-18',201124,6,2011,18,24,201106,2011),('2011-06-19',201125,6,2011,19,25,201106,2011),('2011-06-20',201125,6,2011,20,25,201106,2011),('2011-06-21',201125,6,2011,21,25,201106,2011),('2011-06-22',201125,6,2011,22,25,201106,2011),('2011-06-23',201125,6,2011,23,25,201106,2011),('2011-06-24',201125,6,2011,24,25,201106,2011),('2011-06-25',201125,6,2011,25,25,201106,2011),('2011-06-26',201126,6,2011,26,26,201106,2011),('2011-06-27',201126,6,2011,27,26,201106,2011),('2011-06-28',201126,6,2011,28,26,201106,2011),('2011-06-29',201126,6,2011,29,26,201106,2011),('2011-06-30',201126,6,2011,30,26,201106,2011),('2011-07-01',201126,7,2011,1,26,201107,2011),('2011-07-02',201126,7,2011,2,26,201107,2011),('2011-07-03',201127,7,2011,3,27,201107,2011),('2011-07-04',201127,7,2011,4,27,201107,2011),('2011-07-05',201127,7,2011,5,27,201107,2011),('2011-07-06',201127,7,2011,6,27,201107,2011),('2011-07-07',201127,7,2011,7,27,201107,2011),('2011-07-08',201127,7,2011,8,27,201107,2011),('2011-07-09',201127,7,2011,9,27,201107,2011),('2011-07-10',201128,7,2011,10,28,201107,2011),('2011-07-11',201128,7,2011,11,28,201107,2011),('2011-07-12',201128,7,2011,12,28,201107,2011),('2011-07-13',201128,7,2011,13,28,201107,2011),('2011-07-14',201128,7,2011,14,28,201107,2011),('2011-07-15',201128,7,2011,15,28,201107,2011),('2011-07-16',201128,7,2011,16,28,201107,2011),('2011-07-17',201129,7,2011,17,29,201107,2011),('2011-07-18',201129,7,2011,18,29,201107,2011),('2011-07-19',201129,7,2011,19,29,201107,2011),('2011-07-20',201129,7,2011,20,29,201107,2011),('2011-07-21',201129,7,2011,21,29,201107,2011),('2011-07-22',201129,7,2011,22,29,201107,2011),('2011-07-23',201129,7,2011,23,29,201107,2011),('2011-07-24',201130,7,2011,24,30,201107,2011),('2011-07-25',201130,7,2011,25,30,201107,2011),('2011-07-26',201130,7,2011,26,30,201107,2011),('2011-07-27',201130,7,2011,27,30,201107,2011),('2011-07-28',201130,7,2011,28,30,201107,2011),('2011-07-29',201130,7,2011,29,30,201107,2011),('2011-07-30',201130,7,2011,30,30,201107,2011),('2011-07-31',201131,7,2011,31,31,201107,2011),('2011-08-01',201131,8,2011,1,31,201108,2011),('2011-08-02',201131,8,2011,2,31,201108,2011),('2011-08-03',201131,8,2011,3,31,201108,2011),('2011-08-04',201131,8,2011,4,31,201108,2011),('2011-08-05',201131,8,2011,5,31,201108,2011),('2011-08-06',201131,8,2011,6,31,201108,2011),('2011-08-07',201132,8,2011,7,32,201108,2011),('2011-08-08',201132,8,2011,8,32,201108,2011),('2011-08-09',201132,8,2011,9,32,201108,2011),('2011-08-10',201132,8,2011,10,32,201108,2011),('2011-08-11',201132,8,2011,11,32,201108,2011),('2011-08-12',201132,8,2011,12,32,201108,2011),('2011-08-13',201132,8,2011,13,32,201108,2011),('2011-08-14',201133,8,2011,14,33,201108,2011),('2011-08-15',201133,8,2011,15,33,201108,2011),('2011-08-16',201133,8,2011,16,33,201108,2011),('2011-08-17',201133,8,2011,17,33,201108,2011),('2011-08-18',201133,8,2011,18,33,201108,2011),('2011-08-19',201133,8,2011,19,33,201108,2011),('2011-08-20',201133,8,2011,20,33,201108,2011),('2011-08-21',201134,8,2011,21,34,201108,2011),('2011-08-22',201134,8,2011,22,34,201108,2011),('2011-08-23',201134,8,2011,23,34,201108,2011),('2011-08-24',201134,8,2011,24,34,201108,2011),('2011-08-25',201134,8,2011,25,34,201108,2011),('2011-08-26',201134,8,2011,26,34,201108,2011),('2011-08-27',201134,8,2011,27,34,201108,2011),('2011-08-28',201135,8,2011,28,35,201108,2011),('2011-08-29',201135,8,2011,29,35,201108,2011),('2011-08-30',201135,8,2011,30,35,201108,2011),('2011-08-31',201135,8,2011,31,35,201108,2011),('2011-09-01',201135,9,2011,1,35,201109,2011),('2011-09-02',201135,9,2011,2,35,201109,2011),('2011-09-03',201135,9,2011,3,35,201109,2011),('2011-09-04',201136,9,2011,4,36,201109,2011),('2011-09-05',201136,9,2011,5,36,201109,2011),('2011-09-06',201136,9,2011,6,36,201109,2011),('2011-09-07',201136,9,2011,7,36,201109,2011),('2011-09-08',201136,9,2011,8,36,201109,2011),('2011-09-09',201136,9,2011,9,36,201109,2011),('2011-09-10',201136,9,2011,10,36,201109,2011),('2011-09-11',201137,9,2011,11,37,201109,2011),('2011-09-12',201137,9,2011,12,37,201109,2011),('2011-09-13',201137,9,2011,13,37,201109,2011),('2011-09-14',201137,9,2011,14,37,201109,2011),('2011-09-15',201137,9,2011,15,37,201109,2011),('2011-09-16',201137,9,2011,16,37,201109,2011),('2011-09-17',201137,9,2011,17,37,201109,2011),('2011-09-18',201138,9,2011,18,38,201109,2011),('2011-09-19',201138,9,2011,19,38,201109,2011),('2011-09-20',201138,9,2011,20,38,201109,2011),('2011-09-21',201138,9,2011,21,38,201109,2011),('2011-09-22',201138,9,2011,22,38,201109,2011),('2011-09-23',201138,9,2011,23,38,201109,2011),('2011-09-24',201138,9,2011,24,38,201109,2011),('2011-09-25',201139,9,2011,25,39,201109,2011),('2011-09-26',201139,9,2011,26,39,201109,2011),('2011-09-27',201139,9,2011,27,39,201109,2011),('2011-09-28',201139,9,2011,28,39,201109,2011),('2011-09-29',201139,9,2011,29,39,201109,2011),('2011-09-30',201139,9,2011,30,39,201109,2011),('2011-10-01',201139,10,2011,1,39,201110,2011),('2011-10-02',201140,10,2011,2,40,201110,2011),('2011-10-03',201140,10,2011,3,40,201110,2011),('2011-10-04',201140,10,2011,4,40,201110,2011),('2011-10-05',201140,10,2011,5,40,201110,2011),('2011-10-06',201140,10,2011,6,40,201110,2011),('2011-10-07',201140,10,2011,7,40,201110,2011),('2011-10-08',201140,10,2011,8,40,201110,2011),('2011-10-09',201141,10,2011,9,41,201110,2011),('2011-10-10',201141,10,2011,10,41,201110,2011),('2011-10-11',201141,10,2011,11,41,201110,2011),('2011-10-12',201141,10,2011,12,41,201110,2011),('2011-10-13',201141,10,2011,13,41,201110,2011),('2011-10-14',201141,10,2011,14,41,201110,2011),('2011-10-15',201141,10,2011,15,41,201110,2011),('2011-10-16',201142,10,2011,16,42,201110,2011),('2011-10-17',201142,10,2011,17,42,201110,2011),('2011-10-18',201142,10,2011,18,42,201110,2011),('2011-10-19',201142,10,2011,19,42,201110,2011),('2011-10-20',201142,10,2011,20,42,201110,2011),('2011-10-21',201142,10,2011,21,42,201110,2011),('2011-10-22',201142,10,2011,22,42,201110,2011),('2011-10-23',201143,10,2011,23,43,201110,2011),('2011-10-24',201143,10,2011,24,43,201110,2011),('2011-10-25',201143,10,2011,25,43,201110,2011),('2011-10-26',201143,10,2011,26,43,201110,2011),('2011-10-27',201143,10,2011,27,43,201110,2011),('2011-10-28',201143,10,2011,28,43,201110,2011),('2011-10-29',201143,10,2011,29,43,201110,2011),('2011-10-30',201144,10,2011,30,44,201110,2011),('2011-10-31',201144,10,2011,31,44,201110,2011),('2011-11-01',201144,11,2011,1,44,201111,2011),('2011-11-02',201144,11,2011,2,44,201111,2011),('2011-11-03',201144,11,2011,3,44,201111,2011),('2011-11-04',201144,11,2011,4,44,201111,2011),('2011-11-05',201144,11,2011,5,44,201111,2011),('2011-11-06',201145,11,2011,6,45,201111,2011),('2011-11-07',201145,11,2011,7,45,201111,2011),('2011-11-08',201145,11,2011,8,45,201111,2011),('2011-11-09',201145,11,2011,9,45,201111,2011),('2011-11-10',201145,11,2011,10,45,201111,2011),('2011-11-11',201145,11,2011,11,45,201111,2011),('2011-11-12',201145,11,2011,12,45,201111,2011),('2011-11-13',201146,11,2011,13,46,201111,2011),('2011-11-14',201146,11,2011,14,46,201111,2011),('2011-11-15',201146,11,2011,15,46,201111,2011),('2011-11-16',201146,11,2011,16,46,201111,2011),('2011-11-17',201146,11,2011,17,46,201111,2011),('2011-11-18',201146,11,2011,18,46,201111,2011),('2011-11-19',201146,11,2011,19,46,201111,2011),('2011-11-20',201147,11,2011,20,47,201111,2011),('2011-11-21',201147,11,2011,21,47,201111,2011),('2011-11-22',201147,11,2011,22,47,201111,2011),('2011-11-23',201147,11,2011,23,47,201111,2011),('2011-11-24',201147,11,2011,24,47,201111,2011),('2011-11-25',201147,11,2011,25,47,201111,2011),('2011-11-26',201147,11,2011,26,47,201111,2011),('2011-11-27',201148,11,2011,27,48,201111,2011),('2011-11-28',201148,11,2011,28,48,201111,2011),('2011-11-29',201148,11,2011,29,48,201111,2011),('2011-11-30',201148,11,2011,30,48,201111,2011),('2011-12-01',201148,12,2011,1,48,201112,2012),('2011-12-02',201148,12,2011,2,48,201112,2012),('2011-12-03',201148,12,2011,3,48,201112,2012),('2011-12-04',201149,12,2011,4,49,201112,2012),('2011-12-05',201149,12,2011,5,49,201112,2012),('2011-12-06',201149,12,2011,6,49,201112,2012),('2011-12-07',201149,12,2011,7,49,201112,2012),('2011-12-08',201149,12,2011,8,49,201112,2012),('2011-12-09',201149,12,2011,9,49,201112,2012),('2011-12-10',201149,12,2011,10,49,201112,2012),('2011-12-11',201150,12,2011,11,50,201112,2012),('2011-12-12',201150,12,2011,12,50,201112,2012),('2011-12-13',201150,12,2011,13,50,201112,2012),('2011-12-14',201150,12,2011,14,50,201112,2012),('2011-12-15',201150,12,2011,15,50,201112,2012),('2011-12-16',201150,12,2011,16,50,201112,2012),('2011-12-17',201150,12,2011,17,50,201112,2012),('2011-12-18',201151,12,2011,18,51,201112,2012),('2011-12-19',201151,12,2011,19,51,201112,2012),('2011-12-20',201151,12,2011,20,51,201112,2012),('2011-12-21',201151,12,2011,21,51,201112,2012),('2011-12-22',201151,12,2011,22,51,201112,2012),('2011-12-23',201151,12,2011,23,51,201112,2012),('2011-12-24',201151,12,2011,24,51,201112,2012),('2011-12-25',201152,12,2011,25,52,201112,2012),('2011-12-26',201152,12,2011,26,52,201112,2012),('2011-12-27',201152,12,2011,27,52,201112,2012),('2011-12-28',201152,12,2011,28,52,201112,2012),('2011-12-29',201152,12,2011,29,52,201112,2012),('2011-12-30',201152,12,2011,30,52,201112,2012),('2011-12-31',201152,12,2011,31,52,201112,2012),('2012-01-01',201153,1,2012,1,1,201201,2012),('2012-01-02',201201,1,2012,2,1,201201,2012),('2012-01-03',201201,1,2012,3,1,201201,2012),('2012-01-04',201201,1,2012,4,1,201201,2012),('2012-01-05',201201,1,2012,5,1,201201,2012),('2012-01-06',201201,1,2012,6,1,201201,2012),('2012-01-07',201201,1,2012,7,1,201201,2012),('2012-01-08',201202,1,2012,8,2,201201,2012),('2012-01-09',201202,1,2012,9,2,201201,2012),('2012-01-10',201202,1,2012,10,2,201201,2012),('2012-01-11',201202,1,2012,11,2,201201,2012),('2012-01-12',201202,1,2012,12,2,201201,2012),('2012-01-13',201202,1,2012,13,2,201201,2012),('2012-01-14',201202,1,2012,14,2,201201,2012),('2012-01-15',201203,1,2012,15,3,201201,2012),('2012-01-16',201203,1,2012,16,3,201201,2012),('2012-01-17',201203,1,2012,17,3,201201,2012),('2012-01-18',201203,1,2012,18,3,201201,2012),('2012-01-19',201203,1,2012,19,3,201201,2012),('2012-01-20',201203,1,2012,20,3,201201,2012),('2012-01-21',201203,1,2012,21,3,201201,2012),('2012-01-22',201204,1,2012,22,4,201201,2012),('2012-01-23',201204,1,2012,23,4,201201,2012),('2012-01-24',201204,1,2012,24,4,201201,2012),('2012-01-25',201204,1,2012,25,4,201201,2012),('2012-01-26',201204,1,2012,26,4,201201,2012),('2012-01-27',201204,1,2012,27,4,201201,2012),('2012-01-28',201204,1,2012,28,4,201201,2012),('2012-01-29',201205,1,2012,29,5,201201,2012),('2012-01-30',201205,1,2012,30,5,201201,2012),('2012-01-31',201205,1,2012,31,5,201201,2012),('2012-02-01',201205,2,2012,1,5,201202,2012),('2012-02-02',201205,2,2012,2,5,201202,2012),('2012-02-03',201205,2,2012,3,5,201202,2012),('2012-02-04',201205,2,2012,4,5,201202,2012),('2012-02-05',201206,2,2012,5,6,201202,2012),('2012-02-06',201206,2,2012,6,6,201202,2012),('2012-02-07',201206,2,2012,7,6,201202,2012),('2012-02-08',201206,2,2012,8,6,201202,2012),('2012-02-09',201206,2,2012,9,6,201202,2012),('2012-02-10',201206,2,2012,10,6,201202,2012),('2012-02-11',201206,2,2012,11,6,201202,2012),('2012-02-12',201207,2,2012,12,7,201202,2012),('2012-02-13',201207,2,2012,13,7,201202,2012),('2012-02-14',201207,2,2012,14,7,201202,2012),('2012-02-15',201207,2,2012,15,7,201202,2012),('2012-02-16',201207,2,2012,16,7,201202,2012),('2012-02-17',201207,2,2012,17,7,201202,2012),('2012-02-18',201207,2,2012,18,7,201202,2012),('2012-02-19',201208,2,2012,19,8,201202,2012),('2012-02-20',201208,2,2012,20,8,201202,2012),('2012-02-21',201208,2,2012,21,8,201202,2012),('2012-02-22',201208,2,2012,22,8,201202,2012),('2012-02-23',201208,2,2012,23,8,201202,2012),('2012-02-24',201208,2,2012,24,8,201202,2012),('2012-02-25',201208,2,2012,25,8,201202,2012),('2012-02-26',201209,2,2012,26,9,201202,2012),('2012-02-27',201209,2,2012,27,9,201202,2012),('2012-02-28',201209,2,2012,28,9,201202,2012),('2012-02-29',201209,2,2012,29,9,201202,2012),('2012-03-01',201209,3,2012,1,9,201203,2012),('2012-03-02',201209,3,2012,2,9,201203,2012),('2012-03-03',201209,3,2012,3,9,201203,2012),('2012-03-04',201210,3,2012,4,10,201203,2012),('2012-03-05',201210,3,2012,5,10,201203,2012),('2012-03-06',201210,3,2012,6,10,201203,2012),('2012-03-07',201210,3,2012,7,10,201203,2012),('2012-03-08',201210,3,2012,8,10,201203,2012),('2012-03-09',201210,3,2012,9,10,201203,2012),('2012-03-10',201210,3,2012,10,10,201203,2012),('2012-03-11',201211,3,2012,11,11,201203,2012),('2012-03-12',201211,3,2012,12,11,201203,2012),('2012-03-13',201211,3,2012,13,11,201203,2012),('2012-03-14',201211,3,2012,14,11,201203,2012),('2012-03-15',201211,3,2012,15,11,201203,2012),('2012-03-16',201211,3,2012,16,11,201203,2012),('2012-03-17',201211,3,2012,17,11,201203,2012),('2012-03-18',201212,3,2012,18,12,201203,2012),('2012-03-19',201212,3,2012,19,12,201203,2012),('2012-03-20',201212,3,2012,20,12,201203,2012),('2012-03-21',201212,3,2012,21,12,201203,2012),('2012-03-22',201212,3,2012,22,12,201203,2012),('2012-03-23',201212,3,2012,23,12,201203,2012),('2012-03-24',201212,3,2012,24,12,201203,2012),('2012-03-25',201213,3,2012,25,13,201203,2012),('2012-03-26',201213,3,2012,26,13,201203,2012),('2012-03-27',201213,3,2012,27,13,201203,2012),('2012-03-28',201213,3,2012,28,13,201203,2012),('2012-03-29',201213,3,2012,29,13,201203,2012),('2012-03-30',201213,3,2012,30,13,201203,2012),('2012-03-31',201213,3,2012,31,13,201203,2012),('2012-04-01',201214,4,2012,1,14,201204,2012),('2012-04-02',201214,4,2012,2,14,201204,2012),('2012-04-03',201214,4,2012,3,14,201204,2012),('2012-04-04',201214,4,2012,4,14,201204,2012),('2012-04-05',201214,4,2012,5,14,201204,2012),('2012-04-06',201214,4,2012,6,14,201204,2012),('2012-04-07',201214,4,2012,7,14,201204,2012),('2012-04-08',201215,4,2012,8,15,201204,2012),('2012-04-09',201215,4,2012,9,15,201204,2012),('2012-04-10',201215,4,2012,10,15,201204,2012),('2012-04-11',201215,4,2012,11,15,201204,2012),('2012-04-12',201215,4,2012,12,15,201204,2012),('2012-04-13',201215,4,2012,13,15,201204,2012),('2012-04-14',201215,4,2012,14,15,201204,2012),('2012-04-15',201216,4,2012,15,16,201204,2012),('2012-04-16',201216,4,2012,16,16,201204,2012),('2012-04-17',201216,4,2012,17,16,201204,2012),('2012-04-18',201216,4,2012,18,16,201204,2012),('2012-04-19',201216,4,2012,19,16,201204,2012),('2012-04-20',201216,4,2012,20,16,201204,2012),('2012-04-21',201216,4,2012,21,16,201204,2012),('2012-04-22',201217,4,2012,22,17,201204,2012),('2012-04-23',201217,4,2012,23,17,201204,2012),('2012-04-24',201217,4,2012,24,17,201204,2012),('2012-04-25',201217,4,2012,25,17,201204,2012),('2012-04-26',201217,4,2012,26,17,201204,2012),('2012-04-27',201217,4,2012,27,17,201204,2012),('2012-04-28',201217,4,2012,28,17,201204,2012),('2012-04-29',201218,4,2012,29,18,201204,2012),('2012-04-30',201218,4,2012,30,18,201204,2012),('2012-05-01',201218,5,2012,1,18,201205,2012),('2012-05-02',201218,5,2012,2,18,201205,2012),('2012-05-03',201218,5,2012,3,18,201205,2012),('2012-05-04',201218,5,2012,4,18,201205,2012),('2012-05-05',201218,5,2012,5,18,201205,2012),('2012-05-06',201219,5,2012,6,19,201205,2012),('2012-05-07',201219,5,2012,7,19,201205,2012),('2012-05-08',201219,5,2012,8,19,201205,2012),('2012-05-09',201219,5,2012,9,19,201205,2012),('2012-05-10',201219,5,2012,10,19,201205,2012),('2012-05-11',201219,5,2012,11,19,201205,2012),('2012-05-12',201219,5,2012,12,19,201205,2012),('2012-05-13',201220,5,2012,13,20,201205,2012),('2012-05-14',201220,5,2012,14,20,201205,2012),('2012-05-15',201220,5,2012,15,20,201205,2012),('2012-05-16',201220,5,2012,16,20,201205,2012),('2012-05-17',201220,5,2012,17,20,201205,2012),('2012-05-18',201220,5,2012,18,20,201205,2012),('2012-05-19',201220,5,2012,19,20,201205,2012),('2012-05-20',201221,5,2012,20,21,201205,2012),('2012-05-21',201221,5,2012,21,21,201205,2012),('2012-05-22',201221,5,2012,22,21,201205,2012),('2012-05-23',201221,5,2012,23,21,201205,2012),('2012-05-24',201221,5,2012,24,21,201205,2012),('2012-05-25',201221,5,2012,25,21,201205,2012),('2012-05-26',201221,5,2012,26,21,201205,2012),('2012-05-27',201222,5,2012,27,22,201205,2012),('2012-05-28',201222,5,2012,28,22,201205,2012),('2012-05-29',201222,5,2012,29,22,201205,2012),('2012-05-30',201222,5,2012,30,22,201205,2012),('2012-05-31',201222,5,2012,31,22,201205,2012),('2012-06-01',201222,6,2012,1,22,201206,2012),('2012-06-02',201222,6,2012,2,22,201206,2012),('2012-06-03',201223,6,2012,3,23,201206,2012),('2012-06-04',201223,6,2012,4,23,201206,2012),('2012-06-05',201223,6,2012,5,23,201206,2012),('2012-06-06',201223,6,2012,6,23,201206,2012),('2012-06-07',201223,6,2012,7,23,201206,2012),('2012-06-08',201223,6,2012,8,23,201206,2012),('2012-06-09',201223,6,2012,9,23,201206,2012),('2012-06-10',201224,6,2012,10,24,201206,2012),('2012-06-11',201224,6,2012,11,24,201206,2012),('2012-06-12',201224,6,2012,12,24,201206,2012),('2012-06-13',201224,6,2012,13,24,201206,2012),('2012-06-14',201224,6,2012,14,24,201206,2012),('2012-06-15',201224,6,2012,15,24,201206,2012),('2012-06-16',201224,6,2012,16,24,201206,2012),('2012-06-17',201225,6,2012,17,25,201206,2012),('2012-06-18',201225,6,2012,18,25,201206,2012),('2012-06-19',201225,6,2012,19,25,201206,2012),('2012-06-20',201225,6,2012,20,25,201206,2012),('2012-06-21',201225,6,2012,21,25,201206,2012),('2012-06-22',201225,6,2012,22,25,201206,2012),('2012-06-23',201225,6,2012,23,25,201206,2012),('2012-06-24',201226,6,2012,24,26,201206,2012),('2012-06-25',201226,6,2012,25,26,201206,2012),('2012-06-26',201226,6,2012,26,26,201206,2012),('2012-06-27',201226,6,2012,27,26,201206,2012),('2012-06-28',201226,6,2012,28,26,201206,2012),('2012-06-29',201226,6,2012,29,26,201206,2012),('2012-06-30',201226,6,2012,30,26,201206,2012),('2012-07-01',201227,7,2012,1,27,201207,2012),('2012-07-02',201227,7,2012,2,27,201207,2012),('2012-07-03',201227,7,2012,3,27,201207,2012),('2012-07-04',201227,7,2012,4,27,201207,2012),('2012-07-05',201227,7,2012,5,27,201207,2012),('2012-07-06',201227,7,2012,6,27,201207,2012),('2012-07-07',201227,7,2012,7,27,201207,2012),('2012-07-08',201228,7,2012,8,28,201207,2012),('2012-07-09',201228,7,2012,9,28,201207,2012),('2012-07-10',201228,7,2012,10,28,201207,2012),('2012-07-11',201228,7,2012,11,28,201207,2012),('2012-07-12',201228,7,2012,12,28,201207,2012),('2012-07-13',201228,7,2012,13,28,201207,2012),('2012-07-14',201228,7,2012,14,28,201207,2012),('2012-07-15',201229,7,2012,15,29,201207,2012),('2012-07-16',201229,7,2012,16,29,201207,2012),('2012-07-17',201229,7,2012,17,29,201207,2012),('2012-07-18',201229,7,2012,18,29,201207,2012),('2012-07-19',201229,7,2012,19,29,201207,2012),('2012-07-20',201229,7,2012,20,29,201207,2012),('2012-07-21',201229,7,2012,21,29,201207,2012),('2012-07-22',201230,7,2012,22,30,201207,2012),('2012-07-23',201230,7,2012,23,30,201207,2012),('2012-07-24',201230,7,2012,24,30,201207,2012),('2012-07-25',201230,7,2012,25,30,201207,2012),('2012-07-26',201230,7,2012,26,30,201207,2012),('2012-07-27',201230,7,2012,27,30,201207,2012),('2012-07-28',201230,7,2012,28,30,201207,2012),('2012-07-29',201231,7,2012,29,31,201207,2012),('2012-07-30',201231,7,2012,30,31,201207,2012),('2012-07-31',201231,7,2012,31,31,201207,2012),('2012-08-01',201231,8,2012,1,31,201208,2012),('2012-08-02',201231,8,2012,2,31,201208,2012),('2012-08-03',201231,8,2012,3,31,201208,2012),('2012-08-04',201231,8,2012,4,31,201208,2012),('2012-08-05',201232,8,2012,5,32,201208,2012),('2012-08-06',201232,8,2012,6,32,201208,2012),('2012-08-07',201232,8,2012,7,32,201208,2012),('2012-08-08',201232,8,2012,8,32,201208,2012),('2012-08-09',201232,8,2012,9,32,201208,2012),('2012-08-10',201232,8,2012,10,32,201208,2012),('2012-08-11',201232,8,2012,11,32,201208,2012),('2012-08-12',201233,8,2012,12,33,201208,2012),('2012-08-13',201233,8,2012,13,33,201208,2012),('2012-08-14',201233,8,2012,14,33,201208,2012),('2012-08-15',201233,8,2012,15,33,201208,2012),('2012-08-16',201233,8,2012,16,33,201208,2012),('2012-08-17',201233,8,2012,17,33,201208,2012),('2012-08-18',201233,8,2012,18,33,201208,2012),('2012-08-19',201234,8,2012,19,34,201208,2012),('2012-08-20',201234,8,2012,20,34,201208,2012),('2012-08-21',201234,8,2012,21,34,201208,2012),('2012-08-22',201234,8,2012,22,34,201208,2012),('2012-08-23',201234,8,2012,23,34,201208,2012),('2012-08-24',201234,8,2012,24,34,201208,2012),('2012-08-25',201234,8,2012,25,34,201208,2012),('2012-08-26',201235,8,2012,26,35,201208,2012),('2012-08-27',201235,8,2012,27,35,201208,2012),('2012-08-28',201235,8,2012,28,35,201208,2012),('2012-08-29',201235,8,2012,29,35,201208,2012),('2012-08-30',201235,8,2012,30,35,201208,2012),('2012-08-31',201235,8,2012,31,35,201208,2012),('2012-09-01',201235,9,2012,1,35,201209,2012),('2012-09-02',201236,9,2012,2,36,201209,2012),('2012-09-03',201236,9,2012,3,36,201209,2012),('2012-09-04',201236,9,2012,4,36,201209,2012),('2012-09-05',201236,9,2012,5,36,201209,2012),('2012-09-06',201236,9,2012,6,36,201209,2012),('2012-09-07',201236,9,2012,7,36,201209,2012),('2012-09-08',201236,9,2012,8,36,201209,2012),('2012-09-09',201237,9,2012,9,37,201209,2012),('2012-09-10',201237,9,2012,10,37,201209,2012),('2012-09-11',201237,9,2012,11,37,201209,2012),('2012-09-12',201237,9,2012,12,37,201209,2012),('2012-09-13',201237,9,2012,13,37,201209,2012),('2012-09-14',201237,9,2012,14,37,201209,2012),('2012-09-15',201237,9,2012,15,37,201209,2012),('2012-09-16',201238,9,2012,16,38,201209,2012),('2012-09-17',201238,9,2012,17,38,201209,2012),('2012-09-18',201238,9,2012,18,38,201209,2012),('2012-09-19',201238,9,2012,19,38,201209,2012),('2012-09-20',201238,9,2012,20,38,201209,2012),('2012-09-21',201238,9,2012,21,38,201209,2012),('2012-09-22',201238,9,2012,22,38,201209,2012),('2012-09-23',201239,9,2012,23,39,201209,2012),('2012-09-24',201239,9,2012,24,39,201209,2012),('2012-09-25',201239,9,2012,25,39,201209,2012),('2012-09-26',201239,9,2012,26,39,201209,2012),('2012-09-27',201239,9,2012,27,39,201209,2012),('2012-09-28',201239,9,2012,28,39,201209,2012),('2012-09-29',201239,9,2012,29,39,201209,2012),('2012-09-30',201240,9,2012,30,40,201209,2012),('2012-10-01',201240,10,2012,1,40,201210,2012),('2012-10-02',201240,10,2012,2,40,201210,2012),('2012-10-03',201240,10,2012,3,40,201210,2012),('2012-10-04',201240,10,2012,4,40,201210,2012),('2012-10-05',201240,10,2012,5,40,201210,2012),('2012-10-06',201240,10,2012,6,40,201210,2012),('2012-10-07',201241,10,2012,7,41,201210,2012),('2012-10-08',201241,10,2012,8,41,201210,2012),('2012-10-09',201241,10,2012,9,41,201210,2012),('2012-10-10',201241,10,2012,10,41,201210,2012),('2012-10-11',201241,10,2012,11,41,201210,2012),('2012-10-12',201241,10,2012,12,41,201210,2012),('2012-10-13',201241,10,2012,13,41,201210,2012),('2012-10-14',201242,10,2012,14,42,201210,2012),('2012-10-15',201242,10,2012,15,42,201210,2012),('2012-10-16',201242,10,2012,16,42,201210,2012),('2012-10-17',201242,10,2012,17,42,201210,2012),('2012-10-18',201242,10,2012,18,42,201210,2012),('2012-10-19',201242,10,2012,19,42,201210,2012),('2012-10-20',201242,10,2012,20,42,201210,2012),('2012-10-21',201243,10,2012,21,43,201210,2012),('2012-10-22',201243,10,2012,22,43,201210,2012),('2012-10-23',201243,10,2012,23,43,201210,2012),('2012-10-24',201243,10,2012,24,43,201210,2012),('2012-10-25',201243,10,2012,25,43,201210,2012),('2012-10-26',201243,10,2012,26,43,201210,2012),('2012-10-27',201243,10,2012,27,43,201210,2012),('2012-10-28',201244,10,2012,28,44,201210,2012),('2012-10-29',201244,10,2012,29,44,201210,2012),('2012-10-30',201244,10,2012,30,44,201210,2012),('2012-10-31',201244,10,2012,31,44,201210,2012),('2012-11-01',201244,11,2012,1,44,201211,2012),('2012-11-02',201244,11,2012,2,44,201211,2012),('2012-11-03',201244,11,2012,3,44,201211,2012),('2012-11-04',201245,11,2012,4,45,201211,2012),('2012-11-05',201245,11,2012,5,45,201211,2012),('2012-11-06',201245,11,2012,6,45,201211,2012),('2012-11-07',201245,11,2012,7,45,201211,2012),('2012-11-08',201245,11,2012,8,45,201211,2012),('2012-11-09',201245,11,2012,9,45,201211,2012),('2012-11-10',201245,11,2012,10,45,201211,2012),('2012-11-11',201246,11,2012,11,46,201211,2012),('2012-11-12',201246,11,2012,12,46,201211,2012),('2012-11-13',201246,11,2012,13,46,201211,2012),('2012-11-14',201246,11,2012,14,46,201211,2012),('2012-11-15',201246,11,2012,15,46,201211,2012),('2012-11-16',201246,11,2012,16,46,201211,2012),('2012-11-17',201246,11,2012,17,46,201211,2012),('2012-11-18',201247,11,2012,18,47,201211,2012),('2012-11-19',201247,11,2012,19,47,201211,2012),('2012-11-20',201247,11,2012,20,47,201211,2012),('2012-11-21',201247,11,2012,21,47,201211,2012),('2012-11-22',201247,11,2012,22,47,201211,2012),('2012-11-23',201247,11,2012,23,47,201211,2012),('2012-11-24',201247,11,2012,24,47,201211,2012),('2012-11-25',201248,11,2012,25,48,201211,2012),('2012-11-26',201248,11,2012,26,48,201211,2012),('2012-11-27',201248,11,2012,27,48,201211,2012),('2012-11-28',201248,11,2012,28,48,201211,2012),('2012-11-29',201248,11,2012,29,48,201211,2012),('2012-11-30',201248,11,2012,30,48,201211,2012),('2012-12-01',201248,12,2012,1,48,201212,2013),('2012-12-02',201249,12,2012,2,49,201212,2013),('2012-12-03',201249,12,2012,3,49,201212,2013),('2012-12-04',201249,12,2012,4,49,201212,2013),('2012-12-05',201249,12,2012,5,49,201212,2013),('2012-12-06',201249,12,2012,6,49,201212,2013),('2012-12-07',201249,12,2012,7,49,201212,2013),('2012-12-08',201249,12,2012,8,49,201212,2013),('2012-12-09',201250,12,2012,9,50,201212,2013),('2012-12-10',201250,12,2012,10,50,201212,2013),('2012-12-11',201250,12,2012,11,50,201212,2013),('2012-12-12',201250,12,2012,12,50,201212,2013),('2012-12-13',201250,12,2012,13,50,201212,2013),('2012-12-14',201250,12,2012,14,50,201212,2013),('2012-12-15',201250,12,2012,15,50,201212,2013),('2012-12-16',201251,12,2012,16,51,201212,2013),('2012-12-17',201251,12,2012,17,51,201212,2013),('2012-12-18',201251,12,2012,18,51,201212,2013),('2012-12-19',201251,12,2012,19,51,201212,2013),('2012-12-20',201251,12,2012,20,51,201212,2013),('2012-12-21',201251,12,2012,21,51,201212,2013),('2012-12-22',201251,12,2012,22,51,201212,2013),('2012-12-23',201252,12,2012,23,52,201212,2013),('2012-12-24',201252,12,2012,24,52,201212,2013),('2012-12-25',201252,12,2012,25,52,201212,2013),('2012-12-26',201252,12,2012,26,52,201212,2013),('2012-12-27',201252,12,2012,27,52,201212,2013),('2012-12-28',201252,12,2012,28,52,201212,2013),('2012-12-29',201252,12,2012,29,52,201212,2013),('2012-12-30',201301,12,2012,30,1,201212,2013),('2012-12-31',201301,12,2012,31,1,201212,2013),('2013-01-01',201301,1,2013,1,1,201301,2013),('2013-01-02',201301,1,2013,2,1,201301,2013),('2013-01-03',201301,1,2013,3,1,201301,2013),('2013-01-04',201301,1,2013,4,1,201301,2013),('2013-01-05',201301,1,2013,5,1,201301,2013),('2013-01-06',201302,1,2013,6,2,201301,2013),('2013-01-07',201302,1,2013,7,2,201301,2013),('2013-01-08',201302,1,2013,8,2,201301,2013),('2013-01-09',201302,1,2013,9,2,201301,2013),('2013-01-10',201302,1,2013,10,2,201301,2013),('2013-01-11',201302,1,2013,11,2,201301,2013),('2013-01-12',201302,1,2013,12,2,201301,2013),('2013-01-13',201303,1,2013,13,3,201301,2013),('2013-01-14',201303,1,2013,14,3,201301,2013),('2013-01-15',201303,1,2013,15,3,201301,2013),('2013-01-16',201303,1,2013,16,3,201301,2013),('2013-01-17',201303,1,2013,17,3,201301,2013),('2013-01-18',201303,1,2013,18,3,201301,2013),('2013-01-19',201303,1,2013,19,3,201301,2013),('2013-01-20',201304,1,2013,20,4,201301,2013),('2013-01-21',201304,1,2013,21,4,201301,2013),('2013-01-22',201304,1,2013,22,4,201301,2013),('2013-01-23',201304,1,2013,23,4,201301,2013),('2013-01-24',201304,1,2013,24,4,201301,2013),('2013-01-25',201304,1,2013,25,4,201301,2013),('2013-01-26',201304,1,2013,26,4,201301,2013),('2013-01-27',201305,1,2013,27,5,201301,2013),('2013-01-28',201305,1,2013,28,5,201301,2013),('2013-01-29',201305,1,2013,29,5,201301,2013),('2013-01-30',201305,1,2013,30,5,201301,2013),('2013-01-31',201305,1,2013,31,5,201301,2013),('2013-02-01',201305,2,2013,1,5,201302,2013),('2013-02-02',201305,2,2013,2,5,201302,2013),('2013-02-03',201306,2,2013,3,6,201302,2013),('2013-02-04',201306,2,2013,4,6,201302,2013),('2013-02-05',201306,2,2013,5,6,201302,2013),('2013-02-06',201306,2,2013,6,6,201302,2013),('2013-02-07',201306,2,2013,7,6,201302,2013),('2013-02-08',201306,2,2013,8,6,201302,2013),('2013-02-09',201306,2,2013,9,6,201302,2013),('2013-02-10',201307,2,2013,10,7,201302,2013),('2013-02-11',201307,2,2013,11,7,201302,2013),('2013-02-12',201307,2,2013,12,7,201302,2013),('2013-02-13',201307,2,2013,13,7,201302,2013),('2013-02-14',201307,2,2013,14,7,201302,2013),('2013-02-15',201307,2,2013,15,7,201302,2013),('2013-02-16',201307,2,2013,16,7,201302,2013),('2013-02-17',201308,2,2013,17,8,201302,2013),('2013-02-18',201308,2,2013,18,8,201302,2013),('2013-02-19',201308,2,2013,19,8,201302,2013),('2013-02-20',201308,2,2013,20,8,201302,2013),('2013-02-21',201308,2,2013,21,8,201302,2013),('2013-02-22',201308,2,2013,22,8,201302,2013),('2013-02-23',201308,2,2013,23,8,201302,2013),('2013-02-24',201309,2,2013,24,9,201302,2013),('2013-02-25',201309,2,2013,25,9,201302,2013),('2013-02-26',201309,2,2013,26,9,201302,2013),('2013-02-27',201309,2,2013,27,9,201302,2013),('2013-02-28',201309,2,2013,28,9,201302,2013),('2013-03-01',201309,3,2013,1,9,201303,2013),('2013-03-02',201309,3,2013,2,9,201303,2013),('2013-03-03',201310,3,2013,3,10,201303,2013),('2013-03-04',201310,3,2013,4,10,201303,2013),('2013-03-05',201310,3,2013,5,10,201303,2013),('2013-03-06',201310,3,2013,6,10,201303,2013),('2013-03-07',201310,3,2013,7,10,201303,2013),('2013-03-08',201310,3,2013,8,10,201303,2013),('2013-03-09',201310,3,2013,9,10,201303,2013),('2013-03-10',201311,3,2013,10,11,201303,2013),('2013-03-11',201311,3,2013,11,11,201303,2013),('2013-03-12',201311,3,2013,12,11,201303,2013),('2013-03-13',201311,3,2013,13,11,201303,2013),('2013-03-14',201311,3,2013,14,11,201303,2013),('2013-03-15',201311,3,2013,15,11,201303,2013),('2013-03-16',201311,3,2013,16,11,201303,2013),('2013-03-17',201312,3,2013,17,12,201303,2013),('2013-03-18',201312,3,2013,18,12,201303,2013),('2013-03-19',201312,3,2013,19,12,201303,2013),('2013-03-20',201312,3,2013,20,12,201303,2013),('2013-03-21',201312,3,2013,21,12,201303,2013),('2013-03-22',201312,3,2013,22,12,201303,2013),('2013-03-23',201312,3,2013,23,12,201303,2013),('2013-03-24',201313,3,2013,24,13,201303,2013),('2013-03-25',201313,3,2013,25,13,201303,2013),('2013-03-26',201313,3,2013,26,13,201303,2013),('2013-03-27',201313,3,2013,27,13,201303,2013),('2013-03-28',201313,3,2013,28,13,201303,2013),('2013-03-29',201313,3,2013,29,13,201303,2013),('2013-03-30',201313,3,2013,30,13,201303,2013),('2013-03-31',201314,3,2013,31,14,201303,2013),('2013-04-01',201314,4,2013,1,14,201304,2013),('2013-04-02',201314,4,2013,2,14,201304,2013),('2013-04-03',201314,4,2013,3,14,201304,2013),('2013-04-04',201314,4,2013,4,14,201304,2013),('2013-04-05',201314,4,2013,5,14,201304,2013),('2013-04-06',201314,4,2013,6,14,201304,2013),('2013-04-07',201315,4,2013,7,15,201304,2013),('2013-04-08',201315,4,2013,8,15,201304,2013),('2013-04-09',201315,4,2013,9,15,201304,2013),('2013-04-10',201315,4,2013,10,15,201304,2013),('2013-04-11',201315,4,2013,11,15,201304,2013),('2013-04-12',201315,4,2013,12,15,201304,2013),('2013-04-13',201315,4,2013,13,15,201304,2013),('2013-04-14',201316,4,2013,14,16,201304,2013),('2013-04-15',201316,4,2013,15,16,201304,2013),('2013-04-16',201316,4,2013,16,16,201304,2013),('2013-04-17',201316,4,2013,17,16,201304,2013),('2013-04-18',201316,4,2013,18,16,201304,2013),('2013-04-19',201316,4,2013,19,16,201304,2013),('2013-04-20',201316,4,2013,20,16,201304,2013),('2013-04-21',201317,4,2013,21,17,201304,2013),('2013-04-22',201317,4,2013,22,17,201304,2013),('2013-04-23',201317,4,2013,23,17,201304,2013),('2013-04-24',201317,4,2013,24,17,201304,2013),('2013-04-25',201317,4,2013,25,17,201304,2013),('2013-04-26',201317,4,2013,26,17,201304,2013),('2013-04-27',201317,4,2013,27,17,201304,2013),('2013-04-28',201318,4,2013,28,18,201304,2013),('2013-04-29',201318,4,2013,29,18,201304,2013),('2013-04-30',201318,4,2013,30,18,201304,2013),('2013-05-01',201318,5,2013,1,18,201305,2013),('2013-05-02',201318,5,2013,2,18,201305,2013),('2013-05-03',201318,5,2013,3,18,201305,2013),('2013-05-04',201318,5,2013,4,18,201305,2013),('2013-05-05',201319,5,2013,5,19,201305,2013),('2013-05-06',201319,5,2013,6,19,201305,2013),('2013-05-07',201319,5,2013,7,19,201305,2013),('2013-05-08',201319,5,2013,8,19,201305,2013),('2013-05-09',201319,5,2013,9,19,201305,2013),('2013-05-10',201319,5,2013,10,19,201305,2013),('2013-05-11',201319,5,2013,11,19,201305,2013),('2013-05-12',201320,5,2013,12,20,201305,2013),('2013-05-13',201320,5,2013,13,20,201305,2013),('2013-05-14',201320,5,2013,14,20,201305,2013),('2013-05-15',201320,5,2013,15,20,201305,2013),('2013-05-16',201320,5,2013,16,20,201305,2013),('2013-05-17',201320,5,2013,17,20,201305,2013),('2013-05-18',201320,5,2013,18,20,201305,2013),('2013-05-19',201321,5,2013,19,21,201305,2013),('2013-05-20',201321,5,2013,20,21,201305,2013),('2013-05-21',201321,5,2013,21,21,201305,2013),('2013-05-22',201321,5,2013,22,21,201305,2013),('2013-05-23',201321,5,2013,23,21,201305,2013),('2013-05-24',201321,5,2013,24,21,201305,2013),('2013-05-25',201321,5,2013,25,21,201305,2013),('2013-05-26',201322,5,2013,26,22,201305,2013),('2013-05-27',201322,5,2013,27,22,201305,2013),('2013-05-28',201322,5,2013,28,22,201305,2013),('2013-05-29',201322,5,2013,29,22,201305,2013),('2013-05-30',201322,5,2013,30,22,201305,2013),('2013-05-31',201322,5,2013,31,22,201305,2013),('2013-06-01',201322,6,2013,1,22,201306,2013),('2013-06-02',201323,6,2013,2,23,201306,2013),('2013-06-03',201323,6,2013,3,23,201306,2013),('2013-06-04',201323,6,2013,4,23,201306,2013),('2013-06-05',201323,6,2013,5,23,201306,2013),('2013-06-06',201323,6,2013,6,23,201306,2013),('2013-06-07',201323,6,2013,7,23,201306,2013),('2013-06-08',201323,6,2013,8,23,201306,2013),('2013-06-09',201324,6,2013,9,24,201306,2013),('2013-06-10',201324,6,2013,10,24,201306,2013),('2013-06-11',201324,6,2013,11,24,201306,2013),('2013-06-12',201324,6,2013,12,24,201306,2013),('2013-06-13',201324,6,2013,13,24,201306,2013),('2013-06-14',201324,6,2013,14,24,201306,2013),('2013-06-15',201324,6,2013,15,24,201306,2013),('2013-06-16',201325,6,2013,16,25,201306,2013),('2013-06-17',201325,6,2013,17,25,201306,2013),('2013-06-18',201325,6,2013,18,25,201306,2013),('2013-06-19',201325,6,2013,19,25,201306,2013),('2013-06-20',201325,6,2013,20,25,201306,2013),('2013-06-21',201325,6,2013,21,25,201306,2013),('2013-06-22',201325,6,2013,22,25,201306,2013),('2013-06-23',201326,6,2013,23,26,201306,2013),('2013-06-24',201326,6,2013,24,26,201306,2013),('2013-06-25',201326,6,2013,25,26,201306,2013),('2013-06-26',201326,6,2013,26,26,201306,2013),('2013-06-27',201326,6,2013,27,26,201306,2013),('2013-06-28',201326,6,2013,28,26,201306,2013),('2013-06-29',201326,6,2013,29,26,201306,2013),('2013-06-30',201327,6,2013,30,27,201306,2013),('2013-07-01',201327,7,2013,1,27,201307,2013),('2013-07-02',201327,7,2013,2,27,201307,2013),('2013-07-03',201327,7,2013,3,27,201307,2013),('2013-07-04',201327,7,2013,4,27,201307,2013),('2013-07-05',201327,7,2013,5,27,201307,2013),('2013-07-06',201327,7,2013,6,27,201307,2013),('2013-07-07',201328,7,2013,7,28,201307,2013),('2013-07-08',201328,7,2013,8,28,201307,2013),('2013-07-09',201328,7,2013,9,28,201307,2013),('2013-07-10',201328,7,2013,10,28,201307,2013),('2013-07-11',201328,7,2013,11,28,201307,2013),('2013-07-12',201328,7,2013,12,28,201307,2013),('2013-07-13',201328,7,2013,13,28,201307,2013),('2013-07-14',201329,7,2013,14,29,201307,2013),('2013-07-15',201329,7,2013,15,29,201307,2013),('2013-07-16',201329,7,2013,16,29,201307,2013),('2013-07-17',201329,7,2013,17,29,201307,2013),('2013-07-18',201329,7,2013,18,29,201307,2013),('2013-07-19',201329,7,2013,19,29,201307,2013),('2013-07-20',201329,7,2013,20,29,201307,2013),('2013-07-21',201330,7,2013,21,30,201307,2013),('2013-07-22',201330,7,2013,22,30,201307,2013),('2013-07-23',201330,7,2013,23,30,201307,2013),('2013-07-24',201330,7,2013,24,30,201307,2013),('2013-07-25',201330,7,2013,25,30,201307,2013),('2013-07-26',201330,7,2013,26,30,201307,2013),('2013-07-27',201330,7,2013,27,30,201307,2013),('2013-07-28',201331,7,2013,28,31,201307,2013),('2013-07-29',201331,7,2013,29,31,201307,2013),('2013-07-30',201331,7,2013,30,31,201307,2013),('2013-07-31',201331,7,2013,31,31,201307,2013),('2013-08-01',201331,8,2013,1,31,201308,2013),('2013-08-02',201331,8,2013,2,31,201308,2013),('2013-08-03',201331,8,2013,3,31,201308,2013),('2013-08-04',201332,8,2013,4,32,201308,2013),('2013-08-05',201332,8,2013,5,32,201308,2013),('2013-08-06',201332,8,2013,6,32,201308,2013),('2013-08-07',201332,8,2013,7,32,201308,2013),('2013-08-08',201332,8,2013,8,32,201308,2013),('2013-08-09',201332,8,2013,9,32,201308,2013),('2013-08-10',201332,8,2013,10,32,201308,2013),('2013-08-11',201333,8,2013,11,33,201308,2013),('2013-08-12',201333,8,2013,12,33,201308,2013),('2013-08-13',201333,8,2013,13,33,201308,2013),('2013-08-14',201333,8,2013,14,33,201308,2013),('2013-08-15',201333,8,2013,15,33,201308,2013),('2013-08-16',201333,8,2013,16,33,201308,2013),('2013-08-17',201333,8,2013,17,33,201308,2013),('2013-08-18',201334,8,2013,18,34,201308,2013),('2013-08-19',201334,8,2013,19,34,201308,2013),('2013-08-20',201334,8,2013,20,34,201308,2013),('2013-08-21',201334,8,2013,21,34,201308,2013),('2013-08-22',201334,8,2013,22,34,201308,2013),('2013-08-23',201334,8,2013,23,34,201308,2013),('2013-08-24',201334,8,2013,24,34,201308,2013),('2013-08-25',201335,8,2013,25,35,201308,2013),('2013-08-26',201335,8,2013,26,35,201308,2013),('2013-08-27',201335,8,2013,27,35,201308,2013),('2013-08-28',201335,8,2013,28,35,201308,2013),('2013-08-29',201335,8,2013,29,35,201308,2013),('2013-08-30',201335,8,2013,30,35,201308,2013),('2013-08-31',201335,8,2013,31,35,201308,2013),('2013-09-01',201336,9,2013,1,36,201309,2013),('2013-09-02',201336,9,2013,2,36,201309,2013),('2013-09-03',201336,9,2013,3,36,201309,2013),('2013-09-04',201336,9,2013,4,36,201309,2013),('2013-09-05',201336,9,2013,5,36,201309,2013),('2013-09-06',201336,9,2013,6,36,201309,2013),('2013-09-07',201336,9,2013,7,36,201309,2013),('2013-09-08',201337,9,2013,8,37,201309,2013),('2013-09-09',201337,9,2013,9,37,201309,2013),('2013-09-10',201337,9,2013,10,37,201309,2013),('2013-09-11',201337,9,2013,11,37,201309,2013),('2013-09-12',201337,9,2013,12,37,201309,2013),('2013-09-13',201337,9,2013,13,37,201309,2013),('2013-09-14',201337,9,2013,14,37,201309,2013),('2013-09-15',201338,9,2013,15,38,201309,2013),('2013-09-16',201338,9,2013,16,38,201309,2013),('2013-09-17',201338,9,2013,17,38,201309,2013),('2013-09-18',201338,9,2013,18,38,201309,2013),('2013-09-19',201338,9,2013,19,38,201309,2013),('2013-09-20',201338,9,2013,20,38,201309,2013),('2013-09-21',201338,9,2013,21,38,201309,2013),('2013-09-22',201339,9,2013,22,39,201309,2013),('2013-09-23',201339,9,2013,23,39,201309,2013),('2013-09-24',201339,9,2013,24,39,201309,2013),('2013-09-25',201339,9,2013,25,39,201309,2013),('2013-09-26',201339,9,2013,26,39,201309,2013),('2013-09-27',201339,9,2013,27,39,201309,2013),('2013-09-28',201339,9,2013,28,39,201309,2013),('2013-09-29',201340,9,2013,29,40,201309,2013),('2013-09-30',201340,9,2013,30,40,201309,2013),('2013-10-01',201340,10,2013,1,40,201310,2013),('2013-10-02',201340,10,2013,2,40,201310,2013),('2013-10-03',201340,10,2013,3,40,201310,2013),('2013-10-04',201340,10,2013,4,40,201310,2013),('2013-10-05',201340,10,2013,5,40,201310,2013),('2013-10-06',201341,10,2013,6,41,201310,2013),('2013-10-07',201341,10,2013,7,41,201310,2013),('2013-10-08',201341,10,2013,8,41,201310,2013),('2013-10-09',201341,10,2013,9,41,201310,2013),('2013-10-10',201341,10,2013,10,41,201310,2013),('2013-10-11',201341,10,2013,11,41,201310,2013),('2013-10-12',201341,10,2013,12,41,201310,2013),('2013-10-13',201342,10,2013,13,42,201310,2013),('2013-10-14',201342,10,2013,14,42,201310,2013),('2013-10-15',201342,10,2013,15,42,201310,2013),('2013-10-16',201342,10,2013,16,42,201310,2013),('2013-10-17',201342,10,2013,17,42,201310,2013),('2013-10-18',201342,10,2013,18,42,201310,2013),('2013-10-19',201342,10,2013,19,42,201310,2013),('2013-10-20',201343,10,2013,20,43,201310,2013),('2013-10-21',201343,10,2013,21,43,201310,2013),('2013-10-22',201343,10,2013,22,43,201310,2013),('2013-10-23',201343,10,2013,23,43,201310,2013),('2013-10-24',201343,10,2013,24,43,201310,2013),('2013-10-25',201343,10,2013,25,43,201310,2013),('2013-10-26',201343,10,2013,26,43,201310,2013),('2013-10-27',201344,10,2013,27,44,201310,2013),('2013-10-28',201344,10,2013,28,44,201310,2013),('2013-10-29',201344,10,2013,29,44,201310,2013),('2013-10-30',201344,10,2013,30,44,201310,2013),('2013-10-31',201344,10,2013,31,44,201310,2013),('2013-11-01',201344,11,2013,1,44,201311,2013),('2013-11-02',201344,11,2013,2,44,201311,2013),('2013-11-03',201345,11,2013,3,45,201311,2013),('2013-11-04',201345,11,2013,4,45,201311,2013),('2013-11-05',201345,11,2013,5,45,201311,2013),('2013-11-06',201345,11,2013,6,45,201311,2013),('2013-11-07',201345,11,2013,7,45,201311,2013),('2013-11-08',201345,11,2013,8,45,201311,2013),('2013-11-09',201345,11,2013,9,45,201311,2013),('2013-11-10',201346,11,2013,10,46,201311,2013),('2013-11-11',201346,11,2013,11,46,201311,2013),('2013-11-12',201346,11,2013,12,46,201311,2013),('2013-11-13',201346,11,2013,13,46,201311,2013),('2013-11-14',201346,11,2013,14,46,201311,2013),('2013-11-15',201346,11,2013,15,46,201311,2013),('2013-11-16',201346,11,2013,16,46,201311,2013),('2013-11-17',201347,11,2013,17,47,201311,2013),('2013-11-18',201347,11,2013,18,47,201311,2013),('2013-11-19',201347,11,2013,19,47,201311,2013),('2013-11-20',201347,11,2013,20,47,201311,2013),('2013-11-21',201347,11,2013,21,47,201311,2013),('2013-11-22',201347,11,2013,22,47,201311,2013),('2013-11-23',201347,11,2013,23,47,201311,2013),('2013-11-24',201348,11,2013,24,48,201311,2013),('2013-11-25',201348,11,2013,25,48,201311,2013),('2013-11-26',201348,11,2013,26,48,201311,2013),('2013-11-27',201348,11,2013,27,48,201311,2013),('2013-11-28',201348,11,2013,28,48,201311,2013),('2013-11-29',201348,11,2013,29,48,201311,2013),('2013-11-30',201348,11,2013,30,48,201311,2013),('2013-12-01',201349,12,2013,1,49,201312,2014),('2013-12-02',201349,12,2013,2,49,201312,2014),('2013-12-03',201349,12,2013,3,49,201312,2014),('2013-12-04',201349,12,2013,4,49,201312,2014),('2013-12-05',201349,12,2013,5,49,201312,2014),('2013-12-06',201349,12,2013,6,49,201312,2014),('2013-12-07',201349,12,2013,7,49,201312,2014),('2013-12-08',201350,12,2013,8,50,201312,2014),('2013-12-09',201350,12,2013,9,50,201312,2014),('2013-12-10',201350,12,2013,10,50,201312,2014),('2013-12-11',201350,12,2013,11,50,201312,2014),('2013-12-12',201350,12,2013,12,50,201312,2014),('2013-12-13',201350,12,2013,13,50,201312,2014),('2013-12-14',201350,12,2013,14,50,201312,2014),('2013-12-15',201351,12,2013,15,51,201312,2014),('2013-12-16',201351,12,2013,16,51,201312,2014),('2013-12-17',201351,12,2013,17,51,201312,2014),('2013-12-18',201351,12,2013,18,51,201312,2014),('2013-12-19',201351,12,2013,19,51,201312,2014),('2013-12-20',201351,12,2013,20,51,201312,2014),('2013-12-21',201351,12,2013,21,51,201312,2014),('2013-12-22',201352,12,2013,22,52,201312,2014),('2013-12-23',201352,12,2013,23,52,201312,2014),('2013-12-24',201352,12,2013,24,52,201312,2014),('2013-12-25',201352,12,2013,25,52,201312,2014),('2013-12-26',201352,12,2013,26,52,201312,2014),('2013-12-27',201352,12,2013,27,52,201312,2014),('2013-12-28',201352,12,2013,28,52,201312,2014),('2013-12-29',201401,12,2013,29,1,201312,2014),('2013-12-30',201401,12,2013,30,1,201312,2014),('2013-12-31',201401,12,2013,31,1,201312,2014),('2014-01-01',201401,1,2014,1,1,201401,2014),('2014-01-02',201401,1,2014,2,1,201401,2014),('2014-01-03',201401,1,2014,3,1,201401,2014),('2014-01-04',201401,1,2014,4,1,201401,2014),('2014-01-05',201402,1,2014,5,2,201401,2014),('2014-01-06',201402,1,2014,6,2,201401,2014),('2014-01-07',201402,1,2014,7,2,201401,2014),('2014-01-08',201402,1,2014,8,2,201401,2014),('2014-01-09',201402,1,2014,9,2,201401,2014),('2014-01-10',201402,1,2014,10,2,201401,2014),('2014-01-11',201402,1,2014,11,2,201401,2014),('2014-01-12',201403,1,2014,12,3,201401,2014),('2014-01-13',201403,1,2014,13,3,201401,2014),('2014-01-14',201403,1,2014,14,3,201401,2014),('2014-01-15',201403,1,2014,15,3,201401,2014),('2014-01-16',201403,1,2014,16,3,201401,2014),('2014-01-17',201403,1,2014,17,3,201401,2014),('2014-01-18',201403,1,2014,18,3,201401,2014),('2014-01-19',201404,1,2014,19,4,201401,2014),('2014-01-20',201404,1,2014,20,4,201401,2014),('2014-01-21',201404,1,2014,21,4,201401,2014),('2014-01-22',201404,1,2014,22,4,201401,2014),('2014-01-23',201404,1,2014,23,4,201401,2014),('2014-01-24',201404,1,2014,24,4,201401,2014),('2014-01-25',201404,1,2014,25,4,201401,2014),('2014-01-26',201405,1,2014,26,5,201401,2014),('2014-01-27',201405,1,2014,27,5,201401,2014),('2014-01-28',201405,1,2014,28,5,201401,2014),('2014-01-29',201405,1,2014,29,5,201401,2014),('2014-01-30',201405,1,2014,30,5,201401,2014),('2014-01-31',201405,1,2014,31,5,201401,2014),('2014-02-01',201405,2,2014,1,5,201402,2014),('2014-02-02',201406,2,2014,2,6,201402,2014),('2014-02-03',201406,2,2014,3,6,201402,2014),('2014-02-04',201406,2,2014,4,6,201402,2014),('2014-02-05',201406,2,2014,5,6,201402,2014),('2014-02-06',201406,2,2014,6,6,201402,2014),('2014-02-07',201406,2,2014,7,6,201402,2014),('2014-02-08',201406,2,2014,8,6,201402,2014),('2014-02-09',201407,2,2014,9,7,201402,2014),('2014-02-10',201407,2,2014,10,7,201402,2014),('2014-02-11',201407,2,2014,11,7,201402,2014),('2014-02-12',201407,2,2014,12,7,201402,2014),('2014-02-13',201407,2,2014,13,7,201402,2014),('2014-02-14',201407,2,2014,14,7,201402,2014),('2014-02-15',201407,2,2014,15,7,201402,2014),('2014-02-16',201408,2,2014,16,8,201402,2014),('2014-02-17',201408,2,2014,17,8,201402,2014),('2014-02-18',201408,2,2014,18,8,201402,2014),('2014-02-19',201408,2,2014,19,8,201402,2014),('2014-02-20',201408,2,2014,20,8,201402,2014),('2014-02-21',201408,2,2014,21,8,201402,2014),('2014-02-22',201408,2,2014,22,8,201402,2014),('2014-02-23',201409,2,2014,23,9,201402,2014),('2014-02-24',201409,2,2014,24,9,201402,2014),('2014-02-25',201409,2,2014,25,9,201402,2014),('2014-02-26',201409,2,2014,26,9,201402,2014),('2014-02-27',201409,2,2014,27,9,201402,2014),('2014-02-28',201409,2,2014,28,9,201402,2014),('2014-03-01',201409,3,2014,1,9,201403,2014),('2014-03-02',201410,3,2014,2,10,201403,2014),('2014-03-03',201410,3,2014,3,10,201403,2014),('2014-03-04',201410,3,2014,4,10,201403,2014),('2014-03-05',201410,3,2014,5,10,201403,2014),('2014-03-06',201410,3,2014,6,10,201403,2014),('2014-03-07',201410,3,2014,7,10,201403,2014),('2014-03-08',201410,3,2014,8,10,201403,2014),('2014-03-09',201411,3,2014,9,11,201403,2014),('2014-03-10',201411,3,2014,10,11,201403,2014),('2014-03-11',201411,3,2014,11,11,201403,2014),('2014-03-12',201411,3,2014,12,11,201403,2014),('2014-03-13',201411,3,2014,13,11,201403,2014),('2014-03-14',201411,3,2014,14,11,201403,2014),('2014-03-15',201411,3,2014,15,11,201403,2014),('2014-03-16',201412,3,2014,16,12,201403,2014),('2014-03-17',201412,3,2014,17,12,201403,2014),('2014-03-18',201412,3,2014,18,12,201403,2014),('2014-03-19',201412,3,2014,19,12,201403,2014),('2014-03-20',201412,3,2014,20,12,201403,2014),('2014-03-21',201412,3,2014,21,12,201403,2014),('2014-03-22',201412,3,2014,22,12,201403,2014),('2014-03-23',201413,3,2014,23,13,201403,2014),('2014-03-24',201413,3,2014,24,13,201403,2014),('2014-03-25',201413,3,2014,25,13,201403,2014),('2014-03-26',201413,3,2014,26,13,201403,2014),('2014-03-27',201413,3,2014,27,13,201403,2014),('2014-03-28',201413,3,2014,28,13,201403,2014),('2014-03-29',201413,3,2014,29,13,201403,2014),('2014-03-30',201414,3,2014,30,14,201403,2014),('2014-03-31',201414,3,2014,31,14,201403,2014),('2014-04-01',201414,4,2014,1,14,201404,2014),('2014-04-02',201414,4,2014,2,14,201404,2014),('2014-04-03',201414,4,2014,3,14,201404,2014),('2014-04-04',201414,4,2014,4,14,201404,2014),('2014-04-05',201414,4,2014,5,14,201404,2014),('2014-04-06',201415,4,2014,6,15,201404,2014),('2014-04-07',201415,4,2014,7,15,201404,2014),('2014-04-08',201415,4,2014,8,15,201404,2014),('2014-04-09',201415,4,2014,9,15,201404,2014),('2014-04-10',201415,4,2014,10,15,201404,2014),('2014-04-11',201415,4,2014,11,15,201404,2014),('2014-04-12',201415,4,2014,12,15,201404,2014),('2014-04-13',201416,4,2014,13,16,201404,2014),('2014-04-14',201416,4,2014,14,16,201404,2014),('2014-04-15',201416,4,2014,15,16,201404,2014),('2014-04-16',201416,4,2014,16,16,201404,2014),('2014-04-17',201416,4,2014,17,16,201404,2014),('2014-04-18',201416,4,2014,18,16,201404,2014),('2014-04-19',201416,4,2014,19,16,201404,2014),('2014-04-20',201417,4,2014,20,17,201404,2014),('2014-04-21',201417,4,2014,21,17,201404,2014),('2014-04-22',201417,4,2014,22,17,201404,2014),('2014-04-23',201417,4,2014,23,17,201404,2014),('2014-04-24',201417,4,2014,24,17,201404,2014),('2014-04-25',201417,4,2014,25,17,201404,2014),('2014-04-26',201417,4,2014,26,17,201404,2014),('2014-04-27',201418,4,2014,27,18,201404,2014),('2014-04-28',201418,4,2014,28,18,201404,2014),('2014-04-29',201418,4,2014,29,18,201404,2014),('2014-04-30',201418,4,2014,30,18,201404,2014),('2014-05-01',201418,5,2014,1,18,201405,2014),('2014-05-02',201418,5,2014,2,18,201405,2014),('2014-05-03',201418,5,2014,3,18,201405,2014),('2014-05-04',201419,5,2014,4,19,201405,2014),('2014-05-05',201419,5,2014,5,19,201405,2014),('2014-05-06',201419,5,2014,6,19,201405,2014),('2014-05-07',201419,5,2014,7,19,201405,2014),('2014-05-08',201419,5,2014,8,19,201405,2014),('2014-05-09',201419,5,2014,9,19,201405,2014),('2014-05-10',201419,5,2014,10,19,201405,2014),('2014-05-11',201420,5,2014,11,20,201405,2014),('2014-05-12',201420,5,2014,12,20,201405,2014),('2014-05-13',201420,5,2014,13,20,201405,2014),('2014-05-14',201420,5,2014,14,20,201405,2014),('2014-05-15',201420,5,2014,15,20,201405,2014),('2014-05-16',201420,5,2014,16,20,201405,2014),('2014-05-17',201420,5,2014,17,20,201405,2014),('2014-05-18',201421,5,2014,18,21,201405,2014),('2014-05-19',201421,5,2014,19,21,201405,2014),('2014-05-20',201421,5,2014,20,21,201405,2014),('2014-05-21',201421,5,2014,21,21,201405,2014),('2014-05-22',201421,5,2014,22,21,201405,2014),('2014-05-23',201421,5,2014,23,21,201405,2014),('2014-05-24',201421,5,2014,24,21,201405,2014),('2014-05-25',201422,5,2014,25,22,201405,2014),('2014-05-26',201422,5,2014,26,22,201405,2014),('2014-05-27',201422,5,2014,27,22,201405,2014),('2014-05-28',201422,5,2014,28,22,201405,2014),('2014-05-29',201422,5,2014,29,22,201405,2014),('2014-05-30',201422,5,2014,30,22,201405,2014),('2014-05-31',201422,5,2014,31,22,201405,2014),('2014-06-01',201423,6,2014,1,23,201406,2014),('2014-06-02',201423,6,2014,2,23,201406,2014),('2014-06-03',201423,6,2014,3,23,201406,2014),('2014-06-04',201423,6,2014,4,23,201406,2014),('2014-06-05',201423,6,2014,5,23,201406,2014),('2014-06-06',201423,6,2014,6,23,201406,2014),('2014-06-07',201423,6,2014,7,23,201406,2014),('2014-06-08',201424,6,2014,8,24,201406,2014),('2014-06-09',201424,6,2014,9,24,201406,2014),('2014-06-10',201424,6,2014,10,24,201406,2014),('2014-06-11',201424,6,2014,11,24,201406,2014),('2014-06-12',201424,6,2014,12,24,201406,2014),('2014-06-13',201424,6,2014,13,24,201406,2014),('2014-06-14',201424,6,2014,14,24,201406,2014),('2014-06-15',201425,6,2014,15,25,201406,2014),('2014-06-16',201425,6,2014,16,25,201406,2014),('2014-06-17',201425,6,2014,17,25,201406,2014),('2014-06-18',201425,6,2014,18,25,201406,2014),('2014-06-19',201425,6,2014,19,25,201406,2014),('2014-06-20',201425,6,2014,20,25,201406,2014),('2014-06-21',201425,6,2014,21,25,201406,2014),('2014-06-22',201426,6,2014,22,26,201406,2014),('2014-06-23',201426,6,2014,23,26,201406,2014),('2014-06-24',201426,6,2014,24,26,201406,2014),('2014-06-25',201426,6,2014,25,26,201406,2014),('2014-06-26',201426,6,2014,26,26,201406,2014),('2014-06-27',201426,6,2014,27,26,201406,2014),('2014-06-28',201426,6,2014,28,26,201406,2014),('2014-06-29',201427,6,2014,29,27,201406,2014),('2014-06-30',201427,6,2014,30,27,201406,2014),('2014-07-01',201427,7,2014,1,27,201407,2014),('2014-07-02',201427,7,2014,2,27,201407,2014),('2014-07-03',201427,7,2014,3,27,201407,2014),('2014-07-04',201427,7,2014,4,27,201407,2014),('2014-07-05',201427,7,2014,5,27,201407,2014),('2014-07-06',201428,7,2014,6,28,201407,2014),('2014-07-07',201428,7,2014,7,28,201407,2014),('2014-07-08',201428,7,2014,8,28,201407,2014),('2014-07-09',201428,7,2014,9,28,201407,2014),('2014-07-10',201428,7,2014,10,28,201407,2014),('2014-07-11',201428,7,2014,11,28,201407,2014),('2014-07-12',201428,7,2014,12,28,201407,2014),('2014-07-13',201429,7,2014,13,29,201407,2014),('2014-07-14',201429,7,2014,14,29,201407,2014),('2014-07-15',201429,7,2014,15,29,201407,2014),('2014-07-16',201429,7,2014,16,29,201407,2014),('2014-07-17',201429,7,2014,17,29,201407,2014),('2014-07-18',201429,7,2014,18,29,201407,2014),('2014-07-19',201429,7,2014,19,29,201407,2014),('2014-07-20',201430,7,2014,20,30,201407,2014),('2014-07-21',201430,7,2014,21,30,201407,2014),('2014-07-22',201430,7,2014,22,30,201407,2014),('2014-07-23',201430,7,2014,23,30,201407,2014),('2014-07-24',201430,7,2014,24,30,201407,2014),('2014-07-25',201430,7,2014,25,30,201407,2014),('2014-07-26',201430,7,2014,26,30,201407,2014),('2014-07-27',201431,7,2014,27,31,201407,2014),('2014-07-28',201431,7,2014,28,31,201407,2014),('2014-07-29',201431,7,2014,29,31,201407,2014),('2014-07-30',201431,7,2014,30,31,201407,2014),('2014-07-31',201431,7,2014,31,31,201407,2014),('2014-08-01',201431,8,2014,1,31,201408,2014),('2014-08-02',201431,8,2014,2,31,201408,2014),('2014-08-03',201432,8,2014,3,32,201408,2014),('2014-08-04',201432,8,2014,4,32,201408,2014),('2014-08-05',201432,8,2014,5,32,201408,2014),('2014-08-06',201432,8,2014,6,32,201408,2014),('2014-08-07',201432,8,2014,7,32,201408,2014),('2014-08-08',201432,8,2014,8,32,201408,2014),('2014-08-09',201432,8,2014,9,32,201408,2014),('2014-08-10',201433,8,2014,10,33,201408,2014),('2014-08-11',201433,8,2014,11,33,201408,2014),('2014-08-12',201433,8,2014,12,33,201408,2014),('2014-08-13',201433,8,2014,13,33,201408,2014),('2014-08-14',201433,8,2014,14,33,201408,2014),('2014-08-15',201433,8,2014,15,33,201408,2014),('2014-08-16',201433,8,2014,16,33,201408,2014),('2014-08-17',201434,8,2014,17,34,201408,2014),('2014-08-18',201434,8,2014,18,34,201408,2014),('2014-08-19',201434,8,2014,19,34,201408,2014),('2014-08-20',201434,8,2014,20,34,201408,2014),('2014-08-21',201434,8,2014,21,34,201408,2014),('2014-08-22',201434,8,2014,22,34,201408,2014),('2014-08-23',201434,8,2014,23,34,201408,2014),('2014-08-24',201435,8,2014,24,35,201408,2014),('2014-08-25',201435,8,2014,25,35,201408,2014),('2014-08-26',201435,8,2014,26,35,201408,2014),('2014-08-27',201435,8,2014,27,35,201408,2014),('2014-08-28',201435,8,2014,28,35,201408,2014),('2014-08-29',201435,8,2014,29,35,201408,2014),('2014-08-30',201435,8,2014,30,35,201408,2014),('2014-08-31',201436,8,2014,31,36,201408,2014),('2014-09-01',201436,9,2014,1,36,201409,2014),('2014-09-02',201436,9,2014,2,36,201409,2014),('2014-09-03',201436,9,2014,3,36,201409,2014),('2014-09-04',201436,9,2014,4,36,201409,2014),('2014-09-05',201436,9,2014,5,36,201409,2014),('2014-09-06',201436,9,2014,6,36,201409,2014),('2014-09-07',201437,9,2014,7,37,201409,2014),('2014-09-08',201437,9,2014,8,37,201409,2014),('2014-09-09',201437,9,2014,9,37,201409,2014),('2014-09-10',201437,9,2014,10,37,201409,2014),('2014-09-11',201437,9,2014,11,37,201409,2014),('2014-09-12',201437,9,2014,12,37,201409,2014),('2014-09-13',201437,9,2014,13,37,201409,2014),('2014-09-14',201438,9,2014,14,38,201409,2014),('2014-09-15',201438,9,2014,15,38,201409,2014),('2014-09-16',201438,9,2014,16,38,201409,2014),('2014-09-17',201438,9,2014,17,38,201409,2014),('2014-09-18',201438,9,2014,18,38,201409,2014),('2014-09-19',201438,9,2014,19,38,201409,2014),('2014-09-20',201438,9,2014,20,38,201409,2014),('2014-09-21',201439,9,2014,21,39,201409,2014),('2014-09-22',201439,9,2014,22,39,201409,2014),('2014-09-23',201439,9,2014,23,39,201409,2014),('2014-09-24',201439,9,2014,24,39,201409,2014),('2014-09-25',201439,9,2014,25,39,201409,2014),('2014-09-26',201439,9,2014,26,39,201409,2014),('2014-09-27',201439,9,2014,27,39,201409,2014),('2014-09-28',201440,9,2014,28,40,201409,2014),('2014-09-29',201440,9,2014,29,40,201409,2014),('2014-09-30',201440,9,2014,30,40,201409,2014),('2014-10-01',201440,10,2014,1,40,201410,2014),('2014-10-02',201440,10,2014,2,40,201410,2014),('2014-10-03',201440,10,2014,3,40,201410,2014),('2014-10-04',201440,10,2014,4,40,201410,2014),('2014-10-05',201441,10,2014,5,41,201410,2014),('2014-10-06',201441,10,2014,6,41,201410,2014),('2014-10-07',201441,10,2014,7,41,201410,2014),('2014-10-08',201441,10,2014,8,41,201410,2014),('2014-10-09',201441,10,2014,9,41,201410,2014),('2014-10-10',201441,10,2014,10,41,201410,2014),('2014-10-11',201441,10,2014,11,41,201410,2014),('2014-10-12',201442,10,2014,12,42,201410,2014),('2014-10-13',201442,10,2014,13,42,201410,2014),('2014-10-14',201442,10,2014,14,42,201410,2014),('2014-10-15',201442,10,2014,15,42,201410,2014),('2014-10-16',201442,10,2014,16,42,201410,2014),('2014-10-17',201442,10,2014,17,42,201410,2014),('2014-10-18',201442,10,2014,18,42,201410,2014),('2014-10-19',201443,10,2014,19,43,201410,2014),('2014-10-20',201443,10,2014,20,43,201410,2014),('2014-10-21',201443,10,2014,21,43,201410,2014),('2014-10-22',201443,10,2014,22,43,201410,2014),('2014-10-23',201443,10,2014,23,43,201410,2014),('2014-10-24',201443,10,2014,24,43,201410,2014),('2014-10-25',201443,10,2014,25,43,201410,2014),('2014-10-26',201444,10,2014,26,44,201410,2014),('2014-10-27',201444,10,2014,27,44,201410,2014),('2014-10-28',201444,10,2014,28,44,201410,2014),('2014-10-29',201444,10,2014,29,44,201410,2014),('2014-10-30',201444,10,2014,30,44,201410,2014),('2014-10-31',201444,10,2014,31,44,201410,2014),('2014-11-01',201444,11,2014,1,44,201411,2014),('2014-11-02',201445,11,2014,2,45,201411,2014),('2014-11-03',201445,11,2014,3,45,201411,2014),('2014-11-04',201445,11,2014,4,45,201411,2014),('2014-11-05',201445,11,2014,5,45,201411,2014),('2014-11-06',201445,11,2014,6,45,201411,2014),('2014-11-07',201445,11,2014,7,45,201411,2014),('2014-11-08',201445,11,2014,8,45,201411,2014),('2014-11-09',201446,11,2014,9,46,201411,2014),('2014-11-10',201446,11,2014,10,46,201411,2014),('2014-11-11',201446,11,2014,11,46,201411,2014),('2014-11-12',201446,11,2014,12,46,201411,2014),('2014-11-13',201446,11,2014,13,46,201411,2014),('2014-11-14',201446,11,2014,14,46,201411,2014),('2014-11-15',201446,11,2014,15,46,201411,2014),('2014-11-16',201447,11,2014,16,47,201411,2014),('2014-11-17',201447,11,2014,17,47,201411,2014),('2014-11-18',201447,11,2014,18,47,201411,2014),('2014-11-19',201447,11,2014,19,47,201411,2014),('2014-11-20',201447,11,2014,20,47,201411,2014),('2014-11-21',201447,11,2014,21,47,201411,2014),('2014-11-22',201447,11,2014,22,47,201411,2014),('2014-11-23',201448,11,2014,23,48,201411,2014),('2014-11-24',201448,11,2014,24,48,201411,2014),('2014-11-25',201448,11,2014,25,48,201411,2014),('2014-11-26',201448,11,2014,26,48,201411,2014),('2014-11-27',201448,11,2014,27,48,201411,2014),('2014-11-28',201448,11,2014,28,48,201411,2014),('2014-11-29',201448,11,2014,29,48,201411,2014),('2014-11-30',201449,11,2014,30,49,201411,2014),('2014-12-01',201449,12,2014,1,49,201412,2015),('2014-12-02',201449,12,2014,2,49,201412,2015),('2014-12-03',201449,12,2014,3,49,201412,2015),('2014-12-04',201449,12,2014,4,49,201412,2015),('2014-12-05',201449,12,2014,5,49,201412,2015),('2014-12-06',201449,12,2014,6,49,201412,2015),('2014-12-07',201450,12,2014,7,50,201412,2015),('2014-12-08',201450,12,2014,8,50,201412,2015),('2014-12-09',201450,12,2014,9,50,201412,2015),('2014-12-10',201450,12,2014,10,50,201412,2015),('2014-12-11',201450,12,2014,11,50,201412,2015),('2014-12-12',201450,12,2014,12,50,201412,2015),('2014-12-13',201450,12,2014,13,50,201412,2015),('2014-12-14',201451,12,2014,14,51,201412,2015),('2014-12-15',201451,12,2014,15,51,201412,2015),('2014-12-16',201451,12,2014,16,51,201412,2015),('2014-12-17',201451,12,2014,17,51,201412,2015),('2014-12-18',201451,12,2014,18,51,201412,2015),('2014-12-19',201451,12,2014,19,51,201412,2015),('2014-12-20',201451,12,2014,20,51,201412,2015),('2014-12-21',201452,12,2014,21,52,201412,2015),('2014-12-22',201452,12,2014,22,52,201412,2015),('2014-12-23',201452,12,2014,23,52,201412,2015),('2014-12-24',201452,12,2014,24,52,201412,2015),('2014-12-25',201452,12,2014,25,52,201412,2015),('2014-12-26',201452,12,2014,26,52,201412,2015),('2014-12-27',201452,12,2014,27,52,201412,2015),('2014-12-28',201453,12,2014,28,53,201412,2015),('2014-12-29',201453,12,2014,29,53,201412,2015),('2014-12-30',201453,12,2014,30,53,201412,2015),('2014-12-31',201453,12,2014,31,53,201412,2015),('2015-01-01',201453,1,2015,1,53,201501,2015),('2015-01-02',201453,1,2015,2,53,201501,2015),('2015-01-03',201453,1,2015,3,53,201501,2015),('2015-01-04',201501,1,2015,4,1,201501,2015),('2015-01-05',201501,1,2015,5,1,201501,2015),('2015-01-06',201501,1,2015,6,1,201501,2015),('2015-01-07',201501,1,2015,7,1,201501,2015),('2015-01-08',201501,1,2015,8,1,201501,2015),('2015-01-09',201501,1,2015,9,1,201501,2015),('2015-01-10',201501,1,2015,10,1,201501,2015),('2015-01-11',201502,1,2015,11,2,201501,2015),('2015-01-12',201502,1,2015,12,2,201501,2015),('2015-01-13',201502,1,2015,13,2,201501,2015),('2015-01-14',201502,1,2015,14,2,201501,2015),('2015-01-15',201502,1,2015,15,2,201501,2015),('2015-01-16',201502,1,2015,16,2,201501,2015),('2015-01-17',201502,1,2015,17,2,201501,2015),('2015-01-18',201503,1,2015,18,3,201501,2015),('2015-01-19',201503,1,2015,19,3,201501,2015),('2015-01-20',201503,1,2015,20,3,201501,2015),('2015-01-21',201503,1,2015,21,3,201501,2015),('2015-01-22',201503,1,2015,22,3,201501,2015),('2015-01-23',201503,1,2015,23,3,201501,2015),('2015-01-24',201503,1,2015,24,3,201501,2015),('2015-01-25',201504,1,2015,25,4,201501,2015),('2015-01-26',201504,1,2015,26,4,201501,2015),('2015-01-27',201504,1,2015,27,4,201501,2015),('2015-01-28',201504,1,2015,28,4,201501,2015),('2015-01-29',201504,1,2015,29,4,201501,2015),('2015-01-30',201504,1,2015,30,4,201501,2015),('2015-01-31',201504,1,2015,31,4,201501,2015),('2015-02-01',201505,2,2015,1,5,201502,2015),('2015-02-02',201505,2,2015,2,5,201502,2015),('2015-02-03',201505,2,2015,3,5,201502,2015),('2015-02-04',201505,2,2015,4,5,201502,2015),('2015-02-05',201505,2,2015,5,5,201502,2015),('2015-02-06',201505,2,2015,6,5,201502,2015),('2015-02-07',201505,2,2015,7,5,201502,2015),('2015-02-08',201506,2,2015,8,6,201502,2015),('2015-02-09',201506,2,2015,9,6,201502,2015),('2015-02-10',201506,2,2015,10,6,201502,2015),('2015-02-11',201506,2,2015,11,6,201502,2015),('2015-02-12',201506,2,2015,12,6,201502,2015),('2015-02-13',201506,2,2015,13,6,201502,2015),('2015-02-14',201506,2,2015,14,6,201502,2015),('2015-02-15',201507,2,2015,15,7,201502,2015),('2015-02-16',201507,2,2015,16,7,201502,2015),('2015-02-17',201507,2,2015,17,7,201502,2015),('2015-02-18',201507,2,2015,18,7,201502,2015),('2015-02-19',201507,2,2015,19,7,201502,2015),('2015-02-20',201507,2,2015,20,7,201502,2015),('2015-02-21',201507,2,2015,21,7,201502,2015),('2015-02-22',201508,2,2015,22,8,201502,2015),('2015-02-23',201508,2,2015,23,8,201502,2015),('2015-02-24',201508,2,2015,24,8,201502,2015),('2015-02-25',201508,2,2015,25,8,201502,2015),('2015-02-26',201508,2,2015,26,8,201502,2015),('2015-02-27',201508,2,2015,27,8,201502,2015),('2015-02-28',201508,2,2015,28,8,201502,2015),('2015-03-01',201509,3,2015,1,9,201503,2015),('2015-03-02',201509,3,2015,2,9,201503,2015),('2015-03-03',201509,3,2015,3,9,201503,2015),('2015-03-04',201509,3,2015,4,9,201503,2015),('2015-03-05',201509,3,2015,5,9,201503,2015),('2015-03-06',201509,3,2015,6,9,201503,2015),('2015-03-07',201509,3,2015,7,9,201503,2015),('2015-03-08',201510,3,2015,8,10,201503,2015),('2015-03-09',201510,3,2015,9,10,201503,2015),('2015-03-10',201510,3,2015,10,10,201503,2015),('2015-03-11',201510,3,2015,11,10,201503,2015),('2015-03-12',201510,3,2015,12,10,201503,2015),('2015-03-13',201510,3,2015,13,10,201503,2015),('2015-03-14',201510,3,2015,14,10,201503,2015),('2015-03-15',201511,3,2015,15,11,201503,2015),('2015-03-16',201511,3,2015,16,11,201503,2015),('2015-03-17',201511,3,2015,17,11,201503,2015),('2015-03-18',201511,3,2015,18,11,201503,2015),('2015-03-19',201511,3,2015,19,11,201503,2015),('2015-03-20',201511,3,2015,20,11,201503,2015),('2015-03-21',201511,3,2015,21,11,201503,2015),('2015-03-22',201512,3,2015,22,12,201503,2015),('2015-03-23',201512,3,2015,23,12,201503,2015),('2015-03-24',201512,3,2015,24,12,201503,2015),('2015-03-25',201512,3,2015,25,12,201503,2015),('2015-03-26',201512,3,2015,26,12,201503,2015),('2015-03-27',201512,3,2015,27,12,201503,2015),('2015-03-28',201512,3,2015,28,12,201503,2015),('2015-03-29',201513,3,2015,29,13,201503,2015),('2015-03-30',201513,3,2015,30,13,201503,2015),('2015-03-31',201513,3,2015,31,13,201503,2015),('2015-04-01',201513,4,2015,1,13,201504,2015),('2015-04-02',201513,4,2015,2,13,201504,2015),('2015-04-03',201513,4,2015,3,13,201504,2015),('2015-04-04',201513,4,2015,4,13,201504,2015),('2015-04-05',201514,4,2015,5,14,201504,2015),('2015-04-06',201514,4,2015,6,14,201504,2015),('2015-04-07',201514,4,2015,7,14,201504,2015),('2015-04-08',201514,4,2015,8,14,201504,2015),('2015-04-09',201514,4,2015,9,14,201504,2015),('2015-04-10',201514,4,2015,10,14,201504,2015),('2015-04-11',201514,4,2015,11,14,201504,2015),('2015-04-12',201515,4,2015,12,15,201504,2015),('2015-04-13',201515,4,2015,13,15,201504,2015),('2015-04-14',201515,4,2015,14,15,201504,2015),('2015-04-15',201515,4,2015,15,15,201504,2015),('2015-04-16',201515,4,2015,16,15,201504,2015),('2015-04-17',201515,4,2015,17,15,201504,2015),('2015-04-18',201515,4,2015,18,15,201504,2015),('2015-04-19',201516,4,2015,19,16,201504,2015),('2015-04-20',201516,4,2015,20,16,201504,2015),('2015-04-21',201516,4,2015,21,16,201504,2015),('2015-04-22',201516,4,2015,22,16,201504,2015),('2015-04-23',201516,4,2015,23,16,201504,2015),('2015-04-24',201516,4,2015,24,16,201504,2015),('2015-04-25',201516,4,2015,25,16,201504,2015),('2015-04-26',201517,4,2015,26,17,201504,2015),('2015-04-27',201517,4,2015,27,17,201504,2015),('2015-04-28',201517,4,2015,28,17,201504,2015),('2015-04-29',201517,4,2015,29,17,201504,2015),('2015-04-30',201517,4,2015,30,17,201504,2015),('2015-05-01',201517,5,2015,1,17,201505,2015),('2015-05-02',201517,5,2015,2,17,201505,2015),('2015-05-03',201518,5,2015,3,18,201505,2015),('2015-05-04',201518,5,2015,4,18,201505,2015),('2015-05-05',201518,5,2015,5,18,201505,2015),('2015-05-06',201518,5,2015,6,18,201505,2015),('2015-05-07',201518,5,2015,7,18,201505,2015),('2015-05-08',201518,5,2015,8,18,201505,2015),('2015-05-09',201518,5,2015,9,18,201505,2015),('2015-05-10',201519,5,2015,10,19,201505,2015),('2015-05-11',201519,5,2015,11,19,201505,2015),('2015-05-12',201519,5,2015,12,19,201505,2015),('2015-05-13',201519,5,2015,13,19,201505,2015),('2015-05-14',201519,5,2015,14,19,201505,2015),('2015-05-15',201519,5,2015,15,19,201505,2015),('2015-05-16',201519,5,2015,16,19,201505,2015),('2015-05-17',201520,5,2015,17,20,201505,2015),('2015-05-18',201520,5,2015,18,20,201505,2015),('2015-05-19',201520,5,2015,19,20,201505,2015),('2015-05-20',201520,5,2015,20,20,201505,2015),('2015-05-21',201520,5,2015,21,20,201505,2015),('2015-05-22',201520,5,2015,22,20,201505,2015),('2015-05-23',201520,5,2015,23,20,201505,2015),('2015-05-24',201521,5,2015,24,21,201505,2015),('2015-05-25',201521,5,2015,25,21,201505,2015),('2015-05-26',201521,5,2015,26,21,201505,2015),('2015-05-27',201521,5,2015,27,21,201505,2015),('2015-05-28',201521,5,2015,28,21,201505,2015),('2015-05-29',201521,5,2015,29,21,201505,2015),('2015-05-30',201521,5,2015,30,21,201505,2015),('2015-05-31',201522,5,2015,31,22,201505,2015),('2015-06-01',201522,6,2015,1,22,201506,2015),('2015-06-02',201522,6,2015,2,22,201506,2015),('2015-06-03',201522,6,2015,3,22,201506,2015),('2015-06-04',201522,6,2015,4,22,201506,2015),('2015-06-05',201522,6,2015,5,22,201506,2015),('2015-06-06',201522,6,2015,6,22,201506,2015),('2015-06-07',201523,6,2015,7,23,201506,2015),('2015-06-08',201523,6,2015,8,23,201506,2015),('2015-06-09',201523,6,2015,9,23,201506,2015),('2015-06-10',201523,6,2015,10,23,201506,2015),('2015-06-11',201523,6,2015,11,23,201506,2015),('2015-06-12',201523,6,2015,12,23,201506,2015),('2015-06-13',201523,6,2015,13,23,201506,2015),('2015-06-14',201524,6,2015,14,24,201506,2015),('2015-06-15',201524,6,2015,15,24,201506,2015),('2015-06-16',201524,6,2015,16,24,201506,2015),('2015-06-17',201524,6,2015,17,24,201506,2015),('2015-06-18',201524,6,2015,18,24,201506,2015),('2015-06-19',201524,6,2015,19,24,201506,2015),('2015-06-20',201524,6,2015,20,24,201506,2015),('2015-06-21',201525,6,2015,21,25,201506,2015),('2015-06-22',201525,6,2015,22,25,201506,2015),('2015-06-23',201525,6,2015,23,25,201506,2015),('2015-06-24',201525,6,2015,24,25,201506,2015),('2015-06-25',201525,6,2015,25,25,201506,2015),('2015-06-26',201525,6,2015,26,25,201506,2015),('2015-06-27',201525,6,2015,27,25,201506,2015),('2015-06-28',201526,6,2015,28,26,201506,2015),('2015-06-29',201526,6,2015,29,26,201506,2015),('2015-06-30',201526,6,2015,30,26,201506,2015),('2015-07-01',201526,7,2015,1,26,201507,2015),('2015-07-02',201526,7,2015,2,26,201507,2015),('2015-07-03',201526,7,2015,3,26,201507,2015),('2015-07-04',201526,7,2015,4,26,201507,2015),('2015-07-05',201527,7,2015,5,27,201507,2015),('2015-07-06',201527,7,2015,6,27,201507,2015),('2015-07-07',201527,7,2015,7,27,201507,2015),('2015-07-08',201527,7,2015,8,27,201507,2015),('2015-07-09',201527,7,2015,9,27,201507,2015),('2015-07-10',201527,7,2015,10,27,201507,2015),('2015-07-11',201527,7,2015,11,27,201507,2015),('2015-07-12',201528,7,2015,12,28,201507,2015),('2015-07-13',201528,7,2015,13,28,201507,2015),('2015-07-14',201528,7,2015,14,28,201507,2015),('2015-07-15',201528,7,2015,15,28,201507,2015),('2015-07-16',201528,7,2015,16,28,201507,2015),('2015-07-17',201528,7,2015,17,28,201507,2015),('2015-07-18',201528,7,2015,18,28,201507,2015),('2015-07-19',201529,7,2015,19,29,201507,2015),('2015-07-20',201529,7,2015,20,29,201507,2015),('2015-07-21',201529,7,2015,21,29,201507,2015),('2015-07-22',201529,7,2015,22,29,201507,2015),('2015-07-23',201529,7,2015,23,29,201507,2015),('2015-07-24',201529,7,2015,24,29,201507,2015),('2015-07-25',201529,7,2015,25,29,201507,2015),('2015-07-26',201530,7,2015,26,30,201507,2015),('2015-07-27',201530,7,2015,27,30,201507,2015),('2015-07-28',201530,7,2015,28,30,201507,2015),('2015-07-29',201530,7,2015,29,30,201507,2015),('2015-07-30',201530,7,2015,30,30,201507,2015),('2015-07-31',201530,7,2015,31,30,201507,2015),('2015-08-01',201530,8,2015,1,30,201508,2015),('2015-08-02',201531,8,2015,2,31,201508,2015),('2015-08-03',201531,8,2015,3,31,201508,2015),('2015-08-04',201531,8,2015,4,31,201508,2015),('2015-08-05',201531,8,2015,5,31,201508,2015),('2015-08-06',201531,8,2015,6,31,201508,2015),('2015-08-07',201531,8,2015,7,31,201508,2015),('2015-08-08',201531,8,2015,8,31,201508,2015),('2015-08-09',201532,8,2015,9,32,201508,2015),('2015-08-10',201532,8,2015,10,32,201508,2015),('2015-08-11',201532,8,2015,11,32,201508,2015),('2015-08-12',201532,8,2015,12,32,201508,2015),('2015-08-13',201532,8,2015,13,32,201508,2015),('2015-08-14',201532,8,2015,14,32,201508,2015),('2015-08-15',201532,8,2015,15,32,201508,2015),('2015-08-16',201533,8,2015,16,33,201508,2015),('2015-08-17',201533,8,2015,17,33,201508,2015),('2015-08-18',201533,8,2015,18,33,201508,2015),('2015-08-19',201533,8,2015,19,33,201508,2015),('2015-08-20',201533,8,2015,20,33,201508,2015),('2015-08-21',201533,8,2015,21,33,201508,2015),('2015-08-22',201533,8,2015,22,33,201508,2015),('2015-08-23',201534,8,2015,23,34,201508,2015),('2015-08-24',201534,8,2015,24,34,201508,2015),('2015-08-25',201534,8,2015,25,34,201508,2015),('2015-08-26',201534,8,2015,26,34,201508,2015),('2015-08-27',201534,8,2015,27,34,201508,2015),('2015-08-28',201534,8,2015,28,34,201508,2015),('2015-08-29',201534,8,2015,29,34,201508,2015),('2015-08-30',201535,8,2015,30,35,201508,2015),('2015-08-31',201535,8,2015,31,35,201508,2015),('2015-09-01',201535,9,2015,1,35,201509,2015),('2015-09-02',201535,9,2015,2,35,201509,2015),('2015-09-03',201535,9,2015,3,35,201509,2015),('2015-09-04',201535,9,2015,4,35,201509,2015),('2015-09-05',201535,9,2015,5,35,201509,2015),('2015-09-06',201536,9,2015,6,36,201509,2015),('2015-09-07',201536,9,2015,7,36,201509,2015),('2015-09-08',201536,9,2015,8,36,201509,2015),('2015-09-09',201536,9,2015,9,36,201509,2015),('2015-09-10',201536,9,2015,10,36,201509,2015),('2015-09-11',201536,9,2015,11,36,201509,2015),('2015-09-12',201536,9,2015,12,36,201509,2015),('2015-09-13',201537,9,2015,13,37,201509,2015),('2015-09-14',201537,9,2015,14,37,201509,2015),('2015-09-15',201537,9,2015,15,37,201509,2015),('2015-09-16',201537,9,2015,16,37,201509,2015),('2015-09-17',201537,9,2015,17,37,201509,2015),('2015-09-18',201537,9,2015,18,37,201509,2015),('2015-09-19',201537,9,2015,19,37,201509,2015),('2015-09-20',201538,9,2015,20,38,201509,2015),('2015-09-21',201538,9,2015,21,38,201509,2015),('2015-09-22',201538,9,2015,22,38,201509,2015),('2015-09-23',201538,9,2015,23,38,201509,2015),('2015-09-24',201538,9,2015,24,38,201509,2015),('2015-09-25',201538,9,2015,25,38,201509,2015),('2015-09-26',201538,9,2015,26,38,201509,2015),('2015-09-27',201539,9,2015,27,39,201509,2015),('2015-09-28',201539,9,2015,28,39,201509,2015),('2015-09-29',201539,9,2015,29,39,201509,2015),('2015-09-30',201539,9,2015,30,39,201509,2015),('2015-10-01',201539,10,2015,1,39,201510,2015),('2015-10-02',201539,10,2015,2,39,201510,2015),('2015-10-03',201539,10,2015,3,39,201510,2015),('2015-10-04',201540,10,2015,4,40,201510,2015),('2015-10-05',201540,10,2015,5,40,201510,2015),('2015-10-06',201540,10,2015,6,40,201510,2015),('2015-10-07',201540,10,2015,7,40,201510,2015),('2015-10-08',201540,10,2015,8,40,201510,2015),('2015-10-09',201540,10,2015,9,40,201510,2015),('2015-10-10',201540,10,2015,10,40,201510,2015),('2015-10-11',201541,10,2015,11,41,201510,2015),('2015-10-12',201541,10,2015,12,41,201510,2015),('2015-10-13',201541,10,2015,13,41,201510,2015),('2015-10-14',201541,10,2015,14,41,201510,2015),('2015-10-15',201541,10,2015,15,41,201510,2015),('2015-10-16',201541,10,2015,16,41,201510,2015),('2015-10-17',201541,10,2015,17,41,201510,2015),('2015-10-18',201542,10,2015,18,42,201510,2015),('2015-10-19',201542,10,2015,19,42,201510,2015),('2015-10-20',201542,10,2015,20,42,201510,2015),('2015-10-21',201542,10,2015,21,42,201510,2015),('2015-10-22',201542,10,2015,22,42,201510,2015),('2015-10-23',201542,10,2015,23,42,201510,2015),('2015-10-24',201542,10,2015,24,42,201510,2015),('2015-10-25',201543,10,2015,25,43,201510,2015),('2015-10-26',201543,10,2015,26,43,201510,2015),('2015-10-27',201543,10,2015,27,43,201510,2015),('2015-10-28',201543,10,2015,28,43,201510,2015),('2015-10-29',201543,10,2015,29,43,201510,2015),('2015-10-30',201543,10,2015,30,43,201510,2015),('2015-10-31',201543,10,2015,31,43,201510,2015),('2015-11-01',201544,11,2015,1,44,201511,2015),('2015-11-02',201544,11,2015,2,44,201511,2015),('2015-11-03',201544,11,2015,3,44,201511,2015),('2015-11-04',201544,11,2015,4,44,201511,2015),('2015-11-05',201544,11,2015,5,44,201511,2015),('2015-11-06',201544,11,2015,6,44,201511,2015),('2015-11-07',201544,11,2015,7,44,201511,2015),('2015-11-08',201545,11,2015,8,45,201511,2015),('2015-11-09',201545,11,2015,9,45,201511,2015),('2015-11-10',201545,11,2015,10,45,201511,2015),('2015-11-11',201545,11,2015,11,45,201511,2015),('2015-11-12',201545,11,2015,12,45,201511,2015),('2015-11-13',201545,11,2015,13,45,201511,2015),('2015-11-14',201545,11,2015,14,45,201511,2015),('2015-11-15',201546,11,2015,15,46,201511,2015),('2015-11-16',201546,11,2015,16,46,201511,2015),('2015-11-17',201546,11,2015,17,46,201511,2015),('2015-11-18',201546,11,2015,18,46,201511,2015),('2015-11-19',201546,11,2015,19,46,201511,2015),('2015-11-20',201546,11,2015,20,46,201511,2015),('2015-11-21',201546,11,2015,21,46,201511,2015),('2015-11-22',201547,11,2015,22,47,201511,2015),('2015-11-23',201547,11,2015,23,47,201511,2015),('2015-11-24',201547,11,2015,24,47,201511,2015),('2015-11-25',201547,11,2015,25,47,201511,2015),('2015-11-26',201547,11,2015,26,47,201511,2015),('2015-11-27',201547,11,2015,27,47,201511,2015),('2015-11-28',201547,11,2015,28,47,201511,2015),('2015-11-29',201548,11,2015,29,48,201511,2015),('2015-11-30',201548,11,2015,30,48,201511,2015),('2015-12-01',201548,12,2015,1,48,201512,2016),('2015-12-02',201548,12,2015,2,48,201512,2016),('2015-12-03',201548,12,2015,3,48,201512,2016),('2015-12-04',201548,12,2015,4,48,201512,2016),('2015-12-05',201548,12,2015,5,48,201512,2016),('2015-12-06',201549,12,2015,6,49,201512,2016),('2015-12-07',201549,12,2015,7,49,201512,2016),('2015-12-08',201549,12,2015,8,49,201512,2016),('2015-12-09',201549,12,2015,9,49,201512,2016),('2015-12-10',201549,12,2015,10,49,201512,2016),('2015-12-11',201549,12,2015,11,49,201512,2016),('2015-12-12',201549,12,2015,12,49,201512,2016),('2015-12-13',201550,12,2015,13,50,201512,2016),('2015-12-14',201550,12,2015,14,50,201512,2016),('2015-12-15',201550,12,2015,15,50,201512,2016),('2015-12-16',201550,12,2015,16,50,201512,2016),('2015-12-17',201550,12,2015,17,50,201512,2016),('2015-12-18',201550,12,2015,18,50,201512,2016),('2015-12-19',201550,12,2015,19,50,201512,2016),('2015-12-20',201551,12,2015,20,51,201512,2016),('2015-12-21',201551,12,2015,21,51,201512,2016),('2015-12-22',201551,12,2015,22,51,201512,2016),('2015-12-23',201551,12,2015,23,51,201512,2016),('2015-12-24',201551,12,2015,24,51,201512,2016),('2015-12-25',201551,12,2015,25,51,201512,2016),('2015-12-26',201551,12,2015,26,51,201512,2016),('2015-12-27',201552,12,2015,27,52,201512,2016),('2015-12-28',201552,12,2015,28,52,201512,2016),('2015-12-29',201552,12,2015,29,52,201512,2016),('2015-12-30',201552,12,2015,30,52,201512,2016),('2015-12-31',201552,12,2015,31,52,201512,2016),('2016-01-01',201552,1,2016,1,1,201601,2016),('2016-01-02',201552,1,2016,2,1,201601,2016),('2016-01-03',201601,1,2016,3,1,201601,2016),('2016-01-04',201601,1,2016,4,1,201601,2016),('2016-01-05',201601,1,2016,5,1,201601,2016),('2016-01-06',201601,1,2016,6,1,201601,2016),('2016-01-07',201601,1,2016,7,1,201601,2016),('2016-01-08',201601,1,2016,8,1,201601,2016),('2016-01-09',201601,1,2016,9,1,201601,2016),('2016-01-10',201602,1,2016,10,2,201601,2016),('2016-01-11',201602,1,2016,11,2,201601,2016),('2016-01-12',201602,1,2016,12,2,201601,2016),('2016-01-13',201602,1,2016,13,2,201601,2016),('2016-01-14',201602,1,2016,14,2,201601,2016),('2016-01-15',201602,1,2016,15,2,201601,2016),('2016-01-16',201602,1,2016,16,2,201601,2016),('2016-01-17',201603,1,2016,17,3,201601,2016),('2016-01-18',201603,1,2016,18,3,201601,2016),('2016-01-19',201603,1,2016,19,3,201601,2016),('2016-01-20',201603,1,2016,20,3,201601,2016),('2016-01-21',201603,1,2016,21,3,201601,2016),('2016-01-22',201603,1,2016,22,3,201601,2016),('2016-01-23',201603,1,2016,23,3,201601,2016),('2016-01-24',201604,1,2016,24,4,201601,2016),('2016-01-25',201604,1,2016,25,4,201601,2016),('2016-01-26',201604,1,2016,26,4,201601,2016),('2016-01-27',201604,1,2016,27,4,201601,2016),('2016-01-28',201604,1,2016,28,4,201601,2016),('2016-01-29',201604,1,2016,29,4,201601,2016),('2016-01-30',201604,1,2016,30,4,201601,2016),('2016-01-31',201605,1,2016,31,5,201601,2016),('2016-02-01',201605,2,2016,1,5,201602,2016),('2016-02-02',201605,2,2016,2,5,201602,2016),('2016-02-03',201605,2,2016,3,5,201602,2016),('2016-02-04',201605,2,2016,4,5,201602,2016),('2016-02-05',201605,2,2016,5,5,201602,2016),('2016-02-06',201605,2,2016,6,5,201602,2016),('2016-02-07',201606,2,2016,7,6,201602,2016),('2016-02-08',201606,2,2016,8,6,201602,2016),('2016-02-09',201606,2,2016,9,6,201602,2016),('2016-02-10',201606,2,2016,10,6,201602,2016),('2016-02-11',201606,2,2016,11,6,201602,2016),('2016-02-12',201606,2,2016,12,6,201602,2016),('2016-02-13',201606,2,2016,13,6,201602,2016),('2016-02-14',201607,2,2016,14,7,201602,2016),('2016-02-15',201607,2,2016,15,7,201602,2016),('2016-02-16',201607,2,2016,16,7,201602,2016),('2016-02-17',201607,2,2016,17,7,201602,2016),('2016-02-18',201607,2,2016,18,7,201602,2016),('2016-02-19',201607,2,2016,19,7,201602,2016),('2016-02-20',201607,2,2016,20,7,201602,2016),('2016-02-21',201608,2,2016,21,8,201602,2016),('2016-02-22',201608,2,2016,22,8,201602,2016),('2016-02-23',201608,2,2016,23,8,201602,2016),('2016-02-24',201608,2,2016,24,8,201602,2016),('2016-02-25',201608,2,2016,25,8,201602,2016),('2016-02-26',201608,2,2016,26,8,201602,2016),('2016-02-27',201608,2,2016,27,8,201602,2016),('2016-02-28',201609,2,2016,28,9,201602,2016),('2016-02-29',201609,2,2016,29,9,201602,2016),('2016-03-01',201609,3,2016,1,9,201603,2016),('2016-03-02',201609,3,2016,2,9,201603,2016),('2016-03-03',201609,3,2016,3,9,201603,2016),('2016-03-04',201609,3,2016,4,9,201603,2016),('2016-03-05',201609,3,2016,5,9,201603,2016),('2016-03-06',201610,3,2016,6,10,201603,2016),('2016-03-07',201610,3,2016,7,10,201603,2016),('2016-03-08',201610,3,2016,8,10,201603,2016),('2016-03-09',201610,3,2016,9,10,201603,2016),('2016-03-10',201610,3,2016,10,10,201603,2016),('2016-03-11',201610,3,2016,11,10,201603,2016),('2016-03-12',201610,3,2016,12,10,201603,2016),('2016-03-13',201611,3,2016,13,11,201603,2016),('2016-03-14',201611,3,2016,14,11,201603,2016),('2016-03-15',201611,3,2016,15,11,201603,2016),('2016-03-16',201611,3,2016,16,11,201603,2016),('2016-03-17',201611,3,2016,17,11,201603,2016),('2016-03-18',201611,3,2016,18,11,201603,2016),('2016-03-19',201611,3,2016,19,11,201603,2016),('2016-03-20',201612,3,2016,20,12,201603,2016),('2016-03-21',201612,3,2016,21,12,201603,2016),('2016-03-22',201612,3,2016,22,12,201603,2016),('2016-03-23',201612,3,2016,23,12,201603,2016),('2016-03-24',201612,3,2016,24,12,201603,2016),('2016-03-25',201612,3,2016,25,12,201603,2016),('2016-03-26',201612,3,2016,26,12,201603,2016),('2016-03-27',201613,3,2016,27,13,201603,2016),('2016-03-28',201613,3,2016,28,13,201603,2016),('2016-03-29',201613,3,2016,29,13,201603,2016),('2016-03-30',201613,3,2016,30,13,201603,2016),('2016-03-31',201613,3,2016,31,13,201603,2016),('2016-04-01',201613,4,2016,1,13,201604,2016),('2016-04-02',201613,4,2016,2,13,201604,2016),('2016-04-03',201614,4,2016,3,14,201604,2016),('2016-04-04',201614,4,2016,4,14,201604,2016),('2016-04-05',201614,4,2016,5,14,201604,2016),('2016-04-06',201614,4,2016,6,14,201604,2016),('2016-04-07',201614,4,2016,7,14,201604,2016),('2016-04-08',201614,4,2016,8,14,201604,2016),('2016-04-09',201614,4,2016,9,14,201604,2016),('2016-04-10',201615,4,2016,10,15,201604,2016),('2016-04-11',201615,4,2016,11,15,201604,2016),('2016-04-12',201615,4,2016,12,15,201604,2016),('2016-04-13',201615,4,2016,13,15,201604,2016),('2016-04-14',201615,4,2016,14,15,201604,2016),('2016-04-15',201615,4,2016,15,15,201604,2016),('2016-04-16',201615,4,2016,16,15,201604,2016),('2016-04-17',201616,4,2016,17,16,201604,2016),('2016-04-18',201616,4,2016,18,16,201604,2016),('2016-04-19',201616,4,2016,19,16,201604,2016),('2016-04-20',201616,4,2016,20,16,201604,2016),('2016-04-21',201616,4,2016,21,16,201604,2016),('2016-04-22',201616,4,2016,22,16,201604,2016),('2016-04-23',201616,4,2016,23,16,201604,2016),('2016-04-24',201617,4,2016,24,17,201604,2016),('2016-04-25',201617,4,2016,25,17,201604,2016),('2016-04-26',201617,4,2016,26,17,201604,2016),('2016-04-27',201617,4,2016,27,17,201604,2016),('2016-04-28',201617,4,2016,28,17,201604,2016),('2016-04-29',201617,4,2016,29,17,201604,2016),('2016-04-30',201617,4,2016,30,17,201604,2016),('2016-05-01',201618,5,2016,1,18,201605,2016),('2016-05-02',201618,5,2016,2,18,201605,2016),('2016-05-03',201618,5,2016,3,18,201605,2016),('2016-05-04',201618,5,2016,4,18,201605,2016),('2016-05-05',201618,5,2016,5,18,201605,2016),('2016-05-06',201618,5,2016,6,18,201605,2016),('2016-05-07',201618,5,2016,7,18,201605,2016),('2016-05-08',201619,5,2016,8,19,201605,2016),('2016-05-09',201619,5,2016,9,19,201605,2016),('2016-05-10',201619,5,2016,10,19,201605,2016),('2016-05-11',201619,5,2016,11,19,201605,2016),('2016-05-12',201619,5,2016,12,19,201605,2016),('2016-05-13',201619,5,2016,13,19,201605,2016),('2016-05-14',201619,5,2016,14,19,201605,2016),('2016-05-15',201620,5,2016,15,20,201605,2016),('2016-05-16',201620,5,2016,16,20,201605,2016),('2016-05-17',201620,5,2016,17,20,201605,2016),('2016-05-18',201620,5,2016,18,20,201605,2016),('2016-05-19',201620,5,2016,19,20,201605,2016),('2016-05-20',201620,5,2016,20,20,201605,2016),('2016-05-21',201620,5,2016,21,20,201605,2016),('2016-05-22',201621,5,2016,22,21,201605,2016),('2016-05-23',201621,5,2016,23,21,201605,2016),('2016-05-24',201621,5,2016,24,21,201605,2016),('2016-05-25',201621,5,2016,25,21,201605,2016),('2016-05-26',201621,5,2016,26,21,201605,2016),('2016-05-27',201621,5,2016,27,21,201605,2016),('2016-05-28',201621,5,2016,28,21,201605,2016),('2016-05-29',201622,5,2016,29,22,201605,2016),('2016-05-30',201622,5,2016,30,22,201605,2016),('2016-05-31',201622,5,2016,31,22,201605,2016),('2016-06-01',201622,6,2016,1,22,201606,2016),('2016-06-02',201622,6,2016,2,22,201606,2016),('2016-06-03',201622,6,2016,3,22,201606,2016),('2016-06-04',201622,6,2016,4,22,201606,2016),('2016-06-05',201623,6,2016,5,23,201606,2016),('2016-06-06',201623,6,2016,6,23,201606,2016),('2016-06-07',201623,6,2016,7,23,201606,2016),('2016-06-08',201623,6,2016,8,23,201606,2016),('2016-06-09',201623,6,2016,9,23,201606,2016),('2016-06-10',201623,6,2016,10,23,201606,2016),('2016-06-11',201623,6,2016,11,23,201606,2016),('2016-06-12',201624,6,2016,12,24,201606,2016),('2016-06-13',201624,6,2016,13,24,201606,2016),('2016-06-14',201624,6,2016,14,24,201606,2016),('2016-06-15',201624,6,2016,15,24,201606,2016),('2016-06-16',201624,6,2016,16,24,201606,2016),('2016-06-17',201624,6,2016,17,24,201606,2016),('2016-06-18',201624,6,2016,18,24,201606,2016),('2016-06-19',201625,6,2016,19,25,201606,2016),('2016-06-20',201625,6,2016,20,25,201606,2016),('2016-06-21',201625,6,2016,21,25,201606,2016),('2016-06-22',201625,6,2016,22,25,201606,2016),('2016-06-23',201625,6,2016,23,25,201606,2016),('2016-06-24',201625,6,2016,24,25,201606,2016),('2016-06-25',201625,6,2016,25,25,201606,2016),('2016-06-26',201626,6,2016,26,26,201606,2016),('2016-06-27',201626,6,2016,27,26,201606,2016),('2016-06-28',201626,6,2016,28,26,201606,2016),('2016-06-29',201626,6,2016,29,26,201606,2016),('2016-06-30',201626,6,2016,30,26,201606,2016),('2016-07-01',201626,7,2016,1,26,201607,2016),('2016-07-02',201626,7,2016,2,26,201607,2016),('2016-07-03',201627,7,2016,3,27,201607,2016),('2016-07-04',201627,7,2016,4,27,201607,2016),('2016-07-05',201627,7,2016,5,27,201607,2016),('2016-07-06',201627,7,2016,6,27,201607,2016),('2016-07-07',201627,7,2016,7,27,201607,2016),('2016-07-08',201627,7,2016,8,27,201607,2016),('2016-07-09',201627,7,2016,9,27,201607,2016),('2016-07-10',201628,7,2016,10,28,201607,2016),('2016-07-11',201628,7,2016,11,28,201607,2016),('2016-07-12',201628,7,2016,12,28,201607,2016),('2016-07-13',201628,7,2016,13,28,201607,2016),('2016-07-14',201628,7,2016,14,28,201607,2016),('2016-07-15',201628,7,2016,15,28,201607,2016),('2016-07-16',201628,7,2016,16,28,201607,2016),('2016-07-17',201629,7,2016,17,29,201607,2016),('2016-07-18',201629,7,2016,18,29,201607,2016),('2016-07-19',201629,7,2016,19,29,201607,2016),('2016-07-20',201629,7,2016,20,29,201607,2016),('2016-07-21',201629,7,2016,21,29,201607,2016),('2016-07-22',201629,7,2016,22,29,201607,2016),('2016-07-23',201629,7,2016,23,29,201607,2016),('2016-07-24',201630,7,2016,24,30,201607,2016),('2016-07-25',201630,7,2016,25,30,201607,2016),('2016-07-26',201630,7,2016,26,30,201607,2016),('2016-07-27',201630,7,2016,27,30,201607,2016),('2016-07-28',201630,7,2016,28,30,201607,2016),('2016-07-29',201630,7,2016,29,30,201607,2016),('2016-07-30',201630,7,2016,30,30,201607,2016),('2016-07-31',201631,7,2016,31,31,201607,2016),('2016-08-01',201631,8,2016,1,31,201608,2016),('2016-08-02',201631,8,2016,2,31,201608,2016),('2016-08-03',201631,8,2016,3,31,201608,2016),('2016-08-04',201631,8,2016,4,31,201608,2016),('2016-08-05',201631,8,2016,5,31,201608,2016),('2016-08-06',201631,8,2016,6,31,201608,2016),('2016-08-07',201632,8,2016,7,32,201608,2016),('2016-08-08',201632,8,2016,8,32,201608,2016),('2016-08-09',201632,8,2016,9,32,201608,2016),('2016-08-10',201632,8,2016,10,32,201608,2016),('2016-08-11',201632,8,2016,11,32,201608,2016),('2016-08-12',201632,8,2016,12,32,201608,2016),('2016-08-13',201632,8,2016,13,32,201608,2016),('2016-08-14',201633,8,2016,14,33,201608,2016),('2016-08-15',201633,8,2016,15,33,201608,2016),('2016-08-16',201633,8,2016,16,33,201608,2016),('2016-08-17',201633,8,2016,17,33,201608,2016),('2016-08-18',201633,8,2016,18,33,201608,2016),('2016-08-19',201633,8,2016,19,33,201608,2016),('2016-08-20',201633,8,2016,20,33,201608,2016),('2016-08-21',201634,8,2016,21,34,201608,2016),('2016-08-22',201634,8,2016,22,34,201608,2016),('2016-08-23',201634,8,2016,23,34,201608,2016),('2016-08-24',201634,8,2016,24,34,201608,2016),('2016-08-25',201634,8,2016,25,34,201608,2016),('2016-08-26',201634,8,2016,26,34,201608,2016),('2016-08-27',201634,8,2016,27,34,201608,2016),('2016-08-28',201635,8,2016,28,35,201608,2016),('2016-08-29',201635,8,2016,29,35,201608,2016),('2016-08-30',201635,8,2016,30,35,201608,2016),('2016-08-31',201635,8,2016,31,35,201608,2016),('2016-09-01',201635,9,2016,1,35,201609,2016),('2016-09-02',201635,9,2016,2,35,201609,2016),('2016-09-03',201635,9,2016,3,35,201609,2016),('2016-09-04',201636,9,2016,4,36,201609,2016),('2016-09-05',201636,9,2016,5,36,201609,2016),('2016-09-06',201636,9,2016,6,36,201609,2016),('2016-09-07',201636,9,2016,7,36,201609,2016),('2016-09-08',201636,9,2016,8,36,201609,2016),('2016-09-09',201636,9,2016,9,36,201609,2016),('2016-09-10',201636,9,2016,10,36,201609,2016),('2016-09-11',201637,9,2016,11,37,201609,2016),('2016-09-12',201637,9,2016,12,37,201609,2016),('2016-09-13',201637,9,2016,13,37,201609,2016),('2016-09-14',201637,9,2016,14,37,201609,2016),('2016-09-15',201637,9,2016,15,37,201609,2016),('2016-09-16',201637,9,2016,16,37,201609,2016),('2016-09-17',201637,9,2016,17,37,201609,2016),('2016-09-18',201638,9,2016,18,38,201609,2016),('2016-09-19',201638,9,2016,19,38,201609,2016),('2016-09-20',201638,9,2016,20,38,201609,2016),('2016-09-21',201638,9,2016,21,38,201609,2016),('2016-09-22',201638,9,2016,22,38,201609,2016),('2016-09-23',201638,9,2016,23,38,201609,2016),('2016-09-24',201638,9,2016,24,38,201609,2016),('2016-09-25',201639,9,2016,25,39,201609,2016),('2016-09-26',201639,9,2016,26,39,201609,2016),('2016-09-27',201639,9,2016,27,39,201609,2016),('2016-09-28',201639,9,2016,28,39,201609,2016),('2016-09-29',201639,9,2016,29,39,201609,2016),('2016-09-30',201639,9,2016,30,39,201609,2016),('2016-10-01',201639,10,2016,1,39,201610,2016),('2016-10-02',201640,10,2016,2,40,201610,2016),('2016-10-03',201640,10,2016,3,40,201610,2016),('2016-10-04',201640,10,2016,4,40,201610,2016),('2016-10-05',201640,10,2016,5,40,201610,2016),('2016-10-06',201640,10,2016,6,40,201610,2016),('2016-10-07',201640,10,2016,7,40,201610,2016),('2016-10-08',201640,10,2016,8,40,201610,2016),('2016-10-09',201641,10,2016,9,41,201610,2016),('2016-10-10',201641,10,2016,10,41,201610,2016),('2016-10-11',201641,10,2016,11,41,201610,2016),('2016-10-12',201641,10,2016,12,41,201610,2016),('2016-10-13',201641,10,2016,13,41,201610,2016),('2016-10-14',201641,10,2016,14,41,201610,2016),('2016-10-15',201641,10,2016,15,41,201610,2016),('2016-10-16',201642,10,2016,16,42,201610,2016),('2016-10-17',201642,10,2016,17,42,201610,2016),('2016-10-18',201642,10,2016,18,42,201610,2016),('2016-10-19',201642,10,2016,19,42,201610,2016),('2016-10-20',201642,10,2016,20,42,201610,2016),('2016-10-21',201642,10,2016,21,42,201610,2016),('2016-10-22',201642,10,2016,22,42,201610,2016),('2016-10-23',201643,10,2016,23,43,201610,2016),('2016-10-24',201643,10,2016,24,43,201610,2016),('2016-10-25',201643,10,2016,25,43,201610,2016),('2016-10-26',201643,10,2016,26,43,201610,2016),('2016-10-27',201643,10,2016,27,43,201610,2016),('2016-10-28',201643,10,2016,28,43,201610,2016),('2016-10-29',201643,10,2016,29,43,201610,2016),('2016-10-30',201644,10,2016,30,44,201610,2016),('2016-10-31',201644,10,2016,31,44,201610,2016),('2016-11-01',201644,11,2016,1,44,201611,2016),('2016-11-02',201644,11,2016,2,44,201611,2016),('2016-11-03',201644,11,2016,3,44,201611,2016),('2016-11-04',201644,11,2016,4,44,201611,2016),('2016-11-05',201644,11,2016,5,44,201611,2016),('2016-11-06',201645,11,2016,6,45,201611,2016),('2016-11-07',201645,11,2016,7,45,201611,2016),('2016-11-08',201645,11,2016,8,45,201611,2016),('2016-11-09',201645,11,2016,9,45,201611,2016),('2016-11-10',201645,11,2016,10,45,201611,2016),('2016-11-11',201645,11,2016,11,45,201611,2016),('2016-11-12',201645,11,2016,12,45,201611,2016),('2016-11-13',201646,11,2016,13,46,201611,2016),('2016-11-14',201646,11,2016,14,46,201611,2016),('2016-11-15',201646,11,2016,15,46,201611,2016),('2016-11-16',201646,11,2016,16,46,201611,2016),('2016-11-17',201646,11,2016,17,46,201611,2016),('2016-11-18',201646,11,2016,18,46,201611,2016),('2016-11-19',201646,11,2016,19,46,201611,2016),('2016-11-20',201647,11,2016,20,47,201611,2016),('2016-11-21',201647,11,2016,21,47,201611,2016),('2016-11-22',201647,11,2016,22,47,201611,2016),('2016-11-23',201647,11,2016,23,47,201611,2016),('2016-11-24',201647,11,2016,24,47,201611,2016),('2016-11-25',201647,11,2016,25,47,201611,2016),('2016-11-26',201647,11,2016,26,47,201611,2016),('2016-11-27',201648,11,2016,27,48,201611,2016),('2016-11-28',201648,11,2016,28,48,201611,2016),('2016-11-29',201648,11,2016,29,48,201611,2016),('2016-11-30',201648,11,2016,30,48,201611,2016),('2016-12-01',201648,12,2016,1,48,201612,2017),('2016-12-02',201648,12,2016,2,48,201612,2017),('2016-12-03',201648,12,2016,3,48,201612,2017),('2016-12-04',201649,12,2016,4,49,201612,2017),('2016-12-05',201649,12,2016,5,49,201612,2017),('2016-12-06',201649,12,2016,6,49,201612,2017),('2016-12-07',201649,12,2016,7,49,201612,2017),('2016-12-08',201649,12,2016,8,49,201612,2017),('2016-12-09',201649,12,2016,9,49,201612,2017),('2016-12-10',201649,12,2016,10,49,201612,2017),('2016-12-11',201650,12,2016,11,50,201612,2017),('2016-12-12',201650,12,2016,12,50,201612,2017),('2016-12-13',201650,12,2016,13,50,201612,2017),('2016-12-14',201650,12,2016,14,50,201612,2017),('2016-12-15',201650,12,2016,15,50,201612,2017),('2016-12-16',201650,12,2016,16,50,201612,2017),('2016-12-17',201650,12,2016,17,50,201612,2017),('2016-12-18',201651,12,2016,18,51,201612,2017),('2016-12-19',201651,12,2016,19,51,201612,2017),('2016-12-20',201651,12,2016,20,51,201612,2017),('2016-12-21',201651,12,2016,21,51,201612,2017),('2016-12-22',201651,12,2016,22,51,201612,2017),('2016-12-23',201651,12,2016,23,51,201612,2017),('2016-12-24',201651,12,2016,24,51,201612,2017),('2016-12-25',201652,12,2016,25,52,201612,2017),('2016-12-26',201652,12,2016,26,52,201612,2017),('2016-12-27',201652,12,2016,27,52,201612,2017),('2016-12-28',201652,12,2016,28,52,201612,2017),('2016-12-29',201652,12,2016,29,52,201612,2017),('2016-12-30',201652,12,2016,30,52,201612,2017),('2016-12-31',201652,12,2016,31,52,201612,2017),('2017-01-01',201701,1,2017,1,1,201701,2017),('2017-01-02',201701,1,2017,2,1,201701,2017),('2017-01-03',201701,1,2017,3,1,201701,2017),('2017-01-04',201701,1,2017,4,1,201701,2017),('2017-01-05',201701,1,2017,5,1,201701,2017),('2017-01-06',201701,1,2017,6,1,201701,2017),('2017-01-07',201701,1,2017,7,1,201701,2017),('2017-01-08',201702,1,2017,8,2,201701,2017),('2017-01-09',201702,1,2017,9,2,201701,2017),('2017-01-10',201702,1,2017,10,2,201701,2017),('2017-01-11',201702,1,2017,11,2,201701,2017),('2017-01-12',201702,1,2017,12,2,201701,2017),('2017-01-13',201702,1,2017,13,2,201701,2017),('2017-01-14',201702,1,2017,14,2,201701,2017),('2017-01-15',201703,1,2017,15,3,201701,2017),('2017-01-16',201703,1,2017,16,3,201701,2017),('2017-01-17',201703,1,2017,17,3,201701,2017),('2017-01-18',201703,1,2017,18,3,201701,2017),('2017-01-19',201703,1,2017,19,3,201701,2017),('2017-01-20',201703,1,2017,20,3,201701,2017),('2017-01-21',201703,1,2017,21,3,201701,2017),('2017-01-22',201704,1,2017,22,4,201701,2017),('2017-01-23',201704,1,2017,23,4,201701,2017),('2017-01-24',201704,1,2017,24,4,201701,2017),('2017-01-25',201704,1,2017,25,4,201701,2017),('2017-01-26',201704,1,2017,26,4,201701,2017),('2017-01-27',201704,1,2017,27,4,201701,2017),('2017-01-28',201704,1,2017,28,4,201701,2017),('2017-01-29',201705,1,2017,29,5,201701,2017),('2017-01-30',201705,1,2017,30,5,201701,2017),('2017-01-31',201705,1,2017,31,5,201701,2017),('2017-02-01',201705,2,2017,1,5,201702,2017),('2017-02-02',201705,2,2017,2,5,201702,2017),('2017-02-03',201705,2,2017,3,5,201702,2017),('2017-02-04',201705,2,2017,4,5,201702,2017),('2017-02-05',201706,2,2017,5,6,201702,2017),('2017-02-06',201706,2,2017,6,6,201702,2017),('2017-02-07',201706,2,2017,7,6,201702,2017),('2017-02-08',201706,2,2017,8,6,201702,2017),('2017-02-09',201706,2,2017,9,6,201702,2017),('2017-02-10',201706,2,2017,10,6,201702,2017),('2017-02-11',201706,2,2017,11,6,201702,2017),('2017-02-12',201707,2,2017,12,7,201702,2017),('2017-02-13',201707,2,2017,13,7,201702,2017),('2017-02-14',201707,2,2017,14,7,201702,2017),('2017-02-15',201707,2,2017,15,7,201702,2017),('2017-02-16',201707,2,2017,16,7,201702,2017),('2017-02-17',201707,2,2017,17,7,201702,2017),('2017-02-18',201707,2,2017,18,7,201702,2017),('2017-02-19',201708,2,2017,19,8,201702,2017),('2017-02-20',201708,2,2017,20,8,201702,2017),('2017-02-21',201708,2,2017,21,8,201702,2017),('2017-02-22',201708,2,2017,22,8,201702,2017),('2017-02-23',201708,2,2017,23,8,201702,2017),('2017-02-24',201708,2,2017,24,8,201702,2017),('2017-02-25',201708,2,2017,25,8,201702,2017),('2017-02-26',201709,2,2017,26,9,201702,2017),('2017-02-27',201709,2,2017,27,9,201702,2017),('2017-02-28',201709,2,2017,28,9,201702,2017),('2017-03-01',201709,3,2017,1,9,201703,2017),('2017-03-02',201709,3,2017,2,9,201703,2017),('2017-03-03',201709,3,2017,3,9,201703,2017),('2017-03-04',201709,3,2017,4,9,201703,2017),('2017-03-05',201710,3,2017,5,10,201703,2017),('2017-03-06',201710,3,2017,6,10,201703,2017),('2017-03-07',201710,3,2017,7,10,201703,2017),('2017-03-08',201710,3,2017,8,10,201703,2017),('2017-03-09',201710,3,2017,9,10,201703,2017),('2017-03-10',201710,3,2017,10,10,201703,2017),('2017-03-11',201710,3,2017,11,10,201703,2017),('2017-03-12',201711,3,2017,12,11,201703,2017),('2017-03-13',201711,3,2017,13,11,201703,2017),('2017-03-14',201711,3,2017,14,11,201703,2017),('2017-03-15',201711,3,2017,15,11,201703,2017),('2017-03-16',201711,3,2017,16,11,201703,2017),('2017-03-17',201711,3,2017,17,11,201703,2017),('2017-03-18',201711,3,2017,18,11,201703,2017),('2017-03-19',201712,3,2017,19,12,201703,2017),('2017-03-20',201712,3,2017,20,12,201703,2017),('2017-03-21',201712,3,2017,21,12,201703,2017),('2017-03-22',201712,3,2017,22,12,201703,2017),('2017-03-23',201712,3,2017,23,12,201703,2017),('2017-03-24',201712,3,2017,24,12,201703,2017),('2017-03-25',201712,3,2017,25,12,201703,2017),('2017-03-26',201713,3,2017,26,13,201703,2017),('2017-03-27',201713,3,2017,27,13,201703,2017),('2017-03-28',201713,3,2017,28,13,201703,2017),('2017-03-29',201713,3,2017,29,13,201703,2017),('2017-03-30',201713,3,2017,30,13,201703,2017),('2017-03-31',201713,3,2017,31,13,201703,2017),('2017-04-01',201713,4,2017,1,13,201704,2017),('2017-04-02',201714,4,2017,2,14,201704,2017),('2017-04-03',201714,4,2017,3,14,201704,2017),('2017-04-04',201714,4,2017,4,14,201704,2017),('2017-04-05',201714,4,2017,5,14,201704,2017),('2017-04-06',201714,4,2017,6,14,201704,2017),('2017-04-07',201714,4,2017,7,14,201704,2017),('2017-04-08',201714,4,2017,8,14,201704,2017),('2017-04-09',201715,4,2017,9,15,201704,2017),('2017-04-10',201715,4,2017,10,15,201704,2017),('2017-04-11',201715,4,2017,11,15,201704,2017),('2017-04-12',201715,4,2017,12,15,201704,2017),('2017-04-13',201715,4,2017,13,15,201704,2017),('2017-04-14',201715,4,2017,14,15,201704,2017),('2017-04-15',201715,4,2017,15,15,201704,2017),('2017-04-16',201716,4,2017,16,16,201704,2017),('2017-04-17',201716,4,2017,17,16,201704,2017),('2017-04-18',201716,4,2017,18,16,201704,2017),('2017-04-19',201716,4,2017,19,16,201704,2017),('2017-04-20',201716,4,2017,20,16,201704,2017),('2017-04-21',201716,4,2017,21,16,201704,2017),('2017-04-22',201716,4,2017,22,16,201704,2017),('2017-04-23',201717,4,2017,23,17,201704,2017),('2017-04-24',201717,4,2017,24,17,201704,2017),('2017-04-25',201717,4,2017,25,17,201704,2017),('2017-04-26',201717,4,2017,26,17,201704,2017),('2017-04-27',201717,4,2017,27,17,201704,2017),('2017-04-28',201717,4,2017,28,17,201704,2017),('2017-04-29',201717,4,2017,29,17,201704,2017),('2017-04-30',201718,4,2017,30,18,201704,2017),('2017-05-01',201718,5,2017,1,18,201705,2017),('2017-05-02',201718,5,2017,2,18,201705,2017),('2017-05-03',201718,5,2017,3,18,201705,2017),('2017-05-04',201718,5,2017,4,18,201705,2017),('2017-05-05',201718,5,2017,5,18,201705,2017),('2017-05-06',201718,5,2017,6,18,201705,2017),('2017-05-07',201719,5,2017,7,19,201705,2017),('2017-05-08',201719,5,2017,8,19,201705,2017),('2017-05-09',201719,5,2017,9,19,201705,2017),('2017-05-10',201719,5,2017,10,19,201705,2017),('2017-05-11',201719,5,2017,11,19,201705,2017),('2017-05-12',201719,5,2017,12,19,201705,2017),('2017-05-13',201719,5,2017,13,19,201705,2017),('2017-05-14',201720,5,2017,14,20,201705,2017),('2017-05-15',201720,5,2017,15,20,201705,2017),('2017-05-16',201720,5,2017,16,20,201705,2017),('2017-05-17',201720,5,2017,17,20,201705,2017),('2017-05-18',201720,5,2017,18,20,201705,2017),('2017-05-19',201720,5,2017,19,20,201705,2017),('2017-05-20',201720,5,2017,20,20,201705,2017),('2017-05-21',201721,5,2017,21,21,201705,2017),('2017-05-22',201721,5,2017,22,21,201705,2017),('2017-05-23',201721,5,2017,23,21,201705,2017),('2017-05-24',201721,5,2017,24,21,201705,2017),('2017-05-25',201721,5,2017,25,21,201705,2017),('2017-05-26',201721,5,2017,26,21,201705,2017),('2017-05-27',201721,5,2017,27,21,201705,2017),('2017-05-28',201722,5,2017,28,22,201705,2017),('2017-05-29',201722,5,2017,29,22,201705,2017),('2017-05-30',201722,5,2017,30,22,201705,2017),('2017-05-31',201722,5,2017,31,22,201705,2017),('2017-06-01',201722,6,2017,1,22,201706,2017),('2017-06-02',201722,6,2017,2,22,201706,2017),('2017-06-03',201722,6,2017,3,22,201706,2017),('2017-06-04',201723,6,2017,4,23,201706,2017),('2017-06-05',201723,6,2017,5,23,201706,2017),('2017-06-06',201723,6,2017,6,23,201706,2017),('2017-06-07',201723,6,2017,7,23,201706,2017),('2017-06-08',201723,6,2017,8,23,201706,2017),('2017-06-09',201723,6,2017,9,23,201706,2017),('2017-06-10',201723,6,2017,10,23,201706,2017),('2017-06-11',201724,6,2017,11,24,201706,2017),('2017-06-12',201724,6,2017,12,24,201706,2017),('2017-06-13',201724,6,2017,13,24,201706,2017),('2017-06-14',201724,6,2017,14,24,201706,2017),('2017-06-15',201724,6,2017,15,24,201706,2017),('2017-06-16',201724,6,2017,16,24,201706,2017),('2017-06-17',201724,6,2017,17,24,201706,2017),('2017-06-18',201725,6,2017,18,25,201706,2017),('2017-06-19',201725,6,2017,19,25,201706,2017),('2017-06-20',201725,6,2017,20,25,201706,2017),('2017-06-21',201725,6,2017,21,25,201706,2017),('2017-06-22',201725,6,2017,22,25,201706,2017),('2017-06-23',201725,6,2017,23,25,201706,2017),('2017-06-24',201725,6,2017,24,25,201706,2017),('2017-06-25',201726,6,2017,25,26,201706,2017),('2017-06-26',201726,6,2017,26,26,201706,2017),('2017-06-27',201726,6,2017,27,26,201706,2017),('2017-06-28',201726,6,2017,28,26,201706,2017),('2017-06-29',201726,6,2017,29,26,201706,2017),('2017-06-30',201726,6,2017,30,26,201706,2017),('2017-07-01',201726,7,2017,1,26,201707,2017),('2017-07-02',201727,7,2017,2,27,201707,2017),('2017-07-03',201727,7,2017,3,27,201707,2017),('2017-07-04',201727,7,2017,4,27,201707,2017),('2017-07-05',201727,7,2017,5,27,201707,2017),('2017-07-06',201727,7,2017,6,27,201707,2017),('2017-07-07',201727,7,2017,7,27,201707,2017),('2017-07-08',201727,7,2017,8,27,201707,2017),('2017-07-09',201728,7,2017,9,28,201707,2017),('2017-07-10',201728,7,2017,10,28,201707,2017),('2017-07-11',201728,7,2017,11,28,201707,2017),('2017-07-12',201728,7,2017,12,28,201707,2017),('2017-07-13',201728,7,2017,13,28,201707,2017),('2017-07-14',201728,7,2017,14,28,201707,2017),('2017-07-15',201728,7,2017,15,28,201707,2017),('2017-07-16',201729,7,2017,16,29,201707,2017),('2017-07-17',201729,7,2017,17,29,201707,2017),('2017-07-18',201729,7,2017,18,29,201707,2017),('2017-07-19',201729,7,2017,19,29,201707,2017),('2017-07-20',201729,7,2017,20,29,201707,2017),('2017-07-21',201729,7,2017,21,29,201707,2017),('2017-07-22',201729,7,2017,22,29,201707,2017),('2017-07-23',201730,7,2017,23,30,201707,2017),('2017-07-24',201730,7,2017,24,30,201707,2017),('2017-07-25',201730,7,2017,25,30,201707,2017),('2017-07-26',201730,7,2017,26,30,201707,2017),('2017-07-27',201730,7,2017,27,30,201707,2017),('2017-07-28',201730,7,2017,28,30,201707,2017),('2017-07-29',201730,7,2017,29,30,201707,2017),('2017-07-30',201731,7,2017,30,31,201707,2017),('2017-07-31',201731,7,2017,31,31,201707,2017),('2017-08-01',201731,8,2017,1,31,201708,2017),('2017-08-02',201731,8,2017,2,31,201708,2017),('2017-08-03',201731,8,2017,3,31,201708,2017),('2017-08-04',201731,8,2017,4,31,201708,2017),('2017-08-05',201731,8,2017,5,31,201708,2017),('2017-08-06',201732,8,2017,6,32,201708,2017),('2017-08-07',201732,8,2017,7,32,201708,2017),('2017-08-08',201732,8,2017,8,32,201708,2017),('2017-08-09',201732,8,2017,9,32,201708,2017),('2017-08-10',201732,8,2017,10,32,201708,2017),('2017-08-11',201732,8,2017,11,32,201708,2017),('2017-08-12',201732,8,2017,12,32,201708,2017),('2017-08-13',201733,8,2017,13,33,201708,2017),('2017-08-14',201733,8,2017,14,33,201708,2017),('2017-08-15',201733,8,2017,15,33,201708,2017),('2017-08-16',201733,8,2017,16,33,201708,2017),('2017-08-17',201733,8,2017,17,33,201708,2017),('2017-08-18',201733,8,2017,18,33,201708,2017),('2017-08-19',201733,8,2017,19,33,201708,2017),('2017-08-20',201734,8,2017,20,34,201708,2017),('2017-08-21',201734,8,2017,21,34,201708,2017),('2017-08-22',201734,8,2017,22,34,201708,2017),('2017-08-23',201734,8,2017,23,34,201708,2017),('2017-08-24',201734,8,2017,24,34,201708,2017),('2017-08-25',201734,8,2017,25,34,201708,2017),('2017-08-26',201734,8,2017,26,34,201708,2017),('2017-08-27',201735,8,2017,27,35,201708,2017),('2017-08-28',201735,8,2017,28,35,201708,2017),('2017-08-29',201735,8,2017,29,35,201708,2017),('2017-08-30',201735,8,2017,30,35,201708,2017),('2017-08-31',201735,8,2017,31,35,201708,2017),('2017-09-01',201735,9,2017,1,35,201709,2017),('2017-09-02',201735,9,2017,2,35,201709,2017),('2017-09-03',201736,9,2017,3,36,201709,2017),('2017-09-04',201736,9,2017,4,36,201709,2017),('2017-09-05',201736,9,2017,5,36,201709,2017),('2017-09-06',201736,9,2017,6,36,201709,2017),('2017-09-07',201736,9,2017,7,36,201709,2017),('2017-09-08',201736,9,2017,8,36,201709,2017),('2017-09-09',201736,9,2017,9,36,201709,2017),('2017-09-10',201737,9,2017,10,37,201709,2017),('2017-09-11',201737,9,2017,11,37,201709,2017),('2017-09-12',201737,9,2017,12,37,201709,2017),('2017-09-13',201737,9,2017,13,37,201709,2017),('2017-09-14',201737,9,2017,14,37,201709,2017),('2017-09-15',201737,9,2017,15,37,201709,2017),('2017-09-16',201737,9,2017,16,37,201709,2017),('2017-09-17',201738,9,2017,17,38,201709,2017),('2017-09-18',201738,9,2017,18,38,201709,2017),('2017-09-19',201738,9,2017,19,38,201709,2017),('2017-09-20',201738,9,2017,20,38,201709,2017),('2017-09-21',201738,9,2017,21,38,201709,2017),('2017-09-22',201738,9,2017,22,38,201709,2017),('2017-09-23',201738,9,2017,23,38,201709,2017),('2017-09-24',201739,9,2017,24,39,201709,2017),('2017-09-25',201739,9,2017,25,39,201709,2017),('2017-09-26',201739,9,2017,26,39,201709,2017),('2017-09-27',201739,9,2017,27,39,201709,2017),('2017-09-28',201739,9,2017,28,39,201709,2017),('2017-09-29',201739,9,2017,29,39,201709,2017),('2017-09-30',201739,9,2017,30,39,201709,2017),('2017-10-01',201740,10,2017,1,40,201710,2017),('2017-10-02',201740,10,2017,2,40,201710,2017),('2017-10-03',201740,10,2017,3,40,201710,2017),('2017-10-04',201740,10,2017,4,40,201710,2017),('2017-10-05',201740,10,2017,5,40,201710,2017),('2017-10-06',201740,10,2017,6,40,201710,2017),('2017-10-07',201740,10,2017,7,40,201710,2017),('2017-10-08',201741,10,2017,8,41,201710,2017),('2017-10-09',201741,10,2017,9,41,201710,2017),('2017-10-10',201741,10,2017,10,41,201710,2017),('2017-10-11',201741,10,2017,11,41,201710,2017),('2017-10-12',201741,10,2017,12,41,201710,2017),('2017-10-13',201741,10,2017,13,41,201710,2017),('2017-10-14',201741,10,2017,14,41,201710,2017),('2017-10-15',201742,10,2017,15,42,201710,2017),('2017-10-16',201742,10,2017,16,42,201710,2017),('2017-10-17',201742,10,2017,17,42,201710,2017),('2017-10-18',201742,10,2017,18,42,201710,2017),('2017-10-19',201742,10,2017,19,42,201710,2017),('2017-10-20',201742,10,2017,20,42,201710,2017),('2017-10-21',201742,10,2017,21,42,201710,2017),('2017-10-22',201743,10,2017,22,43,201710,2017),('2017-10-23',201743,10,2017,23,43,201710,2017),('2017-10-24',201743,10,2017,24,43,201710,2017),('2017-10-25',201743,10,2017,25,43,201710,2017),('2017-10-26',201743,10,2017,26,43,201710,2017),('2017-10-27',201743,10,2017,27,43,201710,2017),('2017-10-28',201743,10,2017,28,43,201710,2017),('2017-10-29',201744,10,2017,29,44,201710,2017),('2017-10-30',201744,10,2017,30,44,201710,2017),('2017-10-31',201744,10,2017,31,44,201710,2017),('2017-11-01',201744,11,2017,1,44,201711,2017),('2017-11-02',201744,11,2017,2,44,201711,2017),('2017-11-03',201744,11,2017,3,44,201711,2017),('2017-11-04',201744,11,2017,4,44,201711,2017),('2017-11-05',201745,11,2017,5,45,201711,2017),('2017-11-06',201745,11,2017,6,45,201711,2017),('2017-11-07',201745,11,2017,7,45,201711,2017),('2017-11-08',201745,11,2017,8,45,201711,2017),('2017-11-09',201745,11,2017,9,45,201711,2017),('2017-11-10',201745,11,2017,10,45,201711,2017),('2017-11-11',201745,11,2017,11,45,201711,2017),('2017-11-12',201746,11,2017,12,46,201711,2017),('2017-11-13',201746,11,2017,13,46,201711,2017),('2017-11-14',201746,11,2017,14,46,201711,2017),('2017-11-15',201746,11,2017,15,46,201711,2017),('2017-11-16',201746,11,2017,16,46,201711,2017),('2017-11-17',201746,11,2017,17,46,201711,2017),('2017-11-18',201746,11,2017,18,46,201711,2017),('2017-11-19',201747,11,2017,19,47,201711,2017),('2017-11-20',201747,11,2017,20,47,201711,2017),('2017-11-21',201747,11,2017,21,47,201711,2017),('2017-11-22',201747,11,2017,22,47,201711,2017),('2017-11-23',201747,11,2017,23,47,201711,2017),('2017-11-24',201747,11,2017,24,47,201711,2017),('2017-11-25',201747,11,2017,25,47,201711,2017),('2017-11-26',201748,11,2017,26,48,201711,2017),('2017-11-27',201748,11,2017,27,48,201711,2017),('2017-11-28',201748,11,2017,28,48,201711,2017),('2017-11-29',201748,11,2017,29,48,201711,2017),('2017-11-30',201748,11,2017,30,48,201711,2017),('2017-12-01',201748,12,2017,1,48,201712,2018),('2017-12-02',201748,12,2017,2,48,201712,2018),('2017-12-03',201749,12,2017,3,49,201712,2018),('2017-12-04',201749,12,2017,4,49,201712,2018),('2017-12-05',201749,12,2017,5,49,201712,2018),('2017-12-06',201749,12,2017,6,49,201712,2018),('2017-12-07',201749,12,2017,7,49,201712,2018),('2017-12-08',201749,12,2017,8,49,201712,2018),('2017-12-09',201749,12,2017,9,49,201712,2018),('2017-12-10',201750,12,2017,10,50,201712,2018),('2017-12-11',201750,12,2017,11,50,201712,2018),('2017-12-12',201750,12,2017,12,50,201712,2018),('2017-12-13',201750,12,2017,13,50,201712,2018),('2017-12-14',201750,12,2017,14,50,201712,2018),('2017-12-15',201750,12,2017,15,50,201712,2018),('2017-12-16',201750,12,2017,16,50,201712,2018),('2017-12-17',201751,12,2017,17,51,201712,2018),('2017-12-18',201751,12,2017,18,51,201712,2018),('2017-12-19',201751,12,2017,19,51,201712,2018),('2017-12-20',201751,12,2017,20,51,201712,2018),('2017-12-21',201751,12,2017,21,51,201712,2018),('2017-12-22',201751,12,2017,22,51,201712,2018),('2017-12-23',201751,12,2017,23,51,201712,2018),('2017-12-24',201752,12,2017,24,52,201712,2018),('2017-12-25',201752,12,2017,25,52,201712,2018),('2017-12-26',201752,12,2017,26,52,201712,2018),('2017-12-27',201752,12,2017,27,52,201712,2018),('2017-12-28',201752,12,2017,28,52,201712,2018),('2017-12-29',201752,12,2017,29,52,201712,2018),('2017-12-30',201752,12,2017,30,52,201712,2018),('2017-12-31',201801,12,2017,31,1,201712,2018),('2018-01-01',201801,1,2018,1,1,201801,2018),('2018-01-02',201801,1,2018,2,1,201801,2018),('2018-01-03',201801,1,2018,3,1,201801,2018),('2018-01-04',201801,1,2018,4,1,201801,2018),('2018-01-05',201801,1,2018,5,1,201801,2018),('2018-01-06',201801,1,2018,6,1,201801,2018),('2018-01-07',201802,1,2018,7,2,201801,2018),('2018-01-08',201802,1,2018,8,2,201801,2018),('2018-01-09',201802,1,2018,9,2,201801,2018),('2018-01-10',201802,1,2018,10,2,201801,2018),('2018-01-11',201802,1,2018,11,2,201801,2018),('2018-01-12',201802,1,2018,12,2,201801,2018),('2018-01-13',201802,1,2018,13,2,201801,2018),('2018-01-14',201803,1,2018,14,3,201801,2018),('2018-01-15',201803,1,2018,15,3,201801,2018),('2018-01-16',201803,1,2018,16,3,201801,2018),('2018-01-17',201803,1,2018,17,3,201801,2018),('2018-01-18',201803,1,2018,18,3,201801,2018),('2018-01-19',201803,1,2018,19,3,201801,2018),('2018-01-20',201803,1,2018,20,3,201801,2018),('2018-01-21',201804,1,2018,21,4,201801,2018),('2018-01-22',201804,1,2018,22,4,201801,2018),('2018-01-23',201804,1,2018,23,4,201801,2018),('2018-01-24',201804,1,2018,24,4,201801,2018),('2018-01-25',201804,1,2018,25,4,201801,2018),('2018-01-26',201804,1,2018,26,4,201801,2018),('2018-01-27',201804,1,2018,27,4,201801,2018),('2018-01-28',201805,1,2018,28,5,201801,2018),('2018-01-29',201805,1,2018,29,5,201801,2018),('2018-01-30',201805,1,2018,30,5,201801,2018),('2018-01-31',201805,1,2018,31,5,201801,2018),('2018-02-01',201805,2,2018,1,5,201802,2018),('2018-02-02',201805,2,2018,2,5,201802,2018),('2018-02-03',201805,2,2018,3,5,201802,2018),('2018-02-04',201806,2,2018,4,6,201802,2018),('2018-02-05',201806,2,2018,5,6,201802,2018),('2018-02-06',201806,2,2018,6,6,201802,2018),('2018-02-07',201806,2,2018,7,6,201802,2018),('2018-02-08',201806,2,2018,8,6,201802,2018),('2018-02-09',201806,2,2018,9,6,201802,2018),('2018-02-10',201806,2,2018,10,6,201802,2018),('2018-02-11',201807,2,2018,11,7,201802,2018),('2018-02-12',201807,2,2018,12,7,201802,2018),('2018-02-13',201807,2,2018,13,7,201802,2018),('2018-02-14',201807,2,2018,14,7,201802,2018),('2018-02-15',201807,2,2018,15,7,201802,2018),('2018-02-16',201807,2,2018,16,7,201802,2018),('2018-02-17',201807,2,2018,17,7,201802,2018),('2018-02-18',201808,2,2018,18,8,201802,2018),('2018-02-19',201808,2,2018,19,8,201802,2018),('2018-02-20',201808,2,2018,20,8,201802,2018),('2018-02-21',201808,2,2018,21,8,201802,2018),('2018-02-22',201808,2,2018,22,8,201802,2018),('2018-02-23',201808,2,2018,23,8,201802,2018),('2018-02-24',201808,2,2018,24,8,201802,2018),('2018-02-25',201809,2,2018,25,9,201802,2018),('2018-02-26',201809,2,2018,26,9,201802,2018),('2018-02-27',201809,2,2018,27,9,201802,2018),('2018-02-28',201809,2,2018,28,9,201802,2018),('2018-03-01',201809,3,2018,1,9,201803,2018),('2018-03-02',201809,3,2018,2,9,201803,2018),('2018-03-03',201809,3,2018,3,9,201803,2018),('2018-03-04',201810,3,2018,4,10,201803,2018),('2018-03-05',201810,3,2018,5,10,201803,2018),('2018-03-06',201810,3,2018,6,10,201803,2018),('2018-03-07',201810,3,2018,7,10,201803,2018),('2018-03-08',201810,3,2018,8,10,201803,2018),('2018-03-09',201810,3,2018,9,10,201803,2018),('2018-03-10',201810,3,2018,10,10,201803,2018),('2018-03-11',201811,3,2018,11,11,201803,2018),('2018-03-12',201811,3,2018,12,11,201803,2018),('2018-03-13',201811,3,2018,13,11,201803,2018),('2018-03-14',201811,3,2018,14,11,201803,2018),('2018-03-15',201811,3,2018,15,11,201803,2018),('2018-03-16',201811,3,2018,16,11,201803,2018),('2018-03-17',201811,3,2018,17,11,201803,2018),('2018-03-18',201812,3,2018,18,12,201803,2018),('2018-03-19',201812,3,2018,19,12,201803,2018),('2018-03-20',201812,3,2018,20,12,201803,2018),('2018-03-21',201812,3,2018,21,12,201803,2018),('2018-03-22',201812,3,2018,22,12,201803,2018),('2018-03-23',201812,3,2018,23,12,201803,2018),('2018-03-24',201812,3,2018,24,12,201803,2018),('2018-03-25',201813,3,2018,25,13,201803,2018),('2018-03-26',201813,3,2018,26,13,201803,2018),('2018-03-27',201813,3,2018,27,13,201803,2018),('2018-03-28',201813,3,2018,28,13,201803,2018),('2018-03-29',201813,3,2018,29,13,201803,2018),('2018-03-30',201813,3,2018,30,13,201803,2018),('2018-03-31',201813,3,2018,31,13,201803,2018),('2018-04-01',201814,4,2018,1,14,201804,2018),('2018-04-02',201814,4,2018,2,14,201804,2018),('2018-04-03',201814,4,2018,3,14,201804,2018),('2018-04-04',201814,4,2018,4,14,201804,2018),('2018-04-05',201814,4,2018,5,14,201804,2018),('2018-04-06',201814,4,2018,6,14,201804,2018),('2018-04-07',201814,4,2018,7,14,201804,2018),('2018-04-08',201815,4,2018,8,15,201804,2018),('2018-04-09',201815,4,2018,9,15,201804,2018),('2018-04-10',201815,4,2018,10,15,201804,2018),('2018-04-11',201815,4,2018,11,15,201804,2018),('2018-04-12',201815,4,2018,12,15,201804,2018),('2018-04-13',201815,4,2018,13,15,201804,2018),('2018-04-14',201815,4,2018,14,15,201804,2018),('2018-04-15',201816,4,2018,15,16,201804,2018),('2018-04-16',201816,4,2018,16,16,201804,2018),('2018-04-17',201816,4,2018,17,16,201804,2018),('2018-04-18',201816,4,2018,18,16,201804,2018),('2018-04-19',201816,4,2018,19,16,201804,2018),('2018-04-20',201816,4,2018,20,16,201804,2018),('2018-04-21',201816,4,2018,21,16,201804,2018),('2018-04-22',201817,4,2018,22,17,201804,2018),('2018-04-23',201817,4,2018,23,17,201804,2018),('2018-04-24',201817,4,2018,24,17,201804,2018),('2018-04-25',201817,4,2018,25,17,201804,2018),('2018-04-26',201817,4,2018,26,17,201804,2018),('2018-04-27',201817,4,2018,27,17,201804,2018),('2018-04-28',201817,4,2018,28,17,201804,2018),('2018-04-29',201818,4,2018,29,18,201804,2018),('2018-04-30',201818,4,2018,30,18,201804,2018),('2018-05-01',201818,5,2018,1,18,201805,2018),('2018-05-02',201818,5,2018,2,18,201805,2018),('2018-05-03',201818,5,2018,3,18,201805,2018),('2018-05-04',201818,5,2018,4,18,201805,2018),('2018-05-05',201818,5,2018,5,18,201805,2018),('2018-05-06',201819,5,2018,6,19,201805,2018),('2018-05-07',201819,5,2018,7,19,201805,2018),('2018-05-08',201819,5,2018,8,19,201805,2018),('2018-05-09',201819,5,2018,9,19,201805,2018),('2018-05-10',201819,5,2018,10,19,201805,2018),('2018-05-11',201819,5,2018,11,19,201805,2018),('2018-05-12',201819,5,2018,12,19,201805,2018),('2018-05-13',201820,5,2018,13,20,201805,2018),('2018-05-14',201820,5,2018,14,20,201805,2018),('2018-05-15',201820,5,2018,15,20,201805,2018),('2018-05-16',201820,5,2018,16,20,201805,2018),('2018-05-17',201820,5,2018,17,20,201805,2018),('2018-05-18',201820,5,2018,18,20,201805,2018),('2018-05-19',201820,5,2018,19,20,201805,2018),('2018-05-20',201821,5,2018,20,21,201805,2018),('2018-05-21',201821,5,2018,21,21,201805,2018),('2018-05-22',201821,5,2018,22,21,201805,2018),('2018-05-23',201821,5,2018,23,21,201805,2018),('2018-05-24',201821,5,2018,24,21,201805,2018),('2018-05-25',201821,5,2018,25,21,201805,2018),('2018-05-26',201821,5,2018,26,21,201805,2018),('2018-05-27',201822,5,2018,27,22,201805,2018),('2018-05-28',201822,5,2018,28,22,201805,2018),('2018-05-29',201822,5,2018,29,22,201805,2018),('2018-05-30',201822,5,2018,30,22,201805,2018),('2018-05-31',201822,5,2018,31,22,201805,2018),('2018-06-01',201822,6,2018,1,22,201806,2018),('2018-06-02',201822,6,2018,2,22,201806,2018),('2018-06-03',201823,6,2018,3,23,201806,2018),('2018-06-04',201823,6,2018,4,23,201806,2018),('2018-06-05',201823,6,2018,5,23,201806,2018),('2018-06-06',201823,6,2018,6,23,201806,2018),('2018-06-07',201823,6,2018,7,23,201806,2018),('2018-06-08',201823,6,2018,8,23,201806,2018),('2018-06-09',201823,6,2018,9,23,201806,2018),('2018-06-10',201824,6,2018,10,24,201806,2018),('2018-06-11',201824,6,2018,11,24,201806,2018),('2018-06-12',201824,6,2018,12,24,201806,2018),('2018-06-13',201824,6,2018,13,24,201806,2018),('2018-06-14',201824,6,2018,14,24,201806,2018),('2018-06-15',201824,6,2018,15,24,201806,2018),('2018-06-16',201824,6,2018,16,24,201806,2018),('2018-06-17',201825,6,2018,17,25,201806,2018),('2018-06-18',201825,6,2018,18,25,201806,2018),('2018-06-19',201825,6,2018,19,25,201806,2018),('2018-06-20',201825,6,2018,20,25,201806,2018),('2018-06-21',201825,6,2018,21,25,201806,2018),('2018-06-22',201825,6,2018,22,25,201806,2018),('2018-06-23',201825,6,2018,23,25,201806,2018),('2018-06-24',201826,6,2018,24,26,201806,2018),('2018-06-25',201826,6,2018,25,26,201806,2018),('2018-06-26',201826,6,2018,26,26,201806,2018),('2018-06-27',201826,6,2018,27,26,201806,2018),('2018-06-28',201826,6,2018,28,26,201806,2018),('2018-06-29',201826,6,2018,29,26,201806,2018),('2018-06-30',201826,6,2018,30,26,201806,2018),('2018-07-01',201827,7,2018,1,27,201807,2018),('2018-07-02',201827,7,2018,2,27,201807,2018),('2018-07-03',201827,7,2018,3,27,201807,2018),('2018-07-04',201827,7,2018,4,27,201807,2018),('2018-07-05',201827,7,2018,5,27,201807,2018),('2018-07-06',201827,7,2018,6,27,201807,2018),('2018-07-07',201827,7,2018,7,27,201807,2018),('2018-07-08',201828,7,2018,8,28,201807,2018),('2018-07-09',201828,7,2018,9,28,201807,2018),('2018-07-10',201828,7,2018,10,28,201807,2018),('2018-07-11',201828,7,2018,11,28,201807,2018),('2018-07-12',201828,7,2018,12,28,201807,2018),('2018-07-13',201828,7,2018,13,28,201807,2018),('2018-07-14',201828,7,2018,14,28,201807,2018),('2018-07-15',201829,7,2018,15,29,201807,2018),('2018-07-16',201829,7,2018,16,29,201807,2018),('2018-07-17',201829,7,2018,17,29,201807,2018),('2018-07-18',201829,7,2018,18,29,201807,2018),('2018-07-19',201829,7,2018,19,29,201807,2018),('2018-07-20',201829,7,2018,20,29,201807,2018),('2018-07-21',201829,7,2018,21,29,201807,2018),('2018-07-22',201830,7,2018,22,30,201807,2018),('2018-07-23',201830,7,2018,23,30,201807,2018),('2018-07-24',201830,7,2018,24,30,201807,2018),('2018-07-25',201830,7,2018,25,30,201807,2018),('2018-07-26',201830,7,2018,26,30,201807,2018),('2018-07-27',201830,7,2018,27,30,201807,2018),('2018-07-28',201830,7,2018,28,30,201807,2018),('2018-07-29',201831,7,2018,29,31,201807,2018),('2018-07-30',201831,7,2018,30,31,201807,2018),('2018-07-31',201831,7,2018,31,31,201807,2018),('2018-08-01',201831,8,2018,1,31,201808,2018),('2018-08-02',201831,8,2018,2,31,201808,2018),('2018-08-03',201831,8,2018,3,31,201808,2018),('2018-08-04',201831,8,2018,4,31,201808,2018),('2018-08-05',201832,8,2018,5,32,201808,2018),('2018-08-06',201832,8,2018,6,32,201808,2018),('2018-08-07',201832,8,2018,7,32,201808,2018),('2018-08-08',201832,8,2018,8,32,201808,2018),('2018-08-09',201832,8,2018,9,32,201808,2018),('2018-08-10',201832,8,2018,10,32,201808,2018),('2018-08-11',201832,8,2018,11,32,201808,2018),('2018-08-12',201833,8,2018,12,33,201808,2018),('2018-08-13',201833,8,2018,13,33,201808,2018),('2018-08-14',201833,8,2018,14,33,201808,2018),('2018-08-15',201833,8,2018,15,33,201808,2018),('2018-08-16',201833,8,2018,16,33,201808,2018),('2018-08-17',201833,8,2018,17,33,201808,2018),('2018-08-18',201833,8,2018,18,33,201808,2018),('2018-08-19',201834,8,2018,19,34,201808,2018),('2018-08-20',201834,8,2018,20,34,201808,2018),('2018-08-21',201834,8,2018,21,34,201808,2018),('2018-08-22',201834,8,2018,22,34,201808,2018),('2018-08-23',201834,8,2018,23,34,201808,2018),('2018-08-24',201834,8,2018,24,34,201808,2018),('2018-08-25',201834,8,2018,25,34,201808,2018),('2018-08-26',201835,8,2018,26,35,201808,2018),('2018-08-27',201835,8,2018,27,35,201808,2018),('2018-08-28',201835,8,2018,28,35,201808,2018),('2018-08-29',201835,8,2018,29,35,201808,2018),('2018-08-30',201835,8,2018,30,35,201808,2018),('2018-08-31',201835,8,2018,31,35,201808,2018),('2018-09-01',201835,9,2018,1,35,201809,2018),('2018-09-02',201836,9,2018,2,36,201809,2018),('2018-09-03',201836,9,2018,3,36,201809,2018),('2018-09-04',201836,9,2018,4,36,201809,2018),('2018-09-05',201836,9,2018,5,36,201809,2018),('2018-09-06',201836,9,2018,6,36,201809,2018),('2018-09-07',201836,9,2018,7,36,201809,2018),('2018-09-08',201836,9,2018,8,36,201809,2018),('2018-09-09',201837,9,2018,9,37,201809,2018),('2018-09-10',201837,9,2018,10,37,201809,2018),('2018-09-11',201837,9,2018,11,37,201809,2018),('2018-09-12',201837,9,2018,12,37,201809,2018),('2018-09-13',201837,9,2018,13,37,201809,2018),('2018-09-14',201837,9,2018,14,37,201809,2018),('2018-09-15',201837,9,2018,15,37,201809,2018),('2018-09-16',201838,9,2018,16,38,201809,2018),('2018-09-17',201838,9,2018,17,38,201809,2018),('2018-09-18',201838,9,2018,18,38,201809,2018),('2018-09-19',201838,9,2018,19,38,201809,2018),('2018-09-20',201838,9,2018,20,38,201809,2018),('2018-09-21',201838,9,2018,21,38,201809,2018),('2018-09-22',201838,9,2018,22,38,201809,2018),('2018-09-23',201839,9,2018,23,39,201809,2018),('2018-09-24',201839,9,2018,24,39,201809,2018),('2018-09-25',201839,9,2018,25,39,201809,2018),('2018-09-26',201839,9,2018,26,39,201809,2018),('2018-09-27',201839,9,2018,27,39,201809,2018),('2018-09-28',201839,9,2018,28,39,201809,2018),('2018-09-29',201839,9,2018,29,39,201809,2018),('2018-09-30',201840,9,2018,30,40,201809,2018),('2018-10-01',201840,10,2018,1,40,201810,2018),('2018-10-02',201840,10,2018,2,40,201810,2018),('2018-10-03',201840,10,2018,3,40,201810,2018),('2018-10-04',201840,10,2018,4,40,201810,2018),('2018-10-05',201840,10,2018,5,40,201810,2018),('2018-10-06',201840,10,2018,6,40,201810,2018),('2018-10-07',201841,10,2018,7,41,201810,2018),('2018-10-08',201841,10,2018,8,41,201810,2018),('2018-10-09',201841,10,2018,9,41,201810,2018),('2018-10-10',201841,10,2018,10,41,201810,2018),('2018-10-11',201841,10,2018,11,41,201810,2018),('2018-10-12',201841,10,2018,12,41,201810,2018),('2018-10-13',201841,10,2018,13,41,201810,2018),('2018-10-14',201842,10,2018,14,42,201810,2018),('2018-10-15',201842,10,2018,15,42,201810,2018),('2018-10-16',201842,10,2018,16,42,201810,2018),('2018-10-17',201842,10,2018,17,42,201810,2018),('2018-10-18',201842,10,2018,18,42,201810,2018),('2018-10-19',201842,10,2018,19,42,201810,2018),('2018-10-20',201842,10,2018,20,42,201810,2018),('2018-10-21',201843,10,2018,21,43,201810,2018),('2018-10-22',201843,10,2018,22,43,201810,2018),('2018-10-23',201843,10,2018,23,43,201810,2018),('2018-10-24',201843,10,2018,24,43,201810,2018),('2018-10-25',201843,10,2018,25,43,201810,2018),('2018-10-26',201843,10,2018,26,43,201810,2018),('2018-10-27',201843,10,2018,27,43,201810,2018),('2018-10-28',201844,10,2018,28,44,201810,2018),('2018-10-29',201844,10,2018,29,44,201810,2018),('2018-10-30',201844,10,2018,30,44,201810,2018),('2018-10-31',201844,10,2018,31,44,201810,2018),('2018-11-01',201844,11,2018,1,44,201811,2018),('2018-11-02',201844,11,2018,2,44,201811,2018),('2018-11-03',201844,11,2018,3,44,201811,2018),('2018-11-04',201845,11,2018,4,45,201811,2018),('2018-11-05',201845,11,2018,5,45,201811,2018),('2018-11-06',201845,11,2018,6,45,201811,2018),('2018-11-07',201845,11,2018,7,45,201811,2018),('2018-11-08',201845,11,2018,8,45,201811,2018),('2018-11-09',201845,11,2018,9,45,201811,2018),('2018-11-10',201845,11,2018,10,45,201811,2018),('2018-11-11',201846,11,2018,11,46,201811,2018),('2018-11-12',201846,11,2018,12,46,201811,2018),('2018-11-13',201846,11,2018,13,46,201811,2018),('2018-11-14',201846,11,2018,14,46,201811,2018),('2018-11-15',201846,11,2018,15,46,201811,2018),('2018-11-16',201846,11,2018,16,46,201811,2018),('2018-11-17',201846,11,2018,17,46,201811,2018),('2018-11-18',201847,11,2018,18,47,201811,2018),('2018-11-19',201847,11,2018,19,47,201811,2018),('2018-11-20',201847,11,2018,20,47,201811,2018),('2018-11-21',201847,11,2018,21,47,201811,2018),('2018-11-22',201847,11,2018,22,47,201811,2018),('2018-11-23',201847,11,2018,23,47,201811,2018),('2018-11-24',201847,11,2018,24,47,201811,2018),('2018-11-25',201848,11,2018,25,48,201811,2018),('2018-11-26',201848,11,2018,26,48,201811,2018),('2018-11-27',201848,11,2018,27,48,201811,2018),('2018-11-28',201848,11,2018,28,48,201811,2018),('2018-11-29',201848,11,2018,29,48,201811,2018),('2018-11-30',201848,11,2018,30,48,201811,2018),('2018-12-01',201848,12,2018,1,48,201812,2019),('2018-12-02',201849,12,2018,2,49,201812,2019),('2018-12-03',201849,12,2018,3,49,201812,2019),('2018-12-04',201849,12,2018,4,49,201812,2019),('2018-12-05',201849,12,2018,5,49,201812,2019),('2018-12-06',201849,12,2018,6,49,201812,2019),('2018-12-07',201849,12,2018,7,49,201812,2019),('2018-12-08',201849,12,2018,8,49,201812,2019),('2018-12-09',201850,12,2018,9,50,201812,2019),('2018-12-10',201850,12,2018,10,50,201812,2019),('2018-12-11',201850,12,2018,11,50,201812,2019),('2018-12-12',201850,12,2018,12,50,201812,2019),('2018-12-13',201850,12,2018,13,50,201812,2019),('2018-12-14',201850,12,2018,14,50,201812,2019),('2018-12-15',201850,12,2018,15,50,201812,2019),('2018-12-16',201851,12,2018,16,51,201812,2019),('2018-12-17',201851,12,2018,17,51,201812,2019),('2018-12-18',201851,12,2018,18,51,201812,2019),('2018-12-19',201851,12,2018,19,51,201812,2019),('2018-12-20',201851,12,2018,20,51,201812,2019),('2018-12-21',201851,12,2018,21,51,201812,2019),('2018-12-22',201851,12,2018,22,51,201812,2019),('2018-12-23',201852,12,2018,23,52,201812,2019),('2018-12-24',201852,12,2018,24,52,201812,2019),('2018-12-25',201852,12,2018,25,52,201812,2019),('2018-12-26',201852,12,2018,26,52,201812,2019),('2018-12-27',201852,12,2018,27,52,201812,2019),('2018-12-28',201852,12,2018,28,52,201812,2019),('2018-12-29',201852,12,2018,29,52,201812,2019),('2018-12-30',201901,12,2019,30,1,201812,2019),('2018-12-31',201901,12,2019,31,1,201812,2019),('2019-01-01',201901,1,2019,1,1,201901,2019),('2019-01-02',201901,1,2019,2,1,201901,2019),('2019-01-03',201901,1,2019,3,1,201901,2019),('2019-01-04',201901,1,2019,4,1,201901,2019),('2019-01-05',201901,1,2019,5,1,201901,2019),('2019-01-06',201902,1,2019,6,2,201901,2019),('2019-01-07',201902,1,2019,7,2,201901,2019),('2019-01-08',201902,1,2019,8,2,201901,2019),('2019-01-09',201902,1,2019,9,2,201901,2019),('2019-01-10',201902,1,2019,10,2,201901,2019),('2019-01-11',201902,1,2019,11,2,201901,2019),('2019-01-12',201902,1,2019,12,2,201901,2019),('2019-01-13',201903,1,2019,13,3,201901,2019),('2019-01-14',201903,1,2019,14,3,201901,2019),('2019-01-15',201903,1,2019,15,3,201901,2019),('2019-01-16',201903,1,2019,16,3,201901,2019),('2019-01-17',201903,1,2019,17,3,201901,2019),('2019-01-18',201903,1,2019,18,3,201901,2019),('2019-01-19',201903,1,2019,19,3,201901,2019),('2019-01-20',201904,1,2019,20,4,201901,2019),('2019-01-21',201904,1,2019,21,4,201901,2019),('2019-01-22',201904,1,2019,22,4,201901,2019),('2019-01-23',201904,1,2019,23,4,201901,2019),('2019-01-24',201904,1,2019,24,4,201901,2019),('2019-01-25',201904,1,2019,25,4,201901,2019),('2019-01-26',201904,1,2019,26,4,201901,2019),('2019-01-27',201905,1,2019,27,5,201901,2019),('2019-01-28',201905,1,2019,28,5,201901,2019),('2019-01-29',201905,1,2019,29,5,201901,2019),('2019-01-30',201905,1,2019,30,5,201901,2019),('2019-01-31',201905,1,2019,31,5,201901,2019),('2019-02-01',201905,2,2019,1,5,201902,2019),('2019-02-02',201905,2,2019,2,5,201902,2019),('2019-02-03',201906,2,2019,3,6,201902,2019),('2019-02-04',201906,2,2019,4,6,201902,2019),('2019-02-05',201906,2,2019,5,6,201902,2019),('2019-02-06',201906,2,2019,6,6,201902,2019),('2019-02-07',201906,2,2019,7,6,201902,2019),('2019-02-08',201906,2,2019,8,6,201902,2019),('2019-02-09',201906,2,2019,9,6,201902,2019),('2019-02-10',201907,2,2019,10,7,201902,2019),('2019-02-11',201907,2,2019,11,7,201902,2019),('2019-02-12',201907,2,2019,12,7,201902,2019),('2019-02-13',201907,2,2019,13,7,201902,2019),('2019-02-14',201907,2,2019,14,7,201902,2019),('2019-02-15',201907,2,2019,15,7,201902,2019),('2019-02-16',201907,2,2019,16,7,201902,2019),('2019-02-17',201908,2,2019,17,8,201902,2019),('2019-02-18',201908,2,2019,18,8,201902,2019),('2019-02-19',201908,2,2019,19,8,201902,2019),('2019-02-20',201908,2,2019,20,8,201902,2019),('2019-02-21',201908,2,2019,21,8,201902,2019),('2019-02-22',201908,2,2019,22,8,201902,2019),('2019-02-23',201908,2,2019,23,8,201902,2019),('2019-02-24',201909,2,2019,24,9,201902,2019),('2019-02-25',201909,2,2019,25,9,201902,2019),('2019-02-26',201909,2,2019,26,9,201902,2019),('2019-02-27',201909,2,2019,27,9,201902,2019),('2019-02-28',201909,2,2019,28,9,201902,2019),('2019-03-01',201909,3,2019,1,9,201903,2019),('2019-03-02',201909,3,2019,2,9,201903,2019),('2019-03-03',201910,3,2019,3,10,201903,2019),('2019-03-04',201910,3,2019,4,10,201903,2019),('2019-03-05',201910,3,2019,5,10,201903,2019),('2019-03-06',201910,3,2019,6,10,201903,2019),('2019-03-07',201910,3,2019,7,10,201903,2019),('2019-03-08',201910,3,2019,8,10,201903,2019),('2019-03-09',201910,3,2019,9,10,201903,2019),('2019-03-10',201911,3,2019,10,11,201903,2019),('2019-03-11',201911,3,2019,11,11,201903,2019),('2019-03-12',201911,3,2019,12,11,201903,2019),('2019-03-13',201911,3,2019,13,11,201903,2019),('2019-03-14',201911,3,2019,14,11,201903,2019),('2019-03-15',201911,3,2019,15,11,201903,2019),('2019-03-16',201911,3,2019,16,11,201903,2019),('2019-03-17',201912,3,2019,17,12,201903,2019),('2019-03-18',201912,3,2019,18,12,201903,2019),('2019-03-19',201912,3,2019,19,12,201903,2019),('2019-03-20',201912,3,2019,20,12,201903,2019),('2019-03-21',201912,3,2019,21,12,201903,2019),('2019-03-22',201912,3,2019,22,12,201903,2019),('2019-03-23',201912,3,2019,23,12,201903,2019),('2019-03-24',201913,3,2019,24,13,201903,2019),('2019-03-25',201913,3,2019,25,13,201903,2019),('2019-03-26',201913,3,2019,26,13,201903,2019),('2019-03-27',201913,3,2019,27,13,201903,2019),('2019-03-28',201913,3,2019,28,13,201903,2019),('2019-03-29',201913,3,2019,29,13,201903,2019),('2019-03-30',201913,3,2019,30,13,201903,2019),('2019-03-31',201914,3,2019,31,14,201903,2019),('2019-04-01',201914,4,2019,1,14,201904,2019),('2019-04-02',201914,4,2019,2,14,201904,2019),('2019-04-03',201914,4,2019,3,14,201904,2019),('2019-04-04',201914,4,2019,4,14,201904,2019),('2019-04-05',201914,4,2019,5,14,201904,2019),('2019-04-06',201914,4,2019,6,14,201904,2019),('2019-04-07',201915,4,2019,7,15,201904,2019),('2019-04-08',201915,4,2019,8,15,201904,2019),('2019-04-09',201915,4,2019,9,15,201904,2019),('2019-04-10',201915,4,2019,10,15,201904,2019),('2019-04-11',201915,4,2019,11,15,201904,2019),('2019-04-12',201915,4,2019,12,15,201904,2019),('2019-04-13',201915,4,2019,13,15,201904,2019),('2019-04-14',201916,4,2019,14,16,201904,2019),('2019-04-15',201916,4,2019,15,16,201904,2019),('2019-04-16',201916,4,2019,16,16,201904,2019),('2019-04-17',201916,4,2019,17,16,201904,2019),('2019-04-18',201916,4,2019,18,16,201904,2019),('2019-04-19',201916,4,2019,19,16,201904,2019),('2019-04-20',201916,4,2019,20,16,201904,2019),('2019-04-21',201917,4,2019,21,17,201904,2019),('2019-04-22',201917,4,2019,22,17,201904,2019),('2019-04-23',201917,4,2019,23,17,201904,2019),('2019-04-24',201917,4,2019,24,17,201904,2019),('2019-04-25',201917,4,2019,25,17,201904,2019),('2019-04-26',201917,4,2019,26,17,201904,2019),('2019-04-27',201917,4,2019,27,17,201904,2019),('2019-04-28',201918,4,2019,28,18,201904,2019),('2019-04-29',201918,4,2019,29,18,201904,2019),('2019-04-30',201918,4,2019,30,18,201904,2019),('2019-05-01',201918,5,2019,1,18,201905,2019),('2019-05-02',201918,5,2019,2,18,201905,2019),('2019-05-03',201918,5,2019,3,18,201905,2019),('2019-05-04',201918,5,2019,4,18,201905,2019),('2019-05-05',201919,5,2019,5,19,201905,2019),('2019-05-06',201919,5,2019,6,19,201905,2019),('2019-05-07',201919,5,2019,7,19,201905,2019),('2019-05-08',201919,5,2019,8,19,201905,2019),('2019-05-09',201919,5,2019,9,19,201905,2019),('2019-05-10',201919,5,2019,10,19,201905,2019),('2019-05-11',201919,5,2019,11,19,201905,2019),('2019-05-12',201920,5,2019,12,20,201905,2019),('2019-05-13',201920,5,2019,13,20,201905,2019),('2019-05-14',201920,5,2019,14,20,201905,2019),('2019-05-15',201920,5,2019,15,20,201905,2019),('2019-05-16',201920,5,2019,16,20,201905,2019),('2019-05-17',201920,5,2019,17,20,201905,2019),('2019-05-18',201920,5,2019,18,20,201905,2019),('2019-05-19',201921,5,2019,19,21,201905,2019),('2019-05-20',201921,5,2019,20,21,201905,2019),('2019-05-21',201921,5,2019,21,21,201905,2019),('2019-05-22',201921,5,2019,22,21,201905,2019),('2019-05-23',201921,5,2019,23,21,201905,2019),('2019-05-24',201921,5,2019,24,21,201905,2019),('2019-05-25',201921,5,2019,25,21,201905,2019),('2019-05-26',201922,5,2019,26,22,201905,2019),('2019-05-27',201922,5,2019,27,22,201905,2019),('2019-05-28',201922,5,2019,28,22,201905,2019),('2019-05-29',201922,5,2019,29,22,201905,2019),('2019-05-30',201922,5,2019,30,22,201905,2019),('2019-05-31',201922,5,2019,31,22,201905,2019),('2019-06-01',201922,6,2019,1,22,201906,2019),('2019-06-02',201923,6,2019,2,23,201906,2019),('2019-06-03',201923,6,2019,3,23,201906,2019),('2019-06-04',201923,6,2019,4,23,201906,2019),('2019-06-05',201923,6,2019,5,23,201906,2019),('2019-06-06',201923,6,2019,6,23,201906,2019),('2019-06-07',201923,6,2019,7,23,201906,2019),('2019-06-08',201923,6,2019,8,23,201906,2019),('2019-06-09',201924,6,2019,9,24,201906,2019),('2019-06-10',201924,6,2019,10,24,201906,2019),('2019-06-11',201924,6,2019,11,24,201906,2019),('2019-06-12',201924,6,2019,12,24,201906,2019),('2019-06-13',201924,6,2019,13,24,201906,2019),('2019-06-14',201924,6,2019,14,24,201906,2019),('2019-06-15',201924,6,2019,15,24,201906,2019),('2019-06-16',201925,6,2019,16,25,201906,2019),('2019-06-17',201925,6,2019,17,25,201906,2019),('2019-06-18',201925,6,2019,18,25,201906,2019),('2019-06-19',201925,6,2019,19,25,201906,2019),('2019-06-20',201925,6,2019,20,25,201906,2019),('2019-06-21',201925,6,2019,21,25,201906,2019),('2019-06-22',201925,6,2019,22,25,201906,2019),('2019-06-23',201926,6,2019,23,26,201906,2019),('2019-06-24',201926,6,2019,24,26,201906,2019),('2019-06-25',201926,6,2019,25,26,201906,2019),('2019-06-26',201926,6,2019,26,26,201906,2019),('2019-06-27',201926,6,2019,27,26,201906,2019),('2019-06-28',201926,6,2019,28,26,201906,2019),('2019-06-29',201926,6,2019,29,26,201906,2019),('2019-06-30',201927,6,2019,30,27,201906,2019),('2019-07-01',201927,7,2019,1,27,201907,2019),('2019-07-02',201927,7,2019,2,27,201907,2019),('2019-07-03',201927,7,2019,3,27,201907,2019),('2019-07-04',201927,7,2019,4,27,201907,2019),('2019-07-05',201927,7,2019,5,27,201907,2019),('2019-07-06',201927,7,2019,6,27,201907,2019),('2019-07-07',201928,7,2019,7,28,201907,2019),('2019-07-08',201928,7,2019,8,28,201907,2019),('2019-07-09',201928,7,2019,9,28,201907,2019),('2019-07-10',201928,7,2019,10,28,201907,2019),('2019-07-11',201928,7,2019,11,28,201907,2019),('2019-07-12',201928,7,2019,12,28,201907,2019),('2019-07-13',201928,7,2019,13,28,201907,2019),('2019-07-14',201929,7,2019,14,29,201907,2019),('2019-07-15',201929,7,2019,15,29,201907,2019),('2019-07-16',201929,7,2019,16,29,201907,2019),('2019-07-17',201929,7,2019,17,29,201907,2019),('2019-07-18',201929,7,2019,18,29,201907,2019),('2019-07-19',201929,7,2019,19,29,201907,2019),('2019-07-20',201929,7,2019,20,29,201907,2019),('2019-07-21',201930,7,2019,21,30,201907,2019),('2019-07-22',201930,7,2019,22,30,201907,2019),('2019-07-23',201930,7,2019,23,30,201907,2019),('2019-07-24',201930,7,2019,24,30,201907,2019),('2019-07-25',201930,7,2019,25,30,201907,2019),('2019-07-26',201930,7,2019,26,30,201907,2019),('2019-07-27',201930,7,2019,27,30,201907,2019),('2019-07-28',201931,7,2019,28,31,201907,2019),('2019-07-29',201931,7,2019,29,31,201907,2019),('2019-07-30',201931,7,2019,30,31,201907,2019),('2019-07-31',201931,7,2019,31,31,201907,2019),('2019-08-01',201931,8,2019,1,31,201908,2019),('2019-08-02',201931,8,2019,2,31,201908,2019),('2019-08-03',201931,8,2019,3,31,201908,2019),('2019-08-04',201932,8,2019,4,32,201908,2019),('2019-08-05',201932,8,2019,5,32,201908,2019),('2019-08-06',201932,8,2019,6,32,201908,2019),('2019-08-07',201932,8,2019,7,32,201908,2019),('2019-08-08',201932,8,2019,8,32,201908,2019),('2019-08-09',201932,8,2019,9,32,201908,2019),('2019-08-10',201932,8,2019,10,32,201908,2019),('2019-08-11',201933,8,2019,11,33,201908,2019),('2019-08-12',201933,8,2019,12,33,201908,2019),('2019-08-13',201933,8,2019,13,33,201908,2019),('2019-08-14',201933,8,2019,14,33,201908,2019),('2019-08-15',201933,8,2019,15,33,201908,2019),('2019-08-16',201933,8,2019,16,33,201908,2019),('2019-08-17',201933,8,2019,17,33,201908,2019),('2019-08-18',201934,8,2019,18,34,201908,2019),('2019-08-19',201934,8,2019,19,34,201908,2019),('2019-08-20',201934,8,2019,20,34,201908,2019),('2019-08-21',201934,8,2019,21,34,201908,2019),('2019-08-22',201934,8,2019,22,34,201908,2019),('2019-08-23',201934,8,2019,23,34,201908,2019),('2019-08-24',201934,8,2019,24,34,201908,2019),('2019-08-25',201935,8,2019,25,35,201908,2019),('2019-08-26',201935,8,2019,26,35,201908,2019),('2019-08-27',201935,8,2019,27,35,201908,2019),('2019-08-28',201935,8,2019,28,35,201908,2019),('2019-08-29',201935,8,2019,29,35,201908,2019),('2019-08-30',201935,8,2019,30,35,201908,2019),('2019-08-31',201935,8,2019,31,35,201908,2019),('2019-09-01',201936,9,2019,1,36,201909,2019),('2019-09-02',201936,9,2019,2,36,201909,2019),('2019-09-03',201936,9,2019,3,36,201909,2019),('2019-09-04',201936,9,2019,4,36,201909,2019),('2019-09-05',201936,9,2019,5,36,201909,2019),('2019-09-06',201936,9,2019,6,36,201909,2019),('2019-09-07',201936,9,2019,7,36,201909,2019),('2019-09-08',201937,9,2019,8,37,201909,2019),('2019-09-09',201937,9,2019,9,37,201909,2019),('2019-09-10',201937,9,2019,10,37,201909,2019),('2019-09-11',201937,9,2019,11,37,201909,2019),('2019-09-12',201937,9,2019,12,37,201909,2019),('2019-09-13',201937,9,2019,13,37,201909,2019),('2019-09-14',201937,9,2019,14,37,201909,2019),('2019-09-15',201938,9,2019,15,38,201909,2019),('2019-09-16',201938,9,2019,16,38,201909,2019),('2019-09-17',201938,9,2019,17,38,201909,2019),('2019-09-18',201938,9,2019,18,38,201909,2019),('2019-09-19',201938,9,2019,19,38,201909,2019),('2019-09-20',201938,9,2019,20,38,201909,2019),('2019-09-21',201938,9,2019,21,38,201909,2019),('2019-09-22',201939,9,2019,22,39,201909,2019),('2019-09-23',201939,9,2019,23,39,201909,2019),('2019-09-24',201939,9,2019,24,39,201909,2019),('2019-09-25',201939,9,2019,25,39,201909,2019),('2019-09-26',201939,9,2019,26,39,201909,2019),('2019-09-27',201939,9,2019,27,39,201909,2019),('2019-09-28',201939,9,2019,28,39,201909,2019),('2019-09-29',201940,9,2019,29,40,201909,2019),('2019-09-30',201940,9,2019,30,40,201909,2019),('2019-10-01',201940,10,2019,1,40,201910,2019),('2019-10-02',201940,10,2019,2,40,201910,2019),('2019-10-03',201940,10,2019,3,40,201910,2019),('2019-10-04',201940,10,2019,4,40,201910,2019),('2019-10-05',201940,10,2019,5,40,201910,2019),('2019-10-06',201941,10,2019,6,41,201910,2019),('2019-10-07',201941,10,2019,7,41,201910,2019),('2019-10-08',201941,10,2019,8,41,201910,2019),('2019-10-09',201941,10,2019,9,41,201910,2019),('2019-10-10',201941,10,2019,10,41,201910,2019),('2019-10-11',201941,10,2019,11,41,201910,2019),('2019-10-12',201941,10,2019,12,41,201910,2019),('2019-10-13',201942,10,2019,13,42,201910,2019),('2019-10-14',201942,10,2019,14,42,201910,2019),('2019-10-15',201942,10,2019,15,42,201910,2019),('2019-10-16',201942,10,2019,16,42,201910,2019),('2019-10-17',201942,10,2019,17,42,201910,2019),('2019-10-18',201942,10,2019,18,42,201910,2019),('2019-10-19',201942,10,2019,19,42,201910,2019),('2019-10-20',201943,10,2019,20,43,201910,2019),('2019-10-21',201943,10,2019,21,43,201910,2019),('2019-10-22',201943,10,2019,22,43,201910,2019),('2019-10-23',201943,10,2019,23,43,201910,2019),('2019-10-24',201943,10,2019,24,43,201910,2019),('2019-10-25',201943,10,2019,25,43,201910,2019),('2019-10-26',201943,10,2019,26,43,201910,2019),('2019-10-27',201944,10,2019,27,44,201910,2019),('2019-10-28',201944,10,2019,28,44,201910,2019),('2019-10-29',201944,10,2019,29,44,201910,2019),('2019-10-30',201944,10,2019,30,44,201910,2019),('2019-10-31',201944,10,2019,31,44,201910,2019),('2019-11-01',201944,11,2019,1,44,201911,2019),('2019-11-02',201944,11,2019,2,44,201911,2019),('2019-11-03',201945,11,2019,3,45,201911,2019),('2019-11-04',201945,11,2019,4,45,201911,2019),('2019-11-05',201945,11,2019,5,45,201911,2019),('2019-11-06',201945,11,2019,6,45,201911,2019),('2019-11-07',201945,11,2019,7,45,201911,2019),('2019-11-08',201945,11,2019,8,45,201911,2019),('2019-11-09',201945,11,2019,9,45,201911,2019),('2019-11-10',201946,11,2019,10,46,201911,2019),('2019-11-11',201946,11,2019,11,46,201911,2019),('2019-11-12',201946,11,2019,12,46,201911,2019),('2019-11-13',201946,11,2019,13,46,201911,2019),('2019-11-14',201946,11,2019,14,46,201911,2019),('2019-11-15',201946,11,2019,15,46,201911,2019),('2019-11-16',201946,11,2019,16,46,201911,2019),('2019-11-17',201947,11,2019,17,47,201911,2019),('2019-11-18',201947,11,2019,18,47,201911,2019),('2019-11-19',201947,11,2019,19,47,201911,2019),('2019-11-20',201947,11,2019,20,47,201911,2019),('2019-11-21',201947,11,2019,21,47,201911,2019),('2019-11-22',201947,11,2019,22,47,201911,2019),('2019-11-23',201947,11,2019,23,47,201911,2019),('2019-11-24',201948,11,2019,24,48,201911,2019),('2019-11-25',201948,11,2019,25,48,201911,2019),('2019-11-26',201948,11,2019,26,48,201911,2019),('2019-11-27',201948,11,2019,27,48,201911,2019),('2019-11-28',201948,11,2019,28,48,201911,2019),('2019-11-29',201948,11,2019,29,48,201911,2019),('2019-11-30',201948,11,2019,30,48,201911,2019),('2019-12-01',201949,12,2019,1,49,201912,2020),('2019-12-02',201949,12,2019,2,49,201912,2020),('2019-12-03',201949,12,2019,3,49,201912,2020),('2019-12-04',201949,12,2019,4,49,201912,2020),('2019-12-05',201949,12,2019,5,49,201912,2020),('2019-12-06',201949,12,2019,6,49,201912,2020),('2019-12-07',201949,12,2019,7,49,201912,2020),('2019-12-08',201950,12,2019,8,50,201912,2020),('2019-12-09',201950,12,2019,9,50,201912,2020),('2019-12-10',201950,12,2019,10,50,201912,2020),('2019-12-11',201950,12,2019,11,50,201912,2020),('2019-12-12',201950,12,2019,12,50,201912,2020),('2019-12-13',201950,12,2019,13,50,201912,2020),('2019-12-14',201950,12,2019,14,50,201912,2020),('2019-12-15',201951,12,2019,15,51,201912,2020),('2019-12-16',201951,12,2019,16,51,201912,2020),('2019-12-17',201951,12,2019,17,51,201912,2020),('2019-12-18',201951,12,2019,18,51,201912,2020),('2019-12-19',201951,12,2019,19,51,201912,2020),('2019-12-20',201951,12,2019,20,51,201912,2020),('2019-12-21',201951,12,2019,21,51,201912,2020),('2019-12-22',201952,12,2019,22,52,201912,2020),('2019-12-23',201952,12,2019,23,52,201912,2020),('2019-12-24',201952,12,2019,24,52,201912,2020),('2019-12-25',201952,12,2019,25,52,201912,2020),('2019-12-26',201952,12,2019,26,52,201912,2020),('2019-12-27',201952,12,2019,27,52,201912,2020),('2019-12-28',201952,12,2019,28,52,201912,2020),('2019-12-29',201953,12,2019,29,1,201912,2020),('2019-12-30',201953,12,2019,30,1,201912,2020),('2019-12-31',201953,12,2019,31,1,201912,2020),('2020-01-01',201953,1,2020,1,1,202001,2020),('2020-01-02',201953,1,2020,2,1,202001,2020),('2020-01-03',201953,1,2020,3,1,202001,2020),('2020-01-04',201953,1,2020,4,1,202001,2020),('2020-01-05',202001,1,2020,5,2,202001,2020),('2020-01-06',202001,1,2020,6,2,202001,2020),('2020-01-07',202001,1,2020,7,2,202001,2020),('2020-01-08',202001,1,2020,8,2,202001,2020),('2020-01-09',202001,1,2020,9,2,202001,2020),('2020-01-10',202001,1,2020,10,2,202001,2020),('2020-01-11',202001,1,2020,11,2,202001,2020),('2020-01-12',202002,1,2020,12,3,202001,2020),('2020-01-13',202002,1,2020,13,3,202001,2020),('2020-01-14',202002,1,2020,14,3,202001,2020),('2020-01-15',202002,1,2020,15,3,202001,2020),('2020-01-16',202002,1,2020,16,3,202001,2020),('2020-01-17',202002,1,2020,17,3,202001,2020),('2020-01-18',202002,1,2020,18,3,202001,2020),('2020-01-19',202003,1,2020,19,4,202001,2020),('2020-01-20',202003,1,2020,20,4,202001,2020),('2020-01-21',202003,1,2020,21,4,202001,2020),('2020-01-22',202003,1,2020,22,4,202001,2020),('2020-01-23',202003,1,2020,23,4,202001,2020),('2020-01-24',202003,1,2020,24,4,202001,2020),('2020-01-25',202003,1,2020,25,4,202001,2020),('2020-01-26',202004,1,2020,26,5,202001,2020),('2020-01-27',202004,1,2020,27,5,202001,2020),('2020-01-28',202004,1,2020,28,5,202001,2020),('2020-01-29',202004,1,2020,29,5,202001,2020),('2020-01-30',202004,1,2020,30,5,202001,2020),('2020-01-31',202004,1,2020,31,5,202001,2020),('2020-02-01',202004,2,2020,1,5,202002,2020),('2020-02-02',202005,2,2020,2,6,202002,2020),('2020-02-03',202005,2,2020,3,6,202002,2020),('2020-02-04',202005,2,2020,4,6,202002,2020),('2020-02-05',202005,2,2020,5,6,202002,2020),('2020-02-06',202005,2,2020,6,6,202002,2020),('2020-02-07',202005,2,2020,7,6,202002,2020),('2020-02-08',202005,2,2020,8,6,202002,2020),('2020-02-09',202006,2,2020,9,7,202002,2020),('2020-02-10',202006,2,2020,10,7,202002,2020),('2020-02-11',202006,2,2020,11,7,202002,2020),('2020-02-12',202006,2,2020,12,7,202002,2020),('2020-02-13',202006,2,2020,13,7,202002,2020),('2020-02-14',202006,2,2020,14,7,202002,2020),('2020-02-15',202006,2,2020,15,7,202002,2020),('2020-02-16',202007,2,2020,16,8,202002,2020),('2020-02-17',202007,2,2020,17,8,202002,2020),('2020-02-18',202007,2,2020,18,8,202002,2020),('2020-02-19',202007,2,2020,19,8,202002,2020),('2020-02-20',202007,2,2020,20,8,202002,2020),('2020-02-21',202007,2,2020,21,8,202002,2020),('2020-02-22',202007,2,2020,22,8,202002,2020),('2020-02-23',202008,2,2020,23,9,202002,2020),('2020-02-24',202008,2,2020,24,9,202002,2020),('2020-02-25',202008,2,2020,25,9,202002,2020),('2020-02-26',202008,2,2020,26,9,202002,2020),('2020-02-27',202008,2,2020,27,9,202002,2020),('2020-02-28',202008,2,2020,28,9,202002,2020),('2020-02-29',202008,2,2020,29,9,202002,2020),('2020-03-01',202009,3,2020,1,10,202003,2020),('2020-03-02',202009,3,2020,2,10,202003,2020),('2020-03-03',202009,3,2020,3,10,202003,2020),('2020-03-04',202009,3,2020,4,10,202003,2020),('2020-03-05',202009,3,2020,5,10,202003,2020),('2020-03-06',202009,3,2020,6,10,202003,2020),('2020-03-07',202009,3,2020,7,10,202003,2020),('2020-03-08',202010,3,2020,8,11,202003,2020),('2020-03-09',202010,3,2020,9,11,202003,2020),('2020-03-10',202010,3,2020,10,11,202003,2020),('2020-03-11',202010,3,2020,11,11,202003,2020),('2020-03-12',202010,3,2020,12,11,202003,2020),('2020-03-13',202010,3,2020,13,11,202003,2020),('2020-03-14',202010,3,2020,14,11,202003,2020),('2020-03-15',202011,3,2020,15,12,202003,2020),('2020-03-16',202011,3,2020,16,12,202003,2020),('2020-03-17',202011,3,2020,17,12,202003,2020),('2020-03-18',202011,3,2020,18,12,202003,2020),('2020-03-19',202011,3,2020,19,12,202003,2020),('2020-03-20',202011,3,2020,20,12,202003,2020),('2020-03-21',202011,3,2020,21,12,202003,2020),('2020-03-22',202012,3,2020,22,13,202003,2020),('2020-03-23',202012,3,2020,23,13,202003,2020),('2020-03-24',202012,3,2020,24,13,202003,2020),('2020-03-25',202012,3,2020,25,13,202003,2020),('2020-03-26',202012,3,2020,26,13,202003,2020),('2020-03-27',202012,3,2020,27,13,202003,2020),('2020-03-28',202012,3,2020,28,13,202003,2020),('2020-03-29',202013,3,2020,29,14,202003,2020),('2020-03-30',202013,3,2020,30,14,202003,2020),('2020-03-31',202013,3,2020,31,14,202003,2020),('2020-04-01',202013,4,2020,1,14,202004,2020),('2020-04-02',202013,4,2020,2,14,202004,2020),('2020-04-03',202013,4,2020,3,14,202004,2020),('2020-04-04',202013,4,2020,4,14,202004,2020),('2020-04-05',202014,4,2020,5,15,202004,2020),('2020-04-06',202014,4,2020,6,15,202004,2020),('2020-04-07',202014,4,2020,7,15,202004,2020),('2020-04-08',202014,4,2020,8,15,202004,2020),('2020-04-09',202014,4,2020,9,15,202004,2020),('2020-04-10',202014,4,2020,10,15,202004,2020),('2020-04-11',202014,4,2020,11,15,202004,2020),('2020-04-12',202015,4,2020,12,16,202004,2020),('2020-04-13',202015,4,2020,13,16,202004,2020),('2020-04-14',202015,4,2020,14,16,202004,2020),('2020-04-15',202015,4,2020,15,16,202004,2020),('2020-04-16',202015,4,2020,16,16,202004,2020),('2020-04-17',202015,4,2020,17,16,202004,2020),('2020-04-18',202015,4,2020,18,16,202004,2020),('2020-04-19',202016,4,2020,19,17,202004,2020),('2020-04-20',202016,4,2020,20,17,202004,2020),('2020-04-21',202016,4,2020,21,17,202004,2020),('2020-04-22',202016,4,2020,22,17,202004,2020),('2020-04-23',202016,4,2020,23,17,202004,2020),('2020-04-24',202016,4,2020,24,17,202004,2020),('2020-04-25',202016,4,2020,25,17,202004,2020),('2020-04-26',202017,4,2020,26,18,202004,2020),('2020-04-27',202017,4,2020,27,18,202004,2020),('2020-04-28',202017,4,2020,28,18,202004,2020),('2020-04-29',202017,4,2020,29,18,202004,2020),('2020-04-30',202017,4,2020,30,18,202004,2020),('2020-05-01',202017,5,2020,1,18,202005,2020),('2020-05-02',202017,5,2020,2,18,202005,2020),('2020-05-03',202018,5,2020,3,19,202005,2020),('2020-05-04',202018,5,2020,4,19,202005,2020),('2020-05-05',202018,5,2020,5,19,202005,2020),('2020-05-06',202018,5,2020,6,19,202005,2020),('2020-05-07',202018,5,2020,7,19,202005,2020),('2020-05-08',202018,5,2020,8,19,202005,2020),('2020-05-09',202018,5,2020,9,19,202005,2020),('2020-05-10',202019,5,2020,10,20,202005,2020),('2020-05-11',202019,5,2020,11,20,202005,2020),('2020-05-12',202019,5,2020,12,20,202005,2020),('2020-05-13',202019,5,2020,13,20,202005,2020),('2020-05-14',202019,5,2020,14,20,202005,2020),('2020-05-15',202019,5,2020,15,20,202005,2020),('2020-05-16',202019,5,2020,16,20,202005,2020),('2020-05-17',202020,5,2020,17,21,202005,2020),('2020-05-18',202020,5,2020,18,21,202005,2020),('2020-05-19',202020,5,2020,19,21,202005,2020),('2020-05-20',202020,5,2020,20,21,202005,2020),('2020-05-21',202020,5,2020,21,21,202005,2020),('2020-05-22',202020,5,2020,22,21,202005,2020),('2020-05-23',202020,5,2020,23,21,202005,2020),('2020-05-24',202021,5,2020,24,22,202005,2020),('2020-05-25',202021,5,2020,25,22,202005,2020),('2020-05-26',202021,5,2020,26,22,202005,2020),('2020-05-27',202021,5,2020,27,22,202005,2020),('2020-05-28',202021,5,2020,28,22,202005,2020),('2020-05-29',202021,5,2020,29,22,202005,2020),('2020-05-30',202021,5,2020,30,22,202005,2020),('2020-05-31',202022,5,2020,31,23,202005,2020),('2020-06-01',202022,6,2020,1,23,202006,2020),('2020-06-02',202022,6,2020,2,23,202006,2020),('2020-06-03',202022,6,2020,3,23,202006,2020),('2020-06-04',202022,6,2020,4,23,202006,2020),('2020-06-05',202022,6,2020,5,23,202006,2020),('2020-06-06',202022,6,2020,6,23,202006,2020),('2020-06-07',202023,6,2020,7,24,202006,2020),('2020-06-08',202023,6,2020,8,24,202006,2020),('2020-06-09',202023,6,2020,9,24,202006,2020),('2020-06-10',202023,6,2020,10,24,202006,2020),('2020-06-11',202023,6,2020,11,24,202006,2020),('2020-06-12',202023,6,2020,12,24,202006,2020),('2020-06-13',202023,6,2020,13,24,202006,2020),('2020-06-14',202024,6,2020,14,25,202006,2020),('2020-06-15',202024,6,2020,15,25,202006,2020),('2020-06-16',202024,6,2020,16,25,202006,2020),('2020-06-17',202024,6,2020,17,25,202006,2020),('2020-06-18',202024,6,2020,18,25,202006,2020),('2020-06-19',202024,6,2020,19,25,202006,2020),('2020-06-20',202024,6,2020,20,25,202006,2020),('2020-06-21',202025,6,2020,21,26,202006,2020),('2020-06-22',202025,6,2020,22,26,202006,2020),('2020-06-23',202025,6,2020,23,26,202006,2020),('2020-06-24',202025,6,2020,24,26,202006,2020),('2020-06-25',202025,6,2020,25,26,202006,2020),('2020-06-26',202025,6,2020,26,26,202006,2020),('2020-06-27',202025,6,2020,27,26,202006,2020),('2020-06-28',202026,6,2020,28,27,202006,2020),('2020-06-29',202026,6,2020,29,27,202006,2020),('2020-06-30',202026,6,2020,30,27,202006,2020),('2020-07-01',202026,7,2020,1,27,202007,2020),('2020-07-02',202026,7,2020,2,27,202007,2020),('2020-07-03',202026,7,2020,3,27,202007,2020),('2020-07-04',202026,7,2020,4,27,202007,2020),('2020-07-05',202027,7,2020,5,28,202007,2020),('2020-07-06',202027,7,2020,6,28,202007,2020),('2020-07-07',202027,7,2020,7,28,202007,2020),('2020-07-08',202027,7,2020,8,28,202007,2020),('2020-07-09',202027,7,2020,9,28,202007,2020),('2020-07-10',202027,7,2020,10,28,202007,2020),('2020-07-11',202027,7,2020,11,28,202007,2020),('2020-07-12',202028,7,2020,12,29,202007,2020),('2020-07-13',202028,7,2020,13,29,202007,2020),('2020-07-14',202028,7,2020,14,29,202007,2020),('2020-07-15',202028,7,2020,15,29,202007,2020),('2020-07-16',202028,7,2020,16,29,202007,2020),('2020-07-17',202028,7,2020,17,29,202007,2020),('2020-07-18',202028,7,2020,18,29,202007,2020),('2020-07-19',202029,7,2020,19,30,202007,2020),('2020-07-20',202029,7,2020,20,30,202007,2020),('2020-07-21',202029,7,2020,21,30,202007,2020),('2020-07-22',202029,7,2020,22,30,202007,2020),('2020-07-23',202029,7,2020,23,30,202007,2020),('2020-07-24',202029,7,2020,24,30,202007,2020),('2020-07-25',202029,7,2020,25,30,202007,2020),('2020-07-26',202030,7,2020,26,31,202007,2020),('2020-07-27',202030,7,2020,27,31,202007,2020),('2020-07-28',202030,7,2020,28,31,202007,2020),('2020-07-29',202030,7,2020,29,31,202007,2020),('2020-07-30',202030,7,2020,30,31,202007,2020),('2020-07-31',202030,7,2020,31,31,202007,2020),('2020-08-01',202030,8,2020,1,31,202008,2020),('2020-08-02',202031,8,2020,2,32,202008,2020),('2020-08-03',202031,8,2020,3,32,202008,2020),('2020-08-04',202031,8,2020,4,32,202008,2020),('2020-08-05',202031,8,2020,5,32,202008,2020),('2020-08-06',202031,8,2020,6,32,202008,2020),('2020-08-07',202031,8,2020,7,32,202008,2020),('2020-08-08',202031,8,2020,8,32,202008,2020),('2020-08-09',202032,8,2020,9,33,202008,2020),('2020-08-10',202032,8,2020,10,33,202008,2020),('2020-08-11',202032,8,2020,11,33,202008,2020),('2020-08-12',202032,8,2020,12,33,202008,2020),('2020-08-13',202032,8,2020,13,33,202008,2020),('2020-08-14',202032,8,2020,14,33,202008,2020),('2020-08-15',202032,8,2020,15,33,202008,2020),('2020-08-16',202033,8,2020,16,34,202008,2020),('2020-08-17',202033,8,2020,17,34,202008,2020),('2020-08-18',202033,8,2020,18,34,202008,2020),('2020-08-19',202033,8,2020,19,34,202008,2020),('2020-08-20',202033,8,2020,20,34,202008,2020),('2020-08-21',202033,8,2020,21,34,202008,2020),('2020-08-22',202033,8,2020,22,34,202008,2020),('2020-08-23',202034,8,2020,23,35,202008,2020),('2020-08-24',202034,8,2020,24,35,202008,2020),('2020-08-25',202034,8,2020,25,35,202008,2020),('2020-08-26',202034,8,2020,26,35,202008,2020),('2020-08-27',202034,8,2020,27,35,202008,2020),('2020-08-28',202034,8,2020,28,35,202008,2020),('2020-08-29',202034,8,2020,29,35,202008,2020),('2020-08-30',202035,8,2020,30,36,202008,2020),('2020-08-31',202035,8,2020,31,36,202008,2020),('2020-09-01',202035,9,2020,1,36,202009,2020),('2020-09-02',202035,9,2020,2,36,202009,2020),('2020-09-03',202035,9,2020,3,36,202009,2020),('2020-09-04',202035,9,2020,4,36,202009,2020),('2020-09-05',202035,9,2020,5,36,202009,2020),('2020-09-06',202036,9,2020,6,37,202009,2020),('2020-09-07',202036,9,2020,7,37,202009,2020),('2020-09-08',202036,9,2020,8,37,202009,2020),('2020-09-09',202036,9,2020,9,37,202009,2020),('2020-09-10',202036,9,2020,10,37,202009,2020),('2020-09-11',202036,9,2020,11,37,202009,2020),('2020-09-12',202036,9,2020,12,37,202009,2020),('2020-09-13',202037,9,2020,13,38,202009,2020),('2020-09-14',202037,9,2020,14,38,202009,2020),('2020-09-15',202037,9,2020,15,38,202009,2020),('2020-09-16',202037,9,2020,16,38,202009,2020),('2020-09-17',202037,9,2020,17,38,202009,2020),('2020-09-18',202037,9,2020,18,38,202009,2020),('2020-09-19',202037,9,2020,19,38,202009,2020),('2020-09-20',202038,9,2020,20,39,202009,2020),('2020-09-21',202038,9,2020,21,39,202009,2020),('2020-09-22',202038,9,2020,22,39,202009,2020),('2020-09-23',202038,9,2020,23,39,202009,2020),('2020-09-24',202038,9,2020,24,39,202009,2020),('2020-09-25',202038,9,2020,25,39,202009,2020),('2020-09-26',202038,9,2020,26,39,202009,2020),('2020-09-27',202039,9,2020,27,40,202009,2020),('2020-09-28',202039,9,2020,28,40,202009,2020),('2020-09-29',202039,9,2020,29,40,202009,2020),('2020-09-30',202039,9,2020,30,40,202009,2020),('2020-10-01',202039,10,2020,1,40,202010,2020),('2020-10-02',202039,10,2020,2,40,202010,2020),('2020-10-03',202039,10,2020,3,40,202010,2020),('2020-10-04',202040,10,2020,4,41,202010,2020),('2020-10-05',202040,10,2020,5,41,202010,2020),('2020-10-06',202040,10,2020,6,41,202010,2020),('2020-10-07',202040,10,2020,7,41,202010,2020),('2020-10-08',202040,10,2020,8,41,202010,2020),('2020-10-09',202040,10,2020,9,41,202010,2020),('2020-10-10',202040,10,2020,10,41,202010,2020),('2020-10-11',202041,10,2020,11,42,202010,2020),('2020-10-12',202041,10,2020,12,42,202010,2020),('2020-10-13',202041,10,2020,13,42,202010,2020),('2020-10-14',202041,10,2020,14,42,202010,2020),('2020-10-15',202041,10,2020,15,42,202010,2020),('2020-10-16',202041,10,2020,16,42,202010,2020),('2020-10-17',202041,10,2020,17,42,202010,2020),('2020-10-18',202042,10,2020,18,43,202010,2020),('2020-10-19',202042,10,2020,19,43,202010,2020),('2020-10-20',202042,10,2020,20,43,202010,2020),('2020-10-21',202042,10,2020,21,43,202010,2020),('2020-10-22',202042,10,2020,22,43,202010,2020),('2020-10-23',202042,10,2020,23,43,202010,2020),('2020-10-24',202042,10,2020,24,43,202010,2020),('2020-10-25',202043,10,2020,25,44,202010,2020),('2020-10-26',202043,10,2020,26,44,202010,2020),('2020-10-27',202043,10,2020,27,44,202010,2020),('2020-10-28',202043,10,2020,28,44,202010,2020),('2020-10-29',202043,10,2020,29,44,202010,2020),('2020-10-30',202043,10,2020,30,44,202010,2020),('2020-10-31',202043,10,2020,31,44,202010,2020),('2020-11-01',202044,11,2020,1,45,202011,2020),('2020-11-02',202044,11,2020,2,45,202011,2020),('2020-11-03',202044,11,2020,3,45,202011,2020),('2020-11-04',202044,11,2020,4,45,202011,2020),('2020-11-05',202044,11,2020,5,45,202011,2020),('2020-11-06',202044,11,2020,6,45,202011,2020),('2020-11-07',202044,11,2020,7,45,202011,2020),('2020-11-08',202045,11,2020,8,46,202011,2020),('2020-11-09',202045,11,2020,9,46,202011,2020),('2020-11-10',202045,11,2020,10,46,202011,2020),('2020-11-11',202045,11,2020,11,46,202011,2020),('2020-11-12',202045,11,2020,12,46,202011,2020),('2020-11-13',202045,11,2020,13,46,202011,2020),('2020-11-14',202045,11,2020,14,46,202011,2020),('2020-11-15',202046,11,2020,15,47,202011,2020),('2020-11-16',202046,11,2020,16,47,202011,2020),('2020-11-17',202046,11,2020,17,47,202011,2020),('2020-11-18',202046,11,2020,18,47,202011,2020),('2020-11-19',202046,11,2020,19,47,202011,2020),('2020-11-20',202046,11,2020,20,47,202011,2020),('2020-11-21',202046,11,2020,21,47,202011,2020),('2020-11-22',202047,11,2020,22,48,202011,2020),('2020-11-23',202047,11,2020,23,48,202011,2020),('2020-11-24',202047,11,2020,24,48,202011,2020),('2020-11-25',202047,11,2020,25,48,202011,2020),('2020-11-26',202047,11,2020,26,48,202011,2020),('2020-11-27',202047,11,2020,27,48,202011,2020),('2020-11-28',202047,11,2020,28,48,202011,2020),('2020-11-29',202048,11,2020,29,49,202011,2020),('2020-11-30',202048,11,2020,30,49,202011,2020),('2020-12-01',202048,12,2020,1,49,202012,2021),('2020-12-02',202048,12,2020,2,49,202012,2021),('2020-12-03',202048,12,2020,3,49,202012,2021),('2020-12-04',202048,12,2020,4,49,202012,2021),('2020-12-05',202048,12,2020,5,49,202012,2021),('2020-12-06',202049,12,2020,6,50,202012,2021),('2020-12-07',202049,12,2020,7,50,202012,2021),('2020-12-08',202049,12,2020,8,50,202012,2021),('2020-12-09',202049,12,2020,9,50,202012,2021),('2020-12-10',202049,12,2020,10,50,202012,2021),('2020-12-11',202049,12,2020,11,50,202012,2021),('2020-12-12',202049,12,2020,12,50,202012,2021),('2020-12-13',202050,12,2020,13,51,202012,2021),('2020-12-14',202050,12,2020,14,51,202012,2021),('2020-12-15',202050,12,2020,15,51,202012,2021),('2020-12-16',202050,12,2020,16,51,202012,2021),('2020-12-17',202050,12,2020,17,51,202012,2021),('2020-12-18',202050,12,2020,18,51,202012,2021),('2020-12-19',202050,12,2020,19,51,202012,2021),('2020-12-20',202051,12,2020,20,52,202012,2021),('2020-12-21',202051,12,2020,21,52,202012,2021),('2020-12-22',202051,12,2020,22,52,202012,2021),('2020-12-23',202051,12,2020,23,52,202012,2021),('2020-12-24',202051,12,2020,24,52,202012,2021),('2020-12-25',202051,12,2020,25,52,202012,2021),('2020-12-26',202051,12,2020,26,52,202012,2021),('2020-12-27',202052,12,2020,27,53,202012,2021),('2020-12-28',202052,12,2020,28,53,202012,2021),('2020-12-29',202052,12,2020,29,53,202012,2021),('2020-12-30',202052,12,2020,30,53,202012,2021),('2020-12-31',202052,12,2020,31,53,202012,2021),('2021-01-01',202101,1,2021,1,1,202101,2021),('2021-01-02',202101,1,2021,2,1,202101,2021),('2021-01-03',202101,1,2021,3,1,202101,2021),('2021-01-04',202101,1,2021,4,1,202101,2021),('2021-01-05',202101,1,2021,5,1,202101,2021),('2021-01-06',202101,1,2021,6,1,202101,2021),('2021-01-07',202101,1,2021,7,1,202101,2021),('2021-01-08',202101,1,2021,8,1,202101,2021),('2021-01-09',202101,1,2021,9,1,202101,2021),('2021-01-10',202102,1,2021,10,2,202101,2021),('2021-01-11',202102,1,2021,11,2,202101,2021),('2021-01-12',202102,1,2021,12,2,202101,2021),('2021-01-13',202102,1,2021,13,2,202101,2021),('2021-01-14',202102,1,2021,14,2,202101,2021),('2021-01-15',202102,1,2021,15,2,202101,2021),('2021-01-16',202102,1,2021,16,2,202101,2021),('2021-01-17',202103,1,2021,17,3,202101,2021),('2021-01-18',202103,1,2021,18,3,202101,2021),('2021-01-19',202103,1,2021,19,3,202101,2021),('2021-01-20',202103,1,2021,20,3,202101,2021),('2021-01-21',202103,1,2021,21,3,202101,2021),('2021-01-22',202103,1,2021,22,3,202101,2021),('2021-01-23',202103,1,2021,23,3,202101,2021),('2021-01-24',202104,1,2021,24,4,202101,2021),('2021-01-25',202104,1,2021,25,4,202101,2021),('2021-01-26',202104,1,2021,26,4,202101,2021),('2021-01-27',202104,1,2021,27,4,202101,2021),('2021-01-28',202104,1,2021,28,4,202101,2021),('2021-01-29',202104,1,2021,29,4,202101,2021),('2021-01-30',202104,1,2021,30,4,202101,2021),('2021-01-31',202105,1,2021,31,5,202101,2021),('2021-02-01',202105,2,2021,1,5,202102,2021),('2021-02-02',202105,2,2021,2,5,202102,2021),('2021-02-03',202105,2,2021,3,5,202102,2021),('2021-02-04',202105,2,2021,4,5,202102,2021),('2021-02-05',202105,2,2021,5,5,202102,2021),('2021-02-06',202105,2,2021,6,5,202102,2021),('2021-02-07',202106,2,2021,7,6,202102,2021),('2021-02-08',202106,2,2021,8,6,202102,2021),('2021-02-09',202106,2,2021,9,6,202102,2021),('2021-02-10',202106,2,2021,10,6,202102,2021),('2021-02-11',202106,2,2021,11,6,202102,2021),('2021-02-12',202106,2,2021,12,6,202102,2021),('2021-02-13',202106,2,2021,13,6,202102,2021),('2021-02-14',202107,2,2021,14,7,202102,2021),('2021-02-15',202107,2,2021,15,7,202102,2021),('2021-02-16',202107,2,2021,16,7,202102,2021),('2021-02-17',202107,2,2021,17,7,202102,2021),('2021-02-18',202107,2,2021,18,7,202102,2021),('2021-02-19',202107,2,2021,19,7,202102,2021),('2021-02-20',202107,2,2021,20,7,202102,2021),('2021-02-21',202108,2,2021,21,8,202102,2021),('2021-02-22',202108,2,2021,22,8,202102,2021),('2021-02-23',202108,2,2021,23,8,202102,2021),('2021-02-24',202108,2,2021,24,8,202102,2021),('2021-02-25',202108,2,2021,25,8,202102,2021),('2021-02-26',202108,2,2021,26,8,202102,2021),('2021-02-27',202108,2,2021,27,8,202102,2021),('2021-02-28',202109,2,2021,28,9,202102,2021),('2021-03-01',202109,3,2021,1,9,202103,2021),('2021-03-02',202109,3,2021,2,9,202103,2021),('2021-03-03',202109,3,2021,3,9,202103,2021),('2021-03-04',202109,3,2021,4,9,202103,2021),('2021-03-05',202109,3,2021,5,9,202103,2021),('2021-03-06',202109,3,2021,6,9,202103,2021),('2021-03-07',202110,3,2021,7,10,202103,2021),('2021-03-08',202110,3,2021,8,10,202103,2021),('2021-03-09',202110,3,2021,9,10,202103,2021),('2021-03-10',202110,3,2021,10,10,202103,2021),('2021-03-11',202110,3,2021,11,10,202103,2021),('2021-03-12',202110,3,2021,12,10,202103,2021),('2021-03-13',202110,3,2021,13,10,202103,2021),('2021-03-14',202111,3,2021,14,11,202103,2021),('2021-03-15',202111,3,2021,15,11,202103,2021),('2021-03-16',202111,3,2021,16,11,202103,2021),('2021-03-17',202111,3,2021,17,11,202103,2021),('2021-03-18',202111,3,2021,18,11,202103,2021),('2021-03-19',202111,3,2021,19,11,202103,2021),('2021-03-20',202111,3,2021,20,11,202103,2021),('2021-03-21',202112,3,2021,21,12,202103,2021),('2021-03-22',202112,3,2021,22,12,202103,2021),('2021-03-23',202112,3,2021,23,12,202103,2021),('2021-03-24',202112,3,2021,24,12,202103,2021),('2021-03-25',202112,3,2021,25,12,202103,2021),('2021-03-26',202112,3,2021,26,12,202103,2021),('2021-03-27',202112,3,2021,27,12,202103,2021),('2021-03-28',202113,3,2021,28,13,202103,2021),('2021-03-29',202113,3,2021,29,13,202103,2021),('2021-03-30',202113,3,2021,30,13,202103,2021),('2021-03-31',202113,3,2021,31,13,202103,2021),('2021-04-01',202113,4,2021,1,13,202104,2021),('2021-04-02',202113,4,2021,2,13,202104,2021),('2021-04-03',202113,4,2021,3,13,202104,2021),('2021-04-04',202114,4,2021,4,14,202104,2021),('2021-04-05',202114,4,2021,5,14,202104,2021),('2021-04-06',202114,4,2021,6,14,202104,2021),('2021-04-07',202114,4,2021,7,14,202104,2021),('2021-04-08',202114,4,2021,8,14,202104,2021),('2021-04-09',202114,4,2021,9,14,202104,2021),('2021-04-10',202114,4,2021,10,14,202104,2021),('2021-04-11',202115,4,2021,11,15,202104,2021),('2021-04-12',202115,4,2021,12,15,202104,2021),('2021-04-13',202115,4,2021,13,15,202104,2021),('2021-04-14',202115,4,2021,14,15,202104,2021),('2021-04-15',202115,4,2021,15,15,202104,2021),('2021-04-16',202115,4,2021,16,15,202104,2021),('2021-04-17',202115,4,2021,17,15,202104,2021),('2021-04-18',202116,4,2021,18,16,202104,2021),('2021-04-19',202116,4,2021,19,16,202104,2021),('2021-04-20',202116,4,2021,20,16,202104,2021),('2021-04-21',202116,4,2021,21,16,202104,2021),('2021-04-22',202116,4,2021,22,16,202104,2021),('2021-04-23',202116,4,2021,23,16,202104,2021),('2021-04-24',202116,4,2021,24,16,202104,2021),('2021-04-25',202117,4,2021,25,17,202104,2021),('2021-04-26',202117,4,2021,26,17,202104,2021),('2021-04-27',202117,4,2021,27,17,202104,2021),('2021-04-28',202117,4,2021,28,17,202104,2021),('2021-04-29',202117,4,2021,29,17,202104,2021),('2021-04-30',202117,4,2021,30,17,202104,2021),('2021-05-01',202117,5,2021,1,17,202105,2021),('2021-05-02',202118,5,2021,2,18,202105,2021),('2021-05-03',202118,5,2021,3,18,202105,2021),('2021-05-04',202118,5,2021,4,18,202105,2021),('2021-05-05',202118,5,2021,5,18,202105,2021),('2021-05-06',202118,5,2021,6,18,202105,2021),('2021-05-07',202118,5,2021,7,18,202105,2021),('2021-05-08',202118,5,2021,8,18,202105,2021),('2021-05-09',202119,5,2021,9,19,202105,2021),('2021-05-10',202119,5,2021,10,19,202105,2021),('2021-05-11',202119,5,2021,11,19,202105,2021),('2021-05-12',202119,5,2021,12,19,202105,2021),('2021-05-13',202119,5,2021,13,19,202105,2021),('2021-05-14',202119,5,2021,14,19,202105,2021),('2021-05-15',202119,5,2021,15,19,202105,2021),('2021-05-16',202120,5,2021,16,20,202105,2021),('2021-05-17',202120,5,2021,17,20,202105,2021),('2021-05-18',202120,5,2021,18,20,202105,2021),('2021-05-19',202120,5,2021,19,20,202105,2021),('2021-05-20',202120,5,2021,20,20,202105,2021),('2021-05-21',202120,5,2021,21,20,202105,2021),('2021-05-22',202120,5,2021,22,20,202105,2021),('2021-05-23',202121,5,2021,23,21,202105,2021),('2021-05-24',202121,5,2021,24,21,202105,2021),('2021-05-25',202121,5,2021,25,21,202105,2021),('2021-05-26',202121,5,2021,26,21,202105,2021),('2021-05-27',202121,5,2021,27,21,202105,2021),('2021-05-28',202121,5,2021,28,21,202105,2021),('2021-05-29',202121,5,2021,29,21,202105,2021),('2021-05-30',202122,5,2021,30,22,202105,2021),('2021-05-31',202122,5,2021,31,22,202105,2021),('2021-06-01',202122,6,2021,1,22,202106,2021),('2021-06-02',202122,6,2021,2,22,202106,2021),('2021-06-03',202122,6,2021,3,22,202106,2021),('2021-06-04',202122,6,2021,4,22,202106,2021),('2021-06-05',202122,6,2021,5,22,202106,2021),('2021-06-06',202123,6,2021,6,23,202106,2021),('2021-06-07',202123,6,2021,7,23,202106,2021),('2021-06-08',202123,6,2021,8,23,202106,2021),('2021-06-09',202123,6,2021,9,23,202106,2021),('2021-06-10',202123,6,2021,10,23,202106,2021),('2021-06-11',202123,6,2021,11,23,202106,2021),('2021-06-12',202123,6,2021,12,23,202106,2021),('2021-06-13',202124,6,2021,13,24,202106,2021),('2021-06-14',202124,6,2021,14,24,202106,2021),('2021-06-15',202124,6,2021,15,24,202106,2021),('2021-06-16',202124,6,2021,16,24,202106,2021),('2021-06-17',202124,6,2021,17,24,202106,2021),('2021-06-18',202124,6,2021,18,24,202106,2021),('2021-06-19',202124,6,2021,19,24,202106,2021),('2021-06-20',202125,6,2021,20,25,202106,2021),('2021-06-21',202125,6,2021,21,25,202106,2021),('2021-06-22',202125,6,2021,22,25,202106,2021),('2021-06-23',202125,6,2021,23,25,202106,2021),('2021-06-24',202125,6,2021,24,25,202106,2021),('2021-06-25',202125,6,2021,25,25,202106,2021),('2021-06-26',202125,6,2021,26,25,202106,2021),('2021-06-27',202126,6,2021,27,26,202106,2021),('2021-06-28',202126,6,2021,28,26,202106,2021),('2021-06-29',202126,6,2021,29,26,202106,2021),('2021-06-30',202126,6,2021,30,26,202106,2021),('2021-07-01',202126,7,2021,1,26,202107,2021),('2021-07-02',202126,7,2021,2,26,202107,2021),('2021-07-03',202126,7,2021,3,26,202107,2021),('2021-07-04',202127,7,2021,4,27,202107,2021),('2021-07-05',202127,7,2021,5,27,202107,2021),('2021-07-06',202127,7,2021,6,27,202107,2021),('2021-07-07',202127,7,2021,7,27,202107,2021),('2021-07-08',202127,7,2021,8,27,202107,2021),('2021-07-09',202127,7,2021,9,27,202107,2021),('2021-07-10',202127,7,2021,10,27,202107,2021),('2021-07-11',202128,7,2021,11,28,202107,2021),('2021-07-12',202128,7,2021,12,28,202107,2021),('2021-07-13',202128,7,2021,13,28,202107,2021),('2021-07-14',202128,7,2021,14,28,202107,2021),('2021-07-15',202128,7,2021,15,28,202107,2021),('2021-07-16',202128,7,2021,16,28,202107,2021),('2021-07-17',202128,7,2021,17,28,202107,2021),('2021-07-18',202129,7,2021,18,29,202107,2021),('2021-07-19',202129,7,2021,19,29,202107,2021),('2021-07-20',202129,7,2021,20,29,202107,2021),('2021-07-21',202129,7,2021,21,29,202107,2021),('2021-07-22',202129,7,2021,22,29,202107,2021),('2021-07-23',202129,7,2021,23,29,202107,2021),('2021-07-24',202129,7,2021,24,29,202107,2021),('2021-07-25',202130,7,2021,25,30,202107,2021),('2021-07-26',202130,7,2021,26,30,202107,2021),('2021-07-27',202130,7,2021,27,30,202107,2021),('2021-07-28',202130,7,2021,28,30,202107,2021),('2021-07-29',202130,7,2021,29,30,202107,2021),('2021-07-30',202130,7,2021,30,30,202107,2021),('2021-07-31',202130,7,2021,31,30,202107,2021),('2021-08-01',202131,8,2021,1,31,202108,2021),('2021-08-02',202131,8,2021,2,31,202108,2021),('2021-08-03',202131,8,2021,3,31,202108,2021),('2021-08-04',202131,8,2021,4,31,202108,2021),('2021-08-05',202131,8,2021,5,31,202108,2021),('2021-08-06',202131,8,2021,6,31,202108,2021),('2021-08-07',202131,8,2021,7,31,202108,2021),('2021-08-08',202132,8,2021,8,32,202108,2021),('2021-08-09',202132,8,2021,9,32,202108,2021),('2021-08-10',202132,8,2021,10,32,202108,2021),('2021-08-11',202132,8,2021,11,32,202108,2021),('2021-08-12',202132,8,2021,12,32,202108,2021),('2021-08-13',202132,8,2021,13,32,202108,2021),('2021-08-14',202132,8,2021,14,32,202108,2021),('2021-08-15',202133,8,2021,15,33,202108,2021),('2021-08-16',202133,8,2021,16,33,202108,2021),('2021-08-17',202133,8,2021,17,33,202108,2021),('2021-08-18',202133,8,2021,18,33,202108,2021),('2021-08-19',202133,8,2021,19,33,202108,2021),('2021-08-20',202133,8,2021,20,33,202108,2021),('2021-08-21',202133,8,2021,21,33,202108,2021),('2021-08-22',202134,8,2021,22,34,202108,2021),('2021-08-23',202134,8,2021,23,34,202108,2021),('2021-08-24',202134,8,2021,24,34,202108,2021),('2021-08-25',202134,8,2021,25,34,202108,2021),('2021-08-26',202134,8,2021,26,34,202108,2021),('2021-08-27',202134,8,2021,27,34,202108,2021),('2021-08-28',202134,8,2021,28,34,202108,2021),('2021-08-29',202135,8,2021,29,35,202108,2021),('2021-08-30',202135,8,2021,30,35,202108,2021),('2021-08-31',202135,8,2021,31,35,202108,2021),('2021-09-01',202135,9,2021,1,35,202109,2021),('2021-09-02',202135,9,2021,2,35,202109,2021),('2021-09-03',202135,9,2021,3,35,202109,2021),('2021-09-04',202135,9,2021,4,35,202109,2021),('2021-09-05',202136,9,2021,5,36,202109,2021),('2021-09-06',202136,9,2021,6,36,202109,2021),('2021-09-07',202136,9,2021,7,36,202109,2021),('2021-09-08',202136,9,2021,8,36,202109,2021),('2021-09-09',202136,9,2021,9,36,202109,2021),('2021-09-10',202136,9,2021,10,36,202109,2021),('2021-09-11',202136,9,2021,11,36,202109,2021),('2021-09-12',202137,9,2021,12,37,202109,2021),('2021-09-13',202137,9,2021,13,37,202109,2021),('2021-09-14',202137,9,2021,14,37,202109,2021),('2021-09-15',202137,9,2021,15,37,202109,2021),('2021-09-16',202137,9,2021,16,37,202109,2021),('2021-09-17',202137,9,2021,17,37,202109,2021),('2021-09-18',202137,9,2021,18,37,202109,2021),('2021-09-19',202138,9,2021,19,38,202109,2021),('2021-09-20',202138,9,2021,20,38,202109,2021),('2021-09-21',202138,9,2021,21,38,202109,2021),('2021-09-22',202138,9,2021,22,38,202109,2021),('2021-09-23',202138,9,2021,23,38,202109,2021),('2021-09-24',202138,9,2021,24,38,202109,2021),('2021-09-25',202138,9,2021,25,38,202109,2021),('2021-09-26',202139,9,2021,26,39,202109,2021),('2021-09-27',202139,9,2021,27,39,202109,2021),('2021-09-28',202139,9,2021,28,39,202109,2021),('2021-09-29',202139,9,2021,29,39,202109,2021),('2021-09-30',202139,9,2021,30,39,202109,2021),('2021-10-01',202139,10,2021,1,39,202110,2021),('2021-10-02',202139,10,2021,2,39,202110,2021),('2021-10-03',202140,10,2021,3,40,202110,2021),('2021-10-04',202140,10,2021,4,40,202110,2021),('2021-10-05',202140,10,2021,5,40,202110,2021),('2021-10-06',202140,10,2021,6,40,202110,2021),('2021-10-07',202140,10,2021,7,40,202110,2021),('2021-10-08',202140,10,2021,8,40,202110,2021),('2021-10-09',202140,10,2021,9,40,202110,2021),('2021-10-10',202141,10,2021,10,41,202110,2021),('2021-10-11',202141,10,2021,11,41,202110,2021),('2021-10-12',202141,10,2021,12,41,202110,2021),('2021-10-13',202141,10,2021,13,41,202110,2021),('2021-10-14',202141,10,2021,14,41,202110,2021),('2021-10-15',202141,10,2021,15,41,202110,2021),('2021-10-16',202141,10,2021,16,41,202110,2021),('2021-10-17',202142,10,2021,17,42,202110,2021),('2021-10-18',202142,10,2021,18,42,202110,2021),('2021-10-19',202142,10,2021,19,42,202110,2021),('2021-10-20',202142,10,2021,20,42,202110,2021),('2021-10-21',202142,10,2021,21,42,202110,2021),('2021-10-22',202142,10,2021,22,42,202110,2021),('2021-10-23',202142,10,2021,23,42,202110,2021),('2021-10-24',202143,10,2021,24,43,202110,2021),('2021-10-25',202143,10,2021,25,43,202110,2021),('2021-10-26',202143,10,2021,26,43,202110,2021),('2021-10-27',202143,10,2021,27,43,202110,2021),('2021-10-28',202143,10,2021,28,43,202110,2021),('2021-10-29',202143,10,2021,29,43,202110,2021),('2021-10-30',202143,10,2021,30,43,202110,2021),('2021-10-31',202144,10,2021,31,44,202110,2021),('2021-11-01',202144,11,2021,1,44,202111,2021),('2021-11-02',202144,11,2021,2,44,202111,2021),('2021-11-03',202144,11,2021,3,44,202111,2021),('2021-11-04',202144,11,2021,4,44,202111,2021),('2021-11-05',202144,11,2021,5,44,202111,2021),('2021-11-06',202144,11,2021,6,44,202111,2021),('2021-11-07',202145,11,2021,7,45,202111,2021),('2021-11-08',202145,11,2021,8,45,202111,2021),('2021-11-09',202145,11,2021,9,45,202111,2021),('2021-11-10',202145,11,2021,10,45,202111,2021),('2021-11-11',202145,11,2021,11,45,202111,2021),('2021-11-12',202145,11,2021,12,45,202111,2021),('2021-11-13',202145,11,2021,13,45,202111,2021),('2021-11-14',202146,11,2021,14,46,202111,2021),('2021-11-15',202146,11,2021,15,46,202111,2021),('2021-11-16',202146,11,2021,16,46,202111,2021),('2021-11-17',202146,11,2021,17,46,202111,2021),('2021-11-18',202146,11,2021,18,46,202111,2021),('2021-11-19',202146,11,2021,19,46,202111,2021),('2021-11-20',202146,11,2021,20,46,202111,2021),('2021-11-21',202147,11,2021,21,47,202111,2021),('2021-11-22',202147,11,2021,22,47,202111,2021),('2021-11-23',202147,11,2021,23,47,202111,2021),('2021-11-24',202147,11,2021,24,47,202111,2021),('2021-11-25',202147,11,2021,25,47,202111,2021),('2021-11-26',202147,11,2021,26,47,202111,2021),('2021-11-27',202147,11,2021,27,47,202111,2021),('2021-11-28',202148,11,2021,28,48,202111,2021),('2021-11-29',202148,11,2021,29,48,202111,2021),('2021-11-30',202148,11,2021,30,48,202111,2021),('2021-12-01',202148,12,2021,1,48,202112,2022),('2021-12-02',202148,12,2021,2,48,202112,2022),('2021-12-03',202148,12,2021,3,48,202112,2022),('2021-12-04',202148,12,2021,4,48,202112,2022),('2021-12-05',202149,12,2021,5,49,202112,2022),('2021-12-06',202149,12,2021,6,49,202112,2022),('2021-12-07',202149,12,2021,7,49,202112,2022),('2021-12-08',202149,12,2021,8,49,202112,2022),('2021-12-09',202149,12,2021,9,49,202112,2022),('2021-12-10',202149,12,2021,10,49,202112,2022),('2021-12-11',202149,12,2021,11,49,202112,2022),('2021-12-12',202150,12,2021,12,50,202112,2022),('2021-12-13',202150,12,2021,13,50,202112,2022),('2021-12-14',202150,12,2021,14,50,202112,2022),('2021-12-15',202150,12,2021,15,50,202112,2022),('2021-12-16',202150,12,2021,16,50,202112,2022),('2021-12-17',202150,12,2021,17,50,202112,2022),('2021-12-18',202150,12,2021,18,50,202112,2022),('2021-12-19',202151,12,2021,19,51,202112,2022),('2021-12-20',202151,12,2021,20,51,202112,2022),('2021-12-21',202151,12,2021,21,51,202112,2022),('2021-12-22',202151,12,2021,22,51,202112,2022),('2021-12-23',202151,12,2021,23,51,202112,2022),('2021-12-24',202151,12,2021,24,51,202112,2022),('2021-12-25',202151,12,2021,25,51,202112,2022),('2021-12-26',202152,12,2021,26,52,202112,2022),('2021-12-27',202152,12,2021,27,52,202112,2022),('2021-12-28',202152,12,2021,28,52,202112,2022),('2021-12-29',202152,12,2021,29,52,202112,2022),('2021-12-30',202152,12,2021,30,52,202112,2022),('2021-12-31',202152,12,2021,31,52,202112,2022),('2022-01-01',202252,1,2022,1,52,202201,2022),('2022-01-02',202201,1,2022,2,1,202201,2022),('2022-01-03',202201,1,2022,3,1,202201,2022),('2022-01-04',202201,1,2022,4,1,202201,2022),('2022-01-05',202201,1,2022,5,1,202201,2022),('2022-01-06',202201,1,2022,6,1,202201,2022),('2022-01-07',202201,1,2022,7,1,202201,2022),('2022-01-08',202201,1,2022,8,1,202201,2022),('2022-01-09',202202,1,2022,9,2,202201,2022),('2022-01-10',202202,1,2022,10,2,202201,2022),('2022-01-11',202202,1,2022,11,2,202201,2022),('2022-01-12',202202,1,2022,12,2,202201,2022),('2022-01-13',202202,1,2022,13,2,202201,2022),('2022-01-14',202202,1,2022,14,2,202201,2022),('2022-01-15',202202,1,2022,15,2,202201,2022),('2022-01-16',202203,1,2022,16,3,202201,2022),('2022-01-17',202203,1,2022,17,3,202201,2022),('2022-01-18',202203,1,2022,18,3,202201,2022),('2022-01-19',202203,1,2022,19,3,202201,2022),('2022-01-20',202203,1,2022,20,3,202201,2022),('2022-01-21',202203,1,2022,21,3,202201,2022),('2022-01-22',202203,1,2022,22,3,202201,2022),('2022-01-23',202204,1,2022,23,4,202201,2022),('2022-01-24',202204,1,2022,24,4,202201,2022),('2022-01-25',202204,1,2022,25,4,202201,2022),('2022-01-26',202204,1,2022,26,4,202201,2022),('2022-01-27',202204,1,2022,27,4,202201,2022),('2022-01-28',202204,1,2022,28,4,202201,2022),('2022-01-29',202204,1,2022,29,4,202201,2022),('2022-01-30',202205,1,2022,30,5,202201,2022),('2022-01-31',202205,1,2022,31,5,202201,2022),('2022-02-01',202205,2,2022,1,5,202202,2022),('2022-02-02',202205,2,2022,2,5,202202,2022),('2022-02-03',202205,2,2022,3,5,202202,2022),('2022-02-04',202205,2,2022,4,5,202202,2022),('2022-02-05',202205,2,2022,5,5,202202,2022),('2022-02-06',202206,2,2022,6,6,202202,2022),('2022-02-07',202206,2,2022,7,6,202202,2022),('2022-02-08',202206,2,2022,8,6,202202,2022),('2022-02-09',202206,2,2022,9,6,202202,2022),('2022-02-10',202206,2,2022,10,6,202202,2022),('2022-02-11',202206,2,2022,11,6,202202,2022),('2022-02-12',202206,2,2022,12,6,202202,2022),('2022-02-13',202207,2,2022,13,7,202202,2022),('2022-02-14',202207,2,2022,14,7,202202,2022),('2022-02-15',202207,2,2022,15,7,202202,2022),('2022-02-16',202207,2,2022,16,7,202202,2022),('2022-02-17',202207,2,2022,17,7,202202,2022),('2022-02-18',202207,2,2022,18,7,202202,2022),('2022-02-19',202207,2,2022,19,7,202202,2022),('2022-02-20',202208,2,2022,20,8,202202,2022),('2022-02-21',202208,2,2022,21,8,202202,2022),('2022-02-22',202208,2,2022,22,8,202202,2022),('2022-02-23',202208,2,2022,23,8,202202,2022),('2022-02-24',202208,2,2022,24,8,202202,2022),('2022-02-25',202208,2,2022,25,8,202202,2022),('2022-02-26',202208,2,2022,26,8,202202,2022),('2022-02-27',202209,2,2022,27,9,202202,2022),('2022-02-28',202209,2,2022,28,9,202202,2022),('2022-03-01',202209,3,2022,1,9,202203,2022),('2022-03-02',202209,3,2022,2,9,202203,2022),('2022-03-03',202209,3,2022,3,9,202203,2022),('2022-03-04',202209,3,2022,4,9,202203,2022),('2022-03-05',202209,3,2022,5,9,202203,2022),('2022-03-06',202210,3,2022,6,10,202203,2022),('2022-03-07',202210,3,2022,7,10,202203,2022),('2022-03-08',202210,3,2022,8,10,202203,2022),('2022-03-09',202210,3,2022,9,10,202203,2022),('2022-03-10',202210,3,2022,10,10,202203,2022),('2022-03-11',202210,3,2022,11,10,202203,2022),('2022-03-12',202210,3,2022,12,10,202203,2022),('2022-03-13',202211,3,2022,13,11,202203,2022),('2022-03-14',202211,3,2022,14,11,202203,2022),('2022-03-15',202211,3,2022,15,11,202203,2022),('2022-03-16',202211,3,2022,16,11,202203,2022),('2022-03-17',202211,3,2022,17,11,202203,2022),('2022-03-18',202211,3,2022,18,11,202203,2022),('2022-03-19',202211,3,2022,19,11,202203,2022),('2022-03-20',202212,3,2022,20,12,202203,2022),('2022-03-21',202212,3,2022,21,12,202203,2022),('2022-03-22',202212,3,2022,22,12,202203,2022),('2022-03-23',202212,3,2022,23,12,202203,2022),('2022-03-24',202212,3,2022,24,12,202203,2022),('2022-03-25',202212,3,2022,25,12,202203,2022),('2022-03-26',202212,3,2022,26,12,202203,2022),('2022-03-27',202213,3,2022,27,13,202203,2022),('2022-03-28',202213,3,2022,28,13,202203,2022),('2022-03-29',202213,3,2022,29,13,202203,2022),('2022-03-30',202213,3,2022,30,13,202203,2022),('2022-03-31',202213,3,2022,31,13,202203,2022),('2022-04-01',202213,4,2022,1,13,202204,2022),('2022-04-02',202213,4,2022,2,13,202204,2022),('2022-04-03',202214,4,2022,3,14,202204,2022),('2022-04-04',202214,4,2022,4,14,202204,2022),('2022-04-05',202214,4,2022,5,14,202204,2022),('2022-04-06',202214,4,2022,6,14,202204,2022),('2022-04-07',202214,4,2022,7,14,202204,2022),('2022-04-08',202214,4,2022,8,14,202204,2022),('2022-04-09',202214,4,2022,9,14,202204,2022),('2022-04-10',202215,4,2022,10,15,202204,2022),('2022-04-11',202215,4,2022,11,15,202204,2022),('2022-04-12',202215,4,2022,12,15,202204,2022),('2022-04-13',202215,4,2022,13,15,202204,2022),('2022-04-14',202215,4,2022,14,15,202204,2022),('2022-04-15',202215,4,2022,15,15,202204,2022),('2022-04-16',202215,4,2022,16,15,202204,2022),('2022-04-17',202216,4,2022,17,16,202204,2022),('2022-04-18',202216,4,2022,18,16,202204,2022),('2022-04-19',202216,4,2022,19,16,202204,2022),('2022-04-20',202216,4,2022,20,16,202204,2022),('2022-04-21',202216,4,2022,21,16,202204,2022),('2022-04-22',202216,4,2022,22,16,202204,2022),('2022-04-23',202216,4,2022,23,16,202204,2022),('2022-04-24',202217,4,2022,24,17,202204,2022),('2022-04-25',202217,4,2022,25,17,202204,2022),('2022-04-26',202217,4,2022,26,17,202204,2022),('2022-04-27',202217,4,2022,27,17,202204,2022),('2022-04-28',202217,4,2022,28,17,202204,2022),('2022-04-29',202217,4,2022,29,17,202204,2022),('2022-04-30',202217,4,2022,30,17,202204,2022),('2022-05-01',202218,5,2022,1,18,202205,2022),('2022-05-02',202218,5,2022,2,18,202205,2022),('2022-05-03',202218,5,2022,3,18,202205,2022),('2022-05-04',202218,5,2022,4,18,202205,2022),('2022-05-05',202218,5,2022,5,18,202205,2022),('2022-05-06',202218,5,2022,6,18,202205,2022),('2022-05-07',202218,5,2022,7,18,202205,2022),('2022-05-08',202219,5,2022,8,19,202205,2022),('2022-05-09',202219,5,2022,9,19,202205,2022),('2022-05-10',202219,5,2022,10,19,202205,2022),('2022-05-11',202219,5,2022,11,19,202205,2022),('2022-05-12',202219,5,2022,12,19,202205,2022),('2022-05-13',202219,5,2022,13,19,202205,2022),('2022-05-14',202219,5,2022,14,19,202205,2022),('2022-05-15',202220,5,2022,15,20,202205,2022),('2022-05-16',202220,5,2022,16,20,202205,2022),('2022-05-17',202220,5,2022,17,20,202205,2022),('2022-05-18',202220,5,2022,18,20,202205,2022),('2022-05-19',202220,5,2022,19,20,202205,2022),('2022-05-20',202220,5,2022,20,20,202205,2022),('2022-05-21',202220,5,2022,21,20,202205,2022),('2022-05-22',202221,5,2022,22,21,202205,2022),('2022-05-23',202221,5,2022,23,21,202205,2022),('2022-05-24',202221,5,2022,24,21,202205,2022),('2022-05-25',202221,5,2022,25,21,202205,2022),('2022-05-26',202221,5,2022,26,21,202205,2022),('2022-05-27',202221,5,2022,27,21,202205,2022),('2022-05-28',202221,5,2022,28,21,202205,2022),('2022-05-29',202222,5,2022,29,22,202205,2022),('2022-05-30',202222,5,2022,30,22,202205,2022),('2022-05-31',202222,5,2022,31,22,202205,2022),('2022-06-01',202222,6,2022,1,22,202206,2022),('2022-06-02',202222,6,2022,2,22,202206,2022),('2022-06-03',202222,6,2022,3,22,202206,2022),('2022-06-04',202222,6,2022,4,22,202206,2022),('2022-06-05',202223,6,2022,5,23,202206,2022),('2022-06-06',202223,6,2022,6,23,202206,2022),('2022-06-07',202223,6,2022,7,23,202206,2022),('2022-06-08',202223,6,2022,8,23,202206,2022),('2022-06-09',202223,6,2022,9,23,202206,2022),('2022-06-10',202223,6,2022,10,23,202206,2022),('2022-06-11',202223,6,2022,11,23,202206,2022),('2022-06-12',202224,6,2022,12,24,202206,2022),('2022-06-13',202224,6,2022,13,24,202206,2022),('2022-06-14',202224,6,2022,14,24,202206,2022),('2022-06-15',202224,6,2022,15,24,202206,2022),('2022-06-16',202224,6,2022,16,24,202206,2022),('2022-06-17',202224,6,2022,17,24,202206,2022),('2022-06-18',202224,6,2022,18,24,202206,2022),('2022-06-19',202225,6,2022,19,25,202206,2022),('2022-06-20',202225,6,2022,20,25,202206,2022),('2022-06-21',202225,6,2022,21,25,202206,2022),('2022-06-22',202225,6,2022,22,25,202206,2022),('2022-06-23',202225,6,2022,23,25,202206,2022),('2022-06-24',202225,6,2022,24,25,202206,2022),('2022-06-25',202225,6,2022,25,25,202206,2022),('2022-06-26',202226,6,2022,26,26,202206,2022),('2022-06-27',202226,6,2022,27,26,202206,2022),('2022-06-28',202226,6,2022,28,26,202206,2022),('2022-06-29',202226,6,2022,29,26,202206,2022),('2022-06-30',202226,6,2022,30,26,202206,2022),('2022-07-01',202226,7,2022,1,26,202207,2022),('2022-07-02',202226,7,2022,2,26,202207,2022),('2022-07-03',202227,7,2022,3,27,202207,2022),('2022-07-04',202227,7,2022,4,27,202207,2022),('2022-07-05',202227,7,2022,5,27,202207,2022),('2022-07-06',202227,7,2022,6,27,202207,2022),('2022-07-07',202227,7,2022,7,27,202207,2022),('2022-07-08',202227,7,2022,8,27,202207,2022),('2022-07-09',202227,7,2022,9,27,202207,2022),('2022-07-10',202228,7,2022,10,28,202207,2022),('2022-07-11',202228,7,2022,11,28,202207,2022),('2022-07-12',202228,7,2022,12,28,202207,2022),('2022-07-13',202228,7,2022,13,28,202207,2022),('2022-07-14',202228,7,2022,14,28,202207,2022),('2022-07-15',202228,7,2022,15,28,202207,2022),('2022-07-16',202228,7,2022,16,28,202207,2022),('2022-07-17',202229,7,2022,17,29,202207,2022),('2022-07-18',202229,7,2022,18,29,202207,2022),('2022-07-19',202229,7,2022,19,29,202207,2022),('2022-07-20',202229,7,2022,20,29,202207,2022),('2022-07-21',202229,7,2022,21,29,202207,2022),('2022-07-22',202229,7,2022,22,29,202207,2022),('2022-07-23',202229,7,2022,23,29,202207,2022),('2022-07-24',202230,7,2022,24,30,202207,2022),('2022-07-25',202230,7,2022,25,30,202207,2022),('2022-07-26',202230,7,2022,26,30,202207,2022),('2022-07-27',202230,7,2022,27,30,202207,2022),('2022-07-28',202230,7,2022,28,30,202207,2022),('2022-07-29',202230,7,2022,29,30,202207,2022),('2022-07-30',202230,7,2022,30,30,202207,2022),('2022-07-31',202231,7,2022,31,31,202207,2022),('2022-08-01',202231,8,2022,1,31,202208,2022),('2022-08-02',202231,8,2022,2,31,202208,2022),('2022-08-03',202231,8,2022,3,31,202208,2022),('2022-08-04',202231,8,2022,4,31,202208,2022),('2022-08-05',202231,8,2022,5,31,202208,2022),('2022-08-06',202231,8,2022,6,31,202208,2022),('2022-08-07',202232,8,2022,7,32,202208,2022),('2022-08-08',202232,8,2022,8,32,202208,2022),('2022-08-09',202232,8,2022,9,32,202208,2022),('2022-08-10',202232,8,2022,10,32,202208,2022),('2022-08-11',202232,8,2022,11,32,202208,2022),('2022-08-12',202232,8,2022,12,32,202208,2022),('2022-08-13',202232,8,2022,13,32,202208,2022),('2022-08-14',202233,8,2022,14,33,202208,2022),('2022-08-15',202233,8,2022,15,33,202208,2022),('2022-08-16',202233,8,2022,16,33,202208,2022),('2022-08-17',202233,8,2022,17,33,202208,2022),('2022-08-18',202233,8,2022,18,33,202208,2022),('2022-08-19',202233,8,2022,19,33,202208,2022),('2022-08-20',202233,8,2022,20,33,202208,2022),('2022-08-21',202234,8,2022,21,34,202208,2022),('2022-08-22',202234,8,2022,22,34,202208,2022),('2022-08-23',202234,8,2022,23,34,202208,2022),('2022-08-24',202234,8,2022,24,34,202208,2022),('2022-08-25',202234,8,2022,25,34,202208,2022),('2022-08-26',202234,8,2022,26,34,202208,2022),('2022-08-27',202234,8,2022,27,34,202208,2022),('2022-08-28',202235,8,2022,28,35,202208,2022),('2022-08-29',202235,8,2022,29,35,202208,2022),('2022-08-30',202235,8,2022,30,35,202208,2022),('2022-08-31',202235,8,2022,31,35,202208,2022),('2022-09-01',202235,9,2022,1,35,202209,2022),('2022-09-02',202235,9,2022,2,35,202209,2022),('2022-09-03',202235,9,2022,3,35,202209,2022),('2022-09-04',202236,9,2022,4,36,202209,2022),('2022-09-05',202236,9,2022,5,36,202209,2022),('2022-09-06',202236,9,2022,6,36,202209,2022),('2022-09-07',202236,9,2022,7,36,202209,2022),('2022-09-08',202236,9,2022,8,36,202209,2022),('2022-09-09',202236,9,2022,9,36,202209,2022),('2022-09-10',202236,9,2022,10,36,202209,2022),('2022-09-11',202237,9,2022,11,37,202209,2022),('2022-09-12',202237,9,2022,12,37,202209,2022),('2022-09-13',202237,9,2022,13,37,202209,2022),('2022-09-14',202237,9,2022,14,37,202209,2022),('2022-09-15',202237,9,2022,15,37,202209,2022),('2022-09-16',202237,9,2022,16,37,202209,2022),('2022-09-17',202237,9,2022,17,37,202209,2022),('2022-09-18',202238,9,2022,18,38,202209,2022),('2022-09-19',202238,9,2022,19,38,202209,2022),('2022-09-20',202238,9,2022,20,38,202209,2022),('2022-09-21',202238,9,2022,21,38,202209,2022),('2022-09-22',202238,9,2022,22,38,202209,2022),('2022-09-23',202238,9,2022,23,38,202209,2022),('2022-09-24',202238,9,2022,24,38,202209,2022),('2022-09-25',202239,9,2022,25,39,202209,2022),('2022-09-26',202239,9,2022,26,39,202209,2022),('2022-09-27',202239,9,2022,27,39,202209,2022),('2022-09-28',202239,9,2022,28,39,202209,2022),('2022-09-29',202239,9,2022,29,39,202209,2022),('2022-09-30',202239,9,2022,30,39,202209,2022),('2022-10-01',202239,10,2022,1,39,202210,2022),('2022-10-02',202240,10,2022,2,40,202210,2022),('2022-10-03',202240,10,2022,3,40,202210,2022),('2022-10-04',202240,10,2022,4,40,202210,2022),('2022-10-05',202240,10,2022,5,40,202210,2022),('2022-10-06',202240,10,2022,6,40,202210,2022),('2022-10-07',202240,10,2022,7,40,202210,2022),('2022-10-08',202240,10,2022,8,40,202210,2022),('2022-10-09',202241,10,2022,9,41,202210,2022),('2022-10-10',202241,10,2022,10,41,202210,2022),('2022-10-11',202241,10,2022,11,41,202210,2022),('2022-10-12',202241,10,2022,12,41,202210,2022),('2022-10-13',202241,10,2022,13,41,202210,2022),('2022-10-14',202241,10,2022,14,41,202210,2022),('2022-10-15',202241,10,2022,15,41,202210,2022),('2022-10-16',202242,10,2022,16,42,202210,2022),('2022-10-17',202242,10,2022,17,42,202210,2022),('2022-10-18',202242,10,2022,18,42,202210,2022),('2022-10-19',202242,10,2022,19,42,202210,2022),('2022-10-20',202242,10,2022,20,42,202210,2022),('2022-10-21',202242,10,2022,21,42,202210,2022),('2022-10-22',202242,10,2022,22,42,202210,2022),('2022-10-23',202243,10,2022,23,43,202210,2022),('2022-10-24',202243,10,2022,24,43,202210,2022),('2022-10-25',202243,10,2022,25,43,202210,2022),('2022-10-26',202243,10,2022,26,43,202210,2022),('2022-10-27',202243,10,2022,27,43,202210,2022),('2022-10-28',202243,10,2022,28,43,202210,2022),('2022-10-29',202243,10,2022,29,43,202210,2022),('2022-10-30',202244,10,2022,30,44,202210,2022),('2022-10-31',202244,10,2022,31,44,202210,2022),('2022-11-01',202244,11,2022,1,44,202211,2022),('2022-11-02',202244,11,2022,2,44,202211,2022),('2022-11-03',202244,11,2022,3,44,202211,2022),('2022-11-04',202244,11,2022,4,44,202211,2022),('2022-11-05',202244,11,2022,5,44,202211,2022),('2022-11-06',202245,11,2022,6,45,202211,2022),('2022-11-07',202245,11,2022,7,45,202211,2022),('2022-11-08',202245,11,2022,8,45,202211,2022),('2022-11-09',202245,11,2022,9,45,202211,2022),('2022-11-10',202245,11,2022,10,45,202211,2022),('2022-11-11',202245,11,2022,11,45,202211,2022),('2022-11-12',202245,11,2022,12,45,202211,2022),('2022-11-13',202246,11,2022,13,46,202211,2022),('2022-11-14',202246,11,2022,14,46,202211,2022),('2022-11-15',202246,11,2022,15,46,202211,2022),('2022-11-16',202246,11,2022,16,46,202211,2022),('2022-11-17',202246,11,2022,17,46,202211,2022),('2022-11-18',202246,11,2022,18,46,202211,2022),('2022-11-19',202246,11,2022,19,46,202211,2022),('2022-11-20',202247,11,2022,20,47,202211,2022),('2022-11-21',202247,11,2022,21,47,202211,2022),('2022-11-22',202247,11,2022,22,47,202211,2022),('2022-11-23',202247,11,2022,23,47,202211,2022),('2022-11-24',202247,11,2022,24,47,202211,2022),('2022-11-25',202247,11,2022,25,47,202211,2022),('2022-11-26',202247,11,2022,26,47,202211,2022),('2022-11-27',202248,11,2022,27,48,202211,2022),('2022-11-28',202248,11,2022,28,48,202211,2022),('2022-11-29',202248,11,2022,29,48,202211,2022),('2022-11-30',202248,11,2022,30,48,202211,2022),('2022-12-01',202248,12,2022,1,48,202212,2023),('2022-12-02',202248,12,2022,2,48,202212,2023),('2022-12-03',202248,12,2022,3,48,202212,2023),('2022-12-04',202249,12,2022,4,49,202212,2023),('2022-12-05',202249,12,2022,5,49,202212,2023),('2022-12-06',202249,12,2022,6,49,202212,2023),('2022-12-07',202249,12,2022,7,49,202212,2023),('2022-12-08',202249,12,2022,8,49,202212,2023),('2022-12-09',202249,12,2022,9,49,202212,2023),('2022-12-10',202249,12,2022,10,49,202212,2023),('2022-12-11',202250,12,2022,11,50,202212,2023),('2022-12-12',202250,12,2022,12,50,202212,2023),('2022-12-13',202250,12,2022,13,50,202212,2023),('2022-12-14',202250,12,2022,14,50,202212,2023),('2022-12-15',202250,12,2022,15,50,202212,2023),('2022-12-16',202250,12,2022,16,50,202212,2023),('2022-12-17',202250,12,2022,17,50,202212,2023),('2022-12-18',202251,12,2022,18,51,202212,2023),('2022-12-19',202251,12,2022,19,51,202212,2023),('2022-12-20',202251,12,2022,20,51,202212,2023),('2022-12-21',202251,12,2022,21,51,202212,2023),('2022-12-22',202251,12,2022,22,51,202212,2023),('2022-12-23',202251,12,2022,23,51,202212,2023),('2022-12-24',202251,12,2022,24,51,202212,2023),('2022-12-25',202252,12,2022,25,52,202212,2023),('2022-12-26',202252,12,2022,26,52,202212,2023),('2022-12-27',202252,12,2022,27,52,202212,2023),('2022-12-28',202252,12,2022,28,52,202212,2023),('2022-12-29',202252,12,2022,29,52,202212,2023),('2022-12-30',202252,12,2022,30,52,202212,2023),('2022-12-31',202252,12,2022,31,52,202212,2023),('2023-01-01',202353,1,2023,1,1,202301,2023),('2023-01-02',202301,1,2023,2,1,202301,2023),('2023-01-03',202301,1,2023,3,1,202301,2023),('2023-01-04',202301,1,2023,4,1,202301,2023),('2023-01-05',202301,1,2023,5,1,202301,2023),('2023-01-06',202301,1,2023,6,1,202301,2023),('2023-01-07',202301,1,2023,7,1,202301,2023),('2023-01-08',202302,1,2023,8,2,202301,2023),('2023-01-09',202302,1,2023,9,2,202301,2023),('2023-01-10',202302,1,2023,10,2,202301,2023),('2023-01-11',202302,1,2023,11,2,202301,2023),('2023-01-12',202302,1,2023,12,2,202301,2023),('2023-01-13',202302,1,2023,13,2,202301,2023),('2023-01-14',202302,1,2023,14,2,202301,2023),('2023-01-15',202303,1,2023,15,3,202301,2023),('2023-01-16',202303,1,2023,16,3,202301,2023),('2023-01-17',202303,1,2023,17,3,202301,2023),('2023-01-18',202303,1,2023,18,3,202301,2023),('2023-01-19',202303,1,2023,19,3,202301,2023),('2023-01-20',202303,1,2023,20,3,202301,2023),('2023-01-21',202303,1,2023,21,3,202301,2023),('2023-01-22',202304,1,2023,22,4,202301,2023),('2023-01-23',202304,1,2023,23,4,202301,2023),('2023-01-24',202304,1,2023,24,4,202301,2023),('2023-01-25',202304,1,2023,25,4,202301,2023),('2023-01-26',202304,1,2023,26,4,202301,2023),('2023-01-27',202304,1,2023,27,4,202301,2023),('2023-01-28',202304,1,2023,28,4,202301,2023),('2023-01-29',202305,1,2023,29,5,202301,2023),('2023-01-30',202305,1,2023,30,5,202301,2023),('2023-01-31',202305,1,2023,31,5,202301,2023),('2023-02-01',202305,2,2023,1,5,202302,2023),('2023-02-02',202305,2,2023,2,5,202302,2023),('2023-02-03',202305,2,2023,3,5,202302,2023),('2023-02-04',202305,2,2023,4,5,202302,2023),('2023-02-05',202306,2,2023,5,6,202302,2023),('2023-02-06',202306,2,2023,6,6,202302,2023),('2023-02-07',202306,2,2023,7,6,202302,2023),('2023-02-08',202306,2,2023,8,6,202302,2023),('2023-02-09',202306,2,2023,9,6,202302,2023),('2023-02-10',202306,2,2023,10,6,202302,2023),('2023-02-11',202306,2,2023,11,6,202302,2023),('2023-02-12',202307,2,2023,12,7,202302,2023),('2023-02-13',202307,2,2023,13,7,202302,2023),('2023-02-14',202307,2,2023,14,7,202302,2023),('2023-02-15',202307,2,2023,15,7,202302,2023),('2023-02-16',202307,2,2023,16,7,202302,2023),('2023-02-17',202307,2,2023,17,7,202302,2023),('2023-02-18',202307,2,2023,18,7,202302,2023),('2023-02-19',202308,2,2023,19,8,202302,2023),('2023-02-20',202308,2,2023,20,8,202302,2023),('2023-02-21',202308,2,2023,21,8,202302,2023),('2023-02-22',202308,2,2023,22,8,202302,2023),('2023-02-23',202308,2,2023,23,8,202302,2023),('2023-02-24',202308,2,2023,24,8,202302,2023),('2023-02-25',202308,2,2023,25,8,202302,2023),('2023-02-26',202309,2,2023,26,9,202302,2023),('2023-02-27',202309,2,2023,27,9,202302,2023),('2023-02-28',202309,2,2023,28,9,202302,2023),('2023-03-01',202309,3,2023,1,9,202303,2023),('2023-03-02',202309,3,2023,2,9,202303,2023),('2023-03-03',202309,3,2023,3,9,202303,2023),('2023-03-04',202309,3,2023,4,9,202303,2023),('2023-03-05',202310,3,2023,5,10,202303,2023),('2023-03-06',202310,3,2023,6,10,202303,2023),('2023-03-07',202310,3,2023,7,10,202303,2023),('2023-03-08',202310,3,2023,8,10,202303,2023),('2023-03-09',202310,3,2023,9,10,202303,2023),('2023-03-10',202310,3,2023,10,10,202303,2023),('2023-03-11',202310,3,2023,11,10,202303,2023),('2023-03-12',202311,3,2023,12,11,202303,2023),('2023-03-13',202311,3,2023,13,11,202303,2023),('2023-03-14',202311,3,2023,14,11,202303,2023),('2023-03-15',202311,3,2023,15,11,202303,2023),('2023-03-16',202311,3,2023,16,11,202303,2023),('2023-03-17',202311,3,2023,17,11,202303,2023),('2023-03-18',202311,3,2023,18,11,202303,2023),('2023-03-19',202312,3,2023,19,12,202303,2023),('2023-03-20',202312,3,2023,20,12,202303,2023),('2023-03-21',202312,3,2023,21,12,202303,2023),('2023-03-22',202312,3,2023,22,12,202303,2023),('2023-03-23',202312,3,2023,23,12,202303,2023),('2023-03-24',202312,3,2023,24,12,202303,2023),('2023-03-25',202312,3,2023,25,12,202303,2023),('2023-03-26',202313,3,2023,26,13,202303,2023),('2023-03-27',202313,3,2023,27,13,202303,2023),('2023-03-28',202313,3,2023,28,13,202303,2023),('2023-03-29',202313,3,2023,29,13,202303,2023),('2023-03-30',202313,3,2023,30,13,202303,2023),('2023-03-31',202313,3,2023,31,13,202303,2023),('2023-04-01',202313,4,2023,1,13,202304,2023),('2023-04-02',202314,4,2023,2,14,202304,2023),('2023-04-03',202314,4,2023,3,14,202304,2023),('2023-04-04',202314,4,2023,4,14,202304,2023),('2023-04-05',202314,4,2023,5,14,202304,2023),('2023-04-06',202314,4,2023,6,14,202304,2023),('2023-04-07',202314,4,2023,7,14,202304,2023),('2023-04-08',202314,4,2023,8,14,202304,2023),('2023-04-09',202315,4,2023,9,15,202304,2023),('2023-04-10',202315,4,2023,10,15,202304,2023),('2023-04-11',202315,4,2023,11,15,202304,2023),('2023-04-12',202315,4,2023,12,15,202304,2023),('2023-04-13',202315,4,2023,13,15,202304,2023),('2023-04-14',202315,4,2023,14,15,202304,2023),('2023-04-15',202315,4,2023,15,15,202304,2023),('2023-04-16',202316,4,2023,16,16,202304,2023),('2023-04-17',202316,4,2023,17,16,202304,2023),('2023-04-18',202316,4,2023,18,16,202304,2023),('2023-04-19',202316,4,2023,19,16,202304,2023),('2023-04-20',202316,4,2023,20,16,202304,2023),('2023-04-21',202316,4,2023,21,16,202304,2023),('2023-04-22',202316,4,2023,22,16,202304,2023),('2023-04-23',202317,4,2023,23,17,202304,2023),('2023-04-24',202317,4,2023,24,17,202304,2023),('2023-04-25',202317,4,2023,25,17,202304,2023),('2023-04-26',202317,4,2023,26,17,202304,2023),('2023-04-27',202317,4,2023,27,17,202304,2023),('2023-04-28',202317,4,2023,28,17,202304,2023),('2023-04-29',202317,4,2023,29,17,202304,2023),('2023-04-30',202318,4,2023,30,18,202304,2023),('2023-05-01',202318,5,2023,1,18,202305,2023),('2023-05-02',202318,5,2023,2,18,202305,2023),('2023-05-03',202318,5,2023,3,18,202305,2023),('2023-05-04',202318,5,2023,4,18,202305,2023),('2023-05-05',202318,5,2023,5,18,202305,2023),('2023-05-06',202318,5,2023,6,18,202305,2023),('2023-05-07',202319,5,2023,7,19,202305,2023),('2023-05-08',202319,5,2023,8,19,202305,2023),('2023-05-09',202319,5,2023,9,19,202305,2023),('2023-05-10',202319,5,2023,10,19,202305,2023),('2023-05-11',202319,5,2023,11,19,202305,2023),('2023-05-12',202319,5,2023,12,19,202305,2023),('2023-05-13',202319,5,2023,13,19,202305,2023),('2023-05-14',202320,5,2023,14,20,202305,2023),('2023-05-15',202320,5,2023,15,20,202305,2023),('2023-05-16',202320,5,2023,16,20,202305,2023),('2023-05-17',202320,5,2023,17,20,202305,2023),('2023-05-18',202320,5,2023,18,20,202305,2023),('2023-05-19',202320,5,2023,19,20,202305,2023),('2023-05-20',202320,5,2023,20,20,202305,2023),('2023-05-21',202321,5,2023,21,21,202305,2023),('2023-05-22',202321,5,2023,22,21,202305,2023),('2023-05-23',202321,5,2023,23,21,202305,2023),('2023-05-24',202321,5,2023,24,21,202305,2023),('2023-05-25',202321,5,2023,25,21,202305,2023),('2023-05-26',202321,5,2023,26,21,202305,2023),('2023-05-27',202321,5,2023,27,21,202305,2023),('2023-05-28',202322,5,2023,28,22,202305,2023),('2023-05-29',202322,5,2023,29,22,202305,2023),('2023-05-30',202322,5,2023,30,22,202305,2023),('2023-05-31',202322,5,2023,31,22,202305,2023),('2023-06-01',202322,6,2023,1,22,202306,2023),('2023-06-02',202322,6,2023,2,22,202306,2023),('2023-06-03',202322,6,2023,3,22,202306,2023),('2023-06-04',202323,6,2023,4,23,202306,2023),('2023-06-05',202323,6,2023,5,23,202306,2023),('2023-06-06',202323,6,2023,6,23,202306,2023),('2023-06-07',202323,6,2023,7,23,202306,2023),('2023-06-08',202323,6,2023,8,23,202306,2023),('2023-06-09',202323,6,2023,9,23,202306,2023),('2023-06-10',202323,6,2023,10,23,202306,2023),('2023-06-11',202324,6,2023,11,24,202306,2023),('2023-06-12',202324,6,2023,12,24,202306,2023),('2023-06-13',202324,6,2023,13,24,202306,2023),('2023-06-14',202324,6,2023,14,24,202306,2023),('2023-06-15',202324,6,2023,15,24,202306,2023),('2023-06-16',202324,6,2023,16,24,202306,2023),('2023-06-17',202324,6,2023,17,24,202306,2023),('2023-06-18',202325,6,2023,18,25,202306,2023),('2023-06-19',202325,6,2023,19,25,202306,2023),('2023-06-20',202325,6,2023,20,25,202306,2023),('2023-06-21',202325,6,2023,21,25,202306,2023),('2023-06-22',202325,6,2023,22,25,202306,2023),('2023-06-23',202325,6,2023,23,25,202306,2023),('2023-06-24',202325,6,2023,24,25,202306,2023),('2023-06-25',202326,6,2023,25,26,202306,2023),('2023-06-26',202326,6,2023,26,26,202306,2023),('2023-06-27',202326,6,2023,27,26,202306,2023),('2023-06-28',202326,6,2023,28,26,202306,2023),('2023-06-29',202326,6,2023,29,26,202306,2023),('2023-06-30',202326,6,2023,30,26,202306,2023),('2023-07-01',202326,7,2023,1,26,202307,2023),('2023-07-02',202327,7,2023,2,27,202307,2023),('2023-07-03',202327,7,2023,3,27,202307,2023),('2023-07-04',202327,7,2023,4,27,202307,2023),('2023-07-05',202327,7,2023,5,27,202307,2023),('2023-07-06',202327,7,2023,6,27,202307,2023),('2023-07-07',202327,7,2023,7,27,202307,2023),('2023-07-08',202327,7,2023,8,27,202307,2023),('2023-07-09',202328,7,2023,9,28,202307,2023),('2023-07-10',202328,7,2023,10,28,202307,2023),('2023-07-11',202328,7,2023,11,28,202307,2023),('2023-07-12',202328,7,2023,12,28,202307,2023),('2023-07-13',202328,7,2023,13,28,202307,2023),('2023-07-14',202328,7,2023,14,28,202307,2023),('2023-07-15',202328,7,2023,15,28,202307,2023),('2023-07-16',202329,7,2023,16,29,202307,2023),('2023-07-17',202329,7,2023,17,29,202307,2023),('2023-07-18',202329,7,2023,18,29,202307,2023),('2023-07-19',202329,7,2023,19,29,202307,2023),('2023-07-20',202329,7,2023,20,29,202307,2023),('2023-07-21',202329,7,2023,21,29,202307,2023),('2023-07-22',202329,7,2023,22,29,202307,2023),('2023-07-23',202330,7,2023,23,30,202307,2023),('2023-07-24',202330,7,2023,24,30,202307,2023),('2023-07-25',202330,7,2023,25,30,202307,2023),('2023-07-26',202330,7,2023,26,30,202307,2023),('2023-07-27',202330,7,2023,27,30,202307,2023),('2023-07-28',202330,7,2023,28,30,202307,2023),('2023-07-29',202330,7,2023,29,30,202307,2023),('2023-07-30',202331,7,2023,30,31,202307,2023),('2023-07-31',202331,7,2023,31,31,202307,2023),('2023-08-01',202331,8,2023,1,31,202308,2023),('2023-08-02',202331,8,2023,2,31,202308,2023),('2023-08-03',202331,8,2023,3,31,202308,2023),('2023-08-04',202331,8,2023,4,31,202308,2023),('2023-08-05',202331,8,2023,5,31,202308,2023),('2023-08-06',202332,8,2023,6,32,202308,2023),('2023-08-07',202332,8,2023,7,32,202308,2023),('2023-08-08',202332,8,2023,8,32,202308,2023),('2023-08-09',202332,8,2023,9,32,202308,2023),('2023-08-10',202332,8,2023,10,32,202308,2023),('2023-08-11',202332,8,2023,11,32,202308,2023),('2023-08-12',202332,8,2023,12,32,202308,2023),('2023-08-13',202333,8,2023,13,33,202308,2023),('2023-08-14',202333,8,2023,14,33,202308,2023),('2023-08-15',202333,8,2023,15,33,202308,2023),('2023-08-16',202333,8,2023,16,33,202308,2023),('2023-08-17',202333,8,2023,17,33,202308,2023),('2023-08-18',202333,8,2023,18,33,202308,2023),('2023-08-19',202333,8,2023,19,33,202308,2023),('2023-08-20',202334,8,2023,20,34,202308,2023),('2023-08-21',202334,8,2023,21,34,202308,2023),('2023-08-22',202334,8,2023,22,34,202308,2023),('2023-08-23',202334,8,2023,23,34,202308,2023),('2023-08-24',202334,8,2023,24,34,202308,2023),('2023-08-25',202334,8,2023,25,34,202308,2023),('2023-08-26',202334,8,2023,26,34,202308,2023),('2023-08-27',202335,8,2023,27,35,202308,2023),('2023-08-28',202335,8,2023,28,35,202308,2023),('2023-08-29',202335,8,2023,29,35,202308,2023),('2023-08-30',202335,8,2023,30,35,202308,2023),('2023-08-31',202335,8,2023,31,35,202308,2023),('2023-09-01',202335,9,2023,1,35,202309,2023),('2023-09-02',202335,9,2023,2,35,202309,2023),('2023-09-03',202336,9,2023,3,36,202309,2023),('2023-09-04',202336,9,2023,4,36,202309,2023),('2023-09-05',202336,9,2023,5,36,202309,2023),('2023-09-06',202336,9,2023,6,36,202309,2023),('2023-09-07',202336,9,2023,7,36,202309,2023),('2023-09-08',202336,9,2023,8,36,202309,2023),('2023-09-09',202336,9,2023,9,36,202309,2023),('2023-09-10',202337,9,2023,10,37,202309,2023),('2023-09-11',202337,9,2023,11,37,202309,2023),('2023-09-12',202337,9,2023,12,37,202309,2023),('2023-09-13',202337,9,2023,13,37,202309,2023),('2023-09-14',202337,9,2023,14,37,202309,2023),('2023-09-15',202337,9,2023,15,37,202309,2023),('2023-09-16',202337,9,2023,16,37,202309,2023),('2023-09-17',202338,9,2023,17,38,202309,2023),('2023-09-18',202338,9,2023,18,38,202309,2023),('2023-09-19',202338,9,2023,19,38,202309,2023),('2023-09-20',202338,9,2023,20,38,202309,2023),('2023-09-21',202338,9,2023,21,38,202309,2023),('2023-09-22',202338,9,2023,22,38,202309,2023),('2023-09-23',202338,9,2023,23,38,202309,2023),('2023-09-24',202339,9,2023,24,39,202309,2023),('2023-09-25',202339,9,2023,25,39,202309,2023),('2023-09-26',202339,9,2023,26,39,202309,2023),('2023-09-27',202339,9,2023,27,39,202309,2023),('2023-09-28',202339,9,2023,28,39,202309,2023),('2023-09-29',202339,9,2023,29,39,202309,2023),('2023-09-30',202339,9,2023,30,39,202309,2023),('2023-10-01',202340,10,2023,1,40,202310,2023),('2023-10-02',202340,10,2023,2,40,202310,2023),('2023-10-03',202340,10,2023,3,40,202310,2023),('2023-10-04',202340,10,2023,4,40,202310,2023),('2023-10-05',202340,10,2023,5,40,202310,2023),('2023-10-06',202340,10,2023,6,40,202310,2023),('2023-10-07',202340,10,2023,7,40,202310,2023),('2023-10-08',202341,10,2023,8,41,202310,2023),('2023-10-09',202341,10,2023,9,41,202310,2023),('2023-10-10',202341,10,2023,10,41,202310,2023),('2023-10-11',202341,10,2023,11,41,202310,2023),('2023-10-12',202341,10,2023,12,41,202310,2023),('2023-10-13',202341,10,2023,13,41,202310,2023),('2023-10-14',202341,10,2023,14,41,202310,2023),('2023-10-15',202342,10,2023,15,42,202310,2023),('2023-10-16',202342,10,2023,16,42,202310,2023),('2023-10-17',202342,10,2023,17,42,202310,2023),('2023-10-18',202342,10,2023,18,42,202310,2023),('2023-10-19',202342,10,2023,19,42,202310,2023),('2023-10-20',202342,10,2023,20,42,202310,2023),('2023-10-21',202342,10,2023,21,42,202310,2023),('2023-10-22',202343,10,2023,22,43,202310,2023),('2023-10-23',202343,10,2023,23,43,202310,2023),('2023-10-24',202343,10,2023,24,43,202310,2023),('2023-10-25',202343,10,2023,25,43,202310,2023),('2023-10-26',202343,10,2023,26,43,202310,2023),('2023-10-27',202343,10,2023,27,43,202310,2023),('2023-10-28',202343,10,2023,28,43,202310,2023),('2023-10-29',202344,10,2023,29,44,202310,2023),('2023-10-30',202344,10,2023,30,44,202310,2023),('2023-10-31',202344,10,2023,31,44,202310,2023),('2023-11-01',202344,11,2023,1,44,202311,2023),('2023-11-02',202344,11,2023,2,44,202311,2023),('2023-11-03',202344,11,2023,3,44,202311,2023),('2023-11-04',202344,11,2023,4,44,202311,2023),('2023-11-05',202345,11,2023,5,45,202311,2023),('2023-11-06',202345,11,2023,6,45,202311,2023),('2023-11-07',202345,11,2023,7,45,202311,2023),('2023-11-08',202345,11,2023,8,45,202311,2023),('2023-11-09',202345,11,2023,9,45,202311,2023),('2023-11-10',202345,11,2023,10,45,202311,2023),('2023-11-11',202345,11,2023,11,45,202311,2023),('2023-11-12',202346,11,2023,12,46,202311,2023),('2023-11-13',202346,11,2023,13,46,202311,2023),('2023-11-14',202346,11,2023,14,46,202311,2023),('2023-11-15',202346,11,2023,15,46,202311,2023),('2023-11-16',202346,11,2023,16,46,202311,2023),('2023-11-17',202346,11,2023,17,46,202311,2023),('2023-11-18',202346,11,2023,18,46,202311,2023),('2023-11-19',202347,11,2023,19,47,202311,2023),('2023-11-20',202347,11,2023,20,47,202311,2023),('2023-11-21',202347,11,2023,21,47,202311,2023),('2023-11-22',202347,11,2023,22,47,202311,2023),('2023-11-23',202347,11,2023,23,47,202311,2023),('2023-11-24',202347,11,2023,24,47,202311,2023),('2023-11-25',202347,11,2023,25,47,202311,2023),('2023-11-26',202348,11,2023,26,48,202311,2023),('2023-11-27',202348,11,2023,27,48,202311,2023),('2023-11-28',202348,11,2023,28,48,202311,2023),('2023-11-29',202348,11,2023,29,48,202311,2023),('2023-11-30',202348,11,2023,30,48,202311,2023),('2023-12-01',202348,12,2023,1,48,202312,2024),('2023-12-02',202348,12,2023,2,48,202312,2024),('2023-12-03',202349,12,2023,3,49,202312,2024),('2023-12-04',202349,12,2023,4,49,202312,2024),('2023-12-05',202349,12,2023,5,49,202312,2024),('2023-12-06',202349,12,2023,6,49,202312,2024),('2023-12-07',202349,12,2023,7,49,202312,2024),('2023-12-08',202349,12,2023,8,49,202312,2024),('2023-12-09',202349,12,2023,9,49,202312,2024),('2023-12-10',202350,12,2023,10,50,202312,2024),('2023-12-11',202350,12,2023,11,50,202312,2024),('2023-12-12',202350,12,2023,12,50,202312,2024),('2023-12-13',202350,12,2023,13,50,202312,2024),('2023-12-14',202350,12,2023,14,50,202312,2024),('2023-12-15',202350,12,2023,15,50,202312,2024),('2023-12-16',202350,12,2023,16,50,202312,2024),('2023-12-17',202351,12,2023,17,51,202312,2024),('2023-12-18',202351,12,2023,18,51,202312,2024),('2023-12-19',202351,12,2023,19,51,202312,2024),('2023-12-20',202351,12,2023,20,51,202312,2024),('2023-12-21',202351,12,2023,21,51,202312,2024),('2023-12-22',202351,12,2023,22,51,202312,2024),('2023-12-23',202351,12,2023,23,51,202312,2024),('2023-12-24',202352,12,2023,24,52,202312,2024),('2023-12-25',202352,12,2023,25,52,202312,2024),('2023-12-26',202352,12,2023,26,52,202312,2024),('2023-12-27',202352,12,2023,27,52,202312,2024),('2023-12-28',202352,12,2023,28,52,202312,2024),('2023-12-29',202352,12,2023,29,52,202312,2024),('2023-12-30',202352,12,2023,30,52,202312,2024),('2023-12-31',202353,12,2023,31,1,202312,2024),('2024-01-01',202401,1,2024,1,1,202401,2024),('2024-01-02',202401,1,2024,2,1,202401,2024),('2024-01-03',202401,1,2024,3,1,202401,2024),('2024-01-04',202401,1,2024,4,1,202401,2024),('2024-01-05',202401,1,2024,5,1,202401,2024),('2024-01-06',202401,1,2024,6,1,202401,2024),('2024-01-07',202402,1,2024,7,2,202401,2024),('2024-01-08',202402,1,2024,8,2,202401,2024),('2024-01-09',202402,1,2024,9,2,202401,2024),('2024-01-10',202402,1,2024,10,2,202401,2024),('2024-01-11',202402,1,2024,11,2,202401,2024),('2024-01-12',202402,1,2024,12,2,202401,2024),('2024-01-13',202402,1,2024,13,2,202401,2024),('2024-01-14',202403,1,2024,14,3,202401,2024),('2024-01-15',202403,1,2024,15,3,202401,2024),('2024-01-16',202403,1,2024,16,3,202401,2024),('2024-01-17',202403,1,2024,17,3,202401,2024),('2024-01-18',202403,1,2024,18,3,202401,2024),('2024-01-19',202403,1,2024,19,3,202401,2024),('2024-01-20',202403,1,2024,20,3,202401,2024),('2024-01-21',202404,1,2024,21,4,202401,2024),('2024-01-22',202404,1,2024,22,4,202401,2024),('2024-01-23',202404,1,2024,23,4,202401,2024),('2024-01-24',202404,1,2024,24,4,202401,2024),('2024-01-25',202404,1,2024,25,4,202401,2024),('2024-01-26',202404,1,2024,26,4,202401,2024),('2024-01-27',202404,1,2024,27,4,202401,2024),('2024-01-28',202405,1,2024,28,5,202401,2024),('2024-01-29',202405,1,2024,29,5,202401,2024),('2024-01-30',202405,1,2024,30,5,202401,2024),('2024-01-31',202405,1,2024,31,5,202401,2024),('2024-02-01',202405,2,2024,1,5,202402,2024),('2024-02-02',202405,2,2024,2,5,202402,2024),('2024-02-03',202405,2,2024,3,5,202402,2024),('2024-02-04',202406,2,2024,4,6,202402,2024),('2024-02-05',202406,2,2024,5,6,202402,2024),('2024-02-06',202406,2,2024,6,6,202402,2024),('2024-02-07',202406,2,2024,7,6,202402,2024),('2024-02-08',202406,2,2024,8,6,202402,2024),('2024-02-09',202406,2,2024,9,6,202402,2024),('2024-02-10',202406,2,2024,10,6,202402,2024),('2024-02-11',202407,2,2024,11,7,202402,2024),('2024-02-12',202407,2,2024,12,7,202402,2024),('2024-02-13',202407,2,2024,13,7,202402,2024),('2024-02-14',202407,2,2024,14,7,202402,2024),('2024-02-15',202407,2,2024,15,7,202402,2024),('2024-02-16',202407,2,2024,16,7,202402,2024),('2024-02-17',202407,2,2024,17,7,202402,2024),('2024-02-18',202408,2,2024,18,8,202402,2024),('2024-02-19',202408,2,2024,19,8,202402,2024),('2024-02-20',202408,2,2024,20,8,202402,2024),('2024-02-21',202408,2,2024,21,8,202402,2024),('2024-02-22',202408,2,2024,22,8,202402,2024),('2024-02-23',202408,2,2024,23,8,202402,2024),('2024-02-24',202408,2,2024,24,8,202402,2024),('2024-02-25',202409,2,2024,25,9,202402,2024),('2024-02-26',202409,2,2024,26,9,202402,2024),('2024-02-27',202409,2,2024,27,9,202402,2024),('2024-02-28',202409,2,2024,28,9,202402,2024),('2024-02-29',202409,2,2024,29,9,202402,2024),('2024-03-01',202409,3,2024,1,9,202403,2024),('2024-03-02',202409,3,2024,2,9,202403,2024),('2024-03-03',202410,3,2024,3,10,202403,2024),('2024-03-04',202410,3,2024,4,10,202403,2024),('2024-03-05',202410,3,2024,5,10,202403,2024),('2024-03-06',202410,3,2024,6,10,202403,2024),('2024-03-07',202410,3,2024,7,10,202403,2024),('2024-03-08',202410,3,2024,8,10,202403,2024),('2024-03-09',202410,3,2024,9,10,202403,2024),('2024-03-10',202411,3,2024,10,11,202403,2024),('2024-03-11',202411,3,2024,11,11,202403,2024),('2024-03-12',202411,3,2024,12,11,202403,2024),('2024-03-13',202411,3,2024,13,11,202403,2024),('2024-03-14',202411,3,2024,14,11,202403,2024),('2024-03-15',202411,3,2024,15,11,202403,2024),('2024-03-16',202411,3,2024,16,11,202403,2024),('2024-03-17',202412,3,2024,17,12,202403,2024),('2024-03-18',202412,3,2024,18,12,202403,2024),('2024-03-19',202412,3,2024,19,12,202403,2024),('2024-03-20',202412,3,2024,20,12,202403,2024),('2024-03-21',202412,3,2024,21,12,202403,2024),('2024-03-22',202412,3,2024,22,12,202403,2024),('2024-03-23',202412,3,2024,23,12,202403,2024),('2024-03-24',202413,3,2024,24,13,202403,2024),('2024-03-25',202413,3,2024,25,13,202403,2024),('2024-03-26',202413,3,2024,26,13,202403,2024),('2024-03-27',202413,3,2024,27,13,202403,2024),('2024-03-28',202413,3,2024,28,13,202403,2024),('2024-03-29',202413,3,2024,29,13,202403,2024),('2024-03-30',202413,3,2024,30,13,202403,2024),('2024-03-31',202414,3,2024,31,14,202403,2024),('2024-04-01',202414,4,2024,1,14,202404,2024),('2024-04-02',202414,4,2024,2,14,202404,2024),('2024-04-03',202414,4,2024,3,14,202404,2024),('2024-04-04',202414,4,2024,4,14,202404,2024),('2024-04-05',202414,4,2024,5,14,202404,2024),('2024-04-06',202414,4,2024,6,14,202404,2024),('2024-04-07',202415,4,2024,7,15,202404,2024),('2024-04-08',202415,4,2024,8,15,202404,2024),('2024-04-09',202415,4,2024,9,15,202404,2024),('2024-04-10',202415,4,2024,10,15,202404,2024),('2024-04-11',202415,4,2024,11,15,202404,2024),('2024-04-12',202415,4,2024,12,15,202404,2024),('2024-04-13',202415,4,2024,13,15,202404,2024),('2024-04-14',202416,4,2024,14,16,202404,2024),('2024-04-15',202416,4,2024,15,16,202404,2024),('2024-04-16',202416,4,2024,16,16,202404,2024),('2024-04-17',202416,4,2024,17,16,202404,2024),('2024-04-18',202416,4,2024,18,16,202404,2024),('2024-04-19',202416,4,2024,19,16,202404,2024),('2024-04-20',202416,4,2024,20,16,202404,2024),('2024-04-21',202417,4,2024,21,17,202404,2024),('2024-04-22',202417,4,2024,22,17,202404,2024),('2024-04-23',202417,4,2024,23,17,202404,2024),('2024-04-24',202417,4,2024,24,17,202404,2024),('2024-04-25',202417,4,2024,25,17,202404,2024),('2024-04-26',202417,4,2024,26,17,202404,2024),('2024-04-27',202417,4,2024,27,17,202404,2024),('2024-04-28',202418,4,2024,28,18,202404,2024),('2024-04-29',202418,4,2024,29,18,202404,2024),('2024-04-30',202418,4,2024,30,18,202404,2024),('2024-05-01',202418,5,2024,1,18,202405,2024),('2024-05-02',202418,5,2024,2,18,202405,2024),('2024-05-03',202418,5,2024,3,18,202405,2024),('2024-05-04',202418,5,2024,4,18,202405,2024),('2024-05-05',202419,5,2024,5,19,202405,2024),('2024-05-06',202419,5,2024,6,19,202405,2024),('2024-05-07',202419,5,2024,7,19,202405,2024),('2024-05-08',202419,5,2024,8,19,202405,2024),('2024-05-09',202419,5,2024,9,19,202405,2024),('2024-05-10',202419,5,2024,10,19,202405,2024),('2024-05-11',202419,5,2024,11,19,202405,2024),('2024-05-12',202420,5,2024,12,20,202405,2024),('2024-05-13',202420,5,2024,13,20,202405,2024),('2024-05-14',202420,5,2024,14,20,202405,2024),('2024-05-15',202420,5,2024,15,20,202405,2024),('2024-05-16',202420,5,2024,16,20,202405,2024),('2024-05-17',202420,5,2024,17,20,202405,2024),('2024-05-18',202420,5,2024,18,20,202405,2024),('2024-05-19',202421,5,2024,19,21,202405,2024),('2024-05-20',202421,5,2024,20,21,202405,2024),('2024-05-21',202421,5,2024,21,21,202405,2024),('2024-05-22',202421,5,2024,22,21,202405,2024),('2024-05-23',202421,5,2024,23,21,202405,2024),('2024-05-24',202421,5,2024,24,21,202405,2024),('2024-05-25',202421,5,2024,25,21,202405,2024),('2024-05-26',202422,5,2024,26,22,202405,2024),('2024-05-27',202422,5,2024,27,22,202405,2024),('2024-05-28',202422,5,2024,28,22,202405,2024),('2024-05-29',202422,5,2024,29,22,202405,2024),('2024-05-30',202422,5,2024,30,22,202405,2024),('2024-05-31',202422,5,2024,31,22,202405,2024),('2024-06-01',202422,6,2024,1,22,202406,2024),('2024-06-02',202423,6,2024,2,23,202406,2024),('2024-06-03',202423,6,2024,3,23,202406,2024),('2024-06-04',202423,6,2024,4,23,202406,2024),('2024-06-05',202423,6,2024,5,23,202406,2024),('2024-06-06',202423,6,2024,6,23,202406,2024),('2024-06-07',202423,6,2024,7,23,202406,2024),('2024-06-08',202423,6,2024,8,23,202406,2024),('2024-06-09',202424,6,2024,9,24,202406,2024),('2024-06-10',202424,6,2024,10,24,202406,2024),('2024-06-11',202424,6,2024,11,24,202406,2024),('2024-06-12',202424,6,2024,12,24,202406,2024),('2024-06-13',202424,6,2024,13,24,202406,2024),('2024-06-14',202424,6,2024,14,24,202406,2024),('2024-06-15',202424,6,2024,15,24,202406,2024),('2024-06-16',202425,6,2024,16,25,202406,2024),('2024-06-17',202425,6,2024,17,25,202406,2024),('2024-06-18',202425,6,2024,18,25,202406,2024),('2024-06-19',202425,6,2024,19,25,202406,2024),('2024-06-20',202425,6,2024,20,25,202406,2024),('2024-06-21',202425,6,2024,21,25,202406,2024),('2024-06-22',202425,6,2024,22,25,202406,2024),('2024-06-23',202426,6,2024,23,26,202406,2024),('2024-06-24',202426,6,2024,24,26,202406,2024),('2024-06-25',202426,6,2024,25,26,202406,2024),('2024-06-26',202426,6,2024,26,26,202406,2024),('2024-06-27',202426,6,2024,27,26,202406,2024),('2024-06-28',202426,6,2024,28,26,202406,2024),('2024-06-29',202426,6,2024,29,26,202406,2024),('2024-06-30',202427,6,2024,30,27,202406,2024),('2024-07-01',202427,7,2024,1,27,202407,2024),('2024-07-02',202427,7,2024,2,27,202407,2024),('2024-07-03',202427,7,2024,3,27,202407,2024),('2024-07-04',202427,7,2024,4,27,202407,2024),('2024-07-05',202427,7,2024,5,27,202407,2024),('2024-07-06',202427,7,2024,6,27,202407,2024),('2024-07-07',202428,7,2024,7,28,202407,2024),('2024-07-08',202428,7,2024,8,28,202407,2024),('2024-07-09',202428,7,2024,9,28,202407,2024),('2024-07-10',202428,7,2024,10,28,202407,2024),('2024-07-11',202428,7,2024,11,28,202407,2024),('2024-07-12',202428,7,2024,12,28,202407,2024),('2024-07-13',202428,7,2024,13,28,202407,2024),('2024-07-14',202429,7,2024,14,29,202407,2024),('2024-07-15',202429,7,2024,15,29,202407,2024),('2024-07-16',202429,7,2024,16,29,202407,2024),('2024-07-17',202429,7,2024,17,29,202407,2024),('2024-07-18',202429,7,2024,18,29,202407,2024),('2024-07-19',202429,7,2024,19,29,202407,2024),('2024-07-20',202429,7,2024,20,29,202407,2024),('2024-07-21',202430,7,2024,21,30,202407,2024),('2024-07-22',202430,7,2024,22,30,202407,2024),('2024-07-23',202430,7,2024,23,30,202407,2024),('2024-07-24',202430,7,2024,24,30,202407,2024),('2024-07-25',202430,7,2024,25,30,202407,2024),('2024-07-26',202430,7,2024,26,30,202407,2024),('2024-07-27',202430,7,2024,27,30,202407,2024),('2024-07-28',202431,7,2024,28,31,202407,2024),('2024-07-29',202431,7,2024,29,31,202407,2024),('2024-07-30',202431,7,2024,30,31,202407,2024),('2024-07-31',202431,7,2024,31,31,202407,2024),('2024-08-01',202431,8,2024,1,31,202408,2024),('2024-08-02',202431,8,2024,2,31,202408,2024),('2024-08-03',202431,8,2024,3,31,202408,2024),('2024-08-04',202432,8,2024,4,32,202408,2024),('2024-08-05',202432,8,2024,5,32,202408,2024),('2024-08-06',202432,8,2024,6,32,202408,2024),('2024-08-07',202432,8,2024,7,32,202408,2024),('2024-08-08',202432,8,2024,8,32,202408,2024),('2024-08-09',202432,8,2024,9,32,202408,2024),('2024-08-10',202432,8,2024,10,32,202408,2024),('2024-08-11',202433,8,2024,11,33,202408,2024),('2024-08-12',202433,8,2024,12,33,202408,2024),('2024-08-13',202433,8,2024,13,33,202408,2024),('2024-08-14',202433,8,2024,14,33,202408,2024),('2024-08-15',202433,8,2024,15,33,202408,2024),('2024-08-16',202433,8,2024,16,33,202408,2024),('2024-08-17',202433,8,2024,17,33,202408,2024),('2024-08-18',202434,8,2024,18,34,202408,2024),('2024-08-19',202434,8,2024,19,34,202408,2024),('2024-08-20',202434,8,2024,20,34,202408,2024),('2024-08-21',202434,8,2024,21,34,202408,2024),('2024-08-22',202434,8,2024,22,34,202408,2024),('2024-08-23',202434,8,2024,23,34,202408,2024),('2024-08-24',202434,8,2024,24,34,202408,2024),('2024-08-25',202435,8,2024,25,35,202408,2024),('2024-08-26',202435,8,2024,26,35,202408,2024),('2024-08-27',202435,8,2024,27,35,202408,2024),('2024-08-28',202435,8,2024,28,35,202408,2024),('2024-08-29',202435,8,2024,29,35,202408,2024),('2024-08-30',202435,8,2024,30,35,202408,2024),('2024-08-31',202435,8,2024,31,35,202408,2024),('2024-09-01',202436,9,2024,1,36,202409,2024),('2024-09-02',202436,9,2024,2,36,202409,2024),('2024-09-03',202436,9,2024,3,36,202409,2024),('2024-09-04',202436,9,2024,4,36,202409,2024),('2024-09-05',202436,9,2024,5,36,202409,2024),('2024-09-06',202436,9,2024,6,36,202409,2024),('2024-09-07',202436,9,2024,7,36,202409,2024),('2024-09-08',202437,9,2024,8,37,202409,2024),('2024-09-09',202437,9,2024,9,37,202409,2024),('2024-09-10',202437,9,2024,10,37,202409,2024),('2024-09-11',202437,9,2024,11,37,202409,2024),('2024-09-12',202437,9,2024,12,37,202409,2024),('2024-09-13',202437,9,2024,13,37,202409,2024),('2024-09-14',202437,9,2024,14,37,202409,2024),('2024-09-15',202438,9,2024,15,38,202409,2024),('2024-09-16',202438,9,2024,16,38,202409,2024),('2024-09-17',202438,9,2024,17,38,202409,2024),('2024-09-18',202438,9,2024,18,38,202409,2024),('2024-09-19',202438,9,2024,19,38,202409,2024),('2024-09-20',202438,9,2024,20,38,202409,2024),('2024-09-21',202438,9,2024,21,38,202409,2024),('2024-09-22',202439,9,2024,22,39,202409,2024),('2024-09-23',202439,9,2024,23,39,202409,2024),('2024-09-24',202439,9,2024,24,39,202409,2024),('2024-09-25',202439,9,2024,25,39,202409,2024),('2024-09-26',202439,9,2024,26,39,202409,2024),('2024-09-27',202439,9,2024,27,39,202409,2024),('2024-09-28',202439,9,2024,28,39,202409,2024),('2024-09-29',202440,9,2024,29,40,202409,2024),('2024-09-30',202440,9,2024,30,40,202409,2024),('2024-10-01',202440,10,2024,1,40,202410,2024),('2024-10-02',202440,10,2024,2,40,202410,2024),('2024-10-03',202440,10,2024,3,40,202410,2024),('2024-10-04',202440,10,2024,4,40,202410,2024),('2024-10-05',202440,10,2024,5,40,202410,2024),('2024-10-06',202441,10,2024,6,41,202410,2024),('2024-10-07',202441,10,2024,7,41,202410,2024),('2024-10-08',202441,10,2024,8,41,202410,2024),('2024-10-09',202441,10,2024,9,41,202410,2024),('2024-10-10',202441,10,2024,10,41,202410,2024),('2024-10-11',202441,10,2024,11,41,202410,2024),('2024-10-12',202441,10,2024,12,41,202410,2024),('2024-10-13',202442,10,2024,13,42,202410,2024),('2024-10-14',202442,10,2024,14,42,202410,2024),('2024-10-15',202442,10,2024,15,42,202410,2024),('2024-10-16',202442,10,2024,16,42,202410,2024),('2024-10-17',202442,10,2024,17,42,202410,2024),('2024-10-18',202442,10,2024,18,42,202410,2024),('2024-10-19',202442,10,2024,19,42,202410,2024),('2024-10-20',202443,10,2024,20,43,202410,2024),('2024-10-21',202443,10,2024,21,43,202410,2024),('2024-10-22',202443,10,2024,22,43,202410,2024),('2024-10-23',202443,10,2024,23,43,202410,2024),('2024-10-24',202443,10,2024,24,43,202410,2024),('2024-10-25',202443,10,2024,25,43,202410,2024),('2024-10-26',202443,10,2024,26,43,202410,2024),('2024-10-27',202444,10,2024,27,44,202410,2024),('2024-10-28',202444,10,2024,28,44,202410,2024),('2024-10-29',202444,10,2024,29,44,202410,2024),('2024-10-30',202444,10,2024,30,44,202410,2024),('2024-10-31',202444,10,2024,31,44,202410,2024),('2024-11-01',202444,11,2024,1,44,202411,2024),('2024-11-02',202444,11,2024,2,44,202411,2024),('2024-11-03',202445,11,2024,3,45,202411,2024),('2024-11-04',202445,11,2024,4,45,202411,2024),('2024-11-05',202445,11,2024,5,45,202411,2024),('2024-11-06',202445,11,2024,6,45,202411,2024),('2024-11-07',202445,11,2024,7,45,202411,2024),('2024-11-08',202445,11,2024,8,45,202411,2024),('2024-11-09',202445,11,2024,9,45,202411,2024),('2024-11-10',202446,11,2024,10,46,202411,2024),('2024-11-11',202446,11,2024,11,46,202411,2024),('2024-11-12',202446,11,2024,12,46,202411,2024),('2024-11-13',202446,11,2024,13,46,202411,2024),('2024-11-14',202446,11,2024,14,46,202411,2024),('2024-11-15',202446,11,2024,15,46,202411,2024),('2024-11-16',202446,11,2024,16,46,202411,2024),('2024-11-17',202447,11,2024,17,47,202411,2024),('2024-11-18',202447,11,2024,18,47,202411,2024),('2024-11-19',202447,11,2024,19,47,202411,2024),('2024-11-20',202447,11,2024,20,47,202411,2024),('2024-11-21',202447,11,2024,21,47,202411,2024),('2024-11-22',202447,11,2024,22,47,202411,2024),('2024-11-23',202447,11,2024,23,47,202411,2024),('2024-11-24',202448,11,2024,24,48,202411,2024),('2024-11-25',202448,11,2024,25,48,202411,2024),('2024-11-26',202448,11,2024,26,48,202411,2024),('2024-11-27',202448,11,2024,27,48,202411,2024),('2024-11-28',202448,11,2024,28,48,202411,2024),('2024-11-29',202448,11,2024,29,48,202411,2024),('2024-11-30',202448,11,2024,30,48,202411,2024),('2024-12-01',202449,12,2024,1,49,202412,2025),('2024-12-02',202449,12,2024,2,49,202412,2025),('2024-12-03',202449,12,2024,3,49,202412,2025),('2024-12-04',202449,12,2024,4,49,202412,2025),('2024-12-05',202449,12,2024,5,49,202412,2025),('2024-12-06',202449,12,2024,6,49,202412,2025),('2024-12-07',202449,12,2024,7,49,202412,2025),('2024-12-08',202450,12,2024,8,50,202412,2025),('2024-12-09',202450,12,2024,9,50,202412,2025),('2024-12-10',202450,12,2024,10,50,202412,2025),('2024-12-11',202450,12,2024,11,50,202412,2025),('2024-12-12',202450,12,2024,12,50,202412,2025),('2024-12-13',202450,12,2024,13,50,202412,2025),('2024-12-14',202450,12,2024,14,50,202412,2025),('2024-12-15',202451,12,2024,15,51,202412,2025),('2024-12-16',202451,12,2024,16,51,202412,2025),('2024-12-17',202451,12,2024,17,51,202412,2025),('2024-12-18',202451,12,2024,18,51,202412,2025),('2024-12-19',202451,12,2024,19,51,202412,2025),('2024-12-20',202451,12,2024,20,51,202412,2025),('2024-12-21',202451,12,2024,21,51,202412,2025),('2024-12-22',202452,12,2024,22,52,202412,2025),('2024-12-23',202452,12,2024,23,52,202412,2025),('2024-12-24',202452,12,2024,24,52,202412,2025),('2024-12-25',202452,12,2024,25,52,202412,2025),('2024-12-26',202452,12,2024,26,52,202412,2025),('2024-12-27',202452,12,2024,27,52,202412,2025),('2024-12-28',202452,12,2024,28,52,202412,2025),('2024-12-29',202453,12,2024,29,1,202412,2025),('2024-12-30',202401,12,2024,30,1,202412,2025),('2024-12-31',202401,12,2024,31,1,202412,2025),('2025-01-01',202501,1,2025,1,1,202501,2025),('2025-01-02',202501,1,2025,2,1,202501,2025),('2025-01-03',202501,1,2025,3,1,202501,2025),('2025-01-04',202501,1,2025,4,1,202501,2025),('2025-01-05',202502,1,2025,5,2,202501,2025),('2025-01-06',202502,1,2025,6,2,202501,2025),('2025-01-07',202502,1,2025,7,2,202501,2025),('2025-01-08',202502,1,2025,8,2,202501,2025),('2025-01-09',202502,1,2025,9,2,202501,2025),('2025-01-10',202502,1,2025,10,2,202501,2025),('2025-01-11',202502,1,2025,11,2,202501,2025),('2025-01-12',202503,1,2025,12,3,202501,2025),('2025-01-13',202503,1,2025,13,3,202501,2025),('2025-01-14',202503,1,2025,14,3,202501,2025),('2025-01-15',202503,1,2025,15,3,202501,2025),('2025-01-16',202503,1,2025,16,3,202501,2025),('2025-01-17',202503,1,2025,17,3,202501,2025),('2025-01-18',202503,1,2025,18,3,202501,2025),('2025-01-19',202504,1,2025,19,4,202501,2025),('2025-01-20',202504,1,2025,20,4,202501,2025),('2025-01-21',202504,1,2025,21,4,202501,2025),('2025-01-22',202504,1,2025,22,4,202501,2025),('2025-01-23',202504,1,2025,23,4,202501,2025),('2025-01-24',202504,1,2025,24,4,202501,2025),('2025-01-25',202504,1,2025,25,4,202501,2025),('2025-01-26',202505,1,2025,26,5,202501,2025),('2025-01-27',202505,1,2025,27,5,202501,2025),('2025-01-28',202505,1,2025,28,5,202501,2025),('2025-01-29',202505,1,2025,29,5,202501,2025),('2025-01-30',202505,1,2025,30,5,202501,2025),('2025-01-31',202505,1,2025,31,5,202501,2025),('2025-02-01',202505,2,2025,1,5,202502,2025),('2025-02-02',202506,2,2025,2,6,202502,2025),('2025-02-03',202506,2,2025,3,6,202502,2025),('2025-02-04',202506,2,2025,4,6,202502,2025),('2025-02-05',202506,2,2025,5,6,202502,2025),('2025-02-06',202506,2,2025,6,6,202502,2025),('2025-02-07',202506,2,2025,7,6,202502,2025),('2025-02-08',202506,2,2025,8,6,202502,2025),('2025-02-09',202507,2,2025,9,7,202502,2025),('2025-02-10',202507,2,2025,10,7,202502,2025),('2025-02-11',202507,2,2025,11,7,202502,2025),('2025-02-12',202507,2,2025,12,7,202502,2025),('2025-02-13',202507,2,2025,13,7,202502,2025),('2025-02-14',202507,2,2025,14,7,202502,2025),('2025-02-15',202507,2,2025,15,7,202502,2025),('2025-02-16',202508,2,2025,16,8,202502,2025),('2025-02-17',202508,2,2025,17,8,202502,2025),('2025-02-18',202508,2,2025,18,8,202502,2025),('2025-02-19',202508,2,2025,19,8,202502,2025),('2025-02-20',202508,2,2025,20,8,202502,2025),('2025-02-21',202508,2,2025,21,8,202502,2025),('2025-02-22',202508,2,2025,22,8,202502,2025),('2025-02-23',202509,2,2025,23,9,202502,2025),('2025-02-24',202509,2,2025,24,9,202502,2025),('2025-02-25',202509,2,2025,25,9,202502,2025),('2025-02-26',202509,2,2025,26,9,202502,2025),('2025-02-27',202509,2,2025,27,9,202502,2025),('2025-02-28',202509,2,2025,28,9,202502,2025),('2025-03-01',202509,3,2025,1,9,202503,2025),('2025-03-02',202510,3,2025,2,10,202503,2025),('2025-03-03',202510,3,2025,3,10,202503,2025),('2025-03-04',202510,3,2025,4,10,202503,2025),('2025-03-05',202510,3,2025,5,10,202503,2025),('2025-03-06',202510,3,2025,6,10,202503,2025),('2025-03-07',202510,3,2025,7,10,202503,2025),('2025-03-08',202510,3,2025,8,10,202503,2025),('2025-03-09',202511,3,2025,9,11,202503,2025),('2025-03-10',202511,3,2025,10,11,202503,2025),('2025-03-11',202511,3,2025,11,11,202503,2025),('2025-03-12',202511,3,2025,12,11,202503,2025),('2025-03-13',202511,3,2025,13,11,202503,2025),('2025-03-14',202511,3,2025,14,11,202503,2025),('2025-03-15',202511,3,2025,15,11,202503,2025),('2025-03-16',202512,3,2025,16,12,202503,2025),('2025-03-17',202512,3,2025,17,12,202503,2025),('2025-03-18',202512,3,2025,18,12,202503,2025),('2025-03-19',202512,3,2025,19,12,202503,2025),('2025-03-20',202512,3,2025,20,12,202503,2025),('2025-03-21',202512,3,2025,21,12,202503,2025),('2025-03-22',202512,3,2025,22,12,202503,2025),('2025-03-23',202513,3,2025,23,13,202503,2025),('2025-03-24',202513,3,2025,24,13,202503,2025),('2025-03-25',202513,3,2025,25,13,202503,2025),('2025-03-26',202513,3,2025,26,13,202503,2025),('2025-03-27',202513,3,2025,27,13,202503,2025),('2025-03-28',202513,3,2025,28,13,202503,2025),('2025-03-29',202513,3,2025,29,13,202503,2025),('2025-03-30',202514,3,2025,30,14,202503,2025),('2025-03-31',202514,3,2025,31,14,202503,2025),('2025-04-01',202514,4,2025,1,14,202504,2025),('2025-04-02',202514,4,2025,2,14,202504,2025),('2025-04-03',202514,4,2025,3,14,202504,2025),('2025-04-04',202514,4,2025,4,14,202504,2025),('2025-04-05',202514,4,2025,5,14,202504,2025),('2025-04-06',202515,4,2025,6,15,202504,2025),('2025-04-07',202515,4,2025,7,15,202504,2025),('2025-04-08',202515,4,2025,8,15,202504,2025),('2025-04-09',202515,4,2025,9,15,202504,2025),('2025-04-10',202515,4,2025,10,15,202504,2025),('2025-04-11',202515,4,2025,11,15,202504,2025),('2025-04-12',202515,4,2025,12,15,202504,2025),('2025-04-13',202516,4,2025,13,16,202504,2025),('2025-04-14',202516,4,2025,14,16,202504,2025),('2025-04-15',202516,4,2025,15,16,202504,2025),('2025-04-16',202516,4,2025,16,16,202504,2025),('2025-04-17',202516,4,2025,17,16,202504,2025),('2025-04-18',202516,4,2025,18,16,202504,2025),('2025-04-19',202516,4,2025,19,16,202504,2025),('2025-04-20',202517,4,2025,20,17,202504,2025),('2025-04-21',202517,4,2025,21,17,202504,2025),('2025-04-22',202517,4,2025,22,17,202504,2025),('2025-04-23',202517,4,2025,23,17,202504,2025),('2025-04-24',202517,4,2025,24,17,202504,2025),('2025-04-25',202517,4,2025,25,17,202504,2025),('2025-04-26',202517,4,2025,26,17,202504,2025),('2025-04-27',202518,4,2025,27,18,202504,2025),('2025-04-28',202518,4,2025,28,18,202504,2025),('2025-04-29',202518,4,2025,29,18,202504,2025),('2025-04-30',202518,4,2025,30,18,202504,2025),('2025-05-01',202518,5,2025,1,18,202505,2025),('2025-05-02',202518,5,2025,2,18,202505,2025),('2025-05-03',202518,5,2025,3,18,202505,2025),('2025-05-04',202519,5,2025,4,19,202505,2025),('2025-05-05',202519,5,2025,5,19,202505,2025),('2025-05-06',202519,5,2025,6,19,202505,2025),('2025-05-07',202519,5,2025,7,19,202505,2025),('2025-05-08',202519,5,2025,8,19,202505,2025),('2025-05-09',202519,5,2025,9,19,202505,2025),('2025-05-10',202519,5,2025,10,19,202505,2025),('2025-05-11',202520,5,2025,11,20,202505,2025),('2025-05-12',202520,5,2025,12,20,202505,2025),('2025-05-13',202520,5,2025,13,20,202505,2025),('2025-05-14',202520,5,2025,14,20,202505,2025),('2025-05-15',202520,5,2025,15,20,202505,2025),('2025-05-16',202520,5,2025,16,20,202505,2025),('2025-05-17',202520,5,2025,17,20,202505,2025),('2025-05-18',202521,5,2025,18,21,202505,2025),('2025-05-19',202521,5,2025,19,21,202505,2025),('2025-05-20',202521,5,2025,20,21,202505,2025),('2025-05-21',202521,5,2025,21,21,202505,2025),('2025-05-22',202521,5,2025,22,21,202505,2025),('2025-05-23',202521,5,2025,23,21,202505,2025),('2025-05-24',202521,5,2025,24,21,202505,2025),('2025-05-25',202522,5,2025,25,22,202505,2025),('2025-05-26',202522,5,2025,26,22,202505,2025),('2025-05-27',202522,5,2025,27,22,202505,2025),('2025-05-28',202522,5,2025,28,22,202505,2025),('2025-05-29',202522,5,2025,29,22,202505,2025),('2025-05-30',202522,5,2025,30,22,202505,2025),('2025-05-31',202522,5,2025,31,22,202505,2025),('2025-06-01',202523,6,2025,1,23,202506,2025),('2025-06-02',202523,6,2025,2,23,202506,2025),('2025-06-03',202523,6,2025,3,23,202506,2025),('2025-06-04',202523,6,2025,4,23,202506,2025),('2025-06-05',202523,6,2025,5,23,202506,2025),('2025-06-06',202523,6,2025,6,23,202506,2025),('2025-06-07',202523,6,2025,7,23,202506,2025),('2025-06-08',202524,6,2025,8,24,202506,2025),('2025-06-09',202524,6,2025,9,24,202506,2025),('2025-06-10',202524,6,2025,10,24,202506,2025),('2025-06-11',202524,6,2025,11,24,202506,2025),('2025-06-12',202524,6,2025,12,24,202506,2025),('2025-06-13',202524,6,2025,13,24,202506,2025),('2025-06-14',202524,6,2025,14,24,202506,2025),('2025-06-15',202525,6,2025,15,25,202506,2025),('2025-06-16',202525,6,2025,16,25,202506,2025),('2025-06-17',202525,6,2025,17,25,202506,2025),('2025-06-18',202525,6,2025,18,25,202506,2025),('2025-06-19',202525,6,2025,19,25,202506,2025),('2025-06-20',202525,6,2025,20,25,202506,2025),('2025-06-21',202525,6,2025,21,25,202506,2025),('2025-06-22',202526,6,2025,22,26,202506,2025),('2025-06-23',202526,6,2025,23,26,202506,2025),('2025-06-24',202526,6,2025,24,26,202506,2025),('2025-06-25',202526,6,2025,25,26,202506,2025),('2025-06-26',202526,6,2025,26,26,202506,2025),('2025-06-27',202526,6,2025,27,26,202506,2025),('2025-06-28',202526,6,2025,28,26,202506,2025),('2025-06-29',202527,6,2025,29,27,202506,2025),('2025-06-30',202527,6,2025,30,27,202506,2025),('2025-07-01',202527,7,2025,1,27,202507,2025),('2025-07-02',202527,7,2025,2,27,202507,2025),('2025-07-03',202527,7,2025,3,27,202507,2025),('2025-07-04',202527,7,2025,4,27,202507,2025),('2025-07-05',202527,7,2025,5,27,202507,2025),('2025-07-06',202528,7,2025,6,28,202507,2025),('2025-07-07',202528,7,2025,7,28,202507,2025),('2025-07-08',202528,7,2025,8,28,202507,2025),('2025-07-09',202528,7,2025,9,28,202507,2025),('2025-07-10',202528,7,2025,10,28,202507,2025),('2025-07-11',202528,7,2025,11,28,202507,2025),('2025-07-12',202528,7,2025,12,28,202507,2025),('2025-07-13',202529,7,2025,13,29,202507,2025),('2025-07-14',202529,7,2025,14,29,202507,2025),('2025-07-15',202529,7,2025,15,29,202507,2025),('2025-07-16',202529,7,2025,16,29,202507,2025),('2025-07-17',202529,7,2025,17,29,202507,2025),('2025-07-18',202529,7,2025,18,29,202507,2025),('2025-07-19',202529,7,2025,19,29,202507,2025),('2025-07-20',202530,7,2025,20,30,202507,2025),('2025-07-21',202530,7,2025,21,30,202507,2025),('2025-07-22',202530,7,2025,22,30,202507,2025),('2025-07-23',202530,7,2025,23,30,202507,2025),('2025-07-24',202530,7,2025,24,30,202507,2025),('2025-07-25',202530,7,2025,25,30,202507,2025),('2025-07-26',202530,7,2025,26,30,202507,2025),('2025-07-27',202531,7,2025,27,31,202507,2025),('2025-07-28',202531,7,2025,28,31,202507,2025),('2025-07-29',202531,7,2025,29,31,202507,2025),('2025-07-30',202531,7,2025,30,31,202507,2025),('2025-07-31',202531,7,2025,31,31,202507,2025),('2025-08-01',202531,8,2025,1,31,202508,2025),('2025-08-02',202531,8,2025,2,31,202508,2025),('2025-08-03',202532,8,2025,3,32,202508,2025),('2025-08-04',202532,8,2025,4,32,202508,2025),('2025-08-05',202532,8,2025,5,32,202508,2025),('2025-08-06',202532,8,2025,6,32,202508,2025),('2025-08-07',202532,8,2025,7,32,202508,2025),('2025-08-08',202532,8,2025,8,32,202508,2025),('2025-08-09',202532,8,2025,9,32,202508,2025),('2025-08-10',202533,8,2025,10,33,202508,2025),('2025-08-11',202533,8,2025,11,33,202508,2025),('2025-08-12',202533,8,2025,12,33,202508,2025),('2025-08-13',202533,8,2025,13,33,202508,2025),('2025-08-14',202533,8,2025,14,33,202508,2025),('2025-08-15',202533,8,2025,15,33,202508,2025),('2025-08-16',202533,8,2025,16,33,202508,2025),('2025-08-17',202534,8,2025,17,34,202508,2025),('2025-08-18',202534,8,2025,18,34,202508,2025),('2025-08-19',202534,8,2025,19,34,202508,2025),('2025-08-20',202534,8,2025,20,34,202508,2025),('2025-08-21',202534,8,2025,21,34,202508,2025),('2025-08-22',202534,8,2025,22,34,202508,2025),('2025-08-23',202534,8,2025,23,34,202508,2025),('2025-08-24',202535,8,2025,24,35,202508,2025),('2025-08-25',202535,8,2025,25,35,202508,2025),('2025-08-26',202535,8,2025,26,35,202508,2025),('2025-08-27',202535,8,2025,27,35,202508,2025),('2025-08-28',202535,8,2025,28,35,202508,2025),('2025-08-29',202535,8,2025,29,35,202508,2025),('2025-08-30',202535,8,2025,30,35,202508,2025),('2025-08-31',202536,8,2025,31,36,202508,2025),('2025-09-01',202536,9,2025,1,36,202509,2025),('2025-09-02',202536,9,2025,2,36,202509,2025),('2025-09-03',202536,9,2025,3,36,202509,2025),('2025-09-04',202536,9,2025,4,36,202509,2025),('2025-09-05',202536,9,2025,5,36,202509,2025),('2025-09-06',202536,9,2025,6,36,202509,2025),('2025-09-07',202537,9,2025,7,37,202509,2025),('2025-09-08',202537,9,2025,8,37,202509,2025),('2025-09-09',202537,9,2025,9,37,202509,2025),('2025-09-10',202537,9,2025,10,37,202509,2025),('2025-09-11',202537,9,2025,11,37,202509,2025),('2025-09-12',202537,9,2025,12,37,202509,2025),('2025-09-13',202537,9,2025,13,37,202509,2025),('2025-09-14',202538,9,2025,14,38,202509,2025),('2025-09-15',202538,9,2025,15,38,202509,2025),('2025-09-16',202538,9,2025,16,38,202509,2025),('2025-09-17',202538,9,2025,17,38,202509,2025),('2025-09-18',202538,9,2025,18,38,202509,2025),('2025-09-19',202538,9,2025,19,38,202509,2025),('2025-09-20',202538,9,2025,20,38,202509,2025),('2025-09-21',202539,9,2025,21,39,202509,2025),('2025-09-22',202539,9,2025,22,39,202509,2025),('2025-09-23',202539,9,2025,23,39,202509,2025),('2025-09-24',202539,9,2025,24,39,202509,2025),('2025-09-25',202539,9,2025,25,39,202509,2025),('2025-09-26',202539,9,2025,26,39,202509,2025),('2025-09-27',202539,9,2025,27,39,202509,2025),('2025-09-28',202540,9,2025,28,40,202509,2025),('2025-09-29',202540,9,2025,29,40,202509,2025),('2025-09-30',202540,9,2025,30,40,202509,2025),('2025-10-01',202540,10,2025,1,40,202510,2025),('2025-10-02',202540,10,2025,2,40,202510,2025),('2025-10-03',202540,10,2025,3,40,202510,2025),('2025-10-04',202540,10,2025,4,40,202510,2025),('2025-10-05',202541,10,2025,5,41,202510,2025),('2025-10-06',202541,10,2025,6,41,202510,2025),('2025-10-07',202541,10,2025,7,41,202510,2025),('2025-10-08',202541,10,2025,8,41,202510,2025),('2025-10-09',202541,10,2025,9,41,202510,2025),('2025-10-10',202541,10,2025,10,41,202510,2025),('2025-10-11',202541,10,2025,11,41,202510,2025),('2025-10-12',202542,10,2025,12,42,202510,2025),('2025-10-13',202542,10,2025,13,42,202510,2025),('2025-10-14',202542,10,2025,14,42,202510,2025),('2025-10-15',202542,10,2025,15,42,202510,2025),('2025-10-16',202542,10,2025,16,42,202510,2025),('2025-10-17',202542,10,2025,17,42,202510,2025),('2025-10-18',202542,10,2025,18,42,202510,2025),('2025-10-19',202543,10,2025,19,43,202510,2025),('2025-10-20',202543,10,2025,20,43,202510,2025),('2025-10-21',202543,10,2025,21,43,202510,2025),('2025-10-22',202543,10,2025,22,43,202510,2025),('2025-10-23',202543,10,2025,23,43,202510,2025),('2025-10-24',202543,10,2025,24,43,202510,2025),('2025-10-25',202543,10,2025,25,43,202510,2025),('2025-10-26',202544,10,2025,26,44,202510,2025),('2025-10-27',202544,10,2025,27,44,202510,2025),('2025-10-28',202544,10,2025,28,44,202510,2025),('2025-10-29',202544,10,2025,29,44,202510,2025),('2025-10-30',202544,10,2025,30,44,202510,2025),('2025-10-31',202544,10,2025,31,44,202510,2025),('2025-11-01',202544,11,2025,1,44,202511,2025),('2025-11-02',202545,11,2025,2,45,202511,2025),('2025-11-03',202545,11,2025,3,45,202511,2025),('2025-11-04',202545,11,2025,4,45,202511,2025),('2025-11-05',202545,11,2025,5,45,202511,2025),('2025-11-06',202545,11,2025,6,45,202511,2025),('2025-11-07',202545,11,2025,7,45,202511,2025),('2025-11-08',202545,11,2025,8,45,202511,2025),('2025-11-09',202546,11,2025,9,46,202511,2025),('2025-11-10',202546,11,2025,10,46,202511,2025),('2025-11-11',202546,11,2025,11,46,202511,2025),('2025-11-12',202546,11,2025,12,46,202511,2025),('2025-11-13',202546,11,2025,13,46,202511,2025),('2025-11-14',202546,11,2025,14,46,202511,2025),('2025-11-15',202546,11,2025,15,46,202511,2025),('2025-11-16',202547,11,2025,16,47,202511,2025),('2025-11-17',202547,11,2025,17,47,202511,2025),('2025-11-18',202547,11,2025,18,47,202511,2025),('2025-11-19',202547,11,2025,19,47,202511,2025),('2025-11-20',202547,11,2025,20,47,202511,2025),('2025-11-21',202547,11,2025,21,47,202511,2025),('2025-11-22',202547,11,2025,22,47,202511,2025),('2025-11-23',202548,11,2025,23,48,202511,2025),('2025-11-24',202548,11,2025,24,48,202511,2025),('2025-11-25',202548,11,2025,25,48,202511,2025),('2025-11-26',202548,11,2025,26,48,202511,2025),('2025-11-27',202548,11,2025,27,48,202511,2025),('2025-11-28',202548,11,2025,28,48,202511,2025),('2025-11-29',202548,11,2025,29,48,202511,2025),('2025-11-30',202549,11,2025,30,49,202511,2025),('2025-12-01',202549,12,2025,1,49,202512,2026),('2025-12-02',202549,12,2025,2,49,202512,2026),('2025-12-03',202549,12,2025,3,49,202512,2026),('2025-12-04',202549,12,2025,4,49,202512,2026),('2025-12-05',202549,12,2025,5,49,202512,2026),('2025-12-06',202549,12,2025,6,49,202512,2026),('2025-12-07',202550,12,2025,7,50,202512,2026),('2025-12-08',202550,12,2025,8,50,202512,2026),('2025-12-09',202550,12,2025,9,50,202512,2026),('2025-12-10',202550,12,2025,10,50,202512,2026),('2025-12-11',202550,12,2025,11,50,202512,2026),('2025-12-12',202550,12,2025,12,50,202512,2026),('2025-12-13',202550,12,2025,13,50,202512,2026),('2025-12-14',202551,12,2025,14,51,202512,2026),('2025-12-15',202551,12,2025,15,51,202512,2026),('2025-12-16',202551,12,2025,16,51,202512,2026),('2025-12-17',202551,12,2025,17,51,202512,2026),('2025-12-18',202551,12,2025,18,51,202512,2026),('2025-12-19',202551,12,2025,19,51,202512,2026),('2025-12-20',202551,12,2025,20,51,202512,2026),('2025-12-21',202552,12,2025,21,52,202512,2026),('2025-12-22',202552,12,2025,22,52,202512,2026),('2025-12-23',202552,12,2025,23,52,202512,2026),('2025-12-24',202552,12,2025,24,52,202512,2026),('2025-12-25',202552,12,2025,25,52,202512,2026),('2025-12-26',202552,12,2025,26,52,202512,2026),('2025-12-27',202552,12,2025,27,52,202512,2026),('2025-12-28',202553,12,2025,28,53,202512,2026),('2025-12-29',202501,12,2025,29,53,202512,2026),('2025-12-30',202501,12,2025,30,53,202512,2026),('2025-12-31',202501,12,2025,31,53,202512,2026),('2026-01-01',202601,1,2026,1,53,202601,2026),('2026-01-02',202601,1,2026,2,53,202601,2026),('2026-01-03',202601,1,2026,3,53,202601,2026),('2026-01-04',202602,1,2026,4,1,202601,2026),('2026-01-05',202602,1,2026,5,1,202601,2026),('2026-01-06',202602,1,2026,6,1,202601,2026),('2026-01-07',202602,1,2026,7,1,202601,2026),('2026-01-08',202602,1,2026,8,1,202601,2026),('2026-01-09',202602,1,2026,9,1,202601,2026),('2026-01-10',202602,1,2026,10,1,202601,2026),('2026-01-11',202603,1,2026,11,2,202601,2026),('2026-01-12',202603,1,2026,12,2,202601,2026),('2026-01-13',202603,1,2026,13,2,202601,2026),('2026-01-14',202603,1,2026,14,2,202601,2026),('2026-01-15',202603,1,2026,15,2,202601,2026),('2026-01-16',202603,1,2026,16,2,202601,2026),('2026-01-17',202603,1,2026,17,2,202601,2026),('2026-01-18',202604,1,2026,18,3,202601,2026),('2026-01-19',202604,1,2026,19,3,202601,2026),('2026-01-20',202604,1,2026,20,3,202601,2026),('2026-01-21',202604,1,2026,21,3,202601,2026),('2026-01-22',202604,1,2026,22,3,202601,2026),('2026-01-23',202604,1,2026,23,3,202601,2026),('2026-01-24',202604,1,2026,24,3,202601,2026),('2026-01-25',202605,1,2026,25,4,202601,2026),('2026-01-26',202605,1,2026,26,4,202601,2026),('2026-01-27',202605,1,2026,27,4,202601,2026),('2026-01-28',202605,1,2026,28,4,202601,2026),('2026-01-29',202605,1,2026,29,4,202601,2026),('2026-01-30',202605,1,2026,30,4,202601,2026),('2026-01-31',202605,1,2026,31,4,202601,2026),('2026-02-01',202606,2,2026,1,5,202602,2026),('2026-02-02',202606,2,2026,2,5,202602,2026),('2026-02-03',202606,2,2026,3,5,202602,2026),('2026-02-04',202606,2,2026,4,5,202602,2026),('2026-02-05',202606,2,2026,5,5,202602,2026),('2026-02-06',202606,2,2026,6,5,202602,2026),('2026-02-07',202606,2,2026,7,5,202602,2026),('2026-02-08',202607,2,2026,8,6,202602,2026),('2026-02-09',202607,2,2026,9,6,202602,2026),('2026-02-10',202607,2,2026,10,6,202602,2026),('2026-02-11',202607,2,2026,11,6,202602,2026),('2026-02-12',202607,2,2026,12,6,202602,2026),('2026-02-13',202607,2,2026,13,6,202602,2026),('2026-02-14',202607,2,2026,14,6,202602,2026),('2026-02-15',202608,2,2026,15,7,202602,2026),('2026-02-16',202608,2,2026,16,7,202602,2026),('2026-02-17',202608,2,2026,17,7,202602,2026),('2026-02-18',202608,2,2026,18,7,202602,2026),('2026-02-19',202608,2,2026,19,7,202602,2026),('2026-02-20',202608,2,2026,20,7,202602,2026),('2026-02-21',202608,2,2026,21,7,202602,2026),('2026-02-22',202609,2,2026,22,8,202602,2026),('2026-02-23',202609,2,2026,23,8,202602,2026),('2026-02-24',202609,2,2026,24,8,202602,2026),('2026-02-25',202609,2,2026,25,8,202602,2026),('2026-02-26',202609,2,2026,26,8,202602,2026),('2026-02-27',202609,2,2026,27,8,202602,2026),('2026-02-28',202609,2,2026,28,8,202602,2026),('2026-03-01',202610,3,2026,1,9,202603,2026),('2026-03-02',202610,3,2026,2,9,202603,2026),('2026-03-03',202610,3,2026,3,9,202603,2026),('2026-03-04',202610,3,2026,4,9,202603,2026),('2026-03-05',202610,3,2026,5,9,202603,2026),('2026-03-06',202610,3,2026,6,9,202603,2026),('2026-03-07',202610,3,2026,7,9,202603,2026),('2026-03-08',202611,3,2026,8,10,202603,2026),('2026-03-09',202611,3,2026,9,10,202603,2026),('2026-03-10',202611,3,2026,10,10,202603,2026),('2026-03-11',202611,3,2026,11,10,202603,2026),('2026-03-12',202611,3,2026,12,10,202603,2026),('2026-03-13',202611,3,2026,13,10,202603,2026),('2026-03-14',202611,3,2026,14,10,202603,2026),('2026-03-15',202612,3,2026,15,11,202603,2026),('2026-03-16',202612,3,2026,16,11,202603,2026),('2026-03-17',202612,3,2026,17,11,202603,2026),('2026-03-18',202612,3,2026,18,11,202603,2026),('2026-03-19',202612,3,2026,19,11,202603,2026),('2026-03-20',202612,3,2026,20,11,202603,2026),('2026-03-21',202612,3,2026,21,11,202603,2026),('2026-03-22',202613,3,2026,22,12,202603,2026),('2026-03-23',202613,3,2026,23,12,202603,2026),('2026-03-24',202613,3,2026,24,12,202603,2026),('2026-03-25',202613,3,2026,25,12,202603,2026),('2026-03-26',202613,3,2026,26,12,202603,2026),('2026-03-27',202613,3,2026,27,12,202603,2026),('2026-03-28',202613,3,2026,28,12,202603,2026),('2026-03-29',202614,3,2026,29,13,202603,2026),('2026-03-30',202614,3,2026,30,13,202603,2026),('2026-03-31',202614,3,2026,31,13,202603,2026),('2026-04-01',202614,4,2026,1,13,202604,2026),('2026-04-02',202614,4,2026,2,13,202604,2026),('2026-04-03',202614,4,2026,3,13,202604,2026),('2026-04-04',202614,4,2026,4,13,202604,2026),('2026-04-05',202615,4,2026,5,14,202604,2026),('2026-04-06',202615,4,2026,6,14,202604,2026),('2026-04-07',202615,4,2026,7,14,202604,2026),('2026-04-08',202615,4,2026,8,14,202604,2026),('2026-04-09',202615,4,2026,9,14,202604,2026),('2026-04-10',202615,4,2026,10,14,202604,2026),('2026-04-11',202615,4,2026,11,14,202604,2026),('2026-04-12',202616,4,2026,12,15,202604,2026),('2026-04-13',202616,4,2026,13,15,202604,2026),('2026-04-14',202616,4,2026,14,15,202604,2026),('2026-04-15',202616,4,2026,15,15,202604,2026),('2026-04-16',202616,4,2026,16,15,202604,2026),('2026-04-17',202616,4,2026,17,15,202604,2026),('2026-04-18',202616,4,2026,18,15,202604,2026),('2026-04-19',202617,4,2026,19,16,202604,2026),('2026-04-20',202617,4,2026,20,16,202604,2026),('2026-04-21',202617,4,2026,21,16,202604,2026),('2026-04-22',202617,4,2026,22,16,202604,2026),('2026-04-23',202617,4,2026,23,16,202604,2026),('2026-04-24',202617,4,2026,24,16,202604,2026),('2026-04-25',202617,4,2026,25,16,202604,2026),('2026-04-26',202618,4,2026,26,17,202604,2026),('2026-04-27',202618,4,2026,27,17,202604,2026),('2026-04-28',202618,4,2026,28,17,202604,2026),('2026-04-29',202618,4,2026,29,17,202604,2026),('2026-04-30',202618,4,2026,30,17,202604,2026),('2026-05-01',202618,5,2026,1,17,202605,2026),('2026-05-02',202618,5,2026,2,17,202605,2026),('2026-05-03',202619,5,2026,3,18,202605,2026),('2026-05-04',202619,5,2026,4,18,202605,2026),('2026-05-05',202619,5,2026,5,18,202605,2026),('2026-05-06',202619,5,2026,6,18,202605,2026),('2026-05-07',202619,5,2026,7,18,202605,2026),('2026-05-08',202619,5,2026,8,18,202605,2026),('2026-05-09',202619,5,2026,9,18,202605,2026),('2026-05-10',202620,5,2026,10,19,202605,2026),('2026-05-11',202620,5,2026,11,19,202605,2026),('2026-05-12',202620,5,2026,12,19,202605,2026),('2026-05-13',202620,5,2026,13,19,202605,2026),('2026-05-14',202620,5,2026,14,19,202605,2026),('2026-05-15',202620,5,2026,15,19,202605,2026),('2026-05-16',202620,5,2026,16,19,202605,2026),('2026-05-17',202621,5,2026,17,20,202605,2026),('2026-05-18',202621,5,2026,18,20,202605,2026),('2026-05-19',202621,5,2026,19,20,202605,2026),('2026-05-20',202621,5,2026,20,20,202605,2026),('2026-05-21',202621,5,2026,21,20,202605,2026),('2026-05-22',202621,5,2026,22,20,202605,2026),('2026-05-23',202621,5,2026,23,20,202605,2026),('2026-05-24',202622,5,2026,24,21,202605,2026),('2026-05-25',202622,5,2026,25,21,202605,2026),('2026-05-26',202622,5,2026,26,21,202605,2026),('2026-05-27',202622,5,2026,27,21,202605,2026),('2026-05-28',202622,5,2026,28,21,202605,2026),('2026-05-29',202622,5,2026,29,21,202605,2026),('2026-05-30',202622,5,2026,30,21,202605,2026),('2026-05-31',202623,5,2026,31,22,202605,2026),('2026-06-01',202623,6,2026,1,22,202606,2026),('2026-06-02',202623,6,2026,2,22,202606,2026),('2026-06-03',202623,6,2026,3,22,202606,2026),('2026-06-04',202623,6,2026,4,22,202606,2026),('2026-06-05',202623,6,2026,5,22,202606,2026),('2026-06-06',202623,6,2026,6,22,202606,2026),('2026-06-07',202624,6,2026,7,23,202606,2026),('2026-06-08',202624,6,2026,8,23,202606,2026),('2026-06-09',202624,6,2026,9,23,202606,2026),('2026-06-10',202624,6,2026,10,23,202606,2026),('2026-06-11',202624,6,2026,11,23,202606,2026),('2026-06-12',202624,6,2026,12,23,202606,2026),('2026-06-13',202624,6,2026,13,23,202606,2026),('2026-06-14',202625,6,2026,14,24,202606,2026),('2026-06-15',202625,6,2026,15,24,202606,2026),('2026-06-16',202625,6,2026,16,24,202606,2026),('2026-06-17',202625,6,2026,17,24,202606,2026),('2026-06-18',202625,6,2026,18,24,202606,2026),('2026-06-19',202625,6,2026,19,24,202606,2026),('2026-06-20',202625,6,2026,20,24,202606,2026),('2026-06-21',202626,6,2026,21,25,202606,2026),('2026-06-22',202626,6,2026,22,25,202606,2026),('2026-06-23',202626,6,2026,23,25,202606,2026),('2026-06-24',202626,6,2026,24,25,202606,2026),('2026-06-25',202626,6,2026,25,25,202606,2026),('2026-06-26',202626,6,2026,26,25,202606,2026),('2026-06-27',202626,6,2026,27,25,202606,2026),('2026-06-28',202627,6,2026,28,26,202606,2026),('2026-06-29',202627,6,2026,29,26,202606,2026),('2026-06-30',202627,6,2026,30,26,202606,2026),('2026-07-01',202627,7,2026,1,26,202607,2026),('2026-07-02',202627,7,2026,2,26,202607,2026),('2026-07-03',202627,7,2026,3,26,202607,2026),('2026-07-04',202627,7,2026,4,26,202607,2026),('2026-07-05',202628,7,2026,5,27,202607,2026),('2026-07-06',202628,7,2026,6,27,202607,2026),('2026-07-07',202628,7,2026,7,27,202607,2026),('2026-07-08',202628,7,2026,8,27,202607,2026),('2026-07-09',202628,7,2026,9,27,202607,2026),('2026-07-10',202628,7,2026,10,27,202607,2026),('2026-07-11',202628,7,2026,11,27,202607,2026),('2026-07-12',202629,7,2026,12,28,202607,2026),('2026-07-13',202629,7,2026,13,28,202607,2026),('2026-07-14',202629,7,2026,14,28,202607,2026),('2026-07-15',202629,7,2026,15,28,202607,2026),('2026-07-16',202629,7,2026,16,28,202607,2026),('2026-07-17',202629,7,2026,17,28,202607,2026),('2026-07-18',202629,7,2026,18,28,202607,2026),('2026-07-19',202630,7,2026,19,29,202607,2026),('2026-07-20',202630,7,2026,20,29,202607,2026),('2026-07-21',202630,7,2026,21,29,202607,2026),('2026-07-22',202630,7,2026,22,29,202607,2026),('2026-07-23',202630,7,2026,23,29,202607,2026),('2026-07-24',202630,7,2026,24,29,202607,2026),('2026-07-25',202630,7,2026,25,29,202607,2026),('2026-07-26',202631,7,2026,26,30,202607,2026),('2026-07-27',202631,7,2026,27,30,202607,2026),('2026-07-28',202631,7,2026,28,30,202607,2026),('2026-07-29',202631,7,2026,29,30,202607,2026),('2026-07-30',202631,7,2026,30,30,202607,2026),('2026-07-31',202631,7,2026,31,30,202607,2026),('2026-08-01',202631,8,2026,1,30,202608,2026),('2026-08-02',202632,8,2026,2,31,202608,2026),('2026-08-03',202632,8,2026,3,31,202608,2026),('2026-08-04',202632,8,2026,4,31,202608,2026),('2026-08-05',202632,8,2026,5,31,202608,2026),('2026-08-06',202632,8,2026,6,31,202608,2026),('2026-08-07',202632,8,2026,7,31,202608,2026),('2026-08-08',202632,8,2026,8,31,202608,2026),('2026-08-09',202633,8,2026,9,32,202608,2026),('2026-08-10',202633,8,2026,10,32,202608,2026),('2026-08-11',202633,8,2026,11,32,202608,2026),('2026-08-12',202633,8,2026,12,32,202608,2026),('2026-08-13',202633,8,2026,13,32,202608,2026),('2026-08-14',202633,8,2026,14,32,202608,2026),('2026-08-15',202633,8,2026,15,32,202608,2026),('2026-08-16',202634,8,2026,16,33,202608,2026),('2026-08-17',202634,8,2026,17,33,202608,2026),('2026-08-18',202634,8,2026,18,33,202608,2026),('2026-08-19',202634,8,2026,19,33,202608,2026),('2026-08-20',202634,8,2026,20,33,202608,2026),('2026-08-21',202634,8,2026,21,33,202608,2026),('2026-08-22',202634,8,2026,22,33,202608,2026),('2026-08-23',202635,8,2026,23,34,202608,2026),('2026-08-24',202635,8,2026,24,34,202608,2026),('2026-08-25',202635,8,2026,25,34,202608,2026),('2026-08-26',202635,8,2026,26,34,202608,2026),('2026-08-27',202635,8,2026,27,34,202608,2026),('2026-08-28',202635,8,2026,28,34,202608,2026),('2026-08-29',202635,8,2026,29,34,202608,2026),('2026-08-30',202636,8,2026,30,35,202608,2026),('2026-08-31',202636,8,2026,31,35,202608,2026),('2026-09-01',202636,9,2026,1,35,202609,2026),('2026-09-02',202636,9,2026,2,35,202609,2026),('2026-09-03',202636,9,2026,3,35,202609,2026),('2026-09-04',202636,9,2026,4,35,202609,2026),('2026-09-05',202636,9,2026,5,35,202609,2026),('2026-09-06',202637,9,2026,6,36,202609,2026),('2026-09-07',202637,9,2026,7,36,202609,2026),('2026-09-08',202637,9,2026,8,36,202609,2026),('2026-09-09',202637,9,2026,9,36,202609,2026),('2026-09-10',202637,9,2026,10,36,202609,2026),('2026-09-11',202637,9,2026,11,36,202609,2026),('2026-09-12',202637,9,2026,12,36,202609,2026),('2026-09-13',202638,9,2026,13,37,202609,2026),('2026-09-14',202638,9,2026,14,37,202609,2026),('2026-09-15',202638,9,2026,15,37,202609,2026),('2026-09-16',202638,9,2026,16,37,202609,2026),('2026-09-17',202638,9,2026,17,37,202609,2026),('2026-09-18',202638,9,2026,18,37,202609,2026),('2026-09-19',202638,9,2026,19,37,202609,2026),('2026-09-20',202639,9,2026,20,38,202609,2026),('2026-09-21',202639,9,2026,21,38,202609,2026),('2026-09-22',202639,9,2026,22,38,202609,2026),('2026-09-23',202639,9,2026,23,38,202609,2026),('2026-09-24',202639,9,2026,24,38,202609,2026),('2026-09-25',202639,9,2026,25,38,202609,2026),('2026-09-26',202639,9,2026,26,38,202609,2026),('2026-09-27',202640,9,2026,27,39,202609,2026),('2026-09-28',202640,9,2026,28,39,202609,2026),('2026-09-29',202640,9,2026,29,39,202609,2026),('2026-09-30',202640,9,2026,30,39,202609,2026),('2026-10-01',202640,10,2026,1,39,202610,2026),('2026-10-02',202640,10,2026,2,39,202610,2026),('2026-10-03',202640,10,2026,3,39,202610,2026),('2026-10-04',202641,10,2026,4,40,202610,2026),('2026-10-05',202641,10,2026,5,40,202610,2026),('2026-10-06',202641,10,2026,6,40,202610,2026),('2026-10-07',202641,10,2026,7,40,202610,2026),('2026-10-08',202641,10,2026,8,40,202610,2026),('2026-10-09',202641,10,2026,9,40,202610,2026),('2026-10-10',202641,10,2026,10,40,202610,2026),('2026-10-11',202642,10,2026,11,41,202610,2026),('2026-10-12',202642,10,2026,12,41,202610,2026),('2026-10-13',202642,10,2026,13,41,202610,2026),('2026-10-14',202642,10,2026,14,41,202610,2026),('2026-10-15',202642,10,2026,15,41,202610,2026),('2026-10-16',202642,10,2026,16,41,202610,2026),('2026-10-17',202642,10,2026,17,41,202610,2026),('2026-10-18',202643,10,2026,18,42,202610,2026),('2026-10-19',202643,10,2026,19,42,202610,2026),('2026-10-20',202643,10,2026,20,42,202610,2026),('2026-10-21',202643,10,2026,21,42,202610,2026),('2026-10-22',202643,10,2026,22,42,202610,2026),('2026-10-23',202643,10,2026,23,42,202610,2026),('2026-10-24',202643,10,2026,24,42,202610,2026),('2026-10-25',202644,10,2026,25,43,202610,2026),('2026-10-26',202644,10,2026,26,43,202610,2026),('2026-10-27',202644,10,2026,27,43,202610,2026),('2026-10-28',202644,10,2026,28,43,202610,2026),('2026-10-29',202644,10,2026,29,43,202610,2026),('2026-10-30',202644,10,2026,30,43,202610,2026),('2026-10-31',202644,10,2026,31,43,202610,2026),('2026-11-01',202645,11,2026,1,44,202611,2026),('2026-11-02',202645,11,2026,2,44,202611,2026),('2026-11-03',202645,11,2026,3,44,202611,2026),('2026-11-04',202645,11,2026,4,44,202611,2026),('2026-11-05',202645,11,2026,5,44,202611,2026),('2026-11-06',202645,11,2026,6,44,202611,2026),('2026-11-07',202645,11,2026,7,44,202611,2026),('2026-11-08',202646,11,2026,8,45,202611,2026),('2026-11-09',202646,11,2026,9,45,202611,2026),('2026-11-10',202646,11,2026,10,45,202611,2026),('2026-11-11',202646,11,2026,11,45,202611,2026),('2026-11-12',202646,11,2026,12,45,202611,2026),('2026-11-13',202646,11,2026,13,45,202611,2026),('2026-11-14',202646,11,2026,14,45,202611,2026),('2026-11-15',202647,11,2026,15,46,202611,2026),('2026-11-16',202647,11,2026,16,46,202611,2026),('2026-11-17',202647,11,2026,17,46,202611,2026),('2026-11-18',202647,11,2026,18,46,202611,2026),('2026-11-19',202647,11,2026,19,46,202611,2026),('2026-11-20',202647,11,2026,20,46,202611,2026),('2026-11-21',202647,11,2026,21,46,202611,2026),('2026-11-22',202648,11,2026,22,47,202611,2026),('2026-11-23',202648,11,2026,23,47,202611,2026),('2026-11-24',202648,11,2026,24,47,202611,2026),('2026-11-25',202648,11,2026,25,47,202611,2026),('2026-11-26',202648,11,2026,26,47,202611,2026),('2026-11-27',202648,11,2026,27,47,202611,2026),('2026-11-28',202648,11,2026,28,47,202611,2026),('2026-11-29',202649,11,2026,29,48,202611,2026),('2026-11-30',202649,11,2026,30,48,202611,2026),('2026-12-01',202649,12,2026,1,48,202612,2027),('2026-12-02',202649,12,2026,2,48,202612,2027),('2026-12-03',202649,12,2026,3,48,202612,2027),('2026-12-04',202649,12,2026,4,48,202612,2027),('2026-12-05',202649,12,2026,5,48,202612,2027),('2026-12-06',202650,12,2026,6,49,202612,2027),('2026-12-07',202650,12,2026,7,49,202612,2027),('2026-12-08',202650,12,2026,8,49,202612,2027),('2026-12-09',202650,12,2026,9,49,202612,2027),('2026-12-10',202650,12,2026,10,49,202612,2027),('2026-12-11',202650,12,2026,11,49,202612,2027),('2026-12-12',202650,12,2026,12,49,202612,2027),('2026-12-13',202651,12,2026,13,50,202612,2027),('2026-12-14',202651,12,2026,14,50,202612,2027),('2026-12-15',202651,12,2026,15,50,202612,2027),('2026-12-16',202651,12,2026,16,50,202612,2027),('2026-12-17',202651,12,2026,17,50,202612,2027),('2026-12-18',202651,12,2026,18,50,202612,2027),('2026-12-19',202651,12,2026,19,50,202612,2027),('2026-12-20',202652,12,2026,20,51,202612,2027),('2026-12-21',202652,12,2026,21,51,202612,2027),('2026-12-22',202652,12,2026,22,51,202612,2027),('2026-12-23',202652,12,2026,23,51,202612,2027),('2026-12-24',202652,12,2026,24,51,202612,2027),('2026-12-25',202652,12,2026,25,51,202612,2027),('2026-12-26',202652,12,2026,26,51,202612,2027),('2026-12-27',202653,12,2026,27,52,202612,2027),('2026-12-28',202653,12,2026,28,52,202612,2027),('2026-12-29',202653,12,2026,29,52,202612,2027),('2026-12-30',202653,12,2026,30,52,202612,2027),('2026-12-31',202653,12,2026,31,52,202612,2027),('2027-01-01',202753,1,2027,1,52,202701,2027),('2027-01-02',202753,1,2027,2,52,202701,2027),('2027-01-03',202754,1,2027,3,1,202701,2027),('2027-01-04',202701,1,2027,4,1,202701,2027),('2027-01-05',202701,1,2027,5,1,202701,2027),('2027-01-06',202701,1,2027,6,1,202701,2027),('2027-01-07',202701,1,2027,7,1,202701,2027),('2027-01-08',202701,1,2027,8,1,202701,2027),('2027-01-09',202701,1,2027,9,1,202701,2027),('2027-01-10',202702,1,2027,10,2,202701,2027),('2027-01-11',202702,1,2027,11,2,202701,2027),('2027-01-12',202702,1,2027,12,2,202701,2027),('2027-01-13',202702,1,2027,13,2,202701,2027),('2027-01-14',202702,1,2027,14,2,202701,2027),('2027-01-15',202702,1,2027,15,2,202701,2027),('2027-01-16',202702,1,2027,16,2,202701,2027),('2027-01-17',202703,1,2027,17,3,202701,2027),('2027-01-18',202703,1,2027,18,3,202701,2027),('2027-01-19',202703,1,2027,19,3,202701,2027),('2027-01-20',202703,1,2027,20,3,202701,2027),('2027-01-21',202703,1,2027,21,3,202701,2027),('2027-01-22',202703,1,2027,22,3,202701,2027),('2027-01-23',202703,1,2027,23,3,202701,2027),('2027-01-24',202704,1,2027,24,4,202701,2027),('2027-01-25',202704,1,2027,25,4,202701,2027),('2027-01-26',202704,1,2027,26,4,202701,2027),('2027-01-27',202704,1,2027,27,4,202701,2027),('2027-01-28',202704,1,2027,28,4,202701,2027),('2027-01-29',202704,1,2027,29,4,202701,2027),('2027-01-30',202704,1,2027,30,4,202701,2027),('2027-01-31',202705,1,2027,31,5,202701,2027),('2027-02-01',202705,2,2027,1,5,202702,2027),('2027-02-02',202705,2,2027,2,5,202702,2027),('2027-02-03',202705,2,2027,3,5,202702,2027),('2027-02-04',202705,2,2027,4,5,202702,2027),('2027-02-05',202705,2,2027,5,5,202702,2027),('2027-02-06',202705,2,2027,6,5,202702,2027),('2027-02-07',202706,2,2027,7,6,202702,2027),('2027-02-08',202706,2,2027,8,6,202702,2027),('2027-02-09',202706,2,2027,9,6,202702,2027),('2027-02-10',202706,2,2027,10,6,202702,2027),('2027-02-11',202706,2,2027,11,6,202702,2027),('2027-02-12',202706,2,2027,12,6,202702,2027),('2027-02-13',202706,2,2027,13,6,202702,2027),('2027-02-14',202707,2,2027,14,7,202702,2027),('2027-02-15',202707,2,2027,15,7,202702,2027),('2027-02-16',202707,2,2027,16,7,202702,2027),('2027-02-17',202707,2,2027,17,7,202702,2027),('2027-02-18',202707,2,2027,18,7,202702,2027),('2027-02-19',202707,2,2027,19,7,202702,2027),('2027-02-20',202707,2,2027,20,7,202702,2027),('2027-02-21',202708,2,2027,21,8,202702,2027),('2027-02-22',202708,2,2027,22,8,202702,2027),('2027-02-23',202708,2,2027,23,8,202702,2027),('2027-02-24',202708,2,2027,24,8,202702,2027),('2027-02-25',202708,2,2027,25,8,202702,2027),('2027-02-26',202708,2,2027,26,8,202702,2027),('2027-02-27',202708,2,2027,27,8,202702,2027),('2027-02-28',202709,2,2027,28,9,202702,2027),('2027-03-01',202709,3,2027,1,9,202703,2027),('2027-03-02',202709,3,2027,2,9,202703,2027),('2027-03-03',202709,3,2027,3,9,202703,2027),('2027-03-04',202709,3,2027,4,9,202703,2027),('2027-03-05',202709,3,2027,5,9,202703,2027),('2027-03-06',202709,3,2027,6,9,202703,2027),('2027-03-07',202710,3,2027,7,10,202703,2027),('2027-03-08',202710,3,2027,8,10,202703,2027),('2027-03-09',202710,3,2027,9,10,202703,2027),('2027-03-10',202710,3,2027,10,10,202703,2027),('2027-03-11',202710,3,2027,11,10,202703,2027),('2027-03-12',202710,3,2027,12,10,202703,2027),('2027-03-13',202710,3,2027,13,10,202703,2027),('2027-03-14',202711,3,2027,14,11,202703,2027),('2027-03-15',202711,3,2027,15,11,202703,2027),('2027-03-16',202711,3,2027,16,11,202703,2027),('2027-03-17',202711,3,2027,17,11,202703,2027),('2027-03-18',202711,3,2027,18,11,202703,2027),('2027-03-19',202711,3,2027,19,11,202703,2027),('2027-03-20',202711,3,2027,20,11,202703,2027),('2027-03-21',202712,3,2027,21,12,202703,2027),('2027-03-22',202712,3,2027,22,12,202703,2027),('2027-03-23',202712,3,2027,23,12,202703,2027),('2027-03-24',202712,3,2027,24,12,202703,2027),('2027-03-25',202712,3,2027,25,12,202703,2027),('2027-03-26',202712,3,2027,26,12,202703,2027),('2027-03-27',202712,3,2027,27,12,202703,2027),('2027-03-28',202713,3,2027,28,13,202703,2027),('2027-03-29',202713,3,2027,29,13,202703,2027),('2027-03-30',202713,3,2027,30,13,202703,2027),('2027-03-31',202713,3,2027,31,13,202703,2027),('2027-04-01',202713,4,2027,1,13,202704,2027),('2027-04-02',202713,4,2027,2,13,202704,2027),('2027-04-03',202713,4,2027,3,13,202704,2027),('2027-04-04',202714,4,2027,4,14,202704,2027),('2027-04-05',202714,4,2027,5,14,202704,2027),('2027-04-06',202714,4,2027,6,14,202704,2027),('2027-04-07',202714,4,2027,7,14,202704,2027),('2027-04-08',202714,4,2027,8,14,202704,2027),('2027-04-09',202714,4,2027,9,14,202704,2027),('2027-04-10',202714,4,2027,10,14,202704,2027),('2027-04-11',202715,4,2027,11,15,202704,2027),('2027-04-12',202715,4,2027,12,15,202704,2027),('2027-04-13',202715,4,2027,13,15,202704,2027),('2027-04-14',202715,4,2027,14,15,202704,2027),('2027-04-15',202715,4,2027,15,15,202704,2027),('2027-04-16',202715,4,2027,16,15,202704,2027),('2027-04-17',202715,4,2027,17,15,202704,2027),('2027-04-18',202716,4,2027,18,16,202704,2027),('2027-04-19',202716,4,2027,19,16,202704,2027),('2027-04-20',202716,4,2027,20,16,202704,2027),('2027-04-21',202716,4,2027,21,16,202704,2027),('2027-04-22',202716,4,2027,22,16,202704,2027),('2027-04-23',202716,4,2027,23,16,202704,2027),('2027-04-24',202716,4,2027,24,16,202704,2027),('2027-04-25',202717,4,2027,25,17,202704,2027),('2027-04-26',202717,4,2027,26,17,202704,2027),('2027-04-27',202717,4,2027,27,17,202704,2027),('2027-04-28',202717,4,2027,28,17,202704,2027),('2027-04-29',202717,4,2027,29,17,202704,2027),('2027-04-30',202717,4,2027,30,17,202704,2027),('2027-05-01',202717,5,2027,1,17,202705,2027),('2027-05-02',202718,5,2027,2,18,202705,2027),('2027-05-03',202718,5,2027,3,18,202705,2027),('2027-05-04',202718,5,2027,4,18,202705,2027),('2027-05-05',202718,5,2027,5,18,202705,2027),('2027-05-06',202718,5,2027,6,18,202705,2027),('2027-05-07',202718,5,2027,7,18,202705,2027),('2027-05-08',202718,5,2027,8,18,202705,2027),('2027-05-09',202719,5,2027,9,19,202705,2027),('2027-05-10',202719,5,2027,10,19,202705,2027),('2027-05-11',202719,5,2027,11,19,202705,2027),('2027-05-12',202719,5,2027,12,19,202705,2027),('2027-05-13',202719,5,2027,13,19,202705,2027),('2027-05-14',202719,5,2027,14,19,202705,2027),('2027-05-15',202719,5,2027,15,19,202705,2027),('2027-05-16',202720,5,2027,16,20,202705,2027),('2027-05-17',202720,5,2027,17,20,202705,2027),('2027-05-18',202720,5,2027,18,20,202705,2027),('2027-05-19',202720,5,2027,19,20,202705,2027),('2027-05-20',202720,5,2027,20,20,202705,2027),('2027-05-21',202720,5,2027,21,20,202705,2027),('2027-05-22',202720,5,2027,22,20,202705,2027),('2027-05-23',202721,5,2027,23,21,202705,2027),('2027-05-24',202721,5,2027,24,21,202705,2027),('2027-05-25',202721,5,2027,25,21,202705,2027),('2027-05-26',202721,5,2027,26,21,202705,2027),('2027-05-27',202721,5,2027,27,21,202705,2027),('2027-05-28',202721,5,2027,28,21,202705,2027),('2027-05-29',202721,5,2027,29,21,202705,2027),('2027-05-30',202722,5,2027,30,22,202705,2027),('2027-05-31',202722,5,2027,31,22,202705,2027),('2027-06-01',202722,6,2027,1,22,202706,2027),('2027-06-02',202722,6,2027,2,22,202706,2027),('2027-06-03',202722,6,2027,3,22,202706,2027),('2027-06-04',202722,6,2027,4,22,202706,2027),('2027-06-05',202722,6,2027,5,22,202706,2027),('2027-06-06',202723,6,2027,6,23,202706,2027),('2027-06-07',202723,6,2027,7,23,202706,2027),('2027-06-08',202723,6,2027,8,23,202706,2027),('2027-06-09',202723,6,2027,9,23,202706,2027),('2027-06-10',202723,6,2027,10,23,202706,2027),('2027-06-11',202723,6,2027,11,23,202706,2027),('2027-06-12',202723,6,2027,12,23,202706,2027),('2027-06-13',202724,6,2027,13,24,202706,2027),('2027-06-14',202724,6,2027,14,24,202706,2027),('2027-06-15',202724,6,2027,15,24,202706,2027),('2027-06-16',202724,6,2027,16,24,202706,2027),('2027-06-17',202724,6,2027,17,24,202706,2027),('2027-06-18',202724,6,2027,18,24,202706,2027),('2027-06-19',202724,6,2027,19,24,202706,2027),('2027-06-20',202725,6,2027,20,25,202706,2027),('2027-06-21',202725,6,2027,21,25,202706,2027),('2027-06-22',202725,6,2027,22,25,202706,2027),('2027-06-23',202725,6,2027,23,25,202706,2027),('2027-06-24',202725,6,2027,24,25,202706,2027),('2027-06-25',202725,6,2027,25,25,202706,2027),('2027-06-26',202725,6,2027,26,25,202706,2027),('2027-06-27',202726,6,2027,27,26,202706,2027),('2027-06-28',202726,6,2027,28,26,202706,2027),('2027-06-29',202726,6,2027,29,26,202706,2027),('2027-06-30',202726,6,2027,30,26,202706,2027),('2027-07-01',202726,7,2027,1,26,202707,2027),('2027-07-02',202726,7,2027,2,26,202707,2027),('2027-07-03',202726,7,2027,3,26,202707,2027),('2027-07-04',202727,7,2027,4,27,202707,2027),('2027-07-05',202727,7,2027,5,27,202707,2027),('2027-07-06',202727,7,2027,6,27,202707,2027),('2027-07-07',202727,7,2027,7,27,202707,2027),('2027-07-08',202727,7,2027,8,27,202707,2027),('2027-07-09',202727,7,2027,9,27,202707,2027),('2027-07-10',202727,7,2027,10,27,202707,2027),('2027-07-11',202728,7,2027,11,28,202707,2027),('2027-07-12',202728,7,2027,12,28,202707,2027),('2027-07-13',202728,7,2027,13,28,202707,2027),('2027-07-14',202728,7,2027,14,28,202707,2027),('2027-07-15',202728,7,2027,15,28,202707,2027),('2027-07-16',202728,7,2027,16,28,202707,2027),('2027-07-17',202728,7,2027,17,28,202707,2027),('2027-07-18',202729,7,2027,18,29,202707,2027),('2027-07-19',202729,7,2027,19,29,202707,2027),('2027-07-20',202729,7,2027,20,29,202707,2027),('2027-07-21',202729,7,2027,21,29,202707,2027),('2027-07-22',202729,7,2027,22,29,202707,2027),('2027-07-23',202729,7,2027,23,29,202707,2027),('2027-07-24',202729,7,2027,24,29,202707,2027),('2027-07-25',202730,7,2027,25,30,202707,2027),('2027-07-26',202730,7,2027,26,30,202707,2027),('2027-07-27',202730,7,2027,27,30,202707,2027),('2027-07-28',202730,7,2027,28,30,202707,2027),('2027-07-29',202730,7,2027,29,30,202707,2027),('2027-07-30',202730,7,2027,30,30,202707,2027),('2027-07-31',202730,7,2027,31,30,202707,2027),('2027-08-01',202731,8,2027,1,31,202708,2027),('2027-08-02',202731,8,2027,2,31,202708,2027),('2027-08-03',202731,8,2027,3,31,202708,2027),('2027-08-04',202731,8,2027,4,31,202708,2027),('2027-08-05',202731,8,2027,5,31,202708,2027),('2027-08-06',202731,8,2027,6,31,202708,2027),('2027-08-07',202731,8,2027,7,31,202708,2027),('2027-08-08',202732,8,2027,8,32,202708,2027),('2027-08-09',202732,8,2027,9,32,202708,2027),('2027-08-10',202732,8,2027,10,32,202708,2027),('2027-08-11',202732,8,2027,11,32,202708,2027),('2027-08-12',202732,8,2027,12,32,202708,2027),('2027-08-13',202732,8,2027,13,32,202708,2027),('2027-08-14',202732,8,2027,14,32,202708,2027),('2027-08-15',202733,8,2027,15,33,202708,2027),('2027-08-16',202733,8,2027,16,33,202708,2027),('2027-08-17',202733,8,2027,17,33,202708,2027),('2027-08-18',202733,8,2027,18,33,202708,2027),('2027-08-19',202733,8,2027,19,33,202708,2027),('2027-08-20',202733,8,2027,20,33,202708,2027),('2027-08-21',202733,8,2027,21,33,202708,2027),('2027-08-22',202734,8,2027,22,34,202708,2027),('2027-08-23',202734,8,2027,23,34,202708,2027),('2027-08-24',202734,8,2027,24,34,202708,2027),('2027-08-25',202734,8,2027,25,34,202708,2027),('2027-08-26',202734,8,2027,26,34,202708,2027),('2027-08-27',202734,8,2027,27,34,202708,2027),('2027-08-28',202734,8,2027,28,34,202708,2027),('2027-08-29',202735,8,2027,29,35,202708,2027),('2027-08-30',202735,8,2027,30,35,202708,2027),('2027-08-31',202735,8,2027,31,35,202708,2027),('2027-09-01',202735,9,2027,1,35,202709,2027),('2027-09-02',202735,9,2027,2,35,202709,2027),('2027-09-03',202735,9,2027,3,35,202709,2027),('2027-09-04',202735,9,2027,4,35,202709,2027),('2027-09-05',202736,9,2027,5,36,202709,2027),('2027-09-06',202736,9,2027,6,36,202709,2027),('2027-09-07',202736,9,2027,7,36,202709,2027),('2027-09-08',202736,9,2027,8,36,202709,2027),('2027-09-09',202736,9,2027,9,36,202709,2027),('2027-09-10',202736,9,2027,10,36,202709,2027),('2027-09-11',202736,9,2027,11,36,202709,2027),('2027-09-12',202737,9,2027,12,37,202709,2027),('2027-09-13',202737,9,2027,13,37,202709,2027),('2027-09-14',202737,9,2027,14,37,202709,2027),('2027-09-15',202737,9,2027,15,37,202709,2027),('2027-09-16',202737,9,2027,16,37,202709,2027),('2027-09-17',202737,9,2027,17,37,202709,2027),('2027-09-18',202737,9,2027,18,37,202709,2027),('2027-09-19',202738,9,2027,19,38,202709,2027),('2027-09-20',202738,9,2027,20,38,202709,2027),('2027-09-21',202738,9,2027,21,38,202709,2027),('2027-09-22',202738,9,2027,22,38,202709,2027),('2027-09-23',202738,9,2027,23,38,202709,2027),('2027-09-24',202738,9,2027,24,38,202709,2027),('2027-09-25',202738,9,2027,25,38,202709,2027),('2027-09-26',202739,9,2027,26,39,202709,2027),('2027-09-27',202739,9,2027,27,39,202709,2027),('2027-09-28',202739,9,2027,28,39,202709,2027),('2027-09-29',202739,9,2027,29,39,202709,2027),('2027-09-30',202739,9,2027,30,39,202709,2027),('2027-10-01',202739,10,2027,1,39,202710,2027),('2027-10-02',202739,10,2027,2,39,202710,2027),('2027-10-03',202740,10,2027,3,40,202710,2027),('2027-10-04',202740,10,2027,4,40,202710,2027),('2027-10-05',202740,10,2027,5,40,202710,2027),('2027-10-06',202740,10,2027,6,40,202710,2027),('2027-10-07',202740,10,2027,7,40,202710,2027),('2027-10-08',202740,10,2027,8,40,202710,2027),('2027-10-09',202740,10,2027,9,40,202710,2027),('2027-10-10',202741,10,2027,10,41,202710,2027),('2027-10-11',202741,10,2027,11,41,202710,2027),('2027-10-12',202741,10,2027,12,41,202710,2027),('2027-10-13',202741,10,2027,13,41,202710,2027),('2027-10-14',202741,10,2027,14,41,202710,2027),('2027-10-15',202741,10,2027,15,41,202710,2027),('2027-10-16',202741,10,2027,16,41,202710,2027),('2027-10-17',202742,10,2027,17,42,202710,2027),('2027-10-18',202742,10,2027,18,42,202710,2027),('2027-10-19',202742,10,2027,19,42,202710,2027),('2027-10-20',202742,10,2027,20,42,202710,2027),('2027-10-21',202742,10,2027,21,42,202710,2027),('2027-10-22',202742,10,2027,22,42,202710,2027),('2027-10-23',202742,10,2027,23,42,202710,2027),('2027-10-24',202743,10,2027,24,43,202710,2027),('2027-10-25',202743,10,2027,25,43,202710,2027),('2027-10-26',202743,10,2027,26,43,202710,2027),('2027-10-27',202743,10,2027,27,43,202710,2027),('2027-10-28',202743,10,2027,28,43,202710,2027),('2027-10-29',202743,10,2027,29,43,202710,2027),('2027-10-30',202743,10,2027,30,43,202710,2027),('2027-10-31',202744,10,2027,31,44,202710,2027),('2027-11-01',202744,11,2027,1,44,202711,2027),('2027-11-02',202744,11,2027,2,44,202711,2027),('2027-11-03',202744,11,2027,3,44,202711,2027),('2027-11-04',202744,11,2027,4,44,202711,2027),('2027-11-05',202744,11,2027,5,44,202711,2027),('2027-11-06',202744,11,2027,6,44,202711,2027),('2027-11-07',202745,11,2027,7,45,202711,2027),('2027-11-08',202745,11,2027,8,45,202711,2027),('2027-11-09',202745,11,2027,9,45,202711,2027),('2027-11-10',202745,11,2027,10,45,202711,2027),('2027-11-11',202745,11,2027,11,45,202711,2027),('2027-11-12',202745,11,2027,12,45,202711,2027),('2027-11-13',202745,11,2027,13,45,202711,2027),('2027-11-14',202746,11,2027,14,46,202711,2027),('2027-11-15',202746,11,2027,15,46,202711,2027),('2027-11-16',202746,11,2027,16,46,202711,2027),('2027-11-17',202746,11,2027,17,46,202711,2027),('2027-11-18',202746,11,2027,18,46,202711,2027),('2027-11-19',202746,11,2027,19,46,202711,2027),('2027-11-20',202746,11,2027,20,46,202711,2027),('2027-11-21',202747,11,2027,21,47,202711,2027),('2027-11-22',202747,11,2027,22,47,202711,2027),('2027-11-23',202747,11,2027,23,47,202711,2027),('2027-11-24',202747,11,2027,24,47,202711,2027),('2027-11-25',202747,11,2027,25,47,202711,2027),('2027-11-26',202747,11,2027,26,47,202711,2027),('2027-11-27',202747,11,2027,27,47,202711,2027),('2027-11-28',202748,11,2027,28,48,202711,2027),('2027-11-29',202748,11,2027,29,48,202711,2027),('2027-11-30',202748,11,2027,30,48,202711,2027),('2027-12-01',202748,12,2027,1,48,202712,2028),('2027-12-02',202748,12,2027,2,48,202712,2028),('2027-12-03',202748,12,2027,3,48,202712,2028),('2027-12-04',202748,12,2027,4,48,202712,2028),('2027-12-05',202749,12,2027,5,49,202712,2028),('2027-12-06',202749,12,2027,6,49,202712,2028),('2027-12-07',202749,12,2027,7,49,202712,2028),('2027-12-08',202749,12,2027,8,49,202712,2028),('2027-12-09',202749,12,2027,9,49,202712,2028),('2027-12-10',202749,12,2027,10,49,202712,2028),('2027-12-11',202749,12,2027,11,49,202712,2028),('2027-12-12',202750,12,2027,12,50,202712,2028),('2027-12-13',202750,12,2027,13,50,202712,2028),('2027-12-14',202750,12,2027,14,50,202712,2028),('2027-12-15',202750,12,2027,15,50,202712,2028),('2027-12-16',202750,12,2027,16,50,202712,2028),('2027-12-17',202750,12,2027,17,50,202712,2028),('2027-12-18',202750,12,2027,18,50,202712,2028),('2027-12-19',202751,12,2027,19,51,202712,2028),('2027-12-20',202751,12,2027,20,51,202712,2028),('2027-12-21',202751,12,2027,21,51,202712,2028),('2027-12-22',202751,12,2027,22,51,202712,2028),('2027-12-23',202751,12,2027,23,51,202712,2028),('2027-12-24',202751,12,2027,24,51,202712,2028),('2027-12-25',202751,12,2027,25,51,202712,2028),('2027-12-26',202752,12,2027,26,52,202712,2028),('2027-12-27',202752,12,2027,27,52,202712,2028),('2027-12-28',202752,12,2027,28,52,202712,2028),('2027-12-29',202752,12,2027,29,52,202712,2028),('2027-12-30',202752,12,2027,30,52,202712,2028),('2027-12-31',202752,12,2027,31,52,202712,2028),('2028-01-01',202852,1,2028,1,52,202801,2028),('2028-01-02',202853,1,2028,2,1,202801,2028),('2028-01-03',202801,1,2028,3,1,202801,2028),('2028-01-04',202801,1,2028,4,1,202801,2028),('2028-01-05',202801,1,2028,5,1,202801,2028),('2028-01-06',202801,1,2028,6,1,202801,2028),('2028-01-07',202801,1,2028,7,1,202801,2028),('2028-01-08',202801,1,2028,8,1,202801,2028),('2028-01-09',202802,1,2028,9,2,202801,2028),('2028-01-10',202802,1,2028,10,2,202801,2028),('2028-01-11',202802,1,2028,11,2,202801,2028),('2028-01-12',202802,1,2028,12,2,202801,2028),('2028-01-13',202802,1,2028,13,2,202801,2028),('2028-01-14',202802,1,2028,14,2,202801,2028),('2028-01-15',202802,1,2028,15,2,202801,2028),('2028-01-16',202803,1,2028,16,3,202801,2028),('2028-01-17',202803,1,2028,17,3,202801,2028),('2028-01-18',202803,1,2028,18,3,202801,2028),('2028-01-19',202803,1,2028,19,3,202801,2028),('2028-01-20',202803,1,2028,20,3,202801,2028),('2028-01-21',202803,1,2028,21,3,202801,2028),('2028-01-22',202803,1,2028,22,3,202801,2028),('2028-01-23',202804,1,2028,23,4,202801,2028),('2028-01-24',202804,1,2028,24,4,202801,2028),('2028-01-25',202804,1,2028,25,4,202801,2028),('2028-01-26',202804,1,2028,26,4,202801,2028),('2028-01-27',202804,1,2028,27,4,202801,2028),('2028-01-28',202804,1,2028,28,4,202801,2028),('2028-01-29',202804,1,2028,29,4,202801,2028),('2028-01-30',202805,1,2028,30,5,202801,2028),('2028-01-31',202805,1,2028,31,5,202801,2028),('2028-02-01',202805,2,2028,1,5,202802,2028),('2028-02-02',202805,2,2028,2,5,202802,2028),('2028-02-03',202805,2,2028,3,5,202802,2028),('2028-02-04',202805,2,2028,4,5,202802,2028),('2028-02-05',202805,2,2028,5,5,202802,2028),('2028-02-06',202806,2,2028,6,6,202802,2028),('2028-02-07',202806,2,2028,7,6,202802,2028),('2028-02-08',202806,2,2028,8,6,202802,2028),('2028-02-09',202806,2,2028,9,6,202802,2028),('2028-02-10',202806,2,2028,10,6,202802,2028),('2028-02-11',202806,2,2028,11,6,202802,2028),('2028-02-12',202806,2,2028,12,6,202802,2028),('2028-02-13',202807,2,2028,13,7,202802,2028),('2028-02-14',202807,2,2028,14,7,202802,2028),('2028-02-15',202807,2,2028,15,7,202802,2028),('2028-02-16',202807,2,2028,16,7,202802,2028),('2028-02-17',202807,2,2028,17,7,202802,2028),('2028-02-18',202807,2,2028,18,7,202802,2028),('2028-02-19',202807,2,2028,19,7,202802,2028),('2028-02-20',202808,2,2028,20,8,202802,2028),('2028-02-21',202808,2,2028,21,8,202802,2028),('2028-02-22',202808,2,2028,22,8,202802,2028),('2028-02-23',202808,2,2028,23,8,202802,2028),('2028-02-24',202808,2,2028,24,8,202802,2028),('2028-02-25',202808,2,2028,25,8,202802,2028),('2028-02-26',202808,2,2028,26,8,202802,2028),('2028-02-27',202809,2,2028,27,9,202802,2028),('2028-02-28',202809,2,2028,28,9,202802,2028),('2028-02-29',202809,2,2028,29,9,202802,2028),('2028-03-01',202809,3,2028,1,9,202803,2028),('2028-03-02',202809,3,2028,2,9,202803,2028),('2028-03-03',202809,3,2028,3,9,202803,2028),('2028-03-04',202809,3,2028,4,9,202803,2028),('2028-03-05',202810,3,2028,5,10,202803,2028),('2028-03-06',202810,3,2028,6,10,202803,2028),('2028-03-07',202810,3,2028,7,10,202803,2028),('2028-03-08',202810,3,2028,8,10,202803,2028),('2028-03-09',202810,3,2028,9,10,202803,2028),('2028-03-10',202810,3,2028,10,10,202803,2028),('2028-03-11',202810,3,2028,11,10,202803,2028),('2028-03-12',202811,3,2028,12,11,202803,2028),('2028-03-13',202811,3,2028,13,11,202803,2028),('2028-03-14',202811,3,2028,14,11,202803,2028),('2028-03-15',202811,3,2028,15,11,202803,2028),('2028-03-16',202811,3,2028,16,11,202803,2028),('2028-03-17',202811,3,2028,17,11,202803,2028),('2028-03-18',202811,3,2028,18,11,202803,2028),('2028-03-19',202812,3,2028,19,12,202803,2028),('2028-03-20',202812,3,2028,20,12,202803,2028),('2028-03-21',202812,3,2028,21,12,202803,2028),('2028-03-22',202812,3,2028,22,12,202803,2028),('2028-03-23',202812,3,2028,23,12,202803,2028),('2028-03-24',202812,3,2028,24,12,202803,2028),('2028-03-25',202812,3,2028,25,12,202803,2028),('2028-03-26',202813,3,2028,26,13,202803,2028),('2028-03-27',202813,3,2028,27,13,202803,2028),('2028-03-28',202813,3,2028,28,13,202803,2028),('2028-03-29',202813,3,2028,29,13,202803,2028),('2028-03-30',202813,3,2028,30,13,202803,2028),('2028-03-31',202813,3,2028,31,13,202803,2028),('2028-04-01',202813,4,2028,1,13,202804,2028),('2028-04-02',202814,4,2028,2,14,202804,2028),('2028-04-03',202814,4,2028,3,14,202804,2028),('2028-04-04',202814,4,2028,4,14,202804,2028),('2028-04-05',202814,4,2028,5,14,202804,2028),('2028-04-06',202814,4,2028,6,14,202804,2028),('2028-04-07',202814,4,2028,7,14,202804,2028),('2028-04-08',202814,4,2028,8,14,202804,2028),('2028-04-09',202815,4,2028,9,15,202804,2028),('2028-04-10',202815,4,2028,10,15,202804,2028),('2028-04-11',202815,4,2028,11,15,202804,2028),('2028-04-12',202815,4,2028,12,15,202804,2028),('2028-04-13',202815,4,2028,13,15,202804,2028),('2028-04-14',202815,4,2028,14,15,202804,2028),('2028-04-15',202815,4,2028,15,15,202804,2028),('2028-04-16',202816,4,2028,16,16,202804,2028),('2028-04-17',202816,4,2028,17,16,202804,2028),('2028-04-18',202816,4,2028,18,16,202804,2028),('2028-04-19',202816,4,2028,19,16,202804,2028),('2028-04-20',202816,4,2028,20,16,202804,2028),('2028-04-21',202816,4,2028,21,16,202804,2028),('2028-04-22',202816,4,2028,22,16,202804,2028),('2028-04-23',202817,4,2028,23,17,202804,2028),('2028-04-24',202817,4,2028,24,17,202804,2028),('2028-04-25',202817,4,2028,25,17,202804,2028),('2028-04-26',202817,4,2028,26,17,202804,2028),('2028-04-27',202817,4,2028,27,17,202804,2028),('2028-04-28',202817,4,2028,28,17,202804,2028),('2028-04-29',202817,4,2028,29,17,202804,2028),('2028-04-30',202818,4,2028,30,18,202804,2028),('2028-05-01',202818,5,2028,1,18,202805,2028),('2028-05-02',202818,5,2028,2,18,202805,2028),('2028-05-03',202818,5,2028,3,18,202805,2028),('2028-05-04',202818,5,2028,4,18,202805,2028),('2028-05-05',202818,5,2028,5,18,202805,2028),('2028-05-06',202818,5,2028,6,18,202805,2028),('2028-05-07',202819,5,2028,7,19,202805,2028),('2028-05-08',202819,5,2028,8,19,202805,2028),('2028-05-09',202819,5,2028,9,19,202805,2028),('2028-05-10',202819,5,2028,10,19,202805,2028),('2028-05-11',202819,5,2028,11,19,202805,2028),('2028-05-12',202819,5,2028,12,19,202805,2028),('2028-05-13',202819,5,2028,13,19,202805,2028),('2028-05-14',202820,5,2028,14,20,202805,2028),('2028-05-15',202820,5,2028,15,20,202805,2028),('2028-05-16',202820,5,2028,16,20,202805,2028),('2028-05-17',202820,5,2028,17,20,202805,2028),('2028-05-18',202820,5,2028,18,20,202805,2028),('2028-05-19',202820,5,2028,19,20,202805,2028),('2028-05-20',202820,5,2028,20,20,202805,2028),('2028-05-21',202821,5,2028,21,21,202805,2028),('2028-05-22',202821,5,2028,22,21,202805,2028),('2028-05-23',202821,5,2028,23,21,202805,2028),('2028-05-24',202821,5,2028,24,21,202805,2028),('2028-05-25',202821,5,2028,25,21,202805,2028),('2028-05-26',202821,5,2028,26,21,202805,2028),('2028-05-27',202821,5,2028,27,21,202805,2028),('2028-05-28',202822,5,2028,28,22,202805,2028),('2028-05-29',202822,5,2028,29,22,202805,2028),('2028-05-30',202822,5,2028,30,22,202805,2028),('2028-05-31',202822,5,2028,31,22,202805,2028),('2028-06-01',202822,6,2028,1,22,202806,2028),('2028-06-02',202822,6,2028,2,22,202806,2028),('2028-06-03',202822,6,2028,3,22,202806,2028),('2028-06-04',202823,6,2028,4,23,202806,2028),('2028-06-05',202823,6,2028,5,23,202806,2028),('2028-06-06',202823,6,2028,6,23,202806,2028),('2028-06-07',202823,6,2028,7,23,202806,2028),('2028-06-08',202823,6,2028,8,23,202806,2028),('2028-06-09',202823,6,2028,9,23,202806,2028),('2028-06-10',202823,6,2028,10,23,202806,2028),('2028-06-11',202824,6,2028,11,24,202806,2028),('2028-06-12',202824,6,2028,12,24,202806,2028),('2028-06-13',202824,6,2028,13,24,202806,2028),('2028-06-14',202824,6,2028,14,24,202806,2028),('2028-06-15',202824,6,2028,15,24,202806,2028),('2028-06-16',202824,6,2028,16,24,202806,2028),('2028-06-17',202824,6,2028,17,24,202806,2028),('2028-06-18',202825,6,2028,18,25,202806,2028),('2028-06-19',202825,6,2028,19,25,202806,2028),('2028-06-20',202825,6,2028,20,25,202806,2028),('2028-06-21',202825,6,2028,21,25,202806,2028),('2028-06-22',202825,6,2028,22,25,202806,2028),('2028-06-23',202825,6,2028,23,25,202806,2028),('2028-06-24',202825,6,2028,24,25,202806,2028),('2028-06-25',202826,6,2028,25,26,202806,2028),('2028-06-26',202826,6,2028,26,26,202806,2028),('2028-06-27',202826,6,2028,27,26,202806,2028),('2028-06-28',202826,6,2028,28,26,202806,2028),('2028-06-29',202826,6,2028,29,26,202806,2028),('2028-06-30',202826,6,2028,30,26,202806,2028),('2028-07-01',202826,7,2028,1,26,202807,2028),('2028-07-02',202827,7,2028,2,27,202807,2028),('2028-07-03',202827,7,2028,3,27,202807,2028),('2028-07-04',202827,7,2028,4,27,202807,2028),('2028-07-05',202827,7,2028,5,27,202807,2028),('2028-07-06',202827,7,2028,6,27,202807,2028),('2028-07-07',202827,7,2028,7,27,202807,2028),('2028-07-08',202827,7,2028,8,27,202807,2028),('2028-07-09',202828,7,2028,9,28,202807,2028),('2028-07-10',202828,7,2028,10,28,202807,2028),('2028-07-11',202828,7,2028,11,28,202807,2028),('2028-07-12',202828,7,2028,12,28,202807,2028),('2028-07-13',202828,7,2028,13,28,202807,2028),('2028-07-14',202828,7,2028,14,28,202807,2028),('2028-07-15',202828,7,2028,15,28,202807,2028),('2028-07-16',202829,7,2028,16,29,202807,2028),('2028-07-17',202829,7,2028,17,29,202807,2028),('2028-07-18',202829,7,2028,18,29,202807,2028),('2028-07-19',202829,7,2028,19,29,202807,2028),('2028-07-20',202829,7,2028,20,29,202807,2028),('2028-07-21',202829,7,2028,21,29,202807,2028),('2028-07-22',202829,7,2028,22,29,202807,2028),('2028-07-23',202830,7,2028,23,30,202807,2028),('2028-07-24',202830,7,2028,24,30,202807,2028),('2028-07-25',202830,7,2028,25,30,202807,2028),('2028-07-26',202830,7,2028,26,30,202807,2028),('2028-07-27',202830,7,2028,27,30,202807,2028),('2028-07-28',202830,7,2028,28,30,202807,2028),('2028-07-29',202830,7,2028,29,30,202807,2028),('2028-07-30',202831,7,2028,30,31,202807,2028),('2028-07-31',202831,7,2028,31,31,202807,2028),('2028-08-01',202831,8,2028,1,31,202808,2028),('2028-08-02',202831,8,2028,2,31,202808,2028),('2028-08-03',202831,8,2028,3,31,202808,2028),('2028-08-04',202831,8,2028,4,31,202808,2028),('2028-08-05',202831,8,2028,5,31,202808,2028),('2028-08-06',202832,8,2028,6,32,202808,2028),('2028-08-07',202832,8,2028,7,32,202808,2028),('2028-08-08',202832,8,2028,8,32,202808,2028),('2028-08-09',202832,8,2028,9,32,202808,2028),('2028-08-10',202832,8,2028,10,32,202808,2028),('2028-08-11',202832,8,2028,11,32,202808,2028),('2028-08-12',202832,8,2028,12,32,202808,2028),('2028-08-13',202833,8,2028,13,33,202808,2028),('2028-08-14',202833,8,2028,14,33,202808,2028),('2028-08-15',202833,8,2028,15,33,202808,2028),('2028-08-16',202833,8,2028,16,33,202808,2028),('2028-08-17',202833,8,2028,17,33,202808,2028),('2028-08-18',202833,8,2028,18,33,202808,2028),('2028-08-19',202833,8,2028,19,33,202808,2028),('2028-08-20',202834,8,2028,20,34,202808,2028),('2028-08-21',202834,8,2028,21,34,202808,2028),('2028-08-22',202834,8,2028,22,34,202808,2028),('2028-08-23',202834,8,2028,23,34,202808,2028),('2028-08-24',202834,8,2028,24,34,202808,2028),('2028-08-25',202834,8,2028,25,34,202808,2028),('2028-08-26',202834,8,2028,26,34,202808,2028),('2028-08-27',202835,8,2028,27,35,202808,2028),('2028-08-28',202835,8,2028,28,35,202808,2028),('2028-08-29',202835,8,2028,29,35,202808,2028),('2028-08-30',202835,8,2028,30,35,202808,2028),('2028-08-31',202835,8,2028,31,35,202808,2028),('2028-09-01',202835,9,2028,1,35,202809,2028),('2028-09-02',202835,9,2028,2,35,202809,2028),('2028-09-03',202836,9,2028,3,36,202809,2028),('2028-09-04',202836,9,2028,4,36,202809,2028),('2028-09-05',202836,9,2028,5,36,202809,2028),('2028-09-06',202836,9,2028,6,36,202809,2028),('2028-09-07',202836,9,2028,7,36,202809,2028),('2028-09-08',202836,9,2028,8,36,202809,2028),('2028-09-09',202836,9,2028,9,36,202809,2028),('2028-09-10',202837,9,2028,10,37,202809,2028),('2028-09-11',202837,9,2028,11,37,202809,2028),('2028-09-12',202837,9,2028,12,37,202809,2028),('2028-09-13',202837,9,2028,13,37,202809,2028),('2028-09-14',202837,9,2028,14,37,202809,2028),('2028-09-15',202837,9,2028,15,37,202809,2028),('2028-09-16',202837,9,2028,16,37,202809,2028),('2028-09-17',202838,9,2028,17,38,202809,2028),('2028-09-18',202838,9,2028,18,38,202809,2028),('2028-09-19',202838,9,2028,19,38,202809,2028),('2028-09-20',202838,9,2028,20,38,202809,2028),('2028-09-21',202838,9,2028,21,38,202809,2028),('2028-09-22',202838,9,2028,22,38,202809,2028),('2028-09-23',202838,9,2028,23,38,202809,2028),('2028-09-24',202839,9,2028,24,39,202809,2028),('2028-09-25',202839,9,2028,25,39,202809,2028),('2028-09-26',202839,9,2028,26,39,202809,2028),('2028-09-27',202839,9,2028,27,39,202809,2028),('2028-09-28',202839,9,2028,28,39,202809,2028),('2028-09-29',202839,9,2028,29,39,202809,2028),('2028-09-30',202839,9,2028,30,39,202809,2028),('2028-10-01',202840,10,2028,1,40,202810,2028),('2028-10-02',202840,10,2028,2,40,202810,2028),('2028-10-03',202840,10,2028,3,40,202810,2028),('2028-10-04',202840,10,2028,4,40,202810,2028),('2028-10-05',202840,10,2028,5,40,202810,2028),('2028-10-06',202840,10,2028,6,40,202810,2028),('2028-10-07',202840,10,2028,7,40,202810,2028),('2028-10-08',202841,10,2028,8,41,202810,2028),('2028-10-09',202841,10,2028,9,41,202810,2028),('2028-10-10',202841,10,2028,10,41,202810,2028),('2028-10-11',202841,10,2028,11,41,202810,2028),('2028-10-12',202841,10,2028,12,41,202810,2028),('2028-10-13',202841,10,2028,13,41,202810,2028),('2028-10-14',202841,10,2028,14,41,202810,2028),('2028-10-15',202842,10,2028,15,42,202810,2028),('2028-10-16',202842,10,2028,16,42,202810,2028),('2028-10-17',202842,10,2028,17,42,202810,2028),('2028-10-18',202842,10,2028,18,42,202810,2028),('2028-10-19',202842,10,2028,19,42,202810,2028),('2028-10-20',202842,10,2028,20,42,202810,2028),('2028-10-21',202842,10,2028,21,42,202810,2028),('2028-10-22',202843,10,2028,22,43,202810,2028),('2028-10-23',202843,10,2028,23,43,202810,2028),('2028-10-24',202843,10,2028,24,43,202810,2028),('2028-10-25',202843,10,2028,25,43,202810,2028),('2028-10-26',202843,10,2028,26,43,202810,2028),('2028-10-27',202843,10,2028,27,43,202810,2028),('2028-10-28',202843,10,2028,28,43,202810,2028),('2028-10-29',202844,10,2028,29,44,202810,2028),('2028-10-30',202844,10,2028,30,44,202810,2028),('2028-10-31',202844,10,2028,31,44,202810,2028),('2028-11-01',202844,11,2028,1,44,202811,2028),('2028-11-02',202844,11,2028,2,44,202811,2028),('2028-11-03',202844,11,2028,3,44,202811,2028),('2028-11-04',202844,11,2028,4,44,202811,2028),('2028-11-05',202845,11,2028,5,45,202811,2028),('2028-11-06',202845,11,2028,6,45,202811,2028),('2028-11-07',202845,11,2028,7,45,202811,2028),('2028-11-08',202845,11,2028,8,45,202811,2028),('2028-11-09',202845,11,2028,9,45,202811,2028),('2028-11-10',202845,11,2028,10,45,202811,2028),('2028-11-11',202845,11,2028,11,45,202811,2028),('2028-11-12',202846,11,2028,12,46,202811,2028),('2028-11-13',202846,11,2028,13,46,202811,2028),('2028-11-14',202846,11,2028,14,46,202811,2028),('2028-11-15',202846,11,2028,15,46,202811,2028),('2028-11-16',202846,11,2028,16,46,202811,2028),('2028-11-17',202846,11,2028,17,46,202811,2028),('2028-11-18',202846,11,2028,18,46,202811,2028),('2028-11-19',202847,11,2028,19,47,202811,2028),('2028-11-20',202847,11,2028,20,47,202811,2028),('2028-11-21',202847,11,2028,21,47,202811,2028),('2028-11-22',202847,11,2028,22,47,202811,2028),('2028-11-23',202847,11,2028,23,47,202811,2028),('2028-11-24',202847,11,2028,24,47,202811,2028),('2028-11-25',202847,11,2028,25,47,202811,2028),('2028-11-26',202848,11,2028,26,48,202811,2028),('2028-11-27',202848,11,2028,27,48,202811,2028),('2028-11-28',202848,11,2028,28,48,202811,2028),('2028-11-29',202848,11,2028,29,48,202811,2028),('2028-11-30',202848,11,2028,30,48,202811,2028),('2028-12-01',202848,12,2028,1,48,202812,2029),('2028-12-02',202848,12,2028,2,48,202812,2029),('2028-12-03',202849,12,2028,3,49,202812,2029),('2028-12-04',202849,12,2028,4,49,202812,2029),('2028-12-05',202849,12,2028,5,49,202812,2029),('2028-12-06',202849,12,2028,6,49,202812,2029),('2028-12-07',202849,12,2028,7,49,202812,2029),('2028-12-08',202849,12,2028,8,49,202812,2029),('2028-12-09',202849,12,2028,9,49,202812,2029),('2028-12-10',202850,12,2028,10,50,202812,2029),('2028-12-11',202850,12,2028,11,50,202812,2029),('2028-12-12',202850,12,2028,12,50,202812,2029),('2028-12-13',202850,12,2028,13,50,202812,2029),('2028-12-14',202850,12,2028,14,50,202812,2029),('2028-12-15',202850,12,2028,15,50,202812,2029),('2028-12-16',202850,12,2028,16,50,202812,2029),('2028-12-17',202851,12,2028,17,51,202812,2029),('2028-12-18',202851,12,2028,18,51,202812,2029),('2028-12-19',202851,12,2028,19,51,202812,2029),('2028-12-20',202851,12,2028,20,51,202812,2029),('2028-12-21',202851,12,2028,21,51,202812,2029),('2028-12-22',202851,12,2028,22,51,202812,2029),('2028-12-23',202851,12,2028,23,51,202812,2029),('2028-12-24',202852,12,2028,24,52,202812,2029),('2028-12-25',202852,12,2028,25,52,202812,2029),('2028-12-26',202852,12,2028,26,52,202812,2029),('2028-12-27',202852,12,2028,27,52,202812,2029),('2028-12-28',202852,12,2028,28,52,202812,2029),('2028-12-29',202852,12,2028,29,52,202812,2029),('2028-12-30',202852,12,2028,30,52,202812,2029),('2028-12-31',202853,12,2028,31,1,202812,2029),('2029-01-01',202901,1,2029,1,1,202901,2029),('2029-01-02',202901,1,2029,2,1,202901,2029),('2029-01-03',202901,1,2029,3,1,202901,2029),('2029-01-04',202901,1,2029,4,1,202901,2029),('2029-01-05',202901,1,2029,5,1,202901,2029),('2029-01-06',202901,1,2029,6,1,202901,2029),('2029-01-07',202902,1,2029,7,2,202901,2029),('2029-01-08',202902,1,2029,8,2,202901,2029),('2029-01-09',202902,1,2029,9,2,202901,2029),('2029-01-10',202902,1,2029,10,2,202901,2029),('2029-01-11',202902,1,2029,11,2,202901,2029),('2029-01-12',202902,1,2029,12,2,202901,2029),('2029-01-13',202902,1,2029,13,2,202901,2029),('2029-01-14',202903,1,2029,14,3,202901,2029),('2029-01-15',202903,1,2029,15,3,202901,2029),('2029-01-16',202903,1,2029,16,3,202901,2029),('2029-01-17',202903,1,2029,17,3,202901,2029),('2029-01-18',202903,1,2029,18,3,202901,2029),('2029-01-19',202903,1,2029,19,3,202901,2029),('2029-01-20',202903,1,2029,20,3,202901,2029),('2029-01-21',202904,1,2029,21,4,202901,2029),('2029-01-22',202904,1,2029,22,4,202901,2029),('2029-01-23',202904,1,2029,23,4,202901,2029),('2029-01-24',202904,1,2029,24,4,202901,2029),('2029-01-25',202904,1,2029,25,4,202901,2029),('2029-01-26',202904,1,2029,26,4,202901,2029),('2029-01-27',202904,1,2029,27,4,202901,2029),('2029-01-28',202905,1,2029,28,5,202901,2029),('2029-01-29',202905,1,2029,29,5,202901,2029),('2029-01-30',202905,1,2029,30,5,202901,2029),('2029-01-31',202905,1,2029,31,5,202901,2029),('2029-02-01',202905,2,2029,1,5,202902,2029),('2029-02-02',202905,2,2029,2,5,202902,2029),('2029-02-03',202905,2,2029,3,5,202902,2029),('2029-02-04',202906,2,2029,4,6,202902,2029),('2029-02-05',202906,2,2029,5,6,202902,2029),('2029-02-06',202906,2,2029,6,6,202902,2029),('2029-02-07',202906,2,2029,7,6,202902,2029),('2029-02-08',202906,2,2029,8,6,202902,2029),('2029-02-09',202906,2,2029,9,6,202902,2029),('2029-02-10',202906,2,2029,10,6,202902,2029),('2029-02-11',202907,2,2029,11,7,202902,2029),('2029-02-12',202907,2,2029,12,7,202902,2029),('2029-02-13',202907,2,2029,13,7,202902,2029),('2029-02-14',202907,2,2029,14,7,202902,2029),('2029-02-15',202907,2,2029,15,7,202902,2029),('2029-02-16',202907,2,2029,16,7,202902,2029),('2029-02-17',202907,2,2029,17,7,202902,2029),('2029-02-18',202908,2,2029,18,8,202902,2029),('2029-02-19',202908,2,2029,19,8,202902,2029),('2029-02-20',202908,2,2029,20,8,202902,2029),('2029-02-21',202908,2,2029,21,8,202902,2029),('2029-02-22',202908,2,2029,22,8,202902,2029),('2029-02-23',202908,2,2029,23,8,202902,2029),('2029-02-24',202908,2,2029,24,8,202902,2029),('2029-02-25',202909,2,2029,25,9,202902,2029),('2029-02-26',202909,2,2029,26,9,202902,2029),('2029-02-27',202909,2,2029,27,9,202902,2029),('2029-02-28',202909,2,2029,28,9,202902,2029),('2029-03-01',202909,3,2029,1,9,202903,2029),('2029-03-02',202909,3,2029,2,9,202903,2029),('2029-03-03',202909,3,2029,3,9,202903,2029),('2029-03-04',202910,3,2029,4,10,202903,2029),('2029-03-05',202910,3,2029,5,10,202903,2029),('2029-03-06',202910,3,2029,6,10,202903,2029),('2029-03-07',202910,3,2029,7,10,202903,2029),('2029-03-08',202910,3,2029,8,10,202903,2029),('2029-03-09',202910,3,2029,9,10,202903,2029),('2029-03-10',202910,3,2029,10,10,202903,2029),('2029-03-11',202911,3,2029,11,11,202903,2029),('2029-03-12',202911,3,2029,12,11,202903,2029),('2029-03-13',202911,3,2029,13,11,202903,2029),('2029-03-14',202911,3,2029,14,11,202903,2029),('2029-03-15',202911,3,2029,15,11,202903,2029),('2029-03-16',202911,3,2029,16,11,202903,2029),('2029-03-17',202911,3,2029,17,11,202903,2029),('2029-03-18',202912,3,2029,18,12,202903,2029),('2029-03-19',202912,3,2029,19,12,202903,2029),('2029-03-20',202912,3,2029,20,12,202903,2029),('2029-03-21',202912,3,2029,21,12,202903,2029),('2029-03-22',202912,3,2029,22,12,202903,2029),('2029-03-23',202912,3,2029,23,12,202903,2029),('2029-03-24',202912,3,2029,24,12,202903,2029),('2029-03-25',202913,3,2029,25,13,202903,2029),('2029-03-26',202913,3,2029,26,13,202903,2029),('2029-03-27',202913,3,2029,27,13,202903,2029),('2029-03-28',202913,3,2029,28,13,202903,2029),('2029-03-29',202913,3,2029,29,13,202903,2029),('2029-03-30',202913,3,2029,30,13,202903,2029),('2029-03-31',202913,3,2029,31,13,202903,2029),('2029-04-01',202914,4,2029,1,14,202904,2029),('2029-04-02',202914,4,2029,2,14,202904,2029),('2029-04-03',202914,4,2029,3,14,202904,2029),('2029-04-04',202914,4,2029,4,14,202904,2029),('2029-04-05',202914,4,2029,5,14,202904,2029),('2029-04-06',202914,4,2029,6,14,202904,2029),('2029-04-07',202914,4,2029,7,14,202904,2029),('2029-04-08',202915,4,2029,8,15,202904,2029),('2029-04-09',202915,4,2029,9,15,202904,2029),('2029-04-10',202915,4,2029,10,15,202904,2029),('2029-04-11',202915,4,2029,11,15,202904,2029),('2029-04-12',202915,4,2029,12,15,202904,2029),('2029-04-13',202915,4,2029,13,15,202904,2029),('2029-04-14',202915,4,2029,14,15,202904,2029),('2029-04-15',202916,4,2029,15,16,202904,2029),('2029-04-16',202916,4,2029,16,16,202904,2029),('2029-04-17',202916,4,2029,17,16,202904,2029),('2029-04-18',202916,4,2029,18,16,202904,2029),('2029-04-19',202916,4,2029,19,16,202904,2029),('2029-04-20',202916,4,2029,20,16,202904,2029),('2029-04-21',202916,4,2029,21,16,202904,2029),('2029-04-22',202917,4,2029,22,17,202904,2029),('2029-04-23',202917,4,2029,23,17,202904,2029),('2029-04-24',202917,4,2029,24,17,202904,2029),('2029-04-25',202917,4,2029,25,17,202904,2029),('2029-04-26',202917,4,2029,26,17,202904,2029),('2029-04-27',202917,4,2029,27,17,202904,2029),('2029-04-28',202917,4,2029,28,17,202904,2029),('2029-04-29',202918,4,2029,29,18,202904,2029),('2029-04-30',202918,4,2029,30,18,202904,2029),('2029-05-01',202918,5,2029,1,18,202905,2029),('2029-05-02',202918,5,2029,2,18,202905,2029),('2029-05-03',202918,5,2029,3,18,202905,2029),('2029-05-04',202918,5,2029,4,18,202905,2029),('2029-05-05',202918,5,2029,5,18,202905,2029),('2029-05-06',202919,5,2029,6,19,202905,2029),('2029-05-07',202919,5,2029,7,19,202905,2029),('2029-05-08',202919,5,2029,8,19,202905,2029),('2029-05-09',202919,5,2029,9,19,202905,2029),('2029-05-10',202919,5,2029,10,19,202905,2029),('2029-05-11',202919,5,2029,11,19,202905,2029),('2029-05-12',202919,5,2029,12,19,202905,2029),('2029-05-13',202920,5,2029,13,20,202905,2029),('2029-05-14',202920,5,2029,14,20,202905,2029),('2029-05-15',202920,5,2029,15,20,202905,2029),('2029-05-16',202920,5,2029,16,20,202905,2029),('2029-05-17',202920,5,2029,17,20,202905,2029),('2029-05-18',202920,5,2029,18,20,202905,2029),('2029-05-19',202920,5,2029,19,20,202905,2029),('2029-05-20',202921,5,2029,20,21,202905,2029),('2029-05-21',202921,5,2029,21,21,202905,2029),('2029-05-22',202921,5,2029,22,21,202905,2029),('2029-05-23',202921,5,2029,23,21,202905,2029),('2029-05-24',202921,5,2029,24,21,202905,2029),('2029-05-25',202921,5,2029,25,21,202905,2029),('2029-05-26',202921,5,2029,26,21,202905,2029),('2029-05-27',202922,5,2029,27,22,202905,2029),('2029-05-28',202922,5,2029,28,22,202905,2029),('2029-05-29',202922,5,2029,29,22,202905,2029),('2029-05-30',202922,5,2029,30,22,202905,2029),('2029-05-31',202922,5,2029,31,22,202905,2029),('2029-06-01',202922,6,2029,1,22,202906,2029),('2029-06-02',202922,6,2029,2,22,202906,2029),('2029-06-03',202923,6,2029,3,23,202906,2029),('2029-06-04',202923,6,2029,4,23,202906,2029),('2029-06-05',202923,6,2029,5,23,202906,2029),('2029-06-06',202923,6,2029,6,23,202906,2029),('2029-06-07',202923,6,2029,7,23,202906,2029),('2029-06-08',202923,6,2029,8,23,202906,2029),('2029-06-09',202923,6,2029,9,23,202906,2029),('2029-06-10',202924,6,2029,10,24,202906,2029),('2029-06-11',202924,6,2029,11,24,202906,2029),('2029-06-12',202924,6,2029,12,24,202906,2029),('2029-06-13',202924,6,2029,13,24,202906,2029),('2029-06-14',202924,6,2029,14,24,202906,2029),('2029-06-15',202924,6,2029,15,24,202906,2029),('2029-06-16',202924,6,2029,16,24,202906,2029),('2029-06-17',202925,6,2029,17,25,202906,2029),('2029-06-18',202925,6,2029,18,25,202906,2029),('2029-06-19',202925,6,2029,19,25,202906,2029),('2029-06-20',202925,6,2029,20,25,202906,2029),('2029-06-21',202925,6,2029,21,25,202906,2029),('2029-06-22',202925,6,2029,22,25,202906,2029),('2029-06-23',202925,6,2029,23,25,202906,2029),('2029-06-24',202926,6,2029,24,26,202906,2029),('2029-06-25',202926,6,2029,25,26,202906,2029),('2029-06-26',202926,6,2029,26,26,202906,2029),('2029-06-27',202926,6,2029,27,26,202906,2029),('2029-06-28',202926,6,2029,28,26,202906,2029),('2029-06-29',202926,6,2029,29,26,202906,2029),('2029-06-30',202926,6,2029,30,26,202906,2029),('2029-07-01',202927,7,2029,1,27,202907,2029),('2029-07-02',202927,7,2029,2,27,202907,2029),('2029-07-03',202927,7,2029,3,27,202907,2029),('2029-07-04',202927,7,2029,4,27,202907,2029),('2029-07-05',202927,7,2029,5,27,202907,2029),('2029-07-06',202927,7,2029,6,27,202907,2029),('2029-07-07',202927,7,2029,7,27,202907,2029),('2029-07-08',202928,7,2029,8,28,202907,2029),('2029-07-09',202928,7,2029,9,28,202907,2029),('2029-07-10',202928,7,2029,10,28,202907,2029),('2029-07-11',202928,7,2029,11,28,202907,2029),('2029-07-12',202928,7,2029,12,28,202907,2029),('2029-07-13',202928,7,2029,13,28,202907,2029),('2029-07-14',202928,7,2029,14,28,202907,2029),('2029-07-15',202929,7,2029,15,29,202907,2029),('2029-07-16',202929,7,2029,16,29,202907,2029),('2029-07-17',202929,7,2029,17,29,202907,2029),('2029-07-18',202929,7,2029,18,29,202907,2029),('2029-07-19',202929,7,2029,19,29,202907,2029),('2029-07-20',202929,7,2029,20,29,202907,2029),('2029-07-21',202929,7,2029,21,29,202907,2029),('2029-07-22',202930,7,2029,22,30,202907,2029),('2029-07-23',202930,7,2029,23,30,202907,2029),('2029-07-24',202930,7,2029,24,30,202907,2029),('2029-07-25',202930,7,2029,25,30,202907,2029),('2029-07-26',202930,7,2029,26,30,202907,2029),('2029-07-27',202930,7,2029,27,30,202907,2029),('2029-07-28',202930,7,2029,28,30,202907,2029),('2029-07-29',202931,7,2029,29,31,202907,2029),('2029-07-30',202931,7,2029,30,31,202907,2029),('2029-07-31',202931,7,2029,31,31,202907,2029),('2029-08-01',202931,8,2029,1,31,202908,2029),('2029-08-02',202931,8,2029,2,31,202908,2029),('2029-08-03',202931,8,2029,3,31,202908,2029),('2029-08-04',202931,8,2029,4,31,202908,2029),('2029-08-05',202932,8,2029,5,32,202908,2029),('2029-08-06',202932,8,2029,6,32,202908,2029),('2029-08-07',202932,8,2029,7,32,202908,2029),('2029-08-08',202932,8,2029,8,32,202908,2029),('2029-08-09',202932,8,2029,9,32,202908,2029),('2029-08-10',202932,8,2029,10,32,202908,2029),('2029-08-11',202932,8,2029,11,32,202908,2029),('2029-08-12',202933,8,2029,12,33,202908,2029),('2029-08-13',202933,8,2029,13,33,202908,2029),('2029-08-14',202933,8,2029,14,33,202908,2029),('2029-08-15',202933,8,2029,15,33,202908,2029),('2029-08-16',202933,8,2029,16,33,202908,2029),('2029-08-17',202933,8,2029,17,33,202908,2029),('2029-08-18',202933,8,2029,18,33,202908,2029),('2029-08-19',202934,8,2029,19,34,202908,2029),('2029-08-20',202934,8,2029,20,34,202908,2029),('2029-08-21',202934,8,2029,21,34,202908,2029),('2029-08-22',202934,8,2029,22,34,202908,2029),('2029-08-23',202934,8,2029,23,34,202908,2029),('2029-08-24',202934,8,2029,24,34,202908,2029),('2029-08-25',202934,8,2029,25,34,202908,2029),('2029-08-26',202935,8,2029,26,35,202908,2029),('2029-08-27',202935,8,2029,27,35,202908,2029),('2029-08-28',202935,8,2029,28,35,202908,2029),('2029-08-29',202935,8,2029,29,35,202908,2029),('2029-08-30',202935,8,2029,30,35,202908,2029),('2029-08-31',202935,8,2029,31,35,202908,2029),('2029-09-01',202935,9,2029,1,35,202909,2029),('2029-09-02',202936,9,2029,2,36,202909,2029),('2029-09-03',202936,9,2029,3,36,202909,2029),('2029-09-04',202936,9,2029,4,36,202909,2029),('2029-09-05',202936,9,2029,5,36,202909,2029),('2029-09-06',202936,9,2029,6,36,202909,2029),('2029-09-07',202936,9,2029,7,36,202909,2029),('2029-09-08',202936,9,2029,8,36,202909,2029),('2029-09-09',202937,9,2029,9,37,202909,2029),('2029-09-10',202937,9,2029,10,37,202909,2029),('2029-09-11',202937,9,2029,11,37,202909,2029),('2029-09-12',202937,9,2029,12,37,202909,2029),('2029-09-13',202937,9,2029,13,37,202909,2029),('2029-09-14',202937,9,2029,14,37,202909,2029),('2029-09-15',202937,9,2029,15,37,202909,2029),('2029-09-16',202938,9,2029,16,38,202909,2029),('2029-09-17',202938,9,2029,17,38,202909,2029),('2029-09-18',202938,9,2029,18,38,202909,2029),('2029-09-19',202938,9,2029,19,38,202909,2029),('2029-09-20',202938,9,2029,20,38,202909,2029),('2029-09-21',202938,9,2029,21,38,202909,2029),('2029-09-22',202938,9,2029,22,38,202909,2029),('2029-09-23',202939,9,2029,23,39,202909,2029),('2029-09-24',202939,9,2029,24,39,202909,2029),('2029-09-25',202939,9,2029,25,39,202909,2029),('2029-09-26',202939,9,2029,26,39,202909,2029),('2029-09-27',202939,9,2029,27,39,202909,2029),('2029-09-28',202939,9,2029,28,39,202909,2029),('2029-09-29',202939,9,2029,29,39,202909,2029),('2029-09-30',202940,9,2029,30,40,202909,2029),('2029-10-01',202940,10,2029,1,40,202910,2029),('2029-10-02',202940,10,2029,2,40,202910,2029),('2029-10-03',202940,10,2029,3,40,202910,2029),('2029-10-04',202940,10,2029,4,40,202910,2029),('2029-10-05',202940,10,2029,5,40,202910,2029),('2029-10-06',202940,10,2029,6,40,202910,2029),('2029-10-07',202941,10,2029,7,41,202910,2029),('2029-10-08',202941,10,2029,8,41,202910,2029),('2029-10-09',202941,10,2029,9,41,202910,2029),('2029-10-10',202941,10,2029,10,41,202910,2029),('2029-10-11',202941,10,2029,11,41,202910,2029),('2029-10-12',202941,10,2029,12,41,202910,2029),('2029-10-13',202941,10,2029,13,41,202910,2029),('2029-10-14',202942,10,2029,14,42,202910,2029),('2029-10-15',202942,10,2029,15,42,202910,2029),('2029-10-16',202942,10,2029,16,42,202910,2029),('2029-10-17',202942,10,2029,17,42,202910,2029),('2029-10-18',202942,10,2029,18,42,202910,2029),('2029-10-19',202942,10,2029,19,42,202910,2029),('2029-10-20',202942,10,2029,20,42,202910,2029),('2029-10-21',202943,10,2029,21,43,202910,2029),('2029-10-22',202943,10,2029,22,43,202910,2029),('2029-10-23',202943,10,2029,23,43,202910,2029),('2029-10-24',202943,10,2029,24,43,202910,2029),('2029-10-25',202943,10,2029,25,43,202910,2029),('2029-10-26',202943,10,2029,26,43,202910,2029),('2029-10-27',202943,10,2029,27,43,202910,2029),('2029-10-28',202944,10,2029,28,44,202910,2029),('2029-10-29',202944,10,2029,29,44,202910,2029),('2029-10-30',202944,10,2029,30,44,202910,2029),('2029-10-31',202944,10,2029,31,44,202910,2029),('2029-11-01',202944,11,2029,1,44,202911,2029),('2029-11-02',202944,11,2029,2,44,202911,2029),('2029-11-03',202944,11,2029,3,44,202911,2029),('2029-11-04',202945,11,2029,4,45,202911,2029),('2029-11-05',202945,11,2029,5,45,202911,2029),('2029-11-06',202945,11,2029,6,45,202911,2029),('2029-11-07',202945,11,2029,7,45,202911,2029),('2029-11-08',202945,11,2029,8,45,202911,2029),('2029-11-09',202945,11,2029,9,45,202911,2029),('2029-11-10',202945,11,2029,10,45,202911,2029),('2029-11-11',202946,11,2029,11,46,202911,2029),('2029-11-12',202946,11,2029,12,46,202911,2029),('2029-11-13',202946,11,2029,13,46,202911,2029),('2029-11-14',202946,11,2029,14,46,202911,2029),('2029-11-15',202946,11,2029,15,46,202911,2029),('2029-11-16',202946,11,2029,16,46,202911,2029),('2029-11-17',202946,11,2029,17,46,202911,2029),('2029-11-18',202947,11,2029,18,47,202911,2029),('2029-11-19',202947,11,2029,19,47,202911,2029),('2029-11-20',202947,11,2029,20,47,202911,2029),('2029-11-21',202947,11,2029,21,47,202911,2029),('2029-11-22',202947,11,2029,22,47,202911,2029),('2029-11-23',202947,11,2029,23,47,202911,2029),('2029-11-24',202947,11,2029,24,47,202911,2029),('2029-11-25',202948,11,2029,25,48,202911,2029),('2029-11-26',202948,11,2029,26,48,202911,2029),('2029-11-27',202948,11,2029,27,48,202911,2029),('2029-11-28',202948,11,2029,28,48,202911,2029),('2029-11-29',202948,11,2029,29,48,202911,2029),('2029-11-30',202948,11,2029,30,48,202911,2029),('2029-12-01',202948,12,2029,1,48,202912,2030),('2029-12-02',202949,12,2029,2,49,202912,2030),('2029-12-03',202949,12,2029,3,49,202912,2030),('2029-12-04',202949,12,2029,4,49,202912,2030),('2029-12-05',202949,12,2029,5,49,202912,2030),('2029-12-06',202949,12,2029,6,49,202912,2030),('2029-12-07',202949,12,2029,7,49,202912,2030),('2029-12-08',202949,12,2029,8,49,202912,2030),('2029-12-09',202950,12,2029,9,50,202912,2030),('2029-12-10',202950,12,2029,10,50,202912,2030),('2029-12-11',202950,12,2029,11,50,202912,2030),('2029-12-12',202950,12,2029,12,50,202912,2030),('2029-12-13',202950,12,2029,13,50,202912,2030),('2029-12-14',202950,12,2029,14,50,202912,2030),('2029-12-15',202950,12,2029,15,50,202912,2030),('2029-12-16',202951,12,2029,16,51,202912,2030),('2029-12-17',202951,12,2029,17,51,202912,2030),('2029-12-18',202951,12,2029,18,51,202912,2030),('2029-12-19',202951,12,2029,19,51,202912,2030),('2029-12-20',202951,12,2029,20,51,202912,2030),('2029-12-21',202951,12,2029,21,51,202912,2030),('2029-12-22',202951,12,2029,22,51,202912,2030),('2029-12-23',202952,12,2029,23,52,202912,2030),('2029-12-24',202952,12,2029,24,52,202912,2030),('2029-12-25',202952,12,2029,25,52,202912,2030),('2029-12-26',202952,12,2029,26,52,202912,2030),('2029-12-27',202952,12,2029,27,52,202912,2030),('2029-12-28',202952,12,2029,28,52,202912,2030),('2029-12-29',202952,12,2029,29,52,202912,2030),('2029-12-30',202953,12,2029,30,1,202912,2030),('2029-12-31',202901,12,2029,31,1,202912,2030),('2030-01-01',203001,1,2030,1,1,203001,2030),('2030-01-02',203001,1,2030,2,1,203001,2030),('2030-01-03',203001,1,2030,3,1,203001,2030),('2030-01-04',203001,1,2030,4,1,203001,2030),('2030-01-05',203001,1,2030,5,1,203001,2030),('2030-01-06',203002,1,2030,6,2,203001,2030),('2030-01-07',203002,1,2030,7,2,203001,2030),('2030-01-08',203002,1,2030,8,2,203001,2030),('2030-01-09',203002,1,2030,9,2,203001,2030),('2030-01-10',203002,1,2030,10,2,203001,2030),('2030-01-11',203002,1,2030,11,2,203001,2030),('2030-01-12',203002,1,2030,12,2,203001,2030),('2030-01-13',203003,1,2030,13,3,203001,2030),('2030-01-14',203003,1,2030,14,3,203001,2030),('2030-01-15',203003,1,2030,15,3,203001,2030),('2030-01-16',203003,1,2030,16,3,203001,2030),('2030-01-17',203003,1,2030,17,3,203001,2030),('2030-01-18',203003,1,2030,18,3,203001,2030),('2030-01-19',203003,1,2030,19,3,203001,2030),('2030-01-20',203004,1,2030,20,4,203001,2030),('2030-01-21',203004,1,2030,21,4,203001,2030),('2030-01-22',203004,1,2030,22,4,203001,2030),('2030-01-23',203004,1,2030,23,4,203001,2030),('2030-01-24',203004,1,2030,24,4,203001,2030),('2030-01-25',203004,1,2030,25,4,203001,2030),('2030-01-26',203004,1,2030,26,4,203001,2030),('2030-01-27',203005,1,2030,27,5,203001,2030),('2030-01-28',203005,1,2030,28,5,203001,2030),('2030-01-29',203005,1,2030,29,5,203001,2030),('2030-01-30',203005,1,2030,30,5,203001,2030),('2030-01-31',203005,1,2030,31,5,203001,2030),('2030-02-01',203005,2,2030,1,5,203002,2030),('2030-02-02',203005,2,2030,2,5,203002,2030),('2030-02-03',203006,2,2030,3,6,203002,2030),('2030-02-04',203006,2,2030,4,6,203002,2030),('2030-02-05',203006,2,2030,5,6,203002,2030),('2030-02-06',203006,2,2030,6,6,203002,2030),('2030-02-07',203006,2,2030,7,6,203002,2030),('2030-02-08',203006,2,2030,8,6,203002,2030),('2030-02-09',203006,2,2030,9,6,203002,2030),('2030-02-10',203007,2,2030,10,7,203002,2030),('2030-02-11',203007,2,2030,11,7,203002,2030),('2030-02-12',203007,2,2030,12,7,203002,2030),('2030-02-13',203007,2,2030,13,7,203002,2030),('2030-02-14',203007,2,2030,14,7,203002,2030),('2030-02-15',203007,2,2030,15,7,203002,2030),('2030-02-16',203007,2,2030,16,7,203002,2030),('2030-02-17',203008,2,2030,17,8,203002,2030),('2030-02-18',203008,2,2030,18,8,203002,2030),('2030-02-19',203008,2,2030,19,8,203002,2030),('2030-02-20',203008,2,2030,20,8,203002,2030),('2030-02-21',203008,2,2030,21,8,203002,2030),('2030-02-22',203008,2,2030,22,8,203002,2030),('2030-02-23',203008,2,2030,23,8,203002,2030),('2030-02-24',203009,2,2030,24,9,203002,2030),('2030-02-25',203009,2,2030,25,9,203002,2030),('2030-02-26',203009,2,2030,26,9,203002,2030),('2030-02-27',203009,2,2030,27,9,203002,2030),('2030-02-28',203009,2,2030,28,9,203002,2030),('2030-03-01',203009,3,2030,1,9,203003,2030),('2030-03-02',203009,3,2030,2,9,203003,2030),('2030-03-03',203010,3,2030,3,10,203003,2030),('2030-03-04',203010,3,2030,4,10,203003,2030),('2030-03-05',203010,3,2030,5,10,203003,2030),('2030-03-06',203010,3,2030,6,10,203003,2030),('2030-03-07',203010,3,2030,7,10,203003,2030),('2030-03-08',203010,3,2030,8,10,203003,2030),('2030-03-09',203010,3,2030,9,10,203003,2030),('2030-03-10',203011,3,2030,10,11,203003,2030),('2030-03-11',203011,3,2030,11,11,203003,2030),('2030-03-12',203011,3,2030,12,11,203003,2030),('2030-03-13',203011,3,2030,13,11,203003,2030),('2030-03-14',203011,3,2030,14,11,203003,2030),('2030-03-15',203011,3,2030,15,11,203003,2030),('2030-03-16',203011,3,2030,16,11,203003,2030),('2030-03-17',203012,3,2030,17,12,203003,2030),('2030-03-18',203012,3,2030,18,12,203003,2030),('2030-03-19',203012,3,2030,19,12,203003,2030),('2030-03-20',203012,3,2030,20,12,203003,2030),('2030-03-21',203012,3,2030,21,12,203003,2030),('2030-03-22',203012,3,2030,22,12,203003,2030),('2030-03-23',203012,3,2030,23,12,203003,2030),('2030-03-24',203013,3,2030,24,13,203003,2030),('2030-03-25',203013,3,2030,25,13,203003,2030),('2030-03-26',203013,3,2030,26,13,203003,2030),('2030-03-27',203013,3,2030,27,13,203003,2030),('2030-03-28',203013,3,2030,28,13,203003,2030),('2030-03-29',203013,3,2030,29,13,203003,2030),('2030-03-30',203013,3,2030,30,13,203003,2030),('2030-03-31',203014,3,2030,31,14,203003,2030),('2030-04-01',203014,4,2030,1,14,203004,2030),('2030-04-02',203014,4,2030,2,14,203004,2030),('2030-04-03',203014,4,2030,3,14,203004,2030),('2030-04-04',203014,4,2030,4,14,203004,2030),('2030-04-05',203014,4,2030,5,14,203004,2030),('2030-04-06',203014,4,2030,6,14,203004,2030),('2030-04-07',203015,4,2030,7,15,203004,2030),('2030-04-08',203015,4,2030,8,15,203004,2030),('2030-04-09',203015,4,2030,9,15,203004,2030),('2030-04-10',203015,4,2030,10,15,203004,2030),('2030-04-11',203015,4,2030,11,15,203004,2030),('2030-04-12',203015,4,2030,12,15,203004,2030),('2030-04-13',203015,4,2030,13,15,203004,2030),('2030-04-14',203016,4,2030,14,16,203004,2030),('2030-04-15',203016,4,2030,15,16,203004,2030),('2030-04-16',203016,4,2030,16,16,203004,2030),('2030-04-17',203016,4,2030,17,16,203004,2030),('2030-04-18',203016,4,2030,18,16,203004,2030),('2030-04-19',203016,4,2030,19,16,203004,2030),('2030-04-20',203016,4,2030,20,16,203004,2030),('2030-04-21',203017,4,2030,21,17,203004,2030),('2030-04-22',203017,4,2030,22,17,203004,2030),('2030-04-23',203017,4,2030,23,17,203004,2030),('2030-04-24',203017,4,2030,24,17,203004,2030),('2030-04-25',203017,4,2030,25,17,203004,2030),('2030-04-26',203017,4,2030,26,17,203004,2030),('2030-04-27',203017,4,2030,27,17,203004,2030),('2030-04-28',203018,4,2030,28,18,203004,2030),('2030-04-29',203018,4,2030,29,18,203004,2030),('2030-04-30',203018,4,2030,30,18,203004,2030),('2030-05-01',203018,5,2030,1,18,203005,2030),('2030-05-02',203018,5,2030,2,18,203005,2030),('2030-05-03',203018,5,2030,3,18,203005,2030),('2030-05-04',203018,5,2030,4,18,203005,2030),('2030-05-05',203019,5,2030,5,19,203005,2030),('2030-05-06',203019,5,2030,6,19,203005,2030),('2030-05-07',203019,5,2030,7,19,203005,2030),('2030-05-08',203019,5,2030,8,19,203005,2030),('2030-05-09',203019,5,2030,9,19,203005,2030),('2030-05-10',203019,5,2030,10,19,203005,2030),('2030-05-11',203019,5,2030,11,19,203005,2030),('2030-05-12',203020,5,2030,12,20,203005,2030),('2030-05-13',203020,5,2030,13,20,203005,2030),('2030-05-14',203020,5,2030,14,20,203005,2030),('2030-05-15',203020,5,2030,15,20,203005,2030),('2030-05-16',203020,5,2030,16,20,203005,2030),('2030-05-17',203020,5,2030,17,20,203005,2030),('2030-05-18',203020,5,2030,18,20,203005,2030),('2030-05-19',203021,5,2030,19,21,203005,2030),('2030-05-20',203021,5,2030,20,21,203005,2030),('2030-05-21',203021,5,2030,21,21,203005,2030),('2030-05-22',203021,5,2030,22,21,203005,2030),('2030-05-23',203021,5,2030,23,21,203005,2030),('2030-05-24',203021,5,2030,24,21,203005,2030),('2030-05-25',203021,5,2030,25,21,203005,2030),('2030-05-26',203022,5,2030,26,22,203005,2030),('2030-05-27',203022,5,2030,27,22,203005,2030),('2030-05-28',203022,5,2030,28,22,203005,2030),('2030-05-29',203022,5,2030,29,22,203005,2030),('2030-05-30',203022,5,2030,30,22,203005,2030),('2030-05-31',203022,5,2030,31,22,203005,2030),('2030-06-01',203022,6,2030,1,22,203006,2030),('2030-06-02',203023,6,2030,2,23,203006,2030),('2030-06-03',203023,6,2030,3,23,203006,2030),('2030-06-04',203023,6,2030,4,23,203006,2030),('2030-06-05',203023,6,2030,5,23,203006,2030),('2030-06-06',203023,6,2030,6,23,203006,2030),('2030-06-07',203023,6,2030,7,23,203006,2030),('2030-06-08',203023,6,2030,8,23,203006,2030),('2030-06-09',203024,6,2030,9,24,203006,2030),('2030-06-10',203024,6,2030,10,24,203006,2030),('2030-06-11',203024,6,2030,11,24,203006,2030),('2030-06-12',203024,6,2030,12,24,203006,2030),('2030-06-13',203024,6,2030,13,24,203006,2030),('2030-06-14',203024,6,2030,14,24,203006,2030),('2030-06-15',203024,6,2030,15,24,203006,2030),('2030-06-16',203025,6,2030,16,25,203006,2030),('2030-06-17',203025,6,2030,17,25,203006,2030),('2030-06-18',203025,6,2030,18,25,203006,2030),('2030-06-19',203025,6,2030,19,25,203006,2030),('2030-06-20',203025,6,2030,20,25,203006,2030),('2030-06-21',203025,6,2030,21,25,203006,2030),('2030-06-22',203025,6,2030,22,25,203006,2030),('2030-06-23',203026,6,2030,23,26,203006,2030),('2030-06-24',203026,6,2030,24,26,203006,2030),('2030-06-25',203026,6,2030,25,26,203006,2030),('2030-06-26',203026,6,2030,26,26,203006,2030),('2030-06-27',203026,6,2030,27,26,203006,2030),('2030-06-28',203026,6,2030,28,26,203006,2030),('2030-06-29',203026,6,2030,29,26,203006,2030),('2030-06-30',203027,6,2030,30,27,203006,2030),('2030-07-01',203027,7,2030,1,27,203007,2030),('2030-07-02',203027,7,2030,2,27,203007,2030),('2030-07-03',203027,7,2030,3,27,203007,2030),('2030-07-04',203027,7,2030,4,27,203007,2030),('2030-07-05',203027,7,2030,5,27,203007,2030),('2030-07-06',203027,7,2030,6,27,203007,2030),('2030-07-07',203028,7,2030,7,28,203007,2030),('2030-07-08',203028,7,2030,8,28,203007,2030),('2030-07-09',203028,7,2030,9,28,203007,2030),('2030-07-10',203028,7,2030,10,28,203007,2030),('2030-07-11',203028,7,2030,11,28,203007,2030),('2030-07-12',203028,7,2030,12,28,203007,2030),('2030-07-13',203028,7,2030,13,28,203007,2030),('2030-07-14',203029,7,2030,14,29,203007,2030),('2030-07-15',203029,7,2030,15,29,203007,2030),('2030-07-16',203029,7,2030,16,29,203007,2030),('2030-07-17',203029,7,2030,17,29,203007,2030),('2030-07-18',203029,7,2030,18,29,203007,2030),('2030-07-19',203029,7,2030,19,29,203007,2030),('2030-07-20',203029,7,2030,20,29,203007,2030),('2030-07-21',203030,7,2030,21,30,203007,2030),('2030-07-22',203030,7,2030,22,30,203007,2030),('2030-07-23',203030,7,2030,23,30,203007,2030),('2030-07-24',203030,7,2030,24,30,203007,2030),('2030-07-25',203030,7,2030,25,30,203007,2030),('2030-07-26',203030,7,2030,26,30,203007,2030),('2030-07-27',203030,7,2030,27,30,203007,2030),('2030-07-28',203031,7,2030,28,31,203007,2030),('2030-07-29',203031,7,2030,29,31,203007,2030),('2030-07-30',203031,7,2030,30,31,203007,2030),('2030-07-31',203031,7,2030,31,31,203007,2030),('2030-08-01',203031,8,2030,1,31,203008,2030),('2030-08-02',203031,8,2030,2,31,203008,2030),('2030-08-03',203031,8,2030,3,31,203008,2030),('2030-08-04',203032,8,2030,4,32,203008,2030),('2030-08-05',203032,8,2030,5,32,203008,2030),('2030-08-06',203032,8,2030,6,32,203008,2030),('2030-08-07',203032,8,2030,7,32,203008,2030),('2030-08-08',203032,8,2030,8,32,203008,2030),('2030-08-09',203032,8,2030,9,32,203008,2030),('2030-08-10',203032,8,2030,10,32,203008,2030),('2030-08-11',203033,8,2030,11,33,203008,2030),('2030-08-12',203033,8,2030,12,33,203008,2030),('2030-08-13',203033,8,2030,13,33,203008,2030),('2030-08-14',203033,8,2030,14,33,203008,2030),('2030-08-15',203033,8,2030,15,33,203008,2030),('2030-08-16',203033,8,2030,16,33,203008,2030),('2030-08-17',203033,8,2030,17,33,203008,2030),('2030-08-18',203034,8,2030,18,34,203008,2030),('2030-08-19',203034,8,2030,19,34,203008,2030),('2030-08-20',203034,8,2030,20,34,203008,2030),('2030-08-21',203034,8,2030,21,34,203008,2030),('2030-08-22',203034,8,2030,22,34,203008,2030),('2030-08-23',203034,8,2030,23,34,203008,2030),('2030-08-24',203034,8,2030,24,34,203008,2030),('2030-08-25',203035,8,2030,25,35,203008,2030),('2030-08-26',203035,8,2030,26,35,203008,2030),('2030-08-27',203035,8,2030,27,35,203008,2030),('2030-08-28',203035,8,2030,28,35,203008,2030),('2030-08-29',203035,8,2030,29,35,203008,2030),('2030-08-30',203035,8,2030,30,35,203008,2030),('2030-08-31',203035,8,2030,31,35,203008,2030),('2030-09-01',203036,9,2030,1,36,203009,2030),('2030-09-02',203036,9,2030,2,36,203009,2030),('2030-09-03',203036,9,2030,3,36,203009,2030),('2030-09-04',203036,9,2030,4,36,203009,2030),('2030-09-05',203036,9,2030,5,36,203009,2030),('2030-09-06',203036,9,2030,6,36,203009,2030),('2030-09-07',203036,9,2030,7,36,203009,2030),('2030-09-08',203037,9,2030,8,37,203009,2030),('2030-09-09',203037,9,2030,9,37,203009,2030),('2030-09-10',203037,9,2030,10,37,203009,2030),('2030-09-11',203037,9,2030,11,37,203009,2030),('2030-09-12',203037,9,2030,12,37,203009,2030),('2030-09-13',203037,9,2030,13,37,203009,2030),('2030-09-14',203037,9,2030,14,37,203009,2030),('2030-09-15',203038,9,2030,15,38,203009,2030),('2030-09-16',203038,9,2030,16,38,203009,2030),('2030-09-17',203038,9,2030,17,38,203009,2030),('2030-09-18',203038,9,2030,18,38,203009,2030),('2030-09-19',203038,9,2030,19,38,203009,2030),('2030-09-20',203038,9,2030,20,38,203009,2030),('2030-09-21',203038,9,2030,21,38,203009,2030),('2030-09-22',203039,9,2030,22,39,203009,2030),('2030-09-23',203039,9,2030,23,39,203009,2030),('2030-09-24',203039,9,2030,24,39,203009,2030),('2030-09-25',203039,9,2030,25,39,203009,2030),('2030-09-26',203039,9,2030,26,39,203009,2030),('2030-09-27',203039,9,2030,27,39,203009,2030),('2030-09-28',203039,9,2030,28,39,203009,2030),('2030-09-29',203040,9,2030,29,40,203009,2030),('2030-09-30',203040,9,2030,30,40,203009,2030),('2030-10-01',203040,10,2030,1,40,203010,2030),('2030-10-02',203040,10,2030,2,40,203010,2030),('2030-10-03',203040,10,2030,3,40,203010,2030),('2030-10-04',203040,10,2030,4,40,203010,2030),('2030-10-05',203040,10,2030,5,40,203010,2030),('2030-10-06',203041,10,2030,6,41,203010,2030),('2030-10-07',203041,10,2030,7,41,203010,2030),('2030-10-08',203041,10,2030,8,41,203010,2030),('2030-10-09',203041,10,2030,9,41,203010,2030),('2030-10-10',203041,10,2030,10,41,203010,2030),('2030-10-11',203041,10,2030,11,41,203010,2030),('2030-10-12',203041,10,2030,12,41,203010,2030),('2030-10-13',203042,10,2030,13,42,203010,2030),('2030-10-14',203042,10,2030,14,42,203010,2030),('2030-10-15',203042,10,2030,15,42,203010,2030),('2030-10-16',203042,10,2030,16,42,203010,2030),('2030-10-17',203042,10,2030,17,42,203010,2030),('2030-10-18',203042,10,2030,18,42,203010,2030),('2030-10-19',203042,10,2030,19,42,203010,2030),('2030-10-20',203043,10,2030,20,43,203010,2030),('2030-10-21',203043,10,2030,21,43,203010,2030),('2030-10-22',203043,10,2030,22,43,203010,2030),('2030-10-23',203043,10,2030,23,43,203010,2030),('2030-10-24',203043,10,2030,24,43,203010,2030),('2030-10-25',203043,10,2030,25,43,203010,2030),('2030-10-26',203043,10,2030,26,43,203010,2030),('2030-10-27',203044,10,2030,27,44,203010,2030),('2030-10-28',203044,10,2030,28,44,203010,2030),('2030-10-29',203044,10,2030,29,44,203010,2030),('2030-10-30',203044,10,2030,30,44,203010,2030),('2030-10-31',203044,10,2030,31,44,203010,2030),('2030-11-01',203044,11,2030,1,44,203011,2030),('2030-11-02',203044,11,2030,2,44,203011,2030),('2030-11-03',203045,11,2030,3,45,203011,2030),('2030-11-04',203045,11,2030,4,45,203011,2030),('2030-11-05',203045,11,2030,5,45,203011,2030),('2030-11-06',203045,11,2030,6,45,203011,2030),('2030-11-07',203045,11,2030,7,45,203011,2030),('2030-11-08',203045,11,2030,8,45,203011,2030),('2030-11-09',203045,11,2030,9,45,203011,2030),('2030-11-10',203046,11,2030,10,46,203011,2030),('2030-11-11',203046,11,2030,11,46,203011,2030),('2030-11-12',203046,11,2030,12,46,203011,2030),('2030-11-13',203046,11,2030,13,46,203011,2030),('2030-11-14',203046,11,2030,14,46,203011,2030),('2030-11-15',203046,11,2030,15,46,203011,2030),('2030-11-16',203046,11,2030,16,46,203011,2030),('2030-11-17',203047,11,2030,17,47,203011,2030),('2030-11-18',203047,11,2030,18,47,203011,2030),('2030-11-19',203047,11,2030,19,47,203011,2030),('2030-11-20',203047,11,2030,20,47,203011,2030),('2030-11-21',203047,11,2030,21,47,203011,2030),('2030-11-22',203047,11,2030,22,47,203011,2030),('2030-11-23',203047,11,2030,23,47,203011,2030),('2030-11-24',203048,11,2030,24,48,203011,2030),('2030-11-25',203048,11,2030,25,48,203011,2030),('2030-11-26',203048,11,2030,26,48,203011,2030),('2030-11-27',203048,11,2030,27,48,203011,2030),('2030-11-28',203048,11,2030,28,48,203011,2030),('2030-11-29',203048,11,2030,29,48,203011,2030),('2030-11-30',203048,11,2030,30,48,203011,2030),('2030-12-01',203049,12,2030,1,49,203012,2031),('2030-12-02',203049,12,2030,2,49,203012,2031),('2030-12-03',203049,12,2030,3,49,203012,2031),('2030-12-04',203049,12,2030,4,49,203012,2031),('2030-12-05',203049,12,2030,5,49,203012,2031),('2030-12-06',203049,12,2030,6,49,203012,2031),('2030-12-07',203049,12,2030,7,49,203012,2031),('2030-12-08',203050,12,2030,8,50,203012,2031),('2030-12-09',203050,12,2030,9,50,203012,2031),('2030-12-10',203050,12,2030,10,50,203012,2031),('2030-12-11',203050,12,2030,11,50,203012,2031),('2030-12-12',203050,12,2030,12,50,203012,2031),('2030-12-13',203050,12,2030,13,50,203012,2031),('2030-12-14',203050,12,2030,14,50,203012,2031),('2030-12-15',203051,12,2030,15,51,203012,2031),('2030-12-16',203051,12,2030,16,51,203012,2031),('2030-12-17',203051,12,2030,17,51,203012,2031),('2030-12-18',203051,12,2030,18,51,203012,2031),('2030-12-19',203051,12,2030,19,51,203012,2031),('2030-12-20',203051,12,2030,20,51,203012,2031),('2030-12-21',203051,12,2030,21,51,203012,2031),('2030-12-22',203052,12,2030,22,52,203012,2031),('2030-12-23',203052,12,2030,23,52,203012,2031),('2030-12-24',203052,12,2030,24,52,203012,2031),('2030-12-25',203052,12,2030,25,52,203012,2031),('2030-12-26',203052,12,2030,26,52,203012,2031),('2030-12-27',203052,12,2030,27,52,203012,2031),('2030-12-28',203052,12,2030,28,52,203012,2031),('2030-12-29',203053,12,2030,29,1,203012,2031),('2030-12-30',203001,12,2030,30,1,203012,2031),('2030-12-31',203001,12,2030,31,1,203012,2031),('2031-01-01',203101,1,2031,1,1,203101,2031),('2031-01-02',203101,1,2031,2,1,203101,2031),('2031-01-03',203101,1,2031,3,1,203101,2031),('2031-01-04',203101,1,2031,4,1,203101,2031),('2031-01-05',203102,1,2031,5,2,203101,2031),('2031-01-06',203102,1,2031,6,2,203101,2031),('2031-01-07',203102,1,2031,7,2,203101,2031),('2031-01-08',203102,1,2031,8,2,203101,2031),('2031-01-09',203102,1,2031,9,2,203101,2031),('2031-01-10',203102,1,2031,10,2,203101,2031),('2031-01-11',203102,1,2031,11,2,203101,2031),('2031-01-12',203103,1,2031,12,3,203101,2031),('2031-01-13',203103,1,2031,13,3,203101,2031),('2031-01-14',203103,1,2031,14,3,203101,2031),('2031-01-15',203103,1,2031,15,3,203101,2031),('2031-01-16',203103,1,2031,16,3,203101,2031),('2031-01-17',203103,1,2031,17,3,203101,2031),('2031-01-18',203103,1,2031,18,3,203101,2031),('2031-01-19',203104,1,2031,19,4,203101,2031),('2031-01-20',203104,1,2031,20,4,203101,2031),('2031-01-21',203104,1,2031,21,4,203101,2031),('2031-01-22',203104,1,2031,22,4,203101,2031),('2031-01-23',203104,1,2031,23,4,203101,2031),('2031-01-24',203104,1,2031,24,4,203101,2031),('2031-01-25',203104,1,2031,25,4,203101,2031),('2031-01-26',203105,1,2031,26,5,203101,2031),('2031-01-27',203105,1,2031,27,5,203101,2031),('2031-01-28',203105,1,2031,28,5,203101,2031),('2031-01-29',203105,1,2031,29,5,203101,2031),('2031-01-30',203105,1,2031,30,5,203101,2031),('2031-01-31',203105,1,2031,31,5,203101,2031),('2031-02-01',203105,2,2031,1,5,203102,2031),('2031-02-02',203106,2,2031,2,6,203102,2031),('2031-02-03',203106,2,2031,3,6,203102,2031),('2031-02-04',203106,2,2031,4,6,203102,2031),('2031-02-05',203106,2,2031,5,6,203102,2031),('2031-02-06',203106,2,2031,6,6,203102,2031),('2031-02-07',203106,2,2031,7,6,203102,2031),('2031-02-08',203106,2,2031,8,6,203102,2031),('2031-02-09',203107,2,2031,9,7,203102,2031),('2031-02-10',203107,2,2031,10,7,203102,2031),('2031-02-11',203107,2,2031,11,7,203102,2031),('2031-02-12',203107,2,2031,12,7,203102,2031),('2031-02-13',203107,2,2031,13,7,203102,2031),('2031-02-14',203107,2,2031,14,7,203102,2031),('2031-02-15',203107,2,2031,15,7,203102,2031),('2031-02-16',203108,2,2031,16,8,203102,2031),('2031-02-17',203108,2,2031,17,8,203102,2031),('2031-02-18',203108,2,2031,18,8,203102,2031),('2031-02-19',203108,2,2031,19,8,203102,2031),('2031-02-20',203108,2,2031,20,8,203102,2031),('2031-02-21',203108,2,2031,21,8,203102,2031),('2031-02-22',203108,2,2031,22,8,203102,2031),('2031-02-23',203109,2,2031,23,9,203102,2031),('2031-02-24',203109,2,2031,24,9,203102,2031),('2031-02-25',203109,2,2031,25,9,203102,2031),('2031-02-26',203109,2,2031,26,9,203102,2031),('2031-02-27',203109,2,2031,27,9,203102,2031),('2031-02-28',203109,2,2031,28,9,203102,2031),('2031-03-01',203109,3,2031,1,9,203103,2031),('2031-03-02',203110,3,2031,2,10,203103,2031),('2031-03-03',203110,3,2031,3,10,203103,2031),('2031-03-04',203110,3,2031,4,10,203103,2031),('2031-03-05',203110,3,2031,5,10,203103,2031),('2031-03-06',203110,3,2031,6,10,203103,2031),('2031-03-07',203110,3,2031,7,10,203103,2031),('2031-03-08',203110,3,2031,8,10,203103,2031),('2031-03-09',203111,3,2031,9,11,203103,2031),('2031-03-10',203111,3,2031,10,11,203103,2031),('2031-03-11',203111,3,2031,11,11,203103,2031),('2031-03-12',203111,3,2031,12,11,203103,2031),('2031-03-13',203111,3,2031,13,11,203103,2031),('2031-03-14',203111,3,2031,14,11,203103,2031),('2031-03-15',203111,3,2031,15,11,203103,2031),('2031-03-16',203112,3,2031,16,12,203103,2031),('2031-03-17',203112,3,2031,17,12,203103,2031),('2031-03-18',203112,3,2031,18,12,203103,2031),('2031-03-19',203112,3,2031,19,12,203103,2031),('2031-03-20',203112,3,2031,20,12,203103,2031),('2031-03-21',203112,3,2031,21,12,203103,2031),('2031-03-22',203112,3,2031,22,12,203103,2031),('2031-03-23',203113,3,2031,23,13,203103,2031),('2031-03-24',203113,3,2031,24,13,203103,2031),('2031-03-25',203113,3,2031,25,13,203103,2031),('2031-03-26',203113,3,2031,26,13,203103,2031),('2031-03-27',203113,3,2031,27,13,203103,2031),('2031-03-28',203113,3,2031,28,13,203103,2031),('2031-03-29',203113,3,2031,29,13,203103,2031),('2031-03-30',203114,3,2031,30,14,203103,2031),('2031-03-31',203114,3,2031,31,14,203103,2031),('2031-04-01',203114,4,2031,1,14,203104,2031),('2031-04-02',203114,4,2031,2,14,203104,2031),('2031-04-03',203114,4,2031,3,14,203104,2031),('2031-04-04',203114,4,2031,4,14,203104,2031),('2031-04-05',203114,4,2031,5,14,203104,2031),('2031-04-06',203115,4,2031,6,15,203104,2031),('2031-04-07',203115,4,2031,7,15,203104,2031),('2031-04-08',203115,4,2031,8,15,203104,2031),('2031-04-09',203115,4,2031,9,15,203104,2031),('2031-04-10',203115,4,2031,10,15,203104,2031),('2031-04-11',203115,4,2031,11,15,203104,2031),('2031-04-12',203115,4,2031,12,15,203104,2031),('2031-04-13',203116,4,2031,13,16,203104,2031),('2031-04-14',203116,4,2031,14,16,203104,2031),('2031-04-15',203116,4,2031,15,16,203104,2031),('2031-04-16',203116,4,2031,16,16,203104,2031),('2031-04-17',203116,4,2031,17,16,203104,2031),('2031-04-18',203116,4,2031,18,16,203104,2031),('2031-04-19',203116,4,2031,19,16,203104,2031),('2031-04-20',203117,4,2031,20,17,203104,2031),('2031-04-21',203117,4,2031,21,17,203104,2031),('2031-04-22',203117,4,2031,22,17,203104,2031),('2031-04-23',203117,4,2031,23,17,203104,2031),('2031-04-24',203117,4,2031,24,17,203104,2031),('2031-04-25',203117,4,2031,25,17,203104,2031),('2031-04-26',203117,4,2031,26,17,203104,2031),('2031-04-27',203118,4,2031,27,18,203104,2031),('2031-04-28',203118,4,2031,28,18,203104,2031),('2031-04-29',203118,4,2031,29,18,203104,2031),('2031-04-30',203118,4,2031,30,18,203104,2031),('2031-05-01',203118,5,2031,1,18,203105,2031),('2031-05-02',203118,5,2031,2,18,203105,2031),('2031-05-03',203118,5,2031,3,18,203105,2031),('2031-05-04',203119,5,2031,4,19,203105,2031),('2031-05-05',203119,5,2031,5,19,203105,2031),('2031-05-06',203119,5,2031,6,19,203105,2031),('2031-05-07',203119,5,2031,7,19,203105,2031),('2031-05-08',203119,5,2031,8,19,203105,2031),('2031-05-09',203119,5,2031,9,19,203105,2031),('2031-05-10',203119,5,2031,10,19,203105,2031),('2031-05-11',203120,5,2031,11,20,203105,2031),('2031-05-12',203120,5,2031,12,20,203105,2031),('2031-05-13',203120,5,2031,13,20,203105,2031),('2031-05-14',203120,5,2031,14,20,203105,2031),('2031-05-15',203120,5,2031,15,20,203105,2031),('2031-05-16',203120,5,2031,16,20,203105,2031),('2031-05-17',203120,5,2031,17,20,203105,2031),('2031-05-18',203121,5,2031,18,21,203105,2031),('2031-05-19',203121,5,2031,19,21,203105,2031),('2031-05-20',203121,5,2031,20,21,203105,2031),('2031-05-21',203121,5,2031,21,21,203105,2031),('2031-05-22',203121,5,2031,22,21,203105,2031),('2031-05-23',203121,5,2031,23,21,203105,2031),('2031-05-24',203121,5,2031,24,21,203105,2031),('2031-05-25',203122,5,2031,25,22,203105,2031),('2031-05-26',203122,5,2031,26,22,203105,2031),('2031-05-27',203122,5,2031,27,22,203105,2031),('2031-05-28',203122,5,2031,28,22,203105,2031),('2031-05-29',203122,5,2031,29,22,203105,2031),('2031-05-30',203122,5,2031,30,22,203105,2031),('2031-05-31',203122,5,2031,31,22,203105,2031),('2031-06-01',203123,6,2031,1,23,203106,2031),('2031-06-02',203123,6,2031,2,23,203106,2031),('2031-06-03',203123,6,2031,3,23,203106,2031),('2031-06-04',203123,6,2031,4,23,203106,2031),('2031-06-05',203123,6,2031,5,23,203106,2031),('2031-06-06',203123,6,2031,6,23,203106,2031),('2031-06-07',203123,6,2031,7,23,203106,2031),('2031-06-08',203124,6,2031,8,24,203106,2031),('2031-06-09',203124,6,2031,9,24,203106,2031),('2031-06-10',203124,6,2031,10,24,203106,2031),('2031-06-11',203124,6,2031,11,24,203106,2031),('2031-06-12',203124,6,2031,12,24,203106,2031),('2031-06-13',203124,6,2031,13,24,203106,2031),('2031-06-14',203124,6,2031,14,24,203106,2031),('2031-06-15',203125,6,2031,15,25,203106,2031),('2031-06-16',203125,6,2031,16,25,203106,2031),('2031-06-17',203125,6,2031,17,25,203106,2031),('2031-06-18',203125,6,2031,18,25,203106,2031),('2031-06-19',203125,6,2031,19,25,203106,2031),('2031-06-20',203125,6,2031,20,25,203106,2031),('2031-06-21',203125,6,2031,21,25,203106,2031),('2031-06-22',203126,6,2031,22,26,203106,2031),('2031-06-23',203126,6,2031,23,26,203106,2031),('2031-06-24',203126,6,2031,24,26,203106,2031),('2031-06-25',203126,6,2031,25,26,203106,2031),('2031-06-26',203126,6,2031,26,26,203106,2031),('2031-06-27',203126,6,2031,27,26,203106,2031),('2031-06-28',203126,6,2031,28,26,203106,2031),('2031-06-29',203127,6,2031,29,27,203106,2031),('2031-06-30',203127,6,2031,30,27,203106,2031),('2031-07-01',203127,7,2031,1,27,203107,2031),('2031-07-02',203127,7,2031,2,27,203107,2031),('2031-07-03',203127,7,2031,3,27,203107,2031),('2031-07-04',203127,7,2031,4,27,203107,2031),('2031-07-05',203127,7,2031,5,27,203107,2031),('2031-07-06',203128,7,2031,6,28,203107,2031),('2031-07-07',203128,7,2031,7,28,203107,2031),('2031-07-08',203128,7,2031,8,28,203107,2031),('2031-07-09',203128,7,2031,9,28,203107,2031),('2031-07-10',203128,7,2031,10,28,203107,2031),('2031-07-11',203128,7,2031,11,28,203107,2031),('2031-07-12',203128,7,2031,12,28,203107,2031),('2031-07-13',203129,7,2031,13,29,203107,2031),('2031-07-14',203129,7,2031,14,29,203107,2031),('2031-07-15',203129,7,2031,15,29,203107,2031),('2031-07-16',203129,7,2031,16,29,203107,2031),('2031-07-17',203129,7,2031,17,29,203107,2031),('2031-07-18',203129,7,2031,18,29,203107,2031),('2031-07-19',203129,7,2031,19,29,203107,2031),('2031-07-20',203130,7,2031,20,30,203107,2031),('2031-07-21',203130,7,2031,21,30,203107,2031),('2031-07-22',203130,7,2031,22,30,203107,2031),('2031-07-23',203130,7,2031,23,30,203107,2031),('2031-07-24',203130,7,2031,24,30,203107,2031),('2031-07-25',203130,7,2031,25,30,203107,2031),('2031-07-26',203130,7,2031,26,30,203107,2031),('2031-07-27',203131,7,2031,27,31,203107,2031),('2031-07-28',203131,7,2031,28,31,203107,2031),('2031-07-29',203131,7,2031,29,31,203107,2031),('2031-07-30',203131,7,2031,30,31,203107,2031),('2031-07-31',203131,7,2031,31,31,203107,2031),('2031-08-01',203131,8,2031,1,31,203108,2031),('2031-08-02',203131,8,2031,2,31,203108,2031),('2031-08-03',203132,8,2031,3,32,203108,2031),('2031-08-04',203132,8,2031,4,32,203108,2031),('2031-08-05',203132,8,2031,5,32,203108,2031),('2031-08-06',203132,8,2031,6,32,203108,2031),('2031-08-07',203132,8,2031,7,32,203108,2031),('2031-08-08',203132,8,2031,8,32,203108,2031),('2031-08-09',203132,8,2031,9,32,203108,2031),('2031-08-10',203133,8,2031,10,33,203108,2031),('2031-08-11',203133,8,2031,11,33,203108,2031),('2031-08-12',203133,8,2031,12,33,203108,2031),('2031-08-13',203133,8,2031,13,33,203108,2031),('2031-08-14',203133,8,2031,14,33,203108,2031),('2031-08-15',203133,8,2031,15,33,203108,2031),('2031-08-16',203133,8,2031,16,33,203108,2031),('2031-08-17',203134,8,2031,17,34,203108,2031),('2031-08-18',203134,8,2031,18,34,203108,2031),('2031-08-19',203134,8,2031,19,34,203108,2031),('2031-08-20',203134,8,2031,20,34,203108,2031),('2031-08-21',203134,8,2031,21,34,203108,2031),('2031-08-22',203134,8,2031,22,34,203108,2031),('2031-08-23',203134,8,2031,23,34,203108,2031),('2031-08-24',203135,8,2031,24,35,203108,2031),('2031-08-25',203135,8,2031,25,35,203108,2031),('2031-08-26',203135,8,2031,26,35,203108,2031),('2031-08-27',203135,8,2031,27,35,203108,2031),('2031-08-28',203135,8,2031,28,35,203108,2031),('2031-08-29',203135,8,2031,29,35,203108,2031),('2031-08-30',203135,8,2031,30,35,203108,2031),('2031-08-31',203136,8,2031,31,36,203108,2031),('2031-09-01',203136,9,2031,1,36,203109,2031),('2031-09-02',203136,9,2031,2,36,203109,2031),('2031-09-03',203136,9,2031,3,36,203109,2031),('2031-09-04',203136,9,2031,4,36,203109,2031),('2031-09-05',203136,9,2031,5,36,203109,2031),('2031-09-06',203136,9,2031,6,36,203109,2031),('2031-09-07',203137,9,2031,7,37,203109,2031),('2031-09-08',203137,9,2031,8,37,203109,2031),('2031-09-09',203137,9,2031,9,37,203109,2031),('2031-09-10',203137,9,2031,10,37,203109,2031),('2031-09-11',203137,9,2031,11,37,203109,2031),('2031-09-12',203137,9,2031,12,37,203109,2031),('2031-09-13',203137,9,2031,13,37,203109,2031),('2031-09-14',203138,9,2031,14,38,203109,2031),('2031-09-15',203138,9,2031,15,38,203109,2031),('2031-09-16',203138,9,2031,16,38,203109,2031),('2031-09-17',203138,9,2031,17,38,203109,2031),('2031-09-18',203138,9,2031,18,38,203109,2031),('2031-09-19',203138,9,2031,19,38,203109,2031),('2031-09-20',203138,9,2031,20,38,203109,2031),('2031-09-21',203139,9,2031,21,39,203109,2031),('2031-09-22',203139,9,2031,22,39,203109,2031),('2031-09-23',203139,9,2031,23,39,203109,2031),('2031-09-24',203139,9,2031,24,39,203109,2031),('2031-09-25',203139,9,2031,25,39,203109,2031),('2031-09-26',203139,9,2031,26,39,203109,2031),('2031-09-27',203139,9,2031,27,39,203109,2031),('2031-09-28',203140,9,2031,28,40,203109,2031),('2031-09-29',203140,9,2031,29,40,203109,2031),('2031-09-30',203140,9,2031,30,40,203109,2031),('2031-10-01',203140,10,2031,1,40,203110,2031),('2031-10-02',203140,10,2031,2,40,203110,2031),('2031-10-03',203140,10,2031,3,40,203110,2031),('2031-10-04',203140,10,2031,4,40,203110,2031),('2031-10-05',203141,10,2031,5,41,203110,2031),('2031-10-06',203141,10,2031,6,41,203110,2031),('2031-10-07',203141,10,2031,7,41,203110,2031),('2031-10-08',203141,10,2031,8,41,203110,2031),('2031-10-09',203141,10,2031,9,41,203110,2031),('2031-10-10',203141,10,2031,10,41,203110,2031),('2031-10-11',203141,10,2031,11,41,203110,2031),('2031-10-12',203142,10,2031,12,42,203110,2031),('2031-10-13',203142,10,2031,13,42,203110,2031),('2031-10-14',203142,10,2031,14,42,203110,2031),('2031-10-15',203142,10,2031,15,42,203110,2031),('2031-10-16',203142,10,2031,16,42,203110,2031),('2031-10-17',203142,10,2031,17,42,203110,2031),('2031-10-18',203142,10,2031,18,42,203110,2031),('2031-10-19',203143,10,2031,19,43,203110,2031),('2031-10-20',203143,10,2031,20,43,203110,2031),('2031-10-21',203143,10,2031,21,43,203110,2031),('2031-10-22',203143,10,2031,22,43,203110,2031),('2031-10-23',203143,10,2031,23,43,203110,2031),('2031-10-24',203143,10,2031,24,43,203110,2031),('2031-10-25',203143,10,2031,25,43,203110,2031),('2031-10-26',203144,10,2031,26,44,203110,2031),('2031-10-27',203144,10,2031,27,44,203110,2031),('2031-10-28',203144,10,2031,28,44,203110,2031),('2031-10-29',203144,10,2031,29,44,203110,2031),('2031-10-30',203144,10,2031,30,44,203110,2031),('2031-10-31',203144,10,2031,31,44,203110,2031),('2031-11-01',203144,11,2031,1,44,203111,2031),('2031-11-02',203145,11,2031,2,45,203111,2031),('2031-11-03',203145,11,2031,3,45,203111,2031),('2031-11-04',203145,11,2031,4,45,203111,2031),('2031-11-05',203145,11,2031,5,45,203111,2031),('2031-11-06',203145,11,2031,6,45,203111,2031),('2031-11-07',203145,11,2031,7,45,203111,2031),('2031-11-08',203145,11,2031,8,45,203111,2031),('2031-11-09',203146,11,2031,9,46,203111,2031),('2031-11-10',203146,11,2031,10,46,203111,2031),('2031-11-11',203146,11,2031,11,46,203111,2031),('2031-11-12',203146,11,2031,12,46,203111,2031),('2031-11-13',203146,11,2031,13,46,203111,2031),('2031-11-14',203146,11,2031,14,46,203111,2031),('2031-11-15',203146,11,2031,15,46,203111,2031),('2031-11-16',203147,11,2031,16,47,203111,2031),('2031-11-17',203147,11,2031,17,47,203111,2031),('2031-11-18',203147,11,2031,18,47,203111,2031),('2031-11-19',203147,11,2031,19,47,203111,2031),('2031-11-20',203147,11,2031,20,47,203111,2031),('2031-11-21',203147,11,2031,21,47,203111,2031),('2031-11-22',203147,11,2031,22,47,203111,2031),('2031-11-23',203148,11,2031,23,48,203111,2031),('2031-11-24',203148,11,2031,24,48,203111,2031),('2031-11-25',203148,11,2031,25,48,203111,2031),('2031-11-26',203148,11,2031,26,48,203111,2031),('2031-11-27',203148,11,2031,27,48,203111,2031),('2031-11-28',203148,11,2031,28,48,203111,2031),('2031-11-29',203148,11,2031,29,48,203111,2031),('2031-11-30',203149,11,2031,30,49,203111,2031),('2031-12-01',203149,12,2031,1,49,203112,2032),('2031-12-02',203149,12,2031,2,49,203112,2032),('2031-12-03',203149,12,2031,3,49,203112,2032),('2031-12-04',203149,12,2031,4,49,203112,2032),('2031-12-05',203149,12,2031,5,49,203112,2032),('2031-12-06',203149,12,2031,6,49,203112,2032),('2031-12-07',203150,12,2031,7,50,203112,2032),('2031-12-08',203150,12,2031,8,50,203112,2032),('2031-12-09',203150,12,2031,9,50,203112,2032),('2031-12-10',203150,12,2031,10,50,203112,2032),('2031-12-11',203150,12,2031,11,50,203112,2032),('2031-12-12',203150,12,2031,12,50,203112,2032),('2031-12-13',203150,12,2031,13,50,203112,2032),('2031-12-14',203151,12,2031,14,51,203112,2032),('2031-12-15',203151,12,2031,15,51,203112,2032),('2031-12-16',203151,12,2031,16,51,203112,2032),('2031-12-17',203151,12,2031,17,51,203112,2032),('2031-12-18',203151,12,2031,18,51,203112,2032),('2031-12-19',203151,12,2031,19,51,203112,2032),('2031-12-20',203151,12,2031,20,51,203112,2032),('2031-12-21',203152,12,2031,21,52,203112,2032),('2031-12-22',203152,12,2031,22,52,203112,2032),('2031-12-23',203152,12,2031,23,52,203112,2032),('2031-12-24',203152,12,2031,24,52,203112,2032),('2031-12-25',203152,12,2031,25,52,203112,2032),('2031-12-26',203152,12,2031,26,52,203112,2032),('2031-12-27',203152,12,2031,27,52,203112,2032),('2031-12-28',203153,12,2031,28,53,203112,2032),('2031-12-29',203101,12,2031,29,53,203112,2032),('2031-12-30',203101,12,2031,30,53,203112,2032),('2031-12-31',203101,12,2031,31,53,203112,2032),('2032-01-01',203201,1,2032,1,53,203201,2032),('2032-01-02',203201,1,2032,2,53,203201,2032),('2032-01-03',203201,1,2032,3,53,203201,2032),('2032-01-04',203202,1,2032,4,1,203201,2032),('2032-01-05',203202,1,2032,5,1,203201,2032),('2032-01-06',203202,1,2032,6,1,203201,2032),('2032-01-07',203202,1,2032,7,1,203201,2032),('2032-01-08',203202,1,2032,8,1,203201,2032),('2032-01-09',203202,1,2032,9,1,203201,2032),('2032-01-10',203202,1,2032,10,1,203201,2032),('2032-01-11',203203,1,2032,11,2,203201,2032),('2032-01-12',203203,1,2032,12,2,203201,2032),('2032-01-13',203203,1,2032,13,2,203201,2032),('2032-01-14',203203,1,2032,14,2,203201,2032),('2032-01-15',203203,1,2032,15,2,203201,2032),('2032-01-16',203203,1,2032,16,2,203201,2032),('2032-01-17',203203,1,2032,17,2,203201,2032),('2032-01-18',203204,1,2032,18,3,203201,2032),('2032-01-19',203204,1,2032,19,3,203201,2032),('2032-01-20',203204,1,2032,20,3,203201,2032),('2032-01-21',203204,1,2032,21,3,203201,2032),('2032-01-22',203204,1,2032,22,3,203201,2032),('2032-01-23',203204,1,2032,23,3,203201,2032),('2032-01-24',203204,1,2032,24,3,203201,2032),('2032-01-25',203205,1,2032,25,4,203201,2032),('2032-01-26',203205,1,2032,26,4,203201,2032),('2032-01-27',203205,1,2032,27,4,203201,2032),('2032-01-28',203205,1,2032,28,4,203201,2032),('2032-01-29',203205,1,2032,29,4,203201,2032),('2032-01-30',203205,1,2032,30,4,203201,2032),('2032-01-31',203205,1,2032,31,4,203201,2032),('2032-02-01',203206,2,2032,1,5,203202,2032),('2032-02-02',203206,2,2032,2,5,203202,2032),('2032-02-03',203206,2,2032,3,5,203202,2032),('2032-02-04',203206,2,2032,4,5,203202,2032),('2032-02-05',203206,2,2032,5,5,203202,2032),('2032-02-06',203206,2,2032,6,5,203202,2032),('2032-02-07',203206,2,2032,7,5,203202,2032),('2032-02-08',203207,2,2032,8,6,203202,2032),('2032-02-09',203207,2,2032,9,6,203202,2032),('2032-02-10',203207,2,2032,10,6,203202,2032),('2032-02-11',203207,2,2032,11,6,203202,2032),('2032-02-12',203207,2,2032,12,6,203202,2032),('2032-02-13',203207,2,2032,13,6,203202,2032),('2032-02-14',203207,2,2032,14,6,203202,2032),('2032-02-15',203208,2,2032,15,7,203202,2032),('2032-02-16',203208,2,2032,16,7,203202,2032),('2032-02-17',203208,2,2032,17,7,203202,2032),('2032-02-18',203208,2,2032,18,7,203202,2032),('2032-02-19',203208,2,2032,19,7,203202,2032),('2032-02-20',203208,2,2032,20,7,203202,2032),('2032-02-21',203208,2,2032,21,7,203202,2032),('2032-02-22',203209,2,2032,22,8,203202,2032),('2032-02-23',203209,2,2032,23,8,203202,2032),('2032-02-24',203209,2,2032,24,8,203202,2032),('2032-02-25',203209,2,2032,25,8,203202,2032),('2032-02-26',203209,2,2032,26,8,203202,2032),('2032-02-27',203209,2,2032,27,8,203202,2032),('2032-02-28',203209,2,2032,28,8,203202,2032),('2032-02-29',203210,2,2032,29,9,203202,2032),('2032-03-01',203210,3,2032,1,9,203203,2032),('2032-03-02',203210,3,2032,2,9,203203,2032),('2032-03-03',203210,3,2032,3,9,203203,2032),('2032-03-04',203210,3,2032,4,9,203203,2032),('2032-03-05',203210,3,2032,5,9,203203,2032),('2032-03-06',203210,3,2032,6,9,203203,2032),('2032-03-07',203211,3,2032,7,10,203203,2032),('2032-03-08',203211,3,2032,8,10,203203,2032),('2032-03-09',203211,3,2032,9,10,203203,2032),('2032-03-10',203211,3,2032,10,10,203203,2032),('2032-03-11',203211,3,2032,11,10,203203,2032),('2032-03-12',203211,3,2032,12,10,203203,2032),('2032-03-13',203211,3,2032,13,10,203203,2032),('2032-03-14',203212,3,2032,14,11,203203,2032),('2032-03-15',203212,3,2032,15,11,203203,2032),('2032-03-16',203212,3,2032,16,11,203203,2032),('2032-03-17',203212,3,2032,17,11,203203,2032),('2032-03-18',203212,3,2032,18,11,203203,2032),('2032-03-19',203212,3,2032,19,11,203203,2032),('2032-03-20',203212,3,2032,20,11,203203,2032),('2032-03-21',203213,3,2032,21,12,203203,2032),('2032-03-22',203213,3,2032,22,12,203203,2032),('2032-03-23',203213,3,2032,23,12,203203,2032),('2032-03-24',203213,3,2032,24,12,203203,2032),('2032-03-25',203213,3,2032,25,12,203203,2032),('2032-03-26',203213,3,2032,26,12,203203,2032),('2032-03-27',203213,3,2032,27,12,203203,2032),('2032-03-28',203214,3,2032,28,13,203203,2032),('2032-03-29',203214,3,2032,29,13,203203,2032),('2032-03-30',203214,3,2032,30,13,203203,2032),('2032-03-31',203214,3,2032,31,13,203203,2032),('2032-04-01',203214,4,2032,1,13,203204,2032),('2032-04-02',203214,4,2032,2,13,203204,2032),('2032-04-03',203214,4,2032,3,13,203204,2032),('2032-04-04',203215,4,2032,4,14,203204,2032),('2032-04-05',203215,4,2032,5,14,203204,2032),('2032-04-06',203215,4,2032,6,14,203204,2032),('2032-04-07',203215,4,2032,7,14,203204,2032),('2032-04-08',203215,4,2032,8,14,203204,2032),('2032-04-09',203215,4,2032,9,14,203204,2032),('2032-04-10',203215,4,2032,10,14,203204,2032),('2032-04-11',203216,4,2032,11,15,203204,2032),('2032-04-12',203216,4,2032,12,15,203204,2032),('2032-04-13',203216,4,2032,13,15,203204,2032),('2032-04-14',203216,4,2032,14,15,203204,2032),('2032-04-15',203216,4,2032,15,15,203204,2032),('2032-04-16',203216,4,2032,16,15,203204,2032),('2032-04-17',203216,4,2032,17,15,203204,2032),('2032-04-18',203217,4,2032,18,16,203204,2032),('2032-04-19',203217,4,2032,19,16,203204,2032),('2032-04-20',203217,4,2032,20,16,203204,2032),('2032-04-21',203217,4,2032,21,16,203204,2032),('2032-04-22',203217,4,2032,22,16,203204,2032),('2032-04-23',203217,4,2032,23,16,203204,2032),('2032-04-24',203217,4,2032,24,16,203204,2032),('2032-04-25',203218,4,2032,25,17,203204,2032),('2032-04-26',203218,4,2032,26,17,203204,2032),('2032-04-27',203218,4,2032,27,17,203204,2032),('2032-04-28',203218,4,2032,28,17,203204,2032),('2032-04-29',203218,4,2032,29,17,203204,2032),('2032-04-30',203218,4,2032,30,17,203204,2032),('2032-05-01',203218,5,2032,1,17,203205,2032),('2032-05-02',203219,5,2032,2,18,203205,2032),('2032-05-03',203219,5,2032,3,18,203205,2032),('2032-05-04',203219,5,2032,4,18,203205,2032),('2032-05-05',203219,5,2032,5,18,203205,2032),('2032-05-06',203219,5,2032,6,18,203205,2032),('2032-05-07',203219,5,2032,7,18,203205,2032),('2032-05-08',203219,5,2032,8,18,203205,2032),('2032-05-09',203220,5,2032,9,19,203205,2032),('2032-05-10',203220,5,2032,10,19,203205,2032),('2032-05-11',203220,5,2032,11,19,203205,2032),('2032-05-12',203220,5,2032,12,19,203205,2032),('2032-05-13',203220,5,2032,13,19,203205,2032),('2032-05-14',203220,5,2032,14,19,203205,2032),('2032-05-15',203220,5,2032,15,19,203205,2032),('2032-05-16',203221,5,2032,16,20,203205,2032),('2032-05-17',203221,5,2032,17,20,203205,2032),('2032-05-18',203221,5,2032,18,20,203205,2032),('2032-05-19',203221,5,2032,19,20,203205,2032),('2032-05-20',203221,5,2032,20,20,203205,2032),('2032-05-21',203221,5,2032,21,20,203205,2032),('2032-05-22',203221,5,2032,22,20,203205,2032),('2032-05-23',203222,5,2032,23,21,203205,2032),('2032-05-24',203222,5,2032,24,21,203205,2032),('2032-05-25',203222,5,2032,25,21,203205,2032),('2032-05-26',203222,5,2032,26,21,203205,2032),('2032-05-27',203222,5,2032,27,21,203205,2032),('2032-05-28',203222,5,2032,28,21,203205,2032),('2032-05-29',203222,5,2032,29,21,203205,2032),('2032-05-30',203223,5,2032,30,22,203205,2032),('2032-05-31',203223,5,2032,31,22,203205,2032),('2032-06-01',203223,6,2032,1,22,203206,2032),('2032-06-02',203223,6,2032,2,22,203206,2032),('2032-06-03',203223,6,2032,3,22,203206,2032),('2032-06-04',203223,6,2032,4,22,203206,2032),('2032-06-05',203223,6,2032,5,22,203206,2032),('2032-06-06',203224,6,2032,6,23,203206,2032),('2032-06-07',203224,6,2032,7,23,203206,2032),('2032-06-08',203224,6,2032,8,23,203206,2032),('2032-06-09',203224,6,2032,9,23,203206,2032),('2032-06-10',203224,6,2032,10,23,203206,2032),('2032-06-11',203224,6,2032,11,23,203206,2032),('2032-06-12',203224,6,2032,12,23,203206,2032),('2032-06-13',203225,6,2032,13,24,203206,2032),('2032-06-14',203225,6,2032,14,24,203206,2032),('2032-06-15',203225,6,2032,15,24,203206,2032),('2032-06-16',203225,6,2032,16,24,203206,2032),('2032-06-17',203225,6,2032,17,24,203206,2032),('2032-06-18',203225,6,2032,18,24,203206,2032),('2032-06-19',203225,6,2032,19,24,203206,2032),('2032-06-20',203226,6,2032,20,25,203206,2032),('2032-06-21',203226,6,2032,21,25,203206,2032),('2032-06-22',203226,6,2032,22,25,203206,2032),('2032-06-23',203226,6,2032,23,25,203206,2032),('2032-06-24',203226,6,2032,24,25,203206,2032),('2032-06-25',203226,6,2032,25,25,203206,2032),('2032-06-26',203226,6,2032,26,25,203206,2032),('2032-06-27',203227,6,2032,27,26,203206,2032),('2032-06-28',203227,6,2032,28,26,203206,2032),('2032-06-29',203227,6,2032,29,26,203206,2032),('2032-06-30',203227,6,2032,30,26,203206,2032),('2032-07-01',203227,7,2032,1,26,203207,2032),('2032-07-02',203227,7,2032,2,26,203207,2032),('2032-07-03',203227,7,2032,3,26,203207,2032),('2032-07-04',203228,7,2032,4,27,203207,2032),('2032-07-05',203228,7,2032,5,27,203207,2032),('2032-07-06',203228,7,2032,6,27,203207,2032),('2032-07-07',203228,7,2032,7,27,203207,2032),('2032-07-08',203228,7,2032,8,27,203207,2032),('2032-07-09',203228,7,2032,9,27,203207,2032),('2032-07-10',203228,7,2032,10,27,203207,2032),('2032-07-11',203229,7,2032,11,28,203207,2032),('2032-07-12',203229,7,2032,12,28,203207,2032),('2032-07-13',203229,7,2032,13,28,203207,2032),('2032-07-14',203229,7,2032,14,28,203207,2032),('2032-07-15',203229,7,2032,15,28,203207,2032),('2032-07-16',203229,7,2032,16,28,203207,2032),('2032-07-17',203229,7,2032,17,28,203207,2032),('2032-07-18',203230,7,2032,18,29,203207,2032),('2032-07-19',203230,7,2032,19,29,203207,2032),('2032-07-20',203230,7,2032,20,29,203207,2032),('2032-07-21',203230,7,2032,21,29,203207,2032),('2032-07-22',203230,7,2032,22,29,203207,2032),('2032-07-23',203230,7,2032,23,29,203207,2032),('2032-07-24',203230,7,2032,24,29,203207,2032),('2032-07-25',203231,7,2032,25,30,203207,2032),('2032-07-26',203231,7,2032,26,30,203207,2032),('2032-07-27',203231,7,2032,27,30,203207,2032),('2032-07-28',203231,7,2032,28,30,203207,2032),('2032-07-29',203231,7,2032,29,30,203207,2032),('2032-07-30',203231,7,2032,30,30,203207,2032),('2032-07-31',203231,7,2032,31,30,203207,2032),('2032-08-01',203232,8,2032,1,31,203208,2032),('2032-08-02',203232,8,2032,2,31,203208,2032),('2032-08-03',203232,8,2032,3,31,203208,2032),('2032-08-04',203232,8,2032,4,31,203208,2032),('2032-08-05',203232,8,2032,5,31,203208,2032),('2032-08-06',203232,8,2032,6,31,203208,2032),('2032-08-07',203232,8,2032,7,31,203208,2032),('2032-08-08',203233,8,2032,8,32,203208,2032),('2032-08-09',203233,8,2032,9,32,203208,2032),('2032-08-10',203233,8,2032,10,32,203208,2032),('2032-08-11',203233,8,2032,11,32,203208,2032),('2032-08-12',203233,8,2032,12,32,203208,2032),('2032-08-13',203233,8,2032,13,32,203208,2032),('2032-08-14',203233,8,2032,14,32,203208,2032),('2032-08-15',203234,8,2032,15,33,203208,2032),('2032-08-16',203234,8,2032,16,33,203208,2032),('2032-08-17',203234,8,2032,17,33,203208,2032),('2032-08-18',203234,8,2032,18,33,203208,2032),('2032-08-19',203234,8,2032,19,33,203208,2032),('2032-08-20',203234,8,2032,20,33,203208,2032),('2032-08-21',203234,8,2032,21,33,203208,2032),('2032-08-22',203235,8,2032,22,34,203208,2032),('2032-08-23',203235,8,2032,23,34,203208,2032),('2032-08-24',203235,8,2032,24,34,203208,2032),('2032-08-25',203235,8,2032,25,34,203208,2032),('2032-08-26',203235,8,2032,26,34,203208,2032),('2032-08-27',203235,8,2032,27,34,203208,2032),('2032-08-28',203235,8,2032,28,34,203208,2032),('2032-08-29',203236,8,2032,29,35,203208,2032),('2032-08-30',203236,8,2032,30,35,203208,2032),('2032-08-31',203236,8,2032,31,35,203208,2032),('2032-09-01',203236,9,2032,1,35,203209,2032),('2032-09-02',203236,9,2032,2,35,203209,2032),('2032-09-03',203236,9,2032,3,35,203209,2032),('2032-09-04',203236,9,2032,4,35,203209,2032),('2032-09-05',203237,9,2032,5,36,203209,2032),('2032-09-06',203237,9,2032,6,36,203209,2032),('2032-09-07',203237,9,2032,7,36,203209,2032),('2032-09-08',203237,9,2032,8,36,203209,2032),('2032-09-09',203237,9,2032,9,36,203209,2032),('2032-09-10',203237,9,2032,10,36,203209,2032),('2032-09-11',203237,9,2032,11,36,203209,2032),('2032-09-12',203238,9,2032,12,37,203209,2032),('2032-09-13',203238,9,2032,13,37,203209,2032),('2032-09-14',203238,9,2032,14,37,203209,2032),('2032-09-15',203238,9,2032,15,37,203209,2032),('2032-09-16',203238,9,2032,16,37,203209,2032),('2032-09-17',203238,9,2032,17,37,203209,2032),('2032-09-18',203238,9,2032,18,37,203209,2032),('2032-09-19',203239,9,2032,19,38,203209,2032),('2032-09-20',203239,9,2032,20,38,203209,2032),('2032-09-21',203239,9,2032,21,38,203209,2032),('2032-09-22',203239,9,2032,22,38,203209,2032),('2032-09-23',203239,9,2032,23,38,203209,2032),('2032-09-24',203239,9,2032,24,38,203209,2032),('2032-09-25',203239,9,2032,25,38,203209,2032),('2032-09-26',203240,9,2032,26,39,203209,2032),('2032-09-27',203240,9,2032,27,39,203209,2032),('2032-09-28',203240,9,2032,28,39,203209,2032),('2032-09-29',203240,9,2032,29,39,203209,2032),('2032-09-30',203240,9,2032,30,39,203209,2032),('2032-10-01',203240,10,2032,1,39,203210,2032),('2032-10-02',203240,10,2032,2,39,203210,2032),('2032-10-03',203241,10,2032,3,40,203210,2032),('2032-10-04',203241,10,2032,4,40,203210,2032),('2032-10-05',203241,10,2032,5,40,203210,2032),('2032-10-06',203241,10,2032,6,40,203210,2032),('2032-10-07',203241,10,2032,7,40,203210,2032),('2032-10-08',203241,10,2032,8,40,203210,2032),('2032-10-09',203241,10,2032,9,40,203210,2032),('2032-10-10',203242,10,2032,10,41,203210,2032),('2032-10-11',203242,10,2032,11,41,203210,2032),('2032-10-12',203242,10,2032,12,41,203210,2032),('2032-10-13',203242,10,2032,13,41,203210,2032),('2032-10-14',203242,10,2032,14,41,203210,2032),('2032-10-15',203242,10,2032,15,41,203210,2032),('2032-10-16',203242,10,2032,16,41,203210,2032),('2032-10-17',203243,10,2032,17,42,203210,2032),('2032-10-18',203243,10,2032,18,42,203210,2032),('2032-10-19',203243,10,2032,19,42,203210,2032),('2032-10-20',203243,10,2032,20,42,203210,2032),('2032-10-21',203243,10,2032,21,42,203210,2032),('2032-10-22',203243,10,2032,22,42,203210,2032),('2032-10-23',203243,10,2032,23,42,203210,2032),('2032-10-24',203244,10,2032,24,43,203210,2032),('2032-10-25',203244,10,2032,25,43,203210,2032),('2032-10-26',203244,10,2032,26,43,203210,2032),('2032-10-27',203244,10,2032,27,43,203210,2032),('2032-10-28',203244,10,2032,28,43,203210,2032),('2032-10-29',203244,10,2032,29,43,203210,2032),('2032-10-30',203244,10,2032,30,43,203210,2032),('2032-10-31',203245,10,2032,31,44,203210,2032),('2032-11-01',203245,11,2032,1,44,203211,2032),('2032-11-02',203245,11,2032,2,44,203211,2032),('2032-11-03',203245,11,2032,3,44,203211,2032),('2032-11-04',203245,11,2032,4,44,203211,2032),('2032-11-05',203245,11,2032,5,44,203211,2032),('2032-11-06',203245,11,2032,6,44,203211,2032),('2032-11-07',203246,11,2032,7,45,203211,2032),('2032-11-08',203246,11,2032,8,45,203211,2032),('2032-11-09',203246,11,2032,9,45,203211,2032),('2032-11-10',203246,11,2032,10,45,203211,2032),('2032-11-11',203246,11,2032,11,45,203211,2032),('2032-11-12',203246,11,2032,12,45,203211,2032),('2032-11-13',203246,11,2032,13,45,203211,2032),('2032-11-14',203247,11,2032,14,46,203211,2032),('2032-11-15',203247,11,2032,15,46,203211,2032),('2032-11-16',203247,11,2032,16,46,203211,2032),('2032-11-17',203247,11,2032,17,46,203211,2032),('2032-11-18',203247,11,2032,18,46,203211,2032),('2032-11-19',203247,11,2032,19,46,203211,2032),('2032-11-20',203247,11,2032,20,46,203211,2032),('2032-11-21',203248,11,2032,21,47,203211,2032),('2032-11-22',203248,11,2032,22,47,203211,2032),('2032-11-23',203248,11,2032,23,47,203211,2032),('2032-11-24',203248,11,2032,24,47,203211,2032),('2032-11-25',203248,11,2032,25,47,203211,2032),('2032-11-26',203248,11,2032,26,47,203211,2032),('2032-11-27',203248,11,2032,27,47,203211,2032),('2032-11-28',203249,11,2032,28,48,203211,2032),('2032-11-29',203249,11,2032,29,48,203211,2032),('2032-11-30',203249,11,2032,30,48,203211,2032),('2032-12-01',203249,12,2032,1,48,203212,2033),('2032-12-02',203249,12,2032,2,48,203212,2033),('2032-12-03',203249,12,2032,3,48,203212,2033),('2032-12-04',203249,12,2032,4,48,203212,2033),('2032-12-05',203250,12,2032,5,49,203212,2033),('2032-12-06',203250,12,2032,6,49,203212,2033),('2032-12-07',203250,12,2032,7,49,203212,2033),('2032-12-08',203250,12,2032,8,49,203212,2033),('2032-12-09',203250,12,2032,9,49,203212,2033),('2032-12-10',203250,12,2032,10,49,203212,2033),('2032-12-11',203250,12,2032,11,49,203212,2033),('2032-12-12',203251,12,2032,12,50,203212,2033),('2032-12-13',203251,12,2032,13,50,203212,2033),('2032-12-14',203251,12,2032,14,50,203212,2033),('2032-12-15',203251,12,2032,15,50,203212,2033),('2032-12-16',203251,12,2032,16,50,203212,2033),('2032-12-17',203251,12,2032,17,50,203212,2033),('2032-12-18',203251,12,2032,18,50,203212,2033),('2032-12-19',203252,12,2032,19,51,203212,2033),('2032-12-20',203252,12,2032,20,51,203212,2033),('2032-12-21',203252,12,2032,21,51,203212,2033),('2032-12-22',203252,12,2032,22,51,203212,2033),('2032-12-23',203252,12,2032,23,51,203212,2033),('2032-12-24',203252,12,2032,24,51,203212,2033),('2032-12-25',203252,12,2032,25,51,203212,2033),('2032-12-26',203253,12,2032,26,52,203212,2033),('2032-12-27',203253,12,2032,27,52,203212,2033),('2032-12-28',203253,12,2032,28,52,203212,2033),('2032-12-29',203253,12,2032,29,52,203212,2033),('2032-12-30',203253,12,2032,30,52,203212,2033),('2032-12-31',203253,12,2032,31,52,203212,2033),('2033-01-01',203353,1,2033,1,52,203301,2033),('2033-01-02',203354,1,2033,2,1,203301,2033),('2033-01-03',203301,1,2033,3,1,203301,2033),('2033-01-04',203301,1,2033,4,1,203301,2033),('2033-01-05',203301,1,2033,5,1,203301,2033),('2033-01-06',203301,1,2033,6,1,203301,2033),('2033-01-07',203301,1,2033,7,1,203301,2033),('2033-01-08',203301,1,2033,8,1,203301,2033),('2033-01-09',203302,1,2033,9,2,203301,2033),('2033-01-10',203302,1,2033,10,2,203301,2033),('2033-01-11',203302,1,2033,11,2,203301,2033),('2033-01-12',203302,1,2033,12,2,203301,2033),('2033-01-13',203302,1,2033,13,2,203301,2033),('2033-01-14',203302,1,2033,14,2,203301,2033),('2033-01-15',203302,1,2033,15,2,203301,2033),('2033-01-16',203303,1,2033,16,3,203301,2033),('2033-01-17',203303,1,2033,17,3,203301,2033),('2033-01-18',203303,1,2033,18,3,203301,2033),('2033-01-19',203303,1,2033,19,3,203301,2033),('2033-01-20',203303,1,2033,20,3,203301,2033),('2033-01-21',203303,1,2033,21,3,203301,2033),('2033-01-22',203303,1,2033,22,3,203301,2033),('2033-01-23',203304,1,2033,23,4,203301,2033),('2033-01-24',203304,1,2033,24,4,203301,2033),('2033-01-25',203304,1,2033,25,4,203301,2033),('2033-01-26',203304,1,2033,26,4,203301,2033),('2033-01-27',203304,1,2033,27,4,203301,2033),('2033-01-28',203304,1,2033,28,4,203301,2033),('2033-01-29',203304,1,2033,29,4,203301,2033),('2033-01-30',203305,1,2033,30,5,203301,2033),('2033-01-31',203305,1,2033,31,5,203301,2033),('2033-02-01',203305,2,2033,1,5,203302,2033),('2033-02-02',203305,2,2033,2,5,203302,2033),('2033-02-03',203305,2,2033,3,5,203302,2033),('2033-02-04',203305,2,2033,4,5,203302,2033),('2033-02-05',203305,2,2033,5,5,203302,2033),('2033-02-06',203306,2,2033,6,6,203302,2033),('2033-02-07',203306,2,2033,7,6,203302,2033),('2033-02-08',203306,2,2033,8,6,203302,2033),('2033-02-09',203306,2,2033,9,6,203302,2033),('2033-02-10',203306,2,2033,10,6,203302,2033),('2033-02-11',203306,2,2033,11,6,203302,2033),('2033-02-12',203306,2,2033,12,6,203302,2033),('2033-02-13',203307,2,2033,13,7,203302,2033),('2033-02-14',203307,2,2033,14,7,203302,2033),('2033-02-15',203307,2,2033,15,7,203302,2033),('2033-02-16',203307,2,2033,16,7,203302,2033),('2033-02-17',203307,2,2033,17,7,203302,2033),('2033-02-18',203307,2,2033,18,7,203302,2033),('2033-02-19',203307,2,2033,19,7,203302,2033),('2033-02-20',203308,2,2033,20,8,203302,2033),('2033-02-21',203308,2,2033,21,8,203302,2033),('2033-02-22',203308,2,2033,22,8,203302,2033),('2033-02-23',203308,2,2033,23,8,203302,2033),('2033-02-24',203308,2,2033,24,8,203302,2033),('2033-02-25',203308,2,2033,25,8,203302,2033),('2033-02-26',203308,2,2033,26,8,203302,2033),('2033-02-27',203309,2,2033,27,9,203302,2033),('2033-02-28',203309,2,2033,28,9,203302,2033),('2033-03-01',203309,3,2033,1,9,203303,2033),('2033-03-02',203309,3,2033,2,9,203303,2033),('2033-03-03',203309,3,2033,3,9,203303,2033),('2033-03-04',203309,3,2033,4,9,203303,2033),('2033-03-05',203309,3,2033,5,9,203303,2033),('2033-03-06',203310,3,2033,6,10,203303,2033),('2033-03-07',203310,3,2033,7,10,203303,2033),('2033-03-08',203310,3,2033,8,10,203303,2033),('2033-03-09',203310,3,2033,9,10,203303,2033),('2033-03-10',203310,3,2033,10,10,203303,2033),('2033-03-11',203310,3,2033,11,10,203303,2033),('2033-03-12',203310,3,2033,12,10,203303,2033),('2033-03-13',203311,3,2033,13,11,203303,2033),('2033-03-14',203311,3,2033,14,11,203303,2033),('2033-03-15',203311,3,2033,15,11,203303,2033),('2033-03-16',203311,3,2033,16,11,203303,2033),('2033-03-17',203311,3,2033,17,11,203303,2033),('2033-03-18',203311,3,2033,18,11,203303,2033),('2033-03-19',203311,3,2033,19,11,203303,2033),('2033-03-20',203312,3,2033,20,12,203303,2033),('2033-03-21',203312,3,2033,21,12,203303,2033),('2033-03-22',203312,3,2033,22,12,203303,2033),('2033-03-23',203312,3,2033,23,12,203303,2033),('2033-03-24',203312,3,2033,24,12,203303,2033),('2033-03-25',203312,3,2033,25,12,203303,2033),('2033-03-26',203312,3,2033,26,12,203303,2033),('2033-03-27',203313,3,2033,27,13,203303,2033),('2033-03-28',203313,3,2033,28,13,203303,2033),('2033-03-29',203313,3,2033,29,13,203303,2033),('2033-03-30',203313,3,2033,30,13,203303,2033),('2033-03-31',203313,3,2033,31,13,203303,2033),('2033-04-01',203313,4,2033,1,13,203304,2033),('2033-04-02',203313,4,2033,2,13,203304,2033),('2033-04-03',203314,4,2033,3,14,203304,2033),('2033-04-04',203314,4,2033,4,14,203304,2033),('2033-04-05',203314,4,2033,5,14,203304,2033),('2033-04-06',203314,4,2033,6,14,203304,2033),('2033-04-07',203314,4,2033,7,14,203304,2033),('2033-04-08',203314,4,2033,8,14,203304,2033),('2033-04-09',203314,4,2033,9,14,203304,2033),('2033-04-10',203315,4,2033,10,15,203304,2033),('2033-04-11',203315,4,2033,11,15,203304,2033),('2033-04-12',203315,4,2033,12,15,203304,2033),('2033-04-13',203315,4,2033,13,15,203304,2033),('2033-04-14',203315,4,2033,14,15,203304,2033),('2033-04-15',203315,4,2033,15,15,203304,2033),('2033-04-16',203315,4,2033,16,15,203304,2033),('2033-04-17',203316,4,2033,17,16,203304,2033),('2033-04-18',203316,4,2033,18,16,203304,2033),('2033-04-19',203316,4,2033,19,16,203304,2033),('2033-04-20',203316,4,2033,20,16,203304,2033),('2033-04-21',203316,4,2033,21,16,203304,2033),('2033-04-22',203316,4,2033,22,16,203304,2033),('2033-04-23',203316,4,2033,23,16,203304,2033),('2033-04-24',203317,4,2033,24,17,203304,2033),('2033-04-25',203317,4,2033,25,17,203304,2033),('2033-04-26',203317,4,2033,26,17,203304,2033),('2033-04-27',203317,4,2033,27,17,203304,2033),('2033-04-28',203317,4,2033,28,17,203304,2033),('2033-04-29',203317,4,2033,29,17,203304,2033),('2033-04-30',203317,4,2033,30,17,203304,2033),('2033-05-01',203318,5,2033,1,18,203305,2033),('2033-05-02',203318,5,2033,2,18,203305,2033),('2033-05-03',203318,5,2033,3,18,203305,2033),('2033-05-04',203318,5,2033,4,18,203305,2033),('2033-05-05',203318,5,2033,5,18,203305,2033),('2033-05-06',203318,5,2033,6,18,203305,2033),('2033-05-07',203318,5,2033,7,18,203305,2033),('2033-05-08',203319,5,2033,8,19,203305,2033),('2033-05-09',203319,5,2033,9,19,203305,2033),('2033-05-10',203319,5,2033,10,19,203305,2033),('2033-05-11',203319,5,2033,11,19,203305,2033),('2033-05-12',203319,5,2033,12,19,203305,2033),('2033-05-13',203319,5,2033,13,19,203305,2033),('2033-05-14',203319,5,2033,14,19,203305,2033),('2033-05-15',203320,5,2033,15,20,203305,2033),('2033-05-16',203320,5,2033,16,20,203305,2033),('2033-05-17',203320,5,2033,17,20,203305,2033),('2033-05-18',203320,5,2033,18,20,203305,2033),('2033-05-19',203320,5,2033,19,20,203305,2033),('2033-05-20',203320,5,2033,20,20,203305,2033),('2033-05-21',203320,5,2033,21,20,203305,2033),('2033-05-22',203321,5,2033,22,21,203305,2033),('2033-05-23',203321,5,2033,23,21,203305,2033),('2033-05-24',203321,5,2033,24,21,203305,2033),('2033-05-25',203321,5,2033,25,21,203305,2033),('2033-05-26',203321,5,2033,26,21,203305,2033),('2033-05-27',203321,5,2033,27,21,203305,2033),('2033-05-28',203321,5,2033,28,21,203305,2033),('2033-05-29',203322,5,2033,29,22,203305,2033),('2033-05-30',203322,5,2033,30,22,203305,2033),('2033-05-31',203322,5,2033,31,22,203305,2033),('2033-06-01',203322,6,2033,1,22,203306,2033),('2033-06-02',203322,6,2033,2,22,203306,2033),('2033-06-03',203322,6,2033,3,22,203306,2033),('2033-06-04',203322,6,2033,4,22,203306,2033),('2033-06-05',203323,6,2033,5,23,203306,2033),('2033-06-06',203323,6,2033,6,23,203306,2033),('2033-06-07',203323,6,2033,7,23,203306,2033),('2033-06-08',203323,6,2033,8,23,203306,2033),('2033-06-09',203323,6,2033,9,23,203306,2033),('2033-06-10',203323,6,2033,10,23,203306,2033),('2033-06-11',203323,6,2033,11,23,203306,2033),('2033-06-12',203324,6,2033,12,24,203306,2033),('2033-06-13',203324,6,2033,13,24,203306,2033),('2033-06-14',203324,6,2033,14,24,203306,2033),('2033-06-15',203324,6,2033,15,24,203306,2033),('2033-06-16',203324,6,2033,16,24,203306,2033),('2033-06-17',203324,6,2033,17,24,203306,2033),('2033-06-18',203324,6,2033,18,24,203306,2033),('2033-06-19',203325,6,2033,19,25,203306,2033),('2033-06-20',203325,6,2033,20,25,203306,2033),('2033-06-21',203325,6,2033,21,25,203306,2033),('2033-06-22',203325,6,2033,22,25,203306,2033),('2033-06-23',203325,6,2033,23,25,203306,2033),('2033-06-24',203325,6,2033,24,25,203306,2033),('2033-06-25',203325,6,2033,25,25,203306,2033),('2033-06-26',203326,6,2033,26,26,203306,2033),('2033-06-27',203326,6,2033,27,26,203306,2033),('2033-06-28',203326,6,2033,28,26,203306,2033),('2033-06-29',203326,6,2033,29,26,203306,2033),('2033-06-30',203326,6,2033,30,26,203306,2033),('2033-07-01',203326,7,2033,1,26,203307,2033),('2033-07-02',203326,7,2033,2,26,203307,2033),('2033-07-03',203327,7,2033,3,27,203307,2033),('2033-07-04',203327,7,2033,4,27,203307,2033),('2033-07-05',203327,7,2033,5,27,203307,2033),('2033-07-06',203327,7,2033,6,27,203307,2033),('2033-07-07',203327,7,2033,7,27,203307,2033),('2033-07-08',203327,7,2033,8,27,203307,2033),('2033-07-09',203327,7,2033,9,27,203307,2033),('2033-07-10',203328,7,2033,10,28,203307,2033),('2033-07-11',203328,7,2033,11,28,203307,2033),('2033-07-12',203328,7,2033,12,28,203307,2033),('2033-07-13',203328,7,2033,13,28,203307,2033),('2033-07-14',203328,7,2033,14,28,203307,2033),('2033-07-15',203328,7,2033,15,28,203307,2033),('2033-07-16',203328,7,2033,16,28,203307,2033),('2033-07-17',203329,7,2033,17,29,203307,2033),('2033-07-18',203329,7,2033,18,29,203307,2033),('2033-07-19',203329,7,2033,19,29,203307,2033),('2033-07-20',203329,7,2033,20,29,203307,2033),('2033-07-21',203329,7,2033,21,29,203307,2033),('2033-07-22',203329,7,2033,22,29,203307,2033),('2033-07-23',203329,7,2033,23,29,203307,2033),('2033-07-24',203330,7,2033,24,30,203307,2033),('2033-07-25',203330,7,2033,25,30,203307,2033),('2033-07-26',203330,7,2033,26,30,203307,2033),('2033-07-27',203330,7,2033,27,30,203307,2033),('2033-07-28',203330,7,2033,28,30,203307,2033),('2033-07-29',203330,7,2033,29,30,203307,2033),('2033-07-30',203330,7,2033,30,30,203307,2033),('2033-07-31',203331,7,2033,31,31,203307,2033),('2033-08-01',203331,8,2033,1,31,203308,2033),('2033-08-02',203331,8,2033,2,31,203308,2033),('2033-08-03',203331,8,2033,3,31,203308,2033),('2033-08-04',203331,8,2033,4,31,203308,2033),('2033-08-05',203331,8,2033,5,31,203308,2033),('2033-08-06',203331,8,2033,6,31,203308,2033),('2033-08-07',203332,8,2033,7,32,203308,2033),('2033-08-08',203332,8,2033,8,32,203308,2033),('2033-08-09',203332,8,2033,9,32,203308,2033),('2033-08-10',203332,8,2033,10,32,203308,2033),('2033-08-11',203332,8,2033,11,32,203308,2033),('2033-08-12',203332,8,2033,12,32,203308,2033),('2033-08-13',203332,8,2033,13,32,203308,2033),('2033-08-14',203333,8,2033,14,33,203308,2033),('2033-08-15',203333,8,2033,15,33,203308,2033),('2033-08-16',203333,8,2033,16,33,203308,2033),('2033-08-17',203333,8,2033,17,33,203308,2033),('2033-08-18',203333,8,2033,18,33,203308,2033),('2033-08-19',203333,8,2033,19,33,203308,2033),('2033-08-20',203333,8,2033,20,33,203308,2033),('2033-08-21',203334,8,2033,21,34,203308,2033),('2033-08-22',203334,8,2033,22,34,203308,2033),('2033-08-23',203334,8,2033,23,34,203308,2033),('2033-08-24',203334,8,2033,24,34,203308,2033),('2033-08-25',203334,8,2033,25,34,203308,2033),('2033-08-26',203334,8,2033,26,34,203308,2033),('2033-08-27',203334,8,2033,27,34,203308,2033),('2033-08-28',203335,8,2033,28,35,203308,2033),('2033-08-29',203335,8,2033,29,35,203308,2033),('2033-08-30',203335,8,2033,30,35,203308,2033),('2033-08-31',203335,8,2033,31,35,203308,2033),('2033-09-01',203335,9,2033,1,35,203309,2033),('2033-09-02',203335,9,2033,2,35,203309,2033),('2033-09-03',203335,9,2033,3,35,203309,2033),('2033-09-04',203336,9,2033,4,36,203309,2033),('2033-09-05',203336,9,2033,5,36,203309,2033),('2033-09-06',203336,9,2033,6,36,203309,2033),('2033-09-07',203336,9,2033,7,36,203309,2033),('2033-09-08',203336,9,2033,8,36,203309,2033),('2033-09-09',203336,9,2033,9,36,203309,2033),('2033-09-10',203336,9,2033,10,36,203309,2033),('2033-09-11',203337,9,2033,11,37,203309,2033),('2033-09-12',203337,9,2033,12,37,203309,2033),('2033-09-13',203337,9,2033,13,37,203309,2033),('2033-09-14',203337,9,2033,14,37,203309,2033),('2033-09-15',203337,9,2033,15,37,203309,2033),('2033-09-16',203337,9,2033,16,37,203309,2033),('2033-09-17',203337,9,2033,17,37,203309,2033),('2033-09-18',203338,9,2033,18,38,203309,2033),('2033-09-19',203338,9,2033,19,38,203309,2033),('2033-09-20',203338,9,2033,20,38,203309,2033),('2033-09-21',203338,9,2033,21,38,203309,2033),('2033-09-22',203338,9,2033,22,38,203309,2033),('2033-09-23',203338,9,2033,23,38,203309,2033),('2033-09-24',203338,9,2033,24,38,203309,2033),('2033-09-25',203339,9,2033,25,39,203309,2033),('2033-09-26',203339,9,2033,26,39,203309,2033),('2033-09-27',203339,9,2033,27,39,203309,2033),('2033-09-28',203339,9,2033,28,39,203309,2033),('2033-09-29',203339,9,2033,29,39,203309,2033),('2033-09-30',203339,9,2033,30,39,203309,2033),('2033-10-01',203339,10,2033,1,39,203310,2033),('2033-10-02',203340,10,2033,2,40,203310,2033),('2033-10-03',203340,10,2033,3,40,203310,2033),('2033-10-04',203340,10,2033,4,40,203310,2033),('2033-10-05',203340,10,2033,5,40,203310,2033),('2033-10-06',203340,10,2033,6,40,203310,2033),('2033-10-07',203340,10,2033,7,40,203310,2033),('2033-10-08',203340,10,2033,8,40,203310,2033),('2033-10-09',203341,10,2033,9,41,203310,2033),('2033-10-10',203341,10,2033,10,41,203310,2033),('2033-10-11',203341,10,2033,11,41,203310,2033),('2033-10-12',203341,10,2033,12,41,203310,2033),('2033-10-13',203341,10,2033,13,41,203310,2033),('2033-10-14',203341,10,2033,14,41,203310,2033),('2033-10-15',203341,10,2033,15,41,203310,2033),('2033-10-16',203342,10,2033,16,42,203310,2033),('2033-10-17',203342,10,2033,17,42,203310,2033),('2033-10-18',203342,10,2033,18,42,203310,2033),('2033-10-19',203342,10,2033,19,42,203310,2033),('2033-10-20',203342,10,2033,20,42,203310,2033),('2033-10-21',203342,10,2033,21,42,203310,2033),('2033-10-22',203342,10,2033,22,42,203310,2033),('2033-10-23',203343,10,2033,23,43,203310,2033),('2033-10-24',203343,10,2033,24,43,203310,2033),('2033-10-25',203343,10,2033,25,43,203310,2033),('2033-10-26',203343,10,2033,26,43,203310,2033),('2033-10-27',203343,10,2033,27,43,203310,2033),('2033-10-28',203343,10,2033,28,43,203310,2033),('2033-10-29',203343,10,2033,29,43,203310,2033),('2033-10-30',203344,10,2033,30,44,203310,2033),('2033-10-31',203344,10,2033,31,44,203310,2033),('2033-11-01',203344,11,2033,1,44,203311,2033),('2033-11-02',203344,11,2033,2,44,203311,2033),('2033-11-03',203344,11,2033,3,44,203311,2033),('2033-11-04',203344,11,2033,4,44,203311,2033),('2033-11-05',203344,11,2033,5,44,203311,2033),('2033-11-06',203345,11,2033,6,45,203311,2033),('2033-11-07',203345,11,2033,7,45,203311,2033),('2033-11-08',203345,11,2033,8,45,203311,2033),('2033-11-09',203345,11,2033,9,45,203311,2033),('2033-11-10',203345,11,2033,10,45,203311,2033),('2033-11-11',203345,11,2033,11,45,203311,2033),('2033-11-12',203345,11,2033,12,45,203311,2033),('2033-11-13',203346,11,2033,13,46,203311,2033),('2033-11-14',203346,11,2033,14,46,203311,2033),('2033-11-15',203346,11,2033,15,46,203311,2033),('2033-11-16',203346,11,2033,16,46,203311,2033),('2033-11-17',203346,11,2033,17,46,203311,2033),('2033-11-18',203346,11,2033,18,46,203311,2033),('2033-11-19',203346,11,2033,19,46,203311,2033),('2033-11-20',203347,11,2033,20,47,203311,2033),('2033-11-21',203347,11,2033,21,47,203311,2033),('2033-11-22',203347,11,2033,22,47,203311,2033),('2033-11-23',203347,11,2033,23,47,203311,2033),('2033-11-24',203347,11,2033,24,47,203311,2033),('2033-11-25',203347,11,2033,25,47,203311,2033),('2033-11-26',203347,11,2033,26,47,203311,2033),('2033-11-27',203348,11,2033,27,48,203311,2033),('2033-11-28',203348,11,2033,28,48,203311,2033),('2033-11-29',203348,11,2033,29,48,203311,2033),('2033-11-30',203348,11,2033,30,48,203311,2033),('2033-12-01',203348,12,2033,1,48,203312,2034),('2033-12-02',203348,12,2033,2,48,203312,2034),('2033-12-03',203348,12,2033,3,48,203312,2034),('2033-12-04',203349,12,2033,4,49,203312,2034),('2033-12-05',203349,12,2033,5,49,203312,2034),('2033-12-06',203349,12,2033,6,49,203312,2034),('2033-12-07',203349,12,2033,7,49,203312,2034),('2033-12-08',203349,12,2033,8,49,203312,2034),('2033-12-09',203349,12,2033,9,49,203312,2034),('2033-12-10',203349,12,2033,10,49,203312,2034),('2033-12-11',203350,12,2033,11,50,203312,2034),('2033-12-12',203350,12,2033,12,50,203312,2034),('2033-12-13',203350,12,2033,13,50,203312,2034),('2033-12-14',203350,12,2033,14,50,203312,2034),('2033-12-15',203350,12,2033,15,50,203312,2034),('2033-12-16',203350,12,2033,16,50,203312,2034),('2033-12-17',203350,12,2033,17,50,203312,2034),('2033-12-18',203351,12,2033,18,51,203312,2034),('2033-12-19',203351,12,2033,19,51,203312,2034),('2033-12-20',203351,12,2033,20,51,203312,2034),('2033-12-21',203351,12,2033,21,51,203312,2034),('2033-12-22',203351,12,2033,22,51,203312,2034),('2033-12-23',203351,12,2033,23,51,203312,2034),('2033-12-24',203351,12,2033,24,51,203312,2034),('2033-12-25',203352,12,2033,25,52,203312,2034),('2033-12-26',203352,12,2033,26,52,203312,2034),('2033-12-27',203352,12,2033,27,52,203312,2034),('2033-12-28',203352,12,2033,28,52,203312,2034),('2033-12-29',203352,12,2033,29,52,203312,2034),('2033-12-30',203352,12,2033,30,52,203312,2034),('2033-12-31',203352,12,2033,31,52,203312,2034),('2034-01-01',203453,1,2034,1,1,203401,2034),('2034-01-02',203401,1,2034,2,1,203401,2034),('2034-01-03',203401,1,2034,3,1,203401,2034),('2034-01-04',203401,1,2034,4,1,203401,2034),('2034-01-05',203401,1,2034,5,1,203401,2034),('2034-01-06',203401,1,2034,6,1,203401,2034),('2034-01-07',203401,1,2034,7,1,203401,2034),('2034-01-08',203402,1,2034,8,2,203401,2034),('2034-01-09',203402,1,2034,9,2,203401,2034),('2034-01-10',203402,1,2034,10,2,203401,2034),('2034-01-11',203402,1,2034,11,2,203401,2034),('2034-01-12',203402,1,2034,12,2,203401,2034),('2034-01-13',203402,1,2034,13,2,203401,2034),('2034-01-14',203402,1,2034,14,2,203401,2034),('2034-01-15',203403,1,2034,15,3,203401,2034),('2034-01-16',203403,1,2034,16,3,203401,2034),('2034-01-17',203403,1,2034,17,3,203401,2034),('2034-01-18',203403,1,2034,18,3,203401,2034),('2034-01-19',203403,1,2034,19,3,203401,2034),('2034-01-20',203403,1,2034,20,3,203401,2034),('2034-01-21',203403,1,2034,21,3,203401,2034),('2034-01-22',203404,1,2034,22,4,203401,2034),('2034-01-23',203404,1,2034,23,4,203401,2034),('2034-01-24',203404,1,2034,24,4,203401,2034),('2034-01-25',203404,1,2034,25,4,203401,2034),('2034-01-26',203404,1,2034,26,4,203401,2034),('2034-01-27',203404,1,2034,27,4,203401,2034),('2034-01-28',203404,1,2034,28,4,203401,2034),('2034-01-29',203405,1,2034,29,5,203401,2034),('2034-01-30',203405,1,2034,30,5,203401,2034),('2034-01-31',203405,1,2034,31,5,203401,2034),('2034-02-01',203405,2,2034,1,5,203402,2034),('2034-02-02',203405,2,2034,2,5,203402,2034),('2034-02-03',203405,2,2034,3,5,203402,2034),('2034-02-04',203405,2,2034,4,5,203402,2034),('2034-02-05',203406,2,2034,5,6,203402,2034),('2034-02-06',203406,2,2034,6,6,203402,2034),('2034-02-07',203406,2,2034,7,6,203402,2034),('2034-02-08',203406,2,2034,8,6,203402,2034),('2034-02-09',203406,2,2034,9,6,203402,2034),('2034-02-10',203406,2,2034,10,6,203402,2034),('2034-02-11',203406,2,2034,11,6,203402,2034),('2034-02-12',203407,2,2034,12,7,203402,2034),('2034-02-13',203407,2,2034,13,7,203402,2034),('2034-02-14',203407,2,2034,14,7,203402,2034),('2034-02-15',203407,2,2034,15,7,203402,2034),('2034-02-16',203407,2,2034,16,7,203402,2034),('2034-02-17',203407,2,2034,17,7,203402,2034),('2034-02-18',203407,2,2034,18,7,203402,2034),('2034-02-19',203408,2,2034,19,8,203402,2034),('2034-02-20',203408,2,2034,20,8,203402,2034),('2034-02-21',203408,2,2034,21,8,203402,2034),('2034-02-22',203408,2,2034,22,8,203402,2034),('2034-02-23',203408,2,2034,23,8,203402,2034),('2034-02-24',203408,2,2034,24,8,203402,2034),('2034-02-25',203408,2,2034,25,8,203402,2034),('2034-02-26',203409,2,2034,26,9,203402,2034),('2034-02-27',203409,2,2034,27,9,203402,2034),('2034-02-28',203409,2,2034,28,9,203402,2034),('2034-03-01',203409,3,2034,1,9,203403,2034),('2034-03-02',203409,3,2034,2,9,203403,2034),('2034-03-03',203409,3,2034,3,9,203403,2034),('2034-03-04',203409,3,2034,4,9,203403,2034),('2034-03-05',203410,3,2034,5,10,203403,2034),('2034-03-06',203410,3,2034,6,10,203403,2034),('2034-03-07',203410,3,2034,7,10,203403,2034),('2034-03-08',203410,3,2034,8,10,203403,2034),('2034-03-09',203410,3,2034,9,10,203403,2034),('2034-03-10',203410,3,2034,10,10,203403,2034),('2034-03-11',203410,3,2034,11,10,203403,2034),('2034-03-12',203411,3,2034,12,11,203403,2034),('2034-03-13',203411,3,2034,13,11,203403,2034),('2034-03-14',203411,3,2034,14,11,203403,2034),('2034-03-15',203411,3,2034,15,11,203403,2034),('2034-03-16',203411,3,2034,16,11,203403,2034),('2034-03-17',203411,3,2034,17,11,203403,2034),('2034-03-18',203411,3,2034,18,11,203403,2034),('2034-03-19',203412,3,2034,19,12,203403,2034),('2034-03-20',203412,3,2034,20,12,203403,2034),('2034-03-21',203412,3,2034,21,12,203403,2034),('2034-03-22',203412,3,2034,22,12,203403,2034),('2034-03-23',203412,3,2034,23,12,203403,2034),('2034-03-24',203412,3,2034,24,12,203403,2034),('2034-03-25',203412,3,2034,25,12,203403,2034),('2034-03-26',203413,3,2034,26,13,203403,2034),('2034-03-27',203413,3,2034,27,13,203403,2034),('2034-03-28',203413,3,2034,28,13,203403,2034),('2034-03-29',203413,3,2034,29,13,203403,2034),('2034-03-30',203413,3,2034,30,13,203403,2034),('2034-03-31',203413,3,2034,31,13,203403,2034),('2034-04-01',203413,4,2034,1,13,203404,2034),('2034-04-02',203414,4,2034,2,14,203404,2034),('2034-04-03',203414,4,2034,3,14,203404,2034),('2034-04-04',203414,4,2034,4,14,203404,2034),('2034-04-05',203414,4,2034,5,14,203404,2034),('2034-04-06',203414,4,2034,6,14,203404,2034),('2034-04-07',203414,4,2034,7,14,203404,2034),('2034-04-08',203414,4,2034,8,14,203404,2034),('2034-04-09',203415,4,2034,9,15,203404,2034),('2034-04-10',203415,4,2034,10,15,203404,2034),('2034-04-11',203415,4,2034,11,15,203404,2034),('2034-04-12',203415,4,2034,12,15,203404,2034),('2034-04-13',203415,4,2034,13,15,203404,2034),('2034-04-14',203415,4,2034,14,15,203404,2034),('2034-04-15',203415,4,2034,15,15,203404,2034),('2034-04-16',203416,4,2034,16,16,203404,2034),('2034-04-17',203416,4,2034,17,16,203404,2034),('2034-04-18',203416,4,2034,18,16,203404,2034),('2034-04-19',203416,4,2034,19,16,203404,2034),('2034-04-20',203416,4,2034,20,16,203404,2034),('2034-04-21',203416,4,2034,21,16,203404,2034),('2034-04-22',203416,4,2034,22,16,203404,2034),('2034-04-23',203417,4,2034,23,17,203404,2034),('2034-04-24',203417,4,2034,24,17,203404,2034),('2034-04-25',203417,4,2034,25,17,203404,2034),('2034-04-26',203417,4,2034,26,17,203404,2034),('2034-04-27',203417,4,2034,27,17,203404,2034),('2034-04-28',203417,4,2034,28,17,203404,2034),('2034-04-29',203417,4,2034,29,17,203404,2034),('2034-04-30',203418,4,2034,30,18,203404,2034),('2034-05-01',203418,5,2034,1,18,203405,2034),('2034-05-02',203418,5,2034,2,18,203405,2034),('2034-05-03',203418,5,2034,3,18,203405,2034),('2034-05-04',203418,5,2034,4,18,203405,2034),('2034-05-05',203418,5,2034,5,18,203405,2034),('2034-05-06',203418,5,2034,6,18,203405,2034),('2034-05-07',203419,5,2034,7,19,203405,2034),('2034-05-08',203419,5,2034,8,19,203405,2034),('2034-05-09',203419,5,2034,9,19,203405,2034),('2034-05-10',203419,5,2034,10,19,203405,2034),('2034-05-11',203419,5,2034,11,19,203405,2034),('2034-05-12',203419,5,2034,12,19,203405,2034),('2034-05-13',203419,5,2034,13,19,203405,2034),('2034-05-14',203420,5,2034,14,20,203405,2034),('2034-05-15',203420,5,2034,15,20,203405,2034),('2034-05-16',203420,5,2034,16,20,203405,2034),('2034-05-17',203420,5,2034,17,20,203405,2034),('2034-05-18',203420,5,2034,18,20,203405,2034),('2034-05-19',203420,5,2034,19,20,203405,2034),('2034-05-20',203420,5,2034,20,20,203405,2034),('2034-05-21',203421,5,2034,21,21,203405,2034),('2034-05-22',203421,5,2034,22,21,203405,2034),('2034-05-23',203421,5,2034,23,21,203405,2034),('2034-05-24',203421,5,2034,24,21,203405,2034),('2034-05-25',203421,5,2034,25,21,203405,2034),('2034-05-26',203421,5,2034,26,21,203405,2034),('2034-05-27',203421,5,2034,27,21,203405,2034),('2034-05-28',203422,5,2034,28,22,203405,2034),('2034-05-29',203422,5,2034,29,22,203405,2034),('2034-05-30',203422,5,2034,30,22,203405,2034),('2034-05-31',203422,5,2034,31,22,203405,2034),('2034-06-01',203422,6,2034,1,22,203406,2034),('2034-06-02',203422,6,2034,2,22,203406,2034),('2034-06-03',203422,6,2034,3,22,203406,2034),('2034-06-04',203423,6,2034,4,23,203406,2034),('2034-06-05',203423,6,2034,5,23,203406,2034),('2034-06-06',203423,6,2034,6,23,203406,2034),('2034-06-07',203423,6,2034,7,23,203406,2034),('2034-06-08',203423,6,2034,8,23,203406,2034),('2034-06-09',203423,6,2034,9,23,203406,2034),('2034-06-10',203423,6,2034,10,23,203406,2034),('2034-06-11',203424,6,2034,11,24,203406,2034),('2034-06-12',203424,6,2034,12,24,203406,2034),('2034-06-13',203424,6,2034,13,24,203406,2034),('2034-06-14',203424,6,2034,14,24,203406,2034),('2034-06-15',203424,6,2034,15,24,203406,2034),('2034-06-16',203424,6,2034,16,24,203406,2034),('2034-06-17',203424,6,2034,17,24,203406,2034),('2034-06-18',203425,6,2034,18,25,203406,2034),('2034-06-19',203425,6,2034,19,25,203406,2034),('2034-06-20',203425,6,2034,20,25,203406,2034),('2034-06-21',203425,6,2034,21,25,203406,2034),('2034-06-22',203425,6,2034,22,25,203406,2034),('2034-06-23',203425,6,2034,23,25,203406,2034),('2034-06-24',203425,6,2034,24,25,203406,2034),('2034-06-25',203426,6,2034,25,26,203406,2034),('2034-06-26',203426,6,2034,26,26,203406,2034),('2034-06-27',203426,6,2034,27,26,203406,2034),('2034-06-28',203426,6,2034,28,26,203406,2034),('2034-06-29',203426,6,2034,29,26,203406,2034),('2034-06-30',203426,6,2034,30,26,203406,2034),('2034-07-01',203426,7,2034,1,26,203407,2034),('2034-07-02',203427,7,2034,2,27,203407,2034),('2034-07-03',203427,7,2034,3,27,203407,2034),('2034-07-04',203427,7,2034,4,27,203407,2034),('2034-07-05',203427,7,2034,5,27,203407,2034),('2034-07-06',203427,7,2034,6,27,203407,2034),('2034-07-07',203427,7,2034,7,27,203407,2034),('2034-07-08',203427,7,2034,8,27,203407,2034),('2034-07-09',203428,7,2034,9,28,203407,2034),('2034-07-10',203428,7,2034,10,28,203407,2034),('2034-07-11',203428,7,2034,11,28,203407,2034),('2034-07-12',203428,7,2034,12,28,203407,2034),('2034-07-13',203428,7,2034,13,28,203407,2034),('2034-07-14',203428,7,2034,14,28,203407,2034),('2034-07-15',203428,7,2034,15,28,203407,2034),('2034-07-16',203429,7,2034,16,29,203407,2034),('2034-07-17',203429,7,2034,17,29,203407,2034),('2034-07-18',203429,7,2034,18,29,203407,2034),('2034-07-19',203429,7,2034,19,29,203407,2034),('2034-07-20',203429,7,2034,20,29,203407,2034),('2034-07-21',203429,7,2034,21,29,203407,2034),('2034-07-22',203429,7,2034,22,29,203407,2034),('2034-07-23',203430,7,2034,23,30,203407,2034),('2034-07-24',203430,7,2034,24,30,203407,2034),('2034-07-25',203430,7,2034,25,30,203407,2034),('2034-07-26',203430,7,2034,26,30,203407,2034),('2034-07-27',203430,7,2034,27,30,203407,2034),('2034-07-28',203430,7,2034,28,30,203407,2034),('2034-07-29',203430,7,2034,29,30,203407,2034),('2034-07-30',203431,7,2034,30,31,203407,2034),('2034-07-31',203431,7,2034,31,31,203407,2034),('2034-08-01',203431,8,2034,1,31,203408,2034),('2034-08-02',203431,8,2034,2,31,203408,2034),('2034-08-03',203431,8,2034,3,31,203408,2034),('2034-08-04',203431,8,2034,4,31,203408,2034),('2034-08-05',203431,8,2034,5,31,203408,2034),('2034-08-06',203432,8,2034,6,32,203408,2034),('2034-08-07',203432,8,2034,7,32,203408,2034),('2034-08-08',203432,8,2034,8,32,203408,2034),('2034-08-09',203432,8,2034,9,32,203408,2034),('2034-08-10',203432,8,2034,10,32,203408,2034),('2034-08-11',203432,8,2034,11,32,203408,2034),('2034-08-12',203432,8,2034,12,32,203408,2034),('2034-08-13',203433,8,2034,13,33,203408,2034),('2034-08-14',203433,8,2034,14,33,203408,2034),('2034-08-15',203433,8,2034,15,33,203408,2034),('2034-08-16',203433,8,2034,16,33,203408,2034),('2034-08-17',203433,8,2034,17,33,203408,2034),('2034-08-18',203433,8,2034,18,33,203408,2034),('2034-08-19',203433,8,2034,19,33,203408,2034),('2034-08-20',203434,8,2034,20,34,203408,2034),('2034-08-21',203434,8,2034,21,34,203408,2034),('2034-08-22',203434,8,2034,22,34,203408,2034),('2034-08-23',203434,8,2034,23,34,203408,2034),('2034-08-24',203434,8,2034,24,34,203408,2034),('2034-08-25',203434,8,2034,25,34,203408,2034),('2034-08-26',203434,8,2034,26,34,203408,2034),('2034-08-27',203435,8,2034,27,35,203408,2034),('2034-08-28',203435,8,2034,28,35,203408,2034),('2034-08-29',203435,8,2034,29,35,203408,2034),('2034-08-30',203435,8,2034,30,35,203408,2034),('2034-08-31',203435,8,2034,31,35,203408,2034),('2034-09-01',203435,9,2034,1,35,203409,2034),('2034-09-02',203435,9,2034,2,35,203409,2034),('2034-09-03',203436,9,2034,3,36,203409,2034),('2034-09-04',203436,9,2034,4,36,203409,2034),('2034-09-05',203436,9,2034,5,36,203409,2034),('2034-09-06',203436,9,2034,6,36,203409,2034),('2034-09-07',203436,9,2034,7,36,203409,2034),('2034-09-08',203436,9,2034,8,36,203409,2034),('2034-09-09',203436,9,2034,9,36,203409,2034),('2034-09-10',203437,9,2034,10,37,203409,2034),('2034-09-11',203437,9,2034,11,37,203409,2034),('2034-09-12',203437,9,2034,12,37,203409,2034),('2034-09-13',203437,9,2034,13,37,203409,2034),('2034-09-14',203437,9,2034,14,37,203409,2034),('2034-09-15',203437,9,2034,15,37,203409,2034),('2034-09-16',203437,9,2034,16,37,203409,2034),('2034-09-17',203438,9,2034,17,38,203409,2034),('2034-09-18',203438,9,2034,18,38,203409,2034),('2034-09-19',203438,9,2034,19,38,203409,2034),('2034-09-20',203438,9,2034,20,38,203409,2034),('2034-09-21',203438,9,2034,21,38,203409,2034),('2034-09-22',203438,9,2034,22,38,203409,2034),('2034-09-23',203438,9,2034,23,38,203409,2034),('2034-09-24',203439,9,2034,24,39,203409,2034),('2034-09-25',203439,9,2034,25,39,203409,2034),('2034-09-26',203439,9,2034,26,39,203409,2034),('2034-09-27',203439,9,2034,27,39,203409,2034),('2034-09-28',203439,9,2034,28,39,203409,2034),('2034-09-29',203439,9,2034,29,39,203409,2034),('2034-09-30',203439,9,2034,30,39,203409,2034),('2034-10-01',203440,10,2034,1,40,203410,2034),('2034-10-02',203440,10,2034,2,40,203410,2034),('2034-10-03',203440,10,2034,3,40,203410,2034),('2034-10-04',203440,10,2034,4,40,203410,2034),('2034-10-05',203440,10,2034,5,40,203410,2034),('2034-10-06',203440,10,2034,6,40,203410,2034),('2034-10-07',203440,10,2034,7,40,203410,2034),('2034-10-08',203441,10,2034,8,41,203410,2034),('2034-10-09',203441,10,2034,9,41,203410,2034),('2034-10-10',203441,10,2034,10,41,203410,2034),('2034-10-11',203441,10,2034,11,41,203410,2034),('2034-10-12',203441,10,2034,12,41,203410,2034),('2034-10-13',203441,10,2034,13,41,203410,2034),('2034-10-14',203441,10,2034,14,41,203410,2034),('2034-10-15',203442,10,2034,15,42,203410,2034),('2034-10-16',203442,10,2034,16,42,203410,2034),('2034-10-17',203442,10,2034,17,42,203410,2034),('2034-10-18',203442,10,2034,18,42,203410,2034),('2034-10-19',203442,10,2034,19,42,203410,2034),('2034-10-20',203442,10,2034,20,42,203410,2034),('2034-10-21',203442,10,2034,21,42,203410,2034),('2034-10-22',203443,10,2034,22,43,203410,2034),('2034-10-23',203443,10,2034,23,43,203410,2034),('2034-10-24',203443,10,2034,24,43,203410,2034),('2034-10-25',203443,10,2034,25,43,203410,2034),('2034-10-26',203443,10,2034,26,43,203410,2034),('2034-10-27',203443,10,2034,27,43,203410,2034),('2034-10-28',203443,10,2034,28,43,203410,2034),('2034-10-29',203444,10,2034,29,44,203410,2034),('2034-10-30',203444,10,2034,30,44,203410,2034),('2034-10-31',203444,10,2034,31,44,203410,2034),('2034-11-01',203444,11,2034,1,44,203411,2034),('2034-11-02',203444,11,2034,2,44,203411,2034),('2034-11-03',203444,11,2034,3,44,203411,2034),('2034-11-04',203444,11,2034,4,44,203411,2034),('2034-11-05',203445,11,2034,5,45,203411,2034),('2034-11-06',203445,11,2034,6,45,203411,2034),('2034-11-07',203445,11,2034,7,45,203411,2034),('2034-11-08',203445,11,2034,8,45,203411,2034),('2034-11-09',203445,11,2034,9,45,203411,2034),('2034-11-10',203445,11,2034,10,45,203411,2034),('2034-11-11',203445,11,2034,11,45,203411,2034),('2034-11-12',203446,11,2034,12,46,203411,2034),('2034-11-13',203446,11,2034,13,46,203411,2034),('2034-11-14',203446,11,2034,14,46,203411,2034),('2034-11-15',203446,11,2034,15,46,203411,2034),('2034-11-16',203446,11,2034,16,46,203411,2034),('2034-11-17',203446,11,2034,17,46,203411,2034),('2034-11-18',203446,11,2034,18,46,203411,2034),('2034-11-19',203447,11,2034,19,47,203411,2034),('2034-11-20',203447,11,2034,20,47,203411,2034),('2034-11-21',203447,11,2034,21,47,203411,2034),('2034-11-22',203447,11,2034,22,47,203411,2034),('2034-11-23',203447,11,2034,23,47,203411,2034),('2034-11-24',203447,11,2034,24,47,203411,2034),('2034-11-25',203447,11,2034,25,47,203411,2034),('2034-11-26',203448,11,2034,26,48,203411,2034),('2034-11-27',203448,11,2034,27,48,203411,2034),('2034-11-28',203448,11,2034,28,48,203411,2034),('2034-11-29',203448,11,2034,29,48,203411,2034),('2034-11-30',203448,11,2034,30,48,203411,2034),('2034-12-01',203448,12,2034,1,48,203412,2035),('2034-12-02',203448,12,2034,2,48,203412,2035),('2034-12-03',203449,12,2034,3,49,203412,2035),('2034-12-04',203449,12,2034,4,49,203412,2035),('2034-12-05',203449,12,2034,5,49,203412,2035),('2034-12-06',203449,12,2034,6,49,203412,2035),('2034-12-07',203449,12,2034,7,49,203412,2035),('2034-12-08',203449,12,2034,8,49,203412,2035),('2034-12-09',203449,12,2034,9,49,203412,2035),('2034-12-10',203450,12,2034,10,50,203412,2035),('2034-12-11',203450,12,2034,11,50,203412,2035),('2034-12-12',203450,12,2034,12,50,203412,2035),('2034-12-13',203450,12,2034,13,50,203412,2035),('2034-12-14',203450,12,2034,14,50,203412,2035),('2034-12-15',203450,12,2034,15,50,203412,2035),('2034-12-16',203450,12,2034,16,50,203412,2035),('2034-12-17',203451,12,2034,17,51,203412,2035),('2034-12-18',203451,12,2034,18,51,203412,2035),('2034-12-19',203451,12,2034,19,51,203412,2035),('2034-12-20',203451,12,2034,20,51,203412,2035),('2034-12-21',203451,12,2034,21,51,203412,2035),('2034-12-22',203451,12,2034,22,51,203412,2035),('2034-12-23',203451,12,2034,23,51,203412,2035),('2034-12-24',203452,12,2034,24,52,203412,2035),('2034-12-25',203452,12,2034,25,52,203412,2035),('2034-12-26',203452,12,2034,26,52,203412,2035),('2034-12-27',203452,12,2034,27,52,203412,2035),('2034-12-28',203452,12,2034,28,52,203412,2035),('2034-12-29',203452,12,2034,29,52,203412,2035),('2034-12-30',203452,12,2034,30,52,203412,2035),('2034-12-31',203453,12,2034,31,1,203412,2035),('2035-01-01',203501,1,2035,1,1,203501,2035),('2035-01-02',203501,1,2035,2,1,203501,2035),('2035-01-03',203501,1,2035,3,1,203501,2035),('2035-01-04',203501,1,2035,4,1,203501,2035),('2035-01-05',203501,1,2035,5,1,203501,2035),('2035-01-06',203501,1,2035,6,1,203501,2035),('2035-01-07',203502,1,2035,7,2,203501,2035),('2035-01-08',203502,1,2035,8,2,203501,2035),('2035-01-09',203502,1,2035,9,2,203501,2035),('2035-01-10',203502,1,2035,10,2,203501,2035),('2035-01-11',203502,1,2035,11,2,203501,2035),('2035-01-12',203502,1,2035,12,2,203501,2035),('2035-01-13',203502,1,2035,13,2,203501,2035),('2035-01-14',203503,1,2035,14,3,203501,2035),('2035-01-15',203503,1,2035,15,3,203501,2035),('2035-01-16',203503,1,2035,16,3,203501,2035),('2035-01-17',203503,1,2035,17,3,203501,2035),('2035-01-18',203503,1,2035,18,3,203501,2035),('2035-01-19',203503,1,2035,19,3,203501,2035),('2035-01-20',203503,1,2035,20,3,203501,2035),('2035-01-21',203504,1,2035,21,4,203501,2035),('2035-01-22',203504,1,2035,22,4,203501,2035),('2035-01-23',203504,1,2035,23,4,203501,2035),('2035-01-24',203504,1,2035,24,4,203501,2035),('2035-01-25',203504,1,2035,25,4,203501,2035),('2035-01-26',203504,1,2035,26,4,203501,2035),('2035-01-27',203504,1,2035,27,4,203501,2035),('2035-01-28',203505,1,2035,28,5,203501,2035),('2035-01-29',203505,1,2035,29,5,203501,2035),('2035-01-30',203505,1,2035,30,5,203501,2035),('2035-01-31',203505,1,2035,31,5,203501,2035),('2035-02-01',203505,2,2035,1,5,203502,2035),('2035-02-02',203505,2,2035,2,5,203502,2035),('2035-02-03',203505,2,2035,3,5,203502,2035),('2035-02-04',203506,2,2035,4,6,203502,2035),('2035-02-05',203506,2,2035,5,6,203502,2035),('2035-02-06',203506,2,2035,6,6,203502,2035),('2035-02-07',203506,2,2035,7,6,203502,2035),('2035-02-08',203506,2,2035,8,6,203502,2035),('2035-02-09',203506,2,2035,9,6,203502,2035),('2035-02-10',203506,2,2035,10,6,203502,2035),('2035-02-11',203507,2,2035,11,7,203502,2035),('2035-02-12',203507,2,2035,12,7,203502,2035),('2035-02-13',203507,2,2035,13,7,203502,2035),('2035-02-14',203507,2,2035,14,7,203502,2035),('2035-02-15',203507,2,2035,15,7,203502,2035),('2035-02-16',203507,2,2035,16,7,203502,2035),('2035-02-17',203507,2,2035,17,7,203502,2035),('2035-02-18',203508,2,2035,18,8,203502,2035),('2035-02-19',203508,2,2035,19,8,203502,2035),('2035-02-20',203508,2,2035,20,8,203502,2035),('2035-02-21',203508,2,2035,21,8,203502,2035),('2035-02-22',203508,2,2035,22,8,203502,2035),('2035-02-23',203508,2,2035,23,8,203502,2035),('2035-02-24',203508,2,2035,24,8,203502,2035),('2035-02-25',203509,2,2035,25,9,203502,2035),('2035-02-26',203509,2,2035,26,9,203502,2035),('2035-02-27',203509,2,2035,27,9,203502,2035),('2035-02-28',203509,2,2035,28,9,203502,2035),('2035-03-01',203509,3,2035,1,9,203503,2035),('2035-03-02',203509,3,2035,2,9,203503,2035),('2035-03-03',203509,3,2035,3,9,203503,2035),('2035-03-04',203510,3,2035,4,10,203503,2035),('2035-03-05',203510,3,2035,5,10,203503,2035),('2035-03-06',203510,3,2035,6,10,203503,2035),('2035-03-07',203510,3,2035,7,10,203503,2035),('2035-03-08',203510,3,2035,8,10,203503,2035),('2035-03-09',203510,3,2035,9,10,203503,2035),('2035-03-10',203510,3,2035,10,10,203503,2035),('2035-03-11',203511,3,2035,11,11,203503,2035),('2035-03-12',203511,3,2035,12,11,203503,2035),('2035-03-13',203511,3,2035,13,11,203503,2035),('2035-03-14',203511,3,2035,14,11,203503,2035),('2035-03-15',203511,3,2035,15,11,203503,2035),('2035-03-16',203511,3,2035,16,11,203503,2035),('2035-03-17',203511,3,2035,17,11,203503,2035),('2035-03-18',203512,3,2035,18,12,203503,2035),('2035-03-19',203512,3,2035,19,12,203503,2035),('2035-03-20',203512,3,2035,20,12,203503,2035),('2035-03-21',203512,3,2035,21,12,203503,2035),('2035-03-22',203512,3,2035,22,12,203503,2035),('2035-03-23',203512,3,2035,23,12,203503,2035),('2035-03-24',203512,3,2035,24,12,203503,2035),('2035-03-25',203513,3,2035,25,13,203503,2035),('2035-03-26',203513,3,2035,26,13,203503,2035),('2035-03-27',203513,3,2035,27,13,203503,2035),('2035-03-28',203513,3,2035,28,13,203503,2035),('2035-03-29',203513,3,2035,29,13,203503,2035),('2035-03-30',203513,3,2035,30,13,203503,2035),('2035-03-31',203513,3,2035,31,13,203503,2035),('2035-04-01',203514,4,2035,1,14,203504,2035),('2035-04-02',203514,4,2035,2,14,203504,2035),('2035-04-03',203514,4,2035,3,14,203504,2035),('2035-04-04',203514,4,2035,4,14,203504,2035),('2035-04-05',203514,4,2035,5,14,203504,2035),('2035-04-06',203514,4,2035,6,14,203504,2035),('2035-04-07',203514,4,2035,7,14,203504,2035),('2035-04-08',203515,4,2035,8,15,203504,2035),('2035-04-09',203515,4,2035,9,15,203504,2035),('2035-04-10',203515,4,2035,10,15,203504,2035),('2035-04-11',203515,4,2035,11,15,203504,2035),('2035-04-12',203515,4,2035,12,15,203504,2035),('2035-04-13',203515,4,2035,13,15,203504,2035),('2035-04-14',203515,4,2035,14,15,203504,2035),('2035-04-15',203516,4,2035,15,16,203504,2035),('2035-04-16',203516,4,2035,16,16,203504,2035),('2035-04-17',203516,4,2035,17,16,203504,2035),('2035-04-18',203516,4,2035,18,16,203504,2035),('2035-04-19',203516,4,2035,19,16,203504,2035),('2035-04-20',203516,4,2035,20,16,203504,2035),('2035-04-21',203516,4,2035,21,16,203504,2035),('2035-04-22',203517,4,2035,22,17,203504,2035),('2035-04-23',203517,4,2035,23,17,203504,2035),('2035-04-24',203517,4,2035,24,17,203504,2035),('2035-04-25',203517,4,2035,25,17,203504,2035),('2035-04-26',203517,4,2035,26,17,203504,2035),('2035-04-27',203517,4,2035,27,17,203504,2035),('2035-04-28',203517,4,2035,28,17,203504,2035),('2035-04-29',203518,4,2035,29,18,203504,2035),('2035-04-30',203518,4,2035,30,18,203504,2035),('2035-05-01',203518,5,2035,1,18,203505,2035),('2035-05-02',203518,5,2035,2,18,203505,2035),('2035-05-03',203518,5,2035,3,18,203505,2035),('2035-05-04',203518,5,2035,4,18,203505,2035),('2035-05-05',203518,5,2035,5,18,203505,2035),('2035-05-06',203519,5,2035,6,19,203505,2035),('2035-05-07',203519,5,2035,7,19,203505,2035),('2035-05-08',203519,5,2035,8,19,203505,2035),('2035-05-09',203519,5,2035,9,19,203505,2035),('2035-05-10',203519,5,2035,10,19,203505,2035),('2035-05-11',203519,5,2035,11,19,203505,2035),('2035-05-12',203519,5,2035,12,19,203505,2035),('2035-05-13',203520,5,2035,13,20,203505,2035),('2035-05-14',203520,5,2035,14,20,203505,2035),('2035-05-15',203520,5,2035,15,20,203505,2035),('2035-05-16',203520,5,2035,16,20,203505,2035),('2035-05-17',203520,5,2035,17,20,203505,2035),('2035-05-18',203520,5,2035,18,20,203505,2035),('2035-05-19',203520,5,2035,19,20,203505,2035),('2035-05-20',203521,5,2035,20,21,203505,2035),('2035-05-21',203521,5,2035,21,21,203505,2035),('2035-05-22',203521,5,2035,22,21,203505,2035),('2035-05-23',203521,5,2035,23,21,203505,2035),('2035-05-24',203521,5,2035,24,21,203505,2035),('2035-05-25',203521,5,2035,25,21,203505,2035),('2035-05-26',203521,5,2035,26,21,203505,2035),('2035-05-27',203522,5,2035,27,22,203505,2035),('2035-05-28',203522,5,2035,28,22,203505,2035),('2035-05-29',203522,5,2035,29,22,203505,2035),('2035-05-30',203522,5,2035,30,22,203505,2035),('2035-05-31',203522,5,2035,31,22,203505,2035),('2035-06-01',203522,6,2035,1,22,203506,2035),('2035-06-02',203522,6,2035,2,22,203506,2035),('2035-06-03',203523,6,2035,3,23,203506,2035),('2035-06-04',203523,6,2035,4,23,203506,2035),('2035-06-05',203523,6,2035,5,23,203506,2035),('2035-06-06',203523,6,2035,6,23,203506,2035),('2035-06-07',203523,6,2035,7,23,203506,2035),('2035-06-08',203523,6,2035,8,23,203506,2035),('2035-06-09',203523,6,2035,9,23,203506,2035),('2035-06-10',203524,6,2035,10,24,203506,2035),('2035-06-11',203524,6,2035,11,24,203506,2035),('2035-06-12',203524,6,2035,12,24,203506,2035),('2035-06-13',203524,6,2035,13,24,203506,2035),('2035-06-14',203524,6,2035,14,24,203506,2035),('2035-06-15',203524,6,2035,15,24,203506,2035),('2035-06-16',203524,6,2035,16,24,203506,2035),('2035-06-17',203525,6,2035,17,25,203506,2035),('2035-06-18',203525,6,2035,18,25,203506,2035),('2035-06-19',203525,6,2035,19,25,203506,2035),('2035-06-20',203525,6,2035,20,25,203506,2035),('2035-06-21',203525,6,2035,21,25,203506,2035),('2035-06-22',203525,6,2035,22,25,203506,2035),('2035-06-23',203525,6,2035,23,25,203506,2035),('2035-06-24',203526,6,2035,24,26,203506,2035),('2035-06-25',203526,6,2035,25,26,203506,2035),('2035-06-26',203526,6,2035,26,26,203506,2035),('2035-06-27',203526,6,2035,27,26,203506,2035),('2035-06-28',203526,6,2035,28,26,203506,2035),('2035-06-29',203526,6,2035,29,26,203506,2035),('2035-06-30',203526,6,2035,30,26,203506,2035),('2035-07-01',203527,7,2035,1,27,203507,2035),('2035-07-02',203527,7,2035,2,27,203507,2035),('2035-07-03',203527,7,2035,3,27,203507,2035),('2035-07-04',203527,7,2035,4,27,203507,2035),('2035-07-05',203527,7,2035,5,27,203507,2035),('2035-07-06',203527,7,2035,6,27,203507,2035),('2035-07-07',203527,7,2035,7,27,203507,2035),('2035-07-08',203528,7,2035,8,28,203507,2035),('2035-07-09',203528,7,2035,9,28,203507,2035),('2035-07-10',203528,7,2035,10,28,203507,2035),('2035-07-11',203528,7,2035,11,28,203507,2035),('2035-07-12',203528,7,2035,12,28,203507,2035),('2035-07-13',203528,7,2035,13,28,203507,2035),('2035-07-14',203528,7,2035,14,28,203507,2035),('2035-07-15',203529,7,2035,15,29,203507,2035),('2035-07-16',203529,7,2035,16,29,203507,2035),('2035-07-17',203529,7,2035,17,29,203507,2035),('2035-07-18',203529,7,2035,18,29,203507,2035),('2035-07-19',203529,7,2035,19,29,203507,2035),('2035-07-20',203529,7,2035,20,29,203507,2035),('2035-07-21',203529,7,2035,21,29,203507,2035),('2035-07-22',203530,7,2035,22,30,203507,2035),('2035-07-23',203530,7,2035,23,30,203507,2035),('2035-07-24',203530,7,2035,24,30,203507,2035),('2035-07-25',203530,7,2035,25,30,203507,2035),('2035-07-26',203530,7,2035,26,30,203507,2035),('2035-07-27',203530,7,2035,27,30,203507,2035),('2035-07-28',203530,7,2035,28,30,203507,2035),('2035-07-29',203531,7,2035,29,31,203507,2035),('2035-07-30',203531,7,2035,30,31,203507,2035),('2035-07-31',203531,7,2035,31,31,203507,2035),('2035-08-01',203531,8,2035,1,31,203508,2035),('2035-08-02',203531,8,2035,2,31,203508,2035),('2035-08-03',203531,8,2035,3,31,203508,2035),('2035-08-04',203531,8,2035,4,31,203508,2035),('2035-08-05',203532,8,2035,5,32,203508,2035),('2035-08-06',203532,8,2035,6,32,203508,2035),('2035-08-07',203532,8,2035,7,32,203508,2035),('2035-08-08',203532,8,2035,8,32,203508,2035),('2035-08-09',203532,8,2035,9,32,203508,2035),('2035-08-10',203532,8,2035,10,32,203508,2035),('2035-08-11',203532,8,2035,11,32,203508,2035),('2035-08-12',203533,8,2035,12,33,203508,2035),('2035-08-13',203533,8,2035,13,33,203508,2035),('2035-08-14',203533,8,2035,14,33,203508,2035),('2035-08-15',203533,8,2035,15,33,203508,2035),('2035-08-16',203533,8,2035,16,33,203508,2035),('2035-08-17',203533,8,2035,17,33,203508,2035),('2035-08-18',203533,8,2035,18,33,203508,2035),('2035-08-19',203534,8,2035,19,34,203508,2035),('2035-08-20',203534,8,2035,20,34,203508,2035),('2035-08-21',203534,8,2035,21,34,203508,2035),('2035-08-22',203534,8,2035,22,34,203508,2035),('2035-08-23',203534,8,2035,23,34,203508,2035),('2035-08-24',203534,8,2035,24,34,203508,2035),('2035-08-25',203534,8,2035,25,34,203508,2035),('2035-08-26',203535,8,2035,26,35,203508,2035),('2035-08-27',203535,8,2035,27,35,203508,2035),('2035-08-28',203535,8,2035,28,35,203508,2035),('2035-08-29',203535,8,2035,29,35,203508,2035),('2035-08-30',203535,8,2035,30,35,203508,2035),('2035-08-31',203535,8,2035,31,35,203508,2035),('2035-09-01',203535,9,2035,1,35,203509,2035),('2035-09-02',203536,9,2035,2,36,203509,2035),('2035-09-03',203536,9,2035,3,36,203509,2035),('2035-09-04',203536,9,2035,4,36,203509,2035),('2035-09-05',203536,9,2035,5,36,203509,2035),('2035-09-06',203536,9,2035,6,36,203509,2035),('2035-09-07',203536,9,2035,7,36,203509,2035),('2035-09-08',203536,9,2035,8,36,203509,2035),('2035-09-09',203537,9,2035,9,37,203509,2035),('2035-09-10',203537,9,2035,10,37,203509,2035),('2035-09-11',203537,9,2035,11,37,203509,2035),('2035-09-12',203537,9,2035,12,37,203509,2035),('2035-09-13',203537,9,2035,13,37,203509,2035),('2035-09-14',203537,9,2035,14,37,203509,2035),('2035-09-15',203537,9,2035,15,37,203509,2035),('2035-09-16',203538,9,2035,16,38,203509,2035),('2035-09-17',203538,9,2035,17,38,203509,2035),('2035-09-18',203538,9,2035,18,38,203509,2035),('2035-09-19',203538,9,2035,19,38,203509,2035),('2035-09-20',203538,9,2035,20,38,203509,2035),('2035-09-21',203538,9,2035,21,38,203509,2035),('2035-09-22',203538,9,2035,22,38,203509,2035),('2035-09-23',203539,9,2035,23,39,203509,2035),('2035-09-24',203539,9,2035,24,39,203509,2035),('2035-09-25',203539,9,2035,25,39,203509,2035),('2035-09-26',203539,9,2035,26,39,203509,2035),('2035-09-27',203539,9,2035,27,39,203509,2035),('2035-09-28',203539,9,2035,28,39,203509,2035),('2035-09-29',203539,9,2035,29,39,203509,2035),('2035-09-30',203540,9,2035,30,40,203509,2035),('2035-10-01',203540,10,2035,1,40,203510,2035),('2035-10-02',203540,10,2035,2,40,203510,2035),('2035-10-03',203540,10,2035,3,40,203510,2035),('2035-10-04',203540,10,2035,4,40,203510,2035),('2035-10-05',203540,10,2035,5,40,203510,2035),('2035-10-06',203540,10,2035,6,40,203510,2035),('2035-10-07',203541,10,2035,7,41,203510,2035),('2035-10-08',203541,10,2035,8,41,203510,2035),('2035-10-09',203541,10,2035,9,41,203510,2035),('2035-10-10',203541,10,2035,10,41,203510,2035),('2035-10-11',203541,10,2035,11,41,203510,2035),('2035-10-12',203541,10,2035,12,41,203510,2035),('2035-10-13',203541,10,2035,13,41,203510,2035),('2035-10-14',203542,10,2035,14,42,203510,2035),('2035-10-15',203542,10,2035,15,42,203510,2035),('2035-10-16',203542,10,2035,16,42,203510,2035),('2035-10-17',203542,10,2035,17,42,203510,2035),('2035-10-18',203542,10,2035,18,42,203510,2035),('2035-10-19',203542,10,2035,19,42,203510,2035),('2035-10-20',203542,10,2035,20,42,203510,2035),('2035-10-21',203543,10,2035,21,43,203510,2035),('2035-10-22',203543,10,2035,22,43,203510,2035),('2035-10-23',203543,10,2035,23,43,203510,2035),('2035-10-24',203543,10,2035,24,43,203510,2035),('2035-10-25',203543,10,2035,25,43,203510,2035),('2035-10-26',203543,10,2035,26,43,203510,2035),('2035-10-27',203543,10,2035,27,43,203510,2035),('2035-10-28',203544,10,2035,28,44,203510,2035),('2035-10-29',203544,10,2035,29,44,203510,2035),('2035-10-30',203544,10,2035,30,44,203510,2035),('2035-10-31',203544,10,2035,31,44,203510,2035),('2035-11-01',203544,11,2035,1,44,203511,2035),('2035-11-02',203544,11,2035,2,44,203511,2035),('2035-11-03',203544,11,2035,3,44,203511,2035),('2035-11-04',203545,11,2035,4,45,203511,2035),('2035-11-05',203545,11,2035,5,45,203511,2035),('2035-11-06',203545,11,2035,6,45,203511,2035),('2035-11-07',203545,11,2035,7,45,203511,2035),('2035-11-08',203545,11,2035,8,45,203511,2035),('2035-11-09',203545,11,2035,9,45,203511,2035),('2035-11-10',203545,11,2035,10,45,203511,2035),('2035-11-11',203546,11,2035,11,46,203511,2035),('2035-11-12',203546,11,2035,12,46,203511,2035),('2035-11-13',203546,11,2035,13,46,203511,2035),('2035-11-14',203546,11,2035,14,46,203511,2035),('2035-11-15',203546,11,2035,15,46,203511,2035),('2035-11-16',203546,11,2035,16,46,203511,2035),('2035-11-17',203546,11,2035,17,46,203511,2035),('2035-11-18',203547,11,2035,18,47,203511,2035),('2035-11-19',203547,11,2035,19,47,203511,2035),('2035-11-20',203547,11,2035,20,47,203511,2035),('2035-11-21',203547,11,2035,21,47,203511,2035),('2035-11-22',203547,11,2035,22,47,203511,2035),('2035-11-23',203547,11,2035,23,47,203511,2035),('2035-11-24',203547,11,2035,24,47,203511,2035),('2035-11-25',203548,11,2035,25,48,203511,2035),('2035-11-26',203548,11,2035,26,48,203511,2035),('2035-11-27',203548,11,2035,27,48,203511,2035),('2035-11-28',203548,11,2035,28,48,203511,2035),('2035-11-29',203548,11,2035,29,48,203511,2035),('2035-11-30',203548,11,2035,30,48,203511,2035),('2035-12-01',203548,12,2035,1,48,203512,2036),('2035-12-02',203549,12,2035,2,49,203512,2036),('2035-12-03',203549,12,2035,3,49,203512,2036),('2035-12-04',203549,12,2035,4,49,203512,2036),('2035-12-05',203549,12,2035,5,49,203512,2036),('2035-12-06',203549,12,2035,6,49,203512,2036),('2035-12-07',203549,12,2035,7,49,203512,2036),('2035-12-08',203549,12,2035,8,49,203512,2036),('2035-12-09',203550,12,2035,9,50,203512,2036),('2035-12-10',203550,12,2035,10,50,203512,2036),('2035-12-11',203550,12,2035,11,50,203512,2036),('2035-12-12',203550,12,2035,12,50,203512,2036),('2035-12-13',203550,12,2035,13,50,203512,2036),('2035-12-14',203550,12,2035,14,50,203512,2036),('2035-12-15',203550,12,2035,15,50,203512,2036),('2035-12-16',203551,12,2035,16,51,203512,2036),('2035-12-17',203551,12,2035,17,51,203512,2036),('2035-12-18',203551,12,2035,18,51,203512,2036),('2035-12-19',203551,12,2035,19,51,203512,2036),('2035-12-20',203551,12,2035,20,51,203512,2036),('2035-12-21',203551,12,2035,21,51,203512,2036),('2035-12-22',203551,12,2035,22,51,203512,2036),('2035-12-23',203552,12,2035,23,52,203512,2036),('2035-12-24',203552,12,2035,24,52,203512,2036),('2035-12-25',203552,12,2035,25,52,203512,2036),('2035-12-26',203552,12,2035,26,52,203512,2036),('2035-12-27',203552,12,2035,27,52,203512,2036),('2035-12-28',203552,12,2035,28,52,203512,2036),('2035-12-29',203552,12,2035,29,52,203512,2036),('2035-12-30',203553,12,2035,30,1,203512,2036),('2035-12-31',203501,12,2035,31,1,203512,2036),('2036-01-01',203601,1,2036,1,1,203601,2036),('2036-01-02',203601,1,2036,2,1,203601,2036),('2036-01-03',203601,1,2036,3,1,203601,2036),('2036-01-04',203601,1,2036,4,1,203601,2036),('2036-01-05',203601,1,2036,5,1,203601,2036),('2036-01-06',203602,1,2036,6,2,203601,2036),('2036-01-07',203602,1,2036,7,2,203601,2036),('2036-01-08',203602,1,2036,8,2,203601,2036),('2036-01-09',203602,1,2036,9,2,203601,2036),('2036-01-10',203602,1,2036,10,2,203601,2036),('2036-01-11',203602,1,2036,11,2,203601,2036),('2036-01-12',203602,1,2036,12,2,203601,2036),('2036-01-13',203603,1,2036,13,3,203601,2036),('2036-01-14',203603,1,2036,14,3,203601,2036),('2036-01-15',203603,1,2036,15,3,203601,2036),('2036-01-16',203603,1,2036,16,3,203601,2036),('2036-01-17',203603,1,2036,17,3,203601,2036),('2036-01-18',203603,1,2036,18,3,203601,2036),('2036-01-19',203603,1,2036,19,3,203601,2036),('2036-01-20',203604,1,2036,20,4,203601,2036),('2036-01-21',203604,1,2036,21,4,203601,2036),('2036-01-22',203604,1,2036,22,4,203601,2036),('2036-01-23',203604,1,2036,23,4,203601,2036),('2036-01-24',203604,1,2036,24,4,203601,2036),('2036-01-25',203604,1,2036,25,4,203601,2036),('2036-01-26',203604,1,2036,26,4,203601,2036),('2036-01-27',203605,1,2036,27,5,203601,2036),('2036-01-28',203605,1,2036,28,5,203601,2036),('2036-01-29',203605,1,2036,29,5,203601,2036),('2036-01-30',203605,1,2036,30,5,203601,2036),('2036-01-31',203605,1,2036,31,5,203601,2036),('2036-02-01',203605,2,2036,1,5,203602,2036),('2036-02-02',203605,2,2036,2,5,203602,2036),('2036-02-03',203606,2,2036,3,6,203602,2036),('2036-02-04',203606,2,2036,4,6,203602,2036),('2036-02-05',203606,2,2036,5,6,203602,2036),('2036-02-06',203606,2,2036,6,6,203602,2036),('2036-02-07',203606,2,2036,7,6,203602,2036),('2036-02-08',203606,2,2036,8,6,203602,2036),('2036-02-09',203606,2,2036,9,6,203602,2036),('2036-02-10',203607,2,2036,10,7,203602,2036),('2036-02-11',203607,2,2036,11,7,203602,2036),('2036-02-12',203607,2,2036,12,7,203602,2036),('2036-02-13',203607,2,2036,13,7,203602,2036),('2036-02-14',203607,2,2036,14,7,203602,2036),('2036-02-15',203607,2,2036,15,7,203602,2036),('2036-02-16',203607,2,2036,16,7,203602,2036),('2036-02-17',203608,2,2036,17,8,203602,2036),('2036-02-18',203608,2,2036,18,8,203602,2036),('2036-02-19',203608,2,2036,19,8,203602,2036),('2036-02-20',203608,2,2036,20,8,203602,2036),('2036-02-21',203608,2,2036,21,8,203602,2036),('2036-02-22',203608,2,2036,22,8,203602,2036),('2036-02-23',203608,2,2036,23,8,203602,2036),('2036-02-24',203609,2,2036,24,9,203602,2036),('2036-02-25',203609,2,2036,25,9,203602,2036),('2036-02-26',203609,2,2036,26,9,203602,2036),('2036-02-27',203609,2,2036,27,9,203602,2036),('2036-02-28',203609,2,2036,28,9,203602,2036),('2036-02-29',203609,2,2036,29,9,203602,2036),('2036-03-01',203609,3,2036,1,9,203603,2036),('2036-03-02',203610,3,2036,2,10,203603,2036),('2036-03-03',203610,3,2036,3,10,203603,2036),('2036-03-04',203610,3,2036,4,10,203603,2036),('2036-03-05',203610,3,2036,5,10,203603,2036),('2036-03-06',203610,3,2036,6,10,203603,2036),('2036-03-07',203610,3,2036,7,10,203603,2036),('2036-03-08',203610,3,2036,8,10,203603,2036),('2036-03-09',203611,3,2036,9,11,203603,2036),('2036-03-10',203611,3,2036,10,11,203603,2036),('2036-03-11',203611,3,2036,11,11,203603,2036),('2036-03-12',203611,3,2036,12,11,203603,2036),('2036-03-13',203611,3,2036,13,11,203603,2036),('2036-03-14',203611,3,2036,14,11,203603,2036),('2036-03-15',203611,3,2036,15,11,203603,2036),('2036-03-16',203612,3,2036,16,12,203603,2036),('2036-03-17',203612,3,2036,17,12,203603,2036),('2036-03-18',203612,3,2036,18,12,203603,2036),('2036-03-19',203612,3,2036,19,12,203603,2036),('2036-03-20',203612,3,2036,20,12,203603,2036),('2036-03-21',203612,3,2036,21,12,203603,2036),('2036-03-22',203612,3,2036,22,12,203603,2036),('2036-03-23',203613,3,2036,23,13,203603,2036),('2036-03-24',203613,3,2036,24,13,203603,2036),('2036-03-25',203613,3,2036,25,13,203603,2036),('2036-03-26',203613,3,2036,26,13,203603,2036),('2036-03-27',203613,3,2036,27,13,203603,2036),('2036-03-28',203613,3,2036,28,13,203603,2036),('2036-03-29',203613,3,2036,29,13,203603,2036),('2036-03-30',203614,3,2036,30,14,203603,2036),('2036-03-31',203614,3,2036,31,14,203603,2036),('2036-04-01',203614,4,2036,1,14,203604,2036),('2036-04-02',203614,4,2036,2,14,203604,2036),('2036-04-03',203614,4,2036,3,14,203604,2036),('2036-04-04',203614,4,2036,4,14,203604,2036),('2036-04-05',203614,4,2036,5,14,203604,2036),('2036-04-06',203615,4,2036,6,15,203604,2036),('2036-04-07',203615,4,2036,7,15,203604,2036),('2036-04-08',203615,4,2036,8,15,203604,2036),('2036-04-09',203615,4,2036,9,15,203604,2036),('2036-04-10',203615,4,2036,10,15,203604,2036),('2036-04-11',203615,4,2036,11,15,203604,2036),('2036-04-12',203615,4,2036,12,15,203604,2036),('2036-04-13',203616,4,2036,13,16,203604,2036),('2036-04-14',203616,4,2036,14,16,203604,2036),('2036-04-15',203616,4,2036,15,16,203604,2036),('2036-04-16',203616,4,2036,16,16,203604,2036),('2036-04-17',203616,4,2036,17,16,203604,2036),('2036-04-18',203616,4,2036,18,16,203604,2036),('2036-04-19',203616,4,2036,19,16,203604,2036),('2036-04-20',203617,4,2036,20,17,203604,2036),('2036-04-21',203617,4,2036,21,17,203604,2036),('2036-04-22',203617,4,2036,22,17,203604,2036),('2036-04-23',203617,4,2036,23,17,203604,2036),('2036-04-24',203617,4,2036,24,17,203604,2036),('2036-04-25',203617,4,2036,25,17,203604,2036),('2036-04-26',203617,4,2036,26,17,203604,2036),('2036-04-27',203618,4,2036,27,18,203604,2036),('2036-04-28',203618,4,2036,28,18,203604,2036),('2036-04-29',203618,4,2036,29,18,203604,2036),('2036-04-30',203618,4,2036,30,18,203604,2036),('2036-05-01',203618,5,2036,1,18,203605,2036),('2036-05-02',203618,5,2036,2,18,203605,2036),('2036-05-03',203618,5,2036,3,18,203605,2036),('2036-05-04',203619,5,2036,4,19,203605,2036),('2036-05-05',203619,5,2036,5,19,203605,2036),('2036-05-06',203619,5,2036,6,19,203605,2036),('2036-05-07',203619,5,2036,7,19,203605,2036),('2036-05-08',203619,5,2036,8,19,203605,2036),('2036-05-09',203619,5,2036,9,19,203605,2036),('2036-05-10',203619,5,2036,10,19,203605,2036),('2036-05-11',203620,5,2036,11,20,203605,2036),('2036-05-12',203620,5,2036,12,20,203605,2036),('2036-05-13',203620,5,2036,13,20,203605,2036),('2036-05-14',203620,5,2036,14,20,203605,2036),('2036-05-15',203620,5,2036,15,20,203605,2036),('2036-05-16',203620,5,2036,16,20,203605,2036),('2036-05-17',203620,5,2036,17,20,203605,2036),('2036-05-18',203621,5,2036,18,21,203605,2036),('2036-05-19',203621,5,2036,19,21,203605,2036),('2036-05-20',203621,5,2036,20,21,203605,2036),('2036-05-21',203621,5,2036,21,21,203605,2036),('2036-05-22',203621,5,2036,22,21,203605,2036),('2036-05-23',203621,5,2036,23,21,203605,2036),('2036-05-24',203621,5,2036,24,21,203605,2036),('2036-05-25',203622,5,2036,25,22,203605,2036),('2036-05-26',203622,5,2036,26,22,203605,2036),('2036-05-27',203622,5,2036,27,22,203605,2036),('2036-05-28',203622,5,2036,28,22,203605,2036),('2036-05-29',203622,5,2036,29,22,203605,2036),('2036-05-30',203622,5,2036,30,22,203605,2036),('2036-05-31',203622,5,2036,31,22,203605,2036),('2036-06-01',203623,6,2036,1,23,203606,2036),('2036-06-02',203623,6,2036,2,23,203606,2036),('2036-06-03',203623,6,2036,3,23,203606,2036),('2036-06-04',203623,6,2036,4,23,203606,2036),('2036-06-05',203623,6,2036,5,23,203606,2036),('2036-06-06',203623,6,2036,6,23,203606,2036),('2036-06-07',203623,6,2036,7,23,203606,2036),('2036-06-08',203624,6,2036,8,24,203606,2036),('2036-06-09',203624,6,2036,9,24,203606,2036),('2036-06-10',203624,6,2036,10,24,203606,2036),('2036-06-11',203624,6,2036,11,24,203606,2036),('2036-06-12',203624,6,2036,12,24,203606,2036),('2036-06-13',203624,6,2036,13,24,203606,2036),('2036-06-14',203624,6,2036,14,24,203606,2036),('2036-06-15',203625,6,2036,15,25,203606,2036),('2036-06-16',203625,6,2036,16,25,203606,2036),('2036-06-17',203625,6,2036,17,25,203606,2036),('2036-06-18',203625,6,2036,18,25,203606,2036),('2036-06-19',203625,6,2036,19,25,203606,2036),('2036-06-20',203625,6,2036,20,25,203606,2036),('2036-06-21',203625,6,2036,21,25,203606,2036),('2036-06-22',203626,6,2036,22,26,203606,2036),('2036-06-23',203626,6,2036,23,26,203606,2036),('2036-06-24',203626,6,2036,24,26,203606,2036),('2036-06-25',203626,6,2036,25,26,203606,2036),('2036-06-26',203626,6,2036,26,26,203606,2036),('2036-06-27',203626,6,2036,27,26,203606,2036),('2036-06-28',203626,6,2036,28,26,203606,2036),('2036-06-29',203627,6,2036,29,27,203606,2036),('2036-06-30',203627,6,2036,30,27,203606,2036),('2036-07-01',203627,7,2036,1,27,203607,2036),('2036-07-02',203627,7,2036,2,27,203607,2036),('2036-07-03',203627,7,2036,3,27,203607,2036),('2036-07-04',203627,7,2036,4,27,203607,2036),('2036-07-05',203627,7,2036,5,27,203607,2036),('2036-07-06',203628,7,2036,6,28,203607,2036),('2036-07-07',203628,7,2036,7,28,203607,2036),('2036-07-08',203628,7,2036,8,28,203607,2036),('2036-07-09',203628,7,2036,9,28,203607,2036),('2036-07-10',203628,7,2036,10,28,203607,2036),('2036-07-11',203628,7,2036,11,28,203607,2036),('2036-07-12',203628,7,2036,12,28,203607,2036),('2036-07-13',203629,7,2036,13,29,203607,2036),('2036-07-14',203629,7,2036,14,29,203607,2036),('2036-07-15',203629,7,2036,15,29,203607,2036),('2036-07-16',203629,7,2036,16,29,203607,2036),('2036-07-17',203629,7,2036,17,29,203607,2036),('2036-07-18',203629,7,2036,18,29,203607,2036),('2036-07-19',203629,7,2036,19,29,203607,2036),('2036-07-20',203630,7,2036,20,30,203607,2036),('2036-07-21',203630,7,2036,21,30,203607,2036),('2036-07-22',203630,7,2036,22,30,203607,2036),('2036-07-23',203630,7,2036,23,30,203607,2036),('2036-07-24',203630,7,2036,24,30,203607,2036),('2036-07-25',203630,7,2036,25,30,203607,2036),('2036-07-26',203630,7,2036,26,30,203607,2036),('2036-07-27',203631,7,2036,27,31,203607,2036),('2036-07-28',203631,7,2036,28,31,203607,2036),('2036-07-29',203631,7,2036,29,31,203607,2036),('2036-07-30',203631,7,2036,30,31,203607,2036),('2036-07-31',203631,7,2036,31,31,203607,2036),('2036-08-01',203631,8,2036,1,31,203608,2036),('2036-08-02',203631,8,2036,2,31,203608,2036),('2036-08-03',203632,8,2036,3,32,203608,2036),('2036-08-04',203632,8,2036,4,32,203608,2036),('2036-08-05',203632,8,2036,5,32,203608,2036),('2036-08-06',203632,8,2036,6,32,203608,2036),('2036-08-07',203632,8,2036,7,32,203608,2036),('2036-08-08',203632,8,2036,8,32,203608,2036),('2036-08-09',203632,8,2036,9,32,203608,2036),('2036-08-10',203633,8,2036,10,33,203608,2036),('2036-08-11',203633,8,2036,11,33,203608,2036),('2036-08-12',203633,8,2036,12,33,203608,2036),('2036-08-13',203633,8,2036,13,33,203608,2036),('2036-08-14',203633,8,2036,14,33,203608,2036),('2036-08-15',203633,8,2036,15,33,203608,2036),('2036-08-16',203633,8,2036,16,33,203608,2036),('2036-08-17',203634,8,2036,17,34,203608,2036),('2036-08-18',203634,8,2036,18,34,203608,2036),('2036-08-19',203634,8,2036,19,34,203608,2036),('2036-08-20',203634,8,2036,20,34,203608,2036),('2036-08-21',203634,8,2036,21,34,203608,2036),('2036-08-22',203634,8,2036,22,34,203608,2036),('2036-08-23',203634,8,2036,23,34,203608,2036),('2036-08-24',203635,8,2036,24,35,203608,2036),('2036-08-25',203635,8,2036,25,35,203608,2036),('2036-08-26',203635,8,2036,26,35,203608,2036),('2036-08-27',203635,8,2036,27,35,203608,2036),('2036-08-28',203635,8,2036,28,35,203608,2036),('2036-08-29',203635,8,2036,29,35,203608,2036),('2036-08-30',203635,8,2036,30,35,203608,2036),('2036-08-31',203636,8,2036,31,36,203608,2036),('2036-09-01',203636,9,2036,1,36,203609,2036),('2036-09-02',203636,9,2036,2,36,203609,2036),('2036-09-03',203636,9,2036,3,36,203609,2036),('2036-09-04',203636,9,2036,4,36,203609,2036),('2036-09-05',203636,9,2036,5,36,203609,2036),('2036-09-06',203636,9,2036,6,36,203609,2036),('2036-09-07',203637,9,2036,7,37,203609,2036),('2036-09-08',203637,9,2036,8,37,203609,2036),('2036-09-09',203637,9,2036,9,37,203609,2036),('2036-09-10',203637,9,2036,10,37,203609,2036),('2036-09-11',203637,9,2036,11,37,203609,2036),('2036-09-12',203637,9,2036,12,37,203609,2036),('2036-09-13',203637,9,2036,13,37,203609,2036),('2036-09-14',203638,9,2036,14,38,203609,2036),('2036-09-15',203638,9,2036,15,38,203609,2036),('2036-09-16',203638,9,2036,16,38,203609,2036),('2036-09-17',203638,9,2036,17,38,203609,2036),('2036-09-18',203638,9,2036,18,38,203609,2036),('2036-09-19',203638,9,2036,19,38,203609,2036),('2036-09-20',203638,9,2036,20,38,203609,2036),('2036-09-21',203639,9,2036,21,39,203609,2036),('2036-09-22',203639,9,2036,22,39,203609,2036),('2036-09-23',203639,9,2036,23,39,203609,2036),('2036-09-24',203639,9,2036,24,39,203609,2036),('2036-09-25',203639,9,2036,25,39,203609,2036),('2036-09-26',203639,9,2036,26,39,203609,2036),('2036-09-27',203639,9,2036,27,39,203609,2036),('2036-09-28',203640,9,2036,28,40,203609,2036),('2036-09-29',203640,9,2036,29,40,203609,2036),('2036-09-30',203640,9,2036,30,40,203609,2036),('2036-10-01',203640,10,2036,1,40,203610,2036),('2036-10-02',203640,10,2036,2,40,203610,2036),('2036-10-03',203640,10,2036,3,40,203610,2036),('2036-10-04',203640,10,2036,4,40,203610,2036),('2036-10-05',203641,10,2036,5,41,203610,2036),('2036-10-06',203641,10,2036,6,41,203610,2036),('2036-10-07',203641,10,2036,7,41,203610,2036),('2036-10-08',203641,10,2036,8,41,203610,2036),('2036-10-09',203641,10,2036,9,41,203610,2036),('2036-10-10',203641,10,2036,10,41,203610,2036),('2036-10-11',203641,10,2036,11,41,203610,2036),('2036-10-12',203642,10,2036,12,42,203610,2036),('2036-10-13',203642,10,2036,13,42,203610,2036),('2036-10-14',203642,10,2036,14,42,203610,2036),('2036-10-15',203642,10,2036,15,42,203610,2036),('2036-10-16',203642,10,2036,16,42,203610,2036),('2036-10-17',203642,10,2036,17,42,203610,2036),('2036-10-18',203642,10,2036,18,42,203610,2036),('2036-10-19',203643,10,2036,19,43,203610,2036),('2036-10-20',203643,10,2036,20,43,203610,2036),('2036-10-21',203643,10,2036,21,43,203610,2036),('2036-10-22',203643,10,2036,22,43,203610,2036),('2036-10-23',203643,10,2036,23,43,203610,2036),('2036-10-24',203643,10,2036,24,43,203610,2036),('2036-10-25',203643,10,2036,25,43,203610,2036),('2036-10-26',203644,10,2036,26,44,203610,2036),('2036-10-27',203644,10,2036,27,44,203610,2036),('2036-10-28',203644,10,2036,28,44,203610,2036),('2036-10-29',203644,10,2036,29,44,203610,2036),('2036-10-30',203644,10,2036,30,44,203610,2036),('2036-10-31',203644,10,2036,31,44,203610,2036),('2036-11-01',203644,11,2036,1,44,203611,2036),('2036-11-02',203645,11,2036,2,45,203611,2036),('2036-11-03',203645,11,2036,3,45,203611,2036),('2036-11-04',203645,11,2036,4,45,203611,2036),('2036-11-05',203645,11,2036,5,45,203611,2036),('2036-11-06',203645,11,2036,6,45,203611,2036),('2036-11-07',203645,11,2036,7,45,203611,2036),('2036-11-08',203645,11,2036,8,45,203611,2036),('2036-11-09',203646,11,2036,9,46,203611,2036),('2036-11-10',203646,11,2036,10,46,203611,2036),('2036-11-11',203646,11,2036,11,46,203611,2036),('2036-11-12',203646,11,2036,12,46,203611,2036),('2036-11-13',203646,11,2036,13,46,203611,2036),('2036-11-14',203646,11,2036,14,46,203611,2036),('2036-11-15',203646,11,2036,15,46,203611,2036),('2036-11-16',203647,11,2036,16,47,203611,2036),('2036-11-17',203647,11,2036,17,47,203611,2036),('2036-11-18',203647,11,2036,18,47,203611,2036),('2036-11-19',203647,11,2036,19,47,203611,2036),('2036-11-20',203647,11,2036,20,47,203611,2036),('2036-11-21',203647,11,2036,21,47,203611,2036),('2036-11-22',203647,11,2036,22,47,203611,2036),('2036-11-23',203648,11,2036,23,48,203611,2036),('2036-11-24',203648,11,2036,24,48,203611,2036),('2036-11-25',203648,11,2036,25,48,203611,2036),('2036-11-26',203648,11,2036,26,48,203611,2036),('2036-11-27',203648,11,2036,27,48,203611,2036),('2036-11-28',203648,11,2036,28,48,203611,2036),('2036-11-29',203648,11,2036,29,48,203611,2036),('2036-11-30',203649,11,2036,30,49,203611,2036),('2036-12-01',203649,12,2036,1,49,203612,2037),('2036-12-02',203649,12,2036,2,49,203612,2037),('2036-12-03',203649,12,2036,3,49,203612,2037),('2036-12-04',203649,12,2036,4,49,203612,2037),('2036-12-05',203649,12,2036,5,49,203612,2037),('2036-12-06',203649,12,2036,6,49,203612,2037),('2036-12-07',203650,12,2036,7,50,203612,2037),('2036-12-08',203650,12,2036,8,50,203612,2037),('2036-12-09',203650,12,2036,9,50,203612,2037),('2036-12-10',203650,12,2036,10,50,203612,2037),('2036-12-11',203650,12,2036,11,50,203612,2037),('2036-12-12',203650,12,2036,12,50,203612,2037),('2036-12-13',203650,12,2036,13,50,203612,2037),('2036-12-14',203651,12,2036,14,51,203612,2037),('2036-12-15',203651,12,2036,15,51,203612,2037),('2036-12-16',203651,12,2036,16,51,203612,2037),('2036-12-17',203651,12,2036,17,51,203612,2037),('2036-12-18',203651,12,2036,18,51,203612,2037),('2036-12-19',203651,12,2036,19,51,203612,2037),('2036-12-20',203651,12,2036,20,51,203612,2037),('2036-12-21',203652,12,2036,21,52,203612,2037),('2036-12-22',203652,12,2036,22,52,203612,2037),('2036-12-23',203652,12,2036,23,52,203612,2037),('2036-12-24',203652,12,2036,24,52,203612,2037),('2036-12-25',203652,12,2036,25,52,203612,2037),('2036-12-26',203652,12,2036,26,52,203612,2037),('2036-12-27',203652,12,2036,27,52,203612,2037),('2036-12-28',203653,12,2036,28,53,203612,2037),('2036-12-29',203601,12,2036,29,53,203612,2037),('2036-12-30',203601,12,2036,30,53,203612,2037);
/*!40000 ALTER TABLE `time` ENABLE KEYS */;
UNLOCK TABLES;
@@ -452,7 +452,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-01-13 7:50:30
+-- Dump completed on 2022-03-14 10:28:02
USE `cache`;
-- MariaDB dump 10.19 Distrib 10.5.12-MariaDB, for debian-linux-gnu (x86_64)
--
@@ -488,7 +488,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-01-13 7:50:31
+-- Dump completed on 2022-03-14 10:28:02
USE `hedera`;
-- MariaDB dump 10.19 Distrib 10.5.12-MariaDB, for debian-linux-gnu (x86_64)
--
@@ -554,7 +554,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-01-13 7:50:32
+-- Dump completed on 2022-03-14 10:28:04
USE `postgresql`;
-- MariaDB dump 10.19 Distrib 10.5.12-MariaDB, for debian-linux-gnu (x86_64)
--
@@ -608,7 +608,7 @@ UNLOCK TABLES;
LOCK TABLES `professional_category` WRITE;
/*!40000 ALTER TABLE `professional_category` DISABLE KEYS */;
-INSERT INTO `professional_category` VALUES (1,'Mozos',5,1,27.5,NULL),(2,'Encargados',3,1,27.5,NULL),(4,'Comprador',3,1,27.5,NULL),(5,'Aux Administracion',NULL,1,27.5,NULL),(6,'Of Administracion',3,1,27.5,NULL),(7,'Jefe Administracion',2,1,27.5,NULL),(8,'Informatico',3,1,27.5,NULL),(9,'Directivo',1,0,27.5,NULL),(10,'Aux Ventas',4,1,27.5,NULL),(11,'Vendedor',4,1,27.5,NULL),(12,'Jefe de Ventas',4,0,27.5,NULL),(13,'Repartidor',5,1,27.5,NULL),(14,'Aprendices',NULL,1,27.5,NULL),(15,'Técnicos',2,1,27.5,NULL),(16,'Aux Florista',5,1,27.5,NULL),(17,'Florista',4,1,27.5,NULL),(18,'Jefe Floristas',2,1,27.5,NULL),(19,'Técnico marketing',3,1,27.5,NULL),(20,'Auxiliar marketing',4,1,27.5,NULL),(21,'Aux Informática',4,1,27.5,NULL),(22,'Peón agrícola',5,1,27.5,NULL),(23,'Oficial mantenimiento',4,1,27.5,NULL),(24,'Aux mantenimiento',5,1,27.5,NULL),(25,'Mozo Aeropuerto',5,1,27.5,NULL),(26,'Coordinador',2,1,27.5,NULL),(28,'Aux Logistica',4,1,27.5,NULL),(29,'Oficial Logistica',3,1,27.5,NULL),(30,'Subencargado',4,1,27.5,NULL),(31,'Conductor +3500kg',NULL,1,27.5,32400),(32,'Oficial 1ª',NULL,1,27.5,NULL),(33,'Oficial 2ª',NULL,1,27.5,NULL),(34,'Supervisor',NULL,1,27.5,NULL),(35,'Aux.Comerc./Market.',NULL,1,27.5,NULL),(36,'Oficial Comerc./Market.',NULL,1,27.5,NULL),(37,'Coord. Comerc./Market.',NULL,1,27.5,NULL),(38,'Aux. Florista 1ª',NULL,1,27.5,NULL),(39,'Mozo/campo',NULL,1,27.5,NULL);
+INSERT INTO `professional_category` VALUES (1,'Mozos',5,1,27.5,NULL),(2,'Encargados',3,1,27.5,NULL),(4,'Comprador',3,1,27.5,NULL),(5,'Aux Administracion',NULL,1,27.5,NULL),(6,'Of Administracion',3,1,27.5,NULL),(7,'Jefe Administracion',2,1,27.5,NULL),(8,'Informatico',3,1,27.5,NULL),(9,'Directivo',1,0,27.5,NULL),(10,'Aux Ventas',4,1,27.5,NULL),(11,'Vendedor',4,1,27.5,NULL),(12,'Jefe de Ventas',4,0,27.5,NULL),(13,'Repartidor',5,1,27.5,NULL),(14,'Aprendices',NULL,1,27.5,NULL),(15,'Técnicos',2,1,27.5,NULL),(16,'Aux Florista',5,1,27.5,NULL),(17,'Florista',4,1,27.5,NULL),(18,'Jefe Floristas',2,1,27.5,NULL),(19,'Técnico marketing',3,1,27.5,NULL),(20,'Auxiliar marketing',4,1,27.5,NULL),(21,'Aux Informática',4,1,27.5,NULL),(22,'Peón agrícola',5,1,27.5,NULL),(23,'Oficial mantenimiento',4,1,27.5,NULL),(24,'Aux mantenimiento',5,1,27.5,NULL),(25,'Mozo Aeropuerto',5,1,27.5,NULL),(26,'Coordinador',2,1,27.5,NULL),(28,'Aux Logistica',4,1,27.5,NULL),(29,'Oficial Logistica',3,1,27.5,NULL),(30,'Subencargado',4,1,27.5,NULL),(31,'Conductor +3500kg',NULL,1,27.5,32400),(32,'Oficial 1ª',NULL,1,27.5,NULL),(33,'Oficial 2ª',NULL,1,27.5,NULL),(34,'Supervisor',NULL,1,27.5,NULL),(35,'Aux.Comerc./Market.',NULL,1,27.5,NULL),(36,'Oficial Comerc./Market.',NULL,1,27.5,NULL),(37,'Coord. Comerc./Market.',NULL,1,27.5,NULL),(38,'Aux. Florista 1ª',NULL,1,27.5,NULL),(39,'Mozo/campo',NULL,1,27.5,NULL),(40,'Conductor B',NULL,1,27.5,NULL),(41,'Conductor C',NULL,1,27.5,NULL),(42,'Conductor C + E',NULL,1,27.5,NULL),(43,'Enrutador I',NULL,1,27.5,NULL),(44,'Enrutador II',NULL,1,27.5,NULL),(45,'Jefe Logística',NULL,1,27.5,NULL);
/*!40000 ALTER TABLE `professional_category` ENABLE KEYS */;
UNLOCK TABLES;
@@ -640,7 +640,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-01-13 7:50:33
+-- Dump completed on 2022-03-14 10:28:07
USE `sage`;
-- MariaDB dump 10.19 Distrib 10.5.12-MariaDB, for debian-linux-gnu (x86_64)
--
@@ -696,4 +696,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2022-01-13 7:50:33
+-- Dump completed on 2022-03-14 10:28:10
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 6f7cc87e5..f64ed52c3 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -32,6 +32,11 @@ INSERT INTO `vn`.`packagingConfig`(`upperGap`)
('10');
UPDATE `account`.`role` SET id = 100 WHERE id = 0;
+
+INSERT INTO `account`.`roleConfig`(`id`, `mysqlPassword`, `rolePrefix`, `userPrefix`, `userHost`, `tplUser`)
+ VALUES
+ (1, 'mysqlPassword', '$', '!', '%', 'any');
+
CALL `account`.`role_sync`;
INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `password`,`role`,`active`,`email`, `lang`, `image`)
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 5b463d420..ce367a1d4 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -39,14 +39,15 @@ CREATE TABLE `account` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `account_afterInsert`
- AFTER INSERT ON `account` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `account`.`account_afterInsert`
+ AFTER INSERT ON `account`
+ FOR EACH ROW
BEGIN
INSERT IGNORE INTO userSync (`name`)
SELECT `name` FROM `user` WHERE id = NEW.id;
@@ -59,14 +60,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `account_afterDelete`
- AFTER DELETE ON `account` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `account`.`account_afterDelete`
+ AFTER DELETE ON `account`
+ FOR EACH ROW
BEGIN
INSERT IGNORE INTO userSync (`name`)
SELECT `name` FROM `user` WHERE id = OLD.id;
@@ -209,6 +211,7 @@ CREATE TABLE `mailClientAccess` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`client` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
`action` set('OK','REJECT') CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT 'REJECT',
+ `description` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `mailFrom` (`client`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8;
@@ -254,6 +257,7 @@ CREATE TABLE `mailSenderAccess` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`sender` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
`action` set('OK','REJECT') NOT NULL DEFAULT 'REJECT',
+ `description` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `mailFrom` (`sender`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8;
@@ -313,14 +317,15 @@ CREATE TABLE `role` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER role_beforeInsert
- BEFORE INSERT ON `role` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `account`.`role_beforeInsert`
+ BEFORE INSERT ON `role`
+ FOR EACH ROW
BEGIN
CALL role_checkName(NEW.`name`);
END */;;
@@ -332,14 +337,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER role_beforeUpdate
- BEFORE UPDATE ON `role` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `account`.`role_beforeUpdate`
+ BEFORE UPDATE ON `role`
+ FOR EACH ROW
BEGIN
IF !(NEW.`name` <=> OLD.`name`) THEN
CALL role_checkName (NEW.`name`);
@@ -361,6 +367,10 @@ DROP TABLE IF EXISTS `roleConfig`;
CREATE TABLE `roleConfig` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier',
`mysqlPassword` varchar(255) NOT NULL COMMENT 'The password used for MySQL user roles, base64 encoded',
+ `rolePrefix` char(2) NOT NULL,
+ `userPrefix` char(2) DEFAULT NULL,
+ `userHost` varchar(255) NOT NULL,
+ `tplUser` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COMMENT='Role configuration parameters';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -458,11 +468,11 @@ CREATE TABLE `user` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `user_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `account`.`user_beforeInsert`
BEFORE INSERT ON `user`
FOR EACH ROW
BEGIN
@@ -482,14 +492,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER user_afterInsert
- AFTER INSERT
- ON user
- FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `account`.`user_afterInsert`
+ AFTER INSERT ON `user`
+ FOR EACH ROW
BEGIN
CALL hedera.image_ref('user', NEW.image);
@@ -503,14 +512,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `user_beforeUpdate`
- BEFORE UPDATE ON `user` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `account`.`user_beforeUpdate`
+ BEFORE UPDATE ON `user`
+ FOR EACH ROW
BEGIN
IF !(NEW.`name` <=> OLD.`name`) THEN
CALL user_checkName (NEW.`name`);
@@ -531,14 +541,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER user_afterUpdate
- AFTER UPDATE
- ON user
- FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `account`.`user_afterUpdate`
+ AFTER UPDATE ON `user`
+ FOR EACH ROW
BEGIN
IF !(NEW.image <=> OLD.image) THEN
CALL hedera.image_unref('user', OLD.image);
@@ -573,14 +582,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER user_afterDelete
- AFTER DELETE
- ON user
- FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `account`.`user_afterDelete`
+ AFTER DELETE ON `user`
+ FOR EACH ROW
BEGIN
CALL hedera.image_unref('user', OLD.image);
@@ -648,13 +656,13 @@ CREATE TABLE `userSync` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myUserGetId`() RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUserGetId`() RETURNS int(11)
READS SQL DATA
DETERMINISTIC
BEGIN
@@ -672,13 +680,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myUserGetName`() RETURNS varchar(30) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUserGetName`() RETURNS varchar(30) CHARSET utf8
NO SQL
DETERMINISTIC
BEGIN
@@ -696,13 +704,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myUserHasRole`(vRoleName VARCHAR(255)) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUserHasRole`(vRoleName VARCHAR(255)) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
/**
@@ -719,13 +727,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myUserHasRoleId`(vRoleId INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUserHasRoleId`(vRoleId INT) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
/**
@@ -742,13 +750,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myUser_checkLogin`() RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUser_checkLogin`() RETURNS tinyint(1)
READS SQL DATA
DETERMINISTIC
BEGIN
@@ -770,6 +778,7 @@ BEGIN
END IF;
RETURN FALSE;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -780,13 +789,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myUser_getId`() RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUser_getId`() RETURNS int(11)
READS SQL DATA
DETERMINISTIC
BEGIN
@@ -816,13 +825,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myUser_getName`() RETURNS varchar(30) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUser_getName`() RETURNS varchar(30) CHARSET utf8
NO SQL
DETERMINISTIC
BEGIN
@@ -851,13 +860,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myUser_hasRole`(vRoleName VARCHAR(255)) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUser_hasRole`(vRoleName VARCHAR(255)) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
/**
@@ -877,13 +886,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myUser_hasRoleId`(vRoleId INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUser_hasRoleId`(vRoleId INT) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
/**
@@ -907,56 +916,56 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `passwordGenerate`() RETURNS text CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `passwordGenerate`() RETURNS text CHARSET utf8 COLLATE utf8_unicode_ci
READS SQL DATA
-BEGIN
-/**
- * Generates a random password that meets the minimum requirements.
- *
- * @return Generated password
- */
- DECLARE vMinLength TINYINT;
- DECLARE vMinAlpha TINYINT;
- DECLARE vMinUpper TINYINT;
- DECLARE vMinDigits TINYINT;
- DECLARE vMinPunct TINYINT;
- DECLARE vAlpha TINYINT DEFAULT 0;
- DECLARE vUpper TINYINT DEFAULT 0;
- DECLARE vDigits TINYINT DEFAULT 0;
- DECLARE vPunct TINYINT DEFAULT 0;
- DECLARE vRandIndex INT;
- DECLARE vPwd TEXT DEFAULT '';
-
- DECLARE vAlphaChars TEXT DEFAULT 'abcdefghijklmnopqrstuvwxyz';
- DECLARE vUpperChars TEXT DEFAULT 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
- DECLARE vDigitChars TEXT DEFAULT '1234567890';
- DECLARE vPunctChars TEXT DEFAULT '!$%&()=.';
-
- SELECT length, nAlpha, nUpper, nDigits, nPunct
- INTO vMinLength, vMinAlpha, vMinUpper, vMinDigits, vMinPunct FROM userPassword;
-
- WHILE LENGTH(vPwd) < vMinLength OR vAlpha < vMinAlpha
- OR vUpper < vMinUpper OR vDigits < vMinDigits OR vPunct < vMinPunct DO
- SET vRandIndex = FLOOR((RAND() * 4) + 1);
-
- CASE
- WHEN vRandIndex = 1 THEN
- SET vPwd = CONCAT(vPwd, SUBSTRING(vAlphaChars, FLOOR((RAND() * 26) + 1), 1));
- SET vAlpha = vAlpha + 1;
- WHEN vRandIndex = 2 THEN
- SET vPwd = CONCAT(vPwd, SUBSTRING(vUpperChars, FLOOR((RAND() * 26) + 1), 1));
- SET vUpper = vUpper + 1;
- WHEN vRandIndex = 3 THEN
- SET vPwd = CONCAT(vPwd, SUBSTRING(vDigitChars, FLOOR((RAND() * 10) + 1), 1));
- SET vDigits = vDigits + 1;
- WHEN vRandIndex = 4 THEN
- SET vPwd = CONCAT(vPwd, SUBSTRING(vPunctChars, FLOOR((RAND() * LENGTH(vPunctChars)) + 1), 1));
- SET vPunct = vPunct + 1;
- END CASE;
- END WHILE;
- RETURN vPwd;
+BEGIN
+/**
+ * Generates a random password that meets the minimum requirements.
+ *
+ * @return Generated password
+ */
+ DECLARE vMinLength TINYINT;
+ DECLARE vMinAlpha TINYINT;
+ DECLARE vMinUpper TINYINT;
+ DECLARE vMinDigits TINYINT;
+ DECLARE vMinPunct TINYINT;
+ DECLARE vAlpha TINYINT DEFAULT 0;
+ DECLARE vUpper TINYINT DEFAULT 0;
+ DECLARE vDigits TINYINT DEFAULT 0;
+ DECLARE vPunct TINYINT DEFAULT 0;
+ DECLARE vRandIndex INT;
+ DECLARE vPwd TEXT DEFAULT '';
+
+ DECLARE vAlphaChars TEXT DEFAULT 'abcdefghijklmnopqrstuvwxyz';
+ DECLARE vUpperChars TEXT DEFAULT 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+ DECLARE vDigitChars TEXT DEFAULT '1234567890';
+ DECLARE vPunctChars TEXT DEFAULT '!$%&()=.';
+
+ SELECT length, nAlpha, nUpper, nDigits, nPunct
+ INTO vMinLength, vMinAlpha, vMinUpper, vMinDigits, vMinPunct FROM userPassword;
+
+ WHILE LENGTH(vPwd) < vMinLength OR vAlpha < vMinAlpha
+ OR vUpper < vMinUpper OR vDigits < vMinDigits OR vPunct < vMinPunct DO
+ SET vRandIndex = FLOOR((RAND() * 4) + 1);
+
+ CASE
+ WHEN vRandIndex = 1 THEN
+ SET vPwd = CONCAT(vPwd, SUBSTRING(vAlphaChars, FLOOR((RAND() * 26) + 1), 1));
+ SET vAlpha = vAlpha + 1;
+ WHEN vRandIndex = 2 THEN
+ SET vPwd = CONCAT(vPwd, SUBSTRING(vUpperChars, FLOOR((RAND() * 26) + 1), 1));
+ SET vUpper = vUpper + 1;
+ WHEN vRandIndex = 3 THEN
+ SET vPwd = CONCAT(vPwd, SUBSTRING(vDigitChars, FLOOR((RAND() * 10) + 1), 1));
+ SET vDigits = vDigits + 1;
+ WHEN vRandIndex = 4 THEN
+ SET vPwd = CONCAT(vPwd, SUBSTRING(vPunctChars, FLOOR((RAND() * LENGTH(vPunctChars)) + 1), 1));
+ SET vPunct = vPunct + 1;
+ END CASE;
+ END WHILE;
+ RETURN vPwd;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -967,13 +976,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `toUnixDays`(vDate DATE) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `toUnixDays`(vDate DATE) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -993,13 +1002,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `userGetId`() RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `userGetId`() RETURNS int(11)
READS SQL DATA
DETERMINISTIC
BEGIN
@@ -1017,13 +1026,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `userGetName`() RETURNS varchar(30) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `userGetName`() RETURNS varchar(30) CHARSET utf8
NO SQL
DETERMINISTIC
BEGIN
@@ -1041,13 +1050,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `userHasRole`(vUserName VARCHAR(255), vRoleName VARCHAR(255)) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `userHasRole`(vUserName VARCHAR(255), vRoleName VARCHAR(255)) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
/**
@@ -1064,13 +1073,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `userHasRoleId`(vUser VARCHAR(255), vRoleId INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `userHasRoleId`(vUser VARCHAR(255), vRoleId INT) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
/**
@@ -1087,30 +1096,31 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `user_getMysqlRole`(vUserName VARCHAR(255)) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `user_getMysqlRole`(vUserName VARCHAR(255)) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
-BEGIN
-/**
- * From a username, it returns the associated MySQL wich should be used when
- * using external authentication systems.
- *
- * @param vUserName The user name
- * @return The associated MySQL role
- */
- DECLARE vRole VARCHAR(255);
-
- SELECT CONCAT(IF(r.hasLogin, 'z-', ''), r.name) INTO vRole
- FROM role r
- JOIN user u ON u.role = r.id
- WHERE u.name = vUserName;
-
- RETURN vRole;
+BEGIN
+/**
+ * From a username, it returns the associated MySQL wich should be used when
+ * using external authentication systems.
+ *
+ * @param vUserName The user name
+ * @return The associated MySQL role
+ */
+ DECLARE vRole VARCHAR(255);
+
+ SELECT CONCAT(IF(r.hasLogin, c.rolePrefix, ''), r.name) INTO vRole
+ FROM role r
+ JOIN user u ON u.role = r.id
+ JOIN roleConfig c
+ WHERE u.name = vUserName;
+
+ RETURN vRole;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -1121,28 +1131,28 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `user_getNameFromId`(vSelf INT) RETURNS varchar(30) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `user_getNameFromId`(vSelf INT) RETURNS varchar(30) CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
-BEGIN
-/**
- * Gets user name from it's id.
- *
- * @param vSelf The user id
- * @return The user name
- */
- DECLARE vName VARCHAR(30);
-
- SELECT `name` INTO vName
- FROM user
- WHERE id = vSelf;
-
- RETURN vName;
+BEGIN
+/**
+ * Gets user name from it's id.
+ *
+ * @param vSelf The user id
+ * @return The user name
+ */
+ DECLARE vName VARCHAR(30);
+
+ SELECT `name` INTO vName
+ FROM user
+ WHERE id = vSelf;
+
+ RETURN vName;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -1153,13 +1163,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `user_hasRole`(vUserName VARCHAR(255), vRoleName VARCHAR(255)) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `user_hasRole`(vUserName VARCHAR(255), vRoleName VARCHAR(255)) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
/**
@@ -1189,13 +1199,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `user_hasRoleId`(vUser VARCHAR(255), vRoleId INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `user_hasRoleId`(vUser VARCHAR(255), vRoleId INT) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
/**
@@ -1225,13 +1235,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myUserLogout`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myUserLogout`()
BEGIN
/**
* @deprecated Use myUser_Logout()
@@ -1247,13 +1257,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myUser_changePassword`(vOldPassword VARCHAR(255), vPassword VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myUser_changePassword`(vOldPassword VARCHAR(255), vPassword VARCHAR(255))
BEGIN
/**
* Changes the current user password.
@@ -1272,13 +1282,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myUser_login`(vUserName VARCHAR(255), vPassword VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myUser_login`(vUserName VARCHAR(255), vPassword VARCHAR(255))
READS SQL DATA
BEGIN
/**
@@ -1310,13 +1320,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myUser_loginWithKey`(vUserName VARCHAR(255), vKey VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myUser_loginWithKey`(vUserName VARCHAR(255), vKey VARCHAR(255))
READS SQL DATA
BEGIN
/**
@@ -1344,13 +1354,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myUser_loginWithName`(vUserName VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myUser_loginWithName`(vUserName VARCHAR(255))
READS SQL DATA
BEGIN
/**
@@ -1381,13 +1391,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myUser_logout`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myUser_logout`()
BEGIN
/**
* Logouts the user.
@@ -1405,13 +1415,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myUser_restorePassword`(vVerificationToken VARCHAR(255), vPassword VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myUser_restorePassword`(vVerificationToken VARCHAR(255), vPassword VARCHAR(255))
BEGIN
/**
* Changes the current user password using recovery token.
@@ -1430,13 +1440,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `role_checkName`(vRoleName VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `role_checkName`(vRoleName VARCHAR(255))
BEGIN
/**
* Checks that role name meets the necessary syntax requirements, otherwise it
@@ -1459,13 +1469,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `role_getDescendents`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `role_getDescendents`(vSelf INT)
BEGIN
/**
* Gets the identifiers of all the subroles implemented by a role (Including
@@ -1536,13 +1546,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `role_sync`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `role_sync`()
BEGIN
/**
* Synchronize the @roleRole table with the current role hierarchy. This
@@ -1600,21 +1610,21 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `role_syncPrivileges`()
BEGIN
/**
* Synchronizes permissions of MySQL role users based on role hierarchy.
* The computed role users of permission mix will be named according to
- * pattern z-[role_name].
+ * pattern [vRolePrefix][roleName].
*
- * If any@localhost user exists, it will be taken as a template for basic
- * attributes.
+ * If [vTplUser]@[vTplHost] user exists, it will be taken as a template for
+ * basic attributes.
*
* Warning! This procedure should only be called when MySQL privileges
* are modified. If role hierarchy is modified, you must call the role_sync()
@@ -1622,17 +1632,22 @@ BEGIN
*/
DECLARE vIsMysql BOOL DEFAULT VERSION() NOT LIKE '%MariaDB%';
DECLARE vVersion INT DEFAULT SUBSTRING_INDEX(VERSION(), '.', 1);
- DECLARE vTplUser VARCHAR(255) DEFAULT 'any';
+ DECLARE vTplUser VARCHAR(255);
DECLARE vTplHost VARCHAR(255);
- DECLARE vUserHost VARCHAR(255) DEFAULT '%';
+ DECLARE vUserPrefix VARCHAR(2);
+ DECLARE vUserHost VARCHAR(255);
+ DECLARE vRolePrefix VARCHAR(2);
DECLARE vRoleHost VARCHAR(255);
- DECLARE vPrefix VARCHAR(2) DEFAULT 'z-';
DECLARE vPrefixedLike VARCHAR(255);
DECLARE vPassword VARCHAR(255) DEFAULT '';
+ SELECT rolePrefix, userPrefix, userHost, tplUser
+ INTO vRolePrefix, vUserPrefix, vUserHost, vTplUser
+ FROM roleConfig;
+
-- Deletes computed role users
- SET vPrefixedLike = CONCAT(vPrefix, '%');
+ SET vPrefixedLike = CONCAT(vRolePrefix, '%');
SET vRoleHost = vUserHost;
IF vIsMysql THEN
@@ -1644,12 +1659,14 @@ BEGIN
SET vTplHost = '';
DELETE FROM mysql.global_priv
- WHERE `User` LIKE vPrefixedLike
- OR JSON_EXTRACT(`Priv`, '$.plugin') = 'pam';
+ WHERE `User` LIKE vPrefixedLike;
DELETE FROM mysql.roles_mapping
WHERE `User` LIKE vPrefixedLike
- OR `Role` LIKE vPrefixedLike;
+ OR (
+ `Role` LIKE vPrefixedLike
+ AND (`User`, `Host`) = ('root', 'localhost')
+ );
END IF;
DELETE FROM mysql.db
@@ -1676,10 +1693,25 @@ BEGIN
SELECT
id,
`name` `role`,
- CONCAT(vPrefix, `name`) prefixedRole
+ CONCAT(vRolePrefix, `name`) prefixedRole
FROM `role`
WHERE hasLogin;
+ -- Get role inheritance
+
+ DROP TEMPORARY TABLE IF EXISTS tRoleInherit;
+ CREATE TEMPORARY TABLE tRoleInherit
+ (INDEX (inheritsFrom))
+ ENGINE = MEMORY
+ SELECT
+ r.prefixedRole,
+ ri.`name` inheritsFrom
+ FROM tRole r
+ JOIN `roleRole` rr ON rr.role = r.id
+ JOIN `role` ri ON ri.id = rr.inheritsFrom
+ JOIN mysql.`user` u
+ ON u.`User` = ri.`name` AND u.`Host` = vTplHost;
+
-- Recreate role users
IF vIsMysql THEN
@@ -1793,19 +1825,6 @@ BEGIN
DROP TEMPORARY TABLE tUser;
- -- Get role inheritance
-
- DROP TEMPORARY TABLE IF EXISTS tRoleInherit;
- CREATE TEMPORARY TABLE tRoleInherit
- (INDEX (inheritsFrom))
- ENGINE = MEMORY
- SELECT
- r.prefixedRole,
- ri.`name` inheritsFrom
- FROM tRole r
- JOIN `roleRole` rr ON rr.role = r.id
- JOIN `role` ri ON ri.id = rr.inheritsFrom;
-
-- Proxy privileges
INSERT INTO mysql.proxies_priv (
@@ -2064,32 +2083,38 @@ BEGIN
JOIN mysql.procs_priv t
ON t.`User` = r.inheritsFrom
AND t.`Host`= vTplHost;
-
- -- Cleanup
-
- DROP TEMPORARY TABLE tRoleInherit;
ELSE
-- Roles
INSERT INTO mysql.global_priv (`Host`, `User`, `Priv`)
SELECT vTplHost, prefixedRole,
JSON_OBJECT(
- 'access', 0,
- 'is_role', true
+ 'is_role', TRUE,
+ 'access', 0
)
- FROM tRole r;
+ FROM tRole r
+ UNION
+ SELECT vTplHost, CONCAT(vRolePrefix, 'root'),
+ JSON_OBJECT(
+ 'is_role', TRUE,
+ 'access', 0
+ );
INSERT INTO mysql.roles_mapping (`Host`, `User`, `Role`, `Admin_option`)
- SELECT vTplHost, r.prefixedRole, i.`name`, 'N'
- FROM tRole r
- JOIN roleRole ri
- ON ri.`role` = r.id
- JOIN `role` i
- ON ri.`inheritsFrom` = i.id
- JOIN mysql.global_priv p
- ON p.`User` = i.`name` AND p.`Host` = vTplHost;
+ SELECT vTplHost, prefixedRole, inheritsFrom, 'N'
+ FROM tRoleInherit
+ UNION
+ SELECT vTplHost, CONCAT(vRolePrefix, 'root'), `User`, 'Y'
+ FROM mysql.global_priv
+ WHERE `User` LIKE vPrefixedLike AND `Host` = vTplHost;
- -- Backward compatibility
+ INSERT INTO mysql.roles_mapping (`Host`, `User`, `Role`, `Admin_option`)
+ SELECT 'localhost', 'root', prefixedRole, 'Y'
+ FROM tRole
+ UNION
+ SELECT 'localhost', 'root', CONCAT(vRolePrefix, 'root'), 'Y';
+
+ -- Role users
INSERT INTO mysql.global_priv (
`User`,
@@ -2108,16 +2133,15 @@ BEGIN
'authentication_string', JSON_VALUE(t.`Priv`, '$.authentication_string'),
'ssl_type', JSON_VALUE(t.`Priv`, '$.ssl_type'),
'default_role', r.prefixedRole,
+ 'access', 0,
'is_role', FALSE
)
)
FROM tRole r
LEFT JOIN mysql.global_priv t
- ON t.`User` = vTplUser
- AND t.Host = vTplHost
+ ON (t.`User`, t.Host) = (vTplUser, vTplHost)
LEFT JOIN mysql.global_priv u
- ON u.`User` = r.role
- AND u.Host = vTplHost;
+ ON (u.`User`, u.Host) = (r.`role`, vTplHost);
INSERT INTO mysql.roles_mapping (`Host`, `User`, `Role`, `Admin_option`)
SELECT vRoleHost, prefixedRole, prefixedRole, 'N'
@@ -2125,30 +2149,35 @@ BEGIN
-- Accounts
- INSERT INTO mysql.global_priv (`Host`, `User`, `Priv`)
- SELECT vUserHost, u.`name`,
- JSON_OBJECT(
- 'access', 0,
- 'plugin', 'pam',
- 'authentication_string', '',
- 'default_role', r.`prefixedRole`
- )
- FROM `user` u
- JOIN account a ON a.`id` = u.`id`
+ DROP TEMPORARY TABLE IF EXISTS tAccounts;
+ CREATE TEMPORARY TABLE tAccounts
+ (INDEX (`name`))
+ ENGINE = MEMORY
+ SELECT p.`User` `name`, r.prefixedRole
+ FROM mysql.global_priv p
+ JOIN `user` u ON u.`name` = p.`User`
JOIN tRole r ON r.`id` = u.`role`
- WHERE u.`active`;
+ WHERE JSON_EXTRACT(p.`Priv`, '$.autogenerated') = 'true';
- INSERT INTO mysql.roles_mapping (`Host`, `User`, `Role`, `Admin_option`)
- SELECT vUserHost, u.`name`, r.prefixedRole, 'N'
- FROM `user` u
- JOIN account a ON a.`id` = u.`id`
- JOIN tRole r ON r.`id` = u.`role`
- WHERE u.`active`;
+ UPDATE mysql.global_priv p
+ JOIN tAccounts c ON c.`name` = p.`User`
+ SET p.`Priv` = JSON_SET(p.`Priv`, '$.default_role', c.prefixedRole)
+ WHERE p.`Host` = vUserHost;
+
+ UPDATE IGNORE mysql.roles_mapping m
+ JOIN tAccounts c ON c.`name` = m.`User`
+ SET m.`Role` = c.prefixedRole
+ WHERE m.`Host` = vUserHost;
+
+ DROP TEMPORARY TABLE tAccounts;
END IF;
-- Cleanup
- DROP TEMPORARY TABLE tRole;
+ DROP TEMPORARY TABLE
+ tRole,
+ tRoleInherit;
+
FLUSH PRIVILEGES;
END ;;
DELIMITER ;
@@ -2160,13 +2189,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `userLogin`(vUserName VARCHAR(255), vPassword VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `userLogin`(vUserName VARCHAR(255), vPassword VARCHAR(255))
READS SQL DATA
BEGIN
/**
@@ -2183,13 +2212,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `userLoginWithKey`(vUserName VARCHAR(255), vKey VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `userLoginWithKey`(vUserName VARCHAR(255), vKey VARCHAR(255))
READS SQL DATA
BEGIN
/**
@@ -2206,13 +2235,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `userLoginWithName`(vUserName VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `userLoginWithName`(vUserName VARCHAR(255))
READS SQL DATA
BEGIN
/**
@@ -2229,13 +2258,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `userSetPassword`(vUserName VARCHAR(255), vPassword VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `userSetPassword`(vUserName VARCHAR(255), vPassword VARCHAR(255))
BEGIN
/**
* @deprecated Use user_setPassword()
@@ -2256,13 +2285,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `user_changePassword`(vSelf INT, vOldPassword VARCHAR(255), vPassword VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `user_changePassword`(vSelf INT, vOldPassword VARCHAR(255), vPassword VARCHAR(255))
BEGIN
/**
* Changes the user password.
@@ -2294,13 +2323,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `user_checkName`(vUserName VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `user_checkName`(vUserName VARCHAR(255))
BEGIN
/**
* Checks that username meets the necessary syntax requirements, otherwise it
@@ -2324,11 +2353,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `user_checkPassword`(vPassword VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `user_checkPassword`(vPassword VARCHAR(255))
BEGIN
/**
* Comprueba si la contraseña cumple los requisitos de seguridad
@@ -2390,13 +2419,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `user_restorePassword`(vSelf INT, vVerificationToken VARCHAR(255), vPassword VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `user_restorePassword`(vSelf INT, vVerificationToken VARCHAR(255), vPassword VARCHAR(255))
BEGIN
/**
* Changes the user password using recovery token.
@@ -2428,13 +2457,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `user_setPassword`(vSelf INT, vPassword VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `user_setPassword`(vSelf INT, vPassword VARCHAR(255))
BEGIN
/**
* Change the password of the passed as a parameter. Only administrators should
@@ -2568,6 +2597,7 @@ CREATE TABLE `clientNewBorn` (
`firstShipped` date NOT NULL COMMENT 'Primer pedido o de la relacion comercial, o después de un año de inactividad',
`lastShipped` date NOT NULL COMMENT 'último pedido del cliente',
`isModified` tinyint(4) DEFAULT '0',
+ `isRookie` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'define un cliente que ha de ser cuidado por ser nuevo o recuperado',
PRIMARY KEY (`clientFk`),
CONSTRAINT `clientNewBorn_fk1` FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Listado de clientes que se consideran nuevos a efectos de cobrar la comision adicional del comercial';
@@ -2577,11 +2607,13 @@ CREATE TABLE `clientNewBorn` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `bs`.`clientNewBorn_BEFORE_UPDATE` BEFORE UPDATE ON `clientNewBorn` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `bs`.`clientNewBorn_BEFORE_UPDATE`
+ BEFORE UPDATE ON `clientNewBorn`
+ FOR EACH ROW
BEGIN
-- Si ha pasado un año o mas
IF TIMESTAMPDIFF(YEAR,NEW.lastShipped, OLD.lastShipped) THEN
@@ -2966,13 +2998,15 @@ CREATE TABLE `nightTask` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `bs`.`nightTaskBeforeInsert` BEFORE INSERT ON `nightTask` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `bs`.`nightTaskBeforeInsert`
+ BEFORE INSERT ON `nightTask`
+ FOR EACH ROW
BEGIN
IF NOT (NEW.`schema`REGEXP '^[0-9a-zA-Z_]+$') OR NOT (NEW.`procedure`REGEXP '^[0-9a-zA-Z_]+$') THEN
@@ -2990,13 +3024,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `bs`.`nightTaskBeforeUpdate` BEFORE UPDATE ON `nightTask` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `bs`.`nightTaskBeforeUpdate`
+ BEFORE UPDATE ON `nightTask`
+ FOR EACH ROW
BEGIN
IF NOT (NEW.`schema`REGEXP '^[0-9a-zA-Z_]+$') OR NOT (NEW.`procedure`REGEXP '^[0-9a-zA-Z_]+$') THEN
@@ -3180,6 +3216,34 @@ CREATE TABLE `salaries2018` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `sale`
+--
+
+DROP TABLE IF EXISTS `sale`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sale` (
+ `saleFk` int(11) NOT NULL,
+ `amount` decimal(10,3) NOT NULL DEFAULT '0.000',
+ `surcharge` decimal(10,3) NOT NULL DEFAULT '0.000',
+ `dated` date NOT NULL,
+ `typeFk` smallint(5) unsigned NOT NULL,
+ `clientFk` int(11) NOT NULL DEFAULT '1',
+ `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
+ `margin` decimal(10,3) NOT NULL DEFAULT '0.000',
+ PRIMARY KEY (`saleFk`),
+ KEY `tip_to_tip_idx` (`typeFk`),
+ KEY `clientes_bs_ventas_idx` (`clientFk`),
+ KEY `empresa_bs_ventas_idx` (`companyFk`),
+ KEY `fecha_bs` (`dated`,`clientFk`),
+ CONSTRAINT `sale_FK` FOREIGN KEY (`saleFk`) REFERENCES `vn`.`sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `sale_FK_1` FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `sale_FK_2` FOREIGN KEY (`companyFk`) REFERENCES `vn`.`company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `sale_FK_3` FOREIGN KEY (`typeFk`) REFERENCES `vn`.`itemType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `salePersonEvolution__`
--
@@ -3196,6 +3260,26 @@ CREATE TABLE `salePersonEvolution__` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Temporary table structure for view `sale__`
+--
+
+DROP TABLE IF EXISTS `sale__`;
+/*!50001 DROP VIEW IF EXISTS `sale__`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `sale__` (
+ `saleFk` tinyint NOT NULL,
+ `amount` tinyint NOT NULL,
+ `surcharge` tinyint NOT NULL,
+ `dated` tinyint NOT NULL,
+ `typeFk` tinyint NOT NULL,
+ `clientFk` tinyint NOT NULL,
+ `companyFk` tinyint NOT NULL,
+ `margin` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
--
-- Table structure for table `salesByWeek`
--
@@ -3242,7 +3326,8 @@ DROP TABLE IF EXISTS `salesMonthlySnapshot`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `salesMonthlySnapshot` (
- `salesPersonName` varchar(100) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `salesPersonName` varchar(100) COLLATE utf8_unicode_ci DEFAULT '',
`teamName` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
`year` int(11) DEFAULT NULL,
`month` int(11) DEFAULT NULL,
@@ -3254,8 +3339,8 @@ CREATE TABLE `salesMonthlySnapshot` (
`newClientPlus` decimal(10,3) DEFAULT NULL,
`newClientScore` decimal(10,3) DEFAULT NULL,
`teamBossPlus` decimal(10,3) DEFAULT NULL,
- PRIMARY KEY (`salesPersonName`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3289,13 +3374,38 @@ CREATE TABLE `salesMonthlySnapshot__` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `salesPersonClient`
+-- Table structure for table `salesPerson`
--
-DROP TABLE IF EXISTS `salesPersonClient`;
+DROP TABLE IF EXISTS `salesPerson`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `salesPersonClient` (
+CREATE TABLE `salesPerson` (
+ `workerFk` int(10) unsigned NOT NULL,
+ `year` int(4) NOT NULL,
+ `month` int(2) NOT NULL,
+ `amount` decimal(10,2) DEFAULT NULL,
+ `commission` decimal(10,2) DEFAULT NULL,
+ `leasedCommission` decimal(10,2) DEFAULT NULL COMMENT 'comision proveniente de clientes que han sido donados. Ver tabla Clientes_cedidos',
+ `cededCommission` decimal(10,2) DEFAULT NULL COMMENT 'comision generada por los clientes que han sido donados. Ver tabla Clientes_cedidos',
+ `newCommission` decimal(10,2) DEFAULT NULL,
+ `leasedReplacement` decimal(10,2) DEFAULT NULL,
+ `itemTypeBorrowed` decimal(10,2) DEFAULT NULL,
+ `portfolioWeight` decimal(10,2) DEFAULT NULL COMMENT 'Pero de la cartera del comercial a fecha vendedores.updated',
+ `updated` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ PRIMARY KEY (`workerFk`,`year`,`month`),
+ CONSTRAINT `salesPerson_FK` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `salesPersonClient__`
+--
+
+DROP TABLE IF EXISTS `salesPersonClient__`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `salesPersonClient__` (
`salesPersonFk` int(11) NOT NULL,
`clientFk` int(11) NOT NULL,
`year` int(4) NOT NULL,
@@ -3331,6 +3441,30 @@ CREATE TABLE `salesPersonEvolution` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Evolución Comerciales';
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Temporary table structure for view `salesPerson__`
+--
+
+DROP TABLE IF EXISTS `salesPerson__`;
+/*!50001 DROP VIEW IF EXISTS `salesPerson__`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `salesPerson__` (
+ `workerFk` tinyint NOT NULL,
+ `year` tinyint NOT NULL,
+ `month` tinyint NOT NULL,
+ `amount` tinyint NOT NULL,
+ `commission` tinyint NOT NULL,
+ `leasedCommission` tinyint NOT NULL,
+ `cededCommission` tinyint NOT NULL,
+ `newCommission` tinyint NOT NULL,
+ `leasedReplacement` tinyint NOT NULL,
+ `itemTypeBorrowed` tinyint NOT NULL,
+ `portfolioWeight` tinyint NOT NULL,
+ `updated` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
--
-- Temporary table structure for view `v_ventas__`
--
@@ -3350,29 +3484,28 @@ SET character_set_client = utf8;
SET character_set_client = @saved_cs_client;
--
--- Table structure for table `vendedores`
+-- Temporary table structure for view `vendedores`
--
DROP TABLE IF EXISTS `vendedores`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `vendedores` (
- `Id_Trabajador` int(10) unsigned NOT NULL,
- `año` int(4) NOT NULL,
- `mes` int(2) NOT NULL,
- `importe` decimal(10,2) DEFAULT NULL,
- `comision` decimal(10,2) DEFAULT NULL,
- `comisionArrendada` decimal(10,2) DEFAULT NULL COMMENT 'comision proveniente de clientes que han sido donados. Ver tabla Clientes_cedidos',
- `comisionCedida` decimal(10,2) DEFAULT NULL COMMENT 'comision generada por los clientes que han sido donados. Ver tabla Clientes_cedidos',
- `comisionNuevos` decimal(10,2) DEFAULT NULL,
- `sustitucionArrendada` decimal(10,2) DEFAULT NULL,
- `itemTypeBorrowed` decimal(10,2) DEFAULT NULL,
- `portfolioWeight` decimal(10,2) DEFAULT NULL COMMENT 'Pero de la cartera del comercial a fecha vendedores.updated',
- `updated` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- PRIMARY KEY (`Id_Trabajador`,`año`,`mes`),
- CONSTRAINT `trabajador_trabajador` FOREIGN KEY (`Id_Trabajador`) REFERENCES `vn`.`worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50001 DROP VIEW IF EXISTS `vendedores`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `vendedores` (
+ `Id_Trabajador` tinyint NOT NULL,
+ `año` tinyint NOT NULL,
+ `mes` tinyint NOT NULL,
+ `importe` tinyint NOT NULL,
+ `comision` tinyint NOT NULL,
+ `comisionArrendada` tinyint NOT NULL,
+ `comisionCedida` tinyint NOT NULL,
+ `comisionNuevos` tinyint NOT NULL,
+ `sustitucionArrendada` tinyint NOT NULL,
+ `itemTypeBorrowed` tinyint NOT NULL,
+ `portfolioWeight` tinyint NOT NULL,
+ `updated` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
--
-- Table structure for table `vendedores_evolution`
@@ -3392,32 +3525,24 @@ CREATE TABLE `vendedores_evolution` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `ventas`
+-- Temporary table structure for view `ventas`
--
DROP TABLE IF EXISTS `ventas`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `ventas` (
- `Id_Movimiento` int(11) NOT NULL,
- `importe` decimal(10,3) NOT NULL DEFAULT '0.000',
- `recargo` decimal(10,3) NOT NULL DEFAULT '0.000',
- `fecha` date NOT NULL,
- `tipo_id` smallint(5) unsigned NOT NULL,
- `Id_Cliente` int(11) NOT NULL DEFAULT '1',
- `empresa_id` smallint(5) unsigned NOT NULL DEFAULT '442',
- `margen` decimal(10,3) NOT NULL DEFAULT '0.000',
- PRIMARY KEY (`Id_Movimiento`),
- KEY `tip_to_tip_idx` (`tipo_id`),
- KEY `clientes_bs_ventas_idx` (`Id_Cliente`),
- KEY `empresa_bs_ventas_idx` (`empresa_id`),
- KEY `fecha_bs` (`fecha`,`Id_Cliente`),
- CONSTRAINT `clientes_bs_ventas` FOREIGN KEY (`Id_Cliente`) REFERENCES `vn`.`client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
- CONSTRAINT `empresa_bs_ventas` FOREIGN KEY (`empresa_id`) REFERENCES `vn`.`company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
- CONSTRAINT `mov_to_mov` FOREIGN KEY (`Id_Movimiento`) REFERENCES `vn`.`sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
- CONSTRAINT `tip_to_tip` FOREIGN KEY (`tipo_id`) REFERENCES `vn`.`itemType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50001 DROP VIEW IF EXISTS `ventas`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `ventas` (
+ `Id_Movimiento` tinyint NOT NULL,
+ `importe` tinyint NOT NULL,
+ `recargo` tinyint NOT NULL,
+ `fecha` tinyint NOT NULL,
+ `tipo_id` tinyint NOT NULL,
+ `Id_Cliente` tinyint NOT NULL,
+ `empresa_id` tinyint NOT NULL,
+ `margen` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
--
-- Table structure for table `ventas_contables`
@@ -3511,12 +3636,12 @@ CREATE TABLE `workerProductivity` (
`workerFk` int(10) unsigned NOT NULL,
`volume` decimal(10,6) NOT NULL,
`seconds` int(11) NOT NULL,
- `roleFk` int(10) unsigned NOT NULL,
+ `actionFk` int(11) NOT NULL,
PRIMARY KEY (`id`),
KEY `workerProductivity_warehouseFk_idx` (`warehouseFk`),
KEY `workerProductivity_workerFk_idx` (`workerFk`),
- KEY `workerProductivity_roleFk_idx` (`roleFk`),
- CONSTRAINT `workerProductivity_roleFk` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role` (`id`) ON UPDATE CASCADE,
+ KEY `workerProductivity_roleFk_idx` (`actionFk`),
+ CONSTRAINT `workerProductivity_FK` FOREIGN KEY (`actionFk`) REFERENCES `vncontrol`.`accion` (`accion_id`) ON UPDATE CASCADE,
CONSTRAINT `workerProductivity_warehouseFk` FOREIGN KEY (`warehouseFk`) REFERENCES `vn`.`warehouse` (`id`) ON UPDATE CASCADE,
CONSTRAINT `workerProductivity_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -3603,7 +3728,7 @@ DELIMITER ;;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `nightTask_launchAll` ON SCHEDULE EVERY 1 DAY STARTS '2020-08-05 03:00:00' ON COMPLETION PRESERVE ENABLE DO CALL bs.nightTask_launchAll */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `nightTask_launchAll` ON SCHEDULE EVERY 1 DAY STARTS '2022-02-08 04:14:00' ON COMPLETION PRESERVE ENABLE DO CALL bs.nightTask_launchAll */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -3614,14 +3739,14 @@ DELIMITER ;;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection = utf8_general_ci */ ;;
+/*!50003 SET character_set_client = utf8mb4 */ ;;
+/*!50003 SET character_set_results = utf8mb4 */ ;;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `zone_ETD_byTime_Refresh` ON SCHEDULE EVERY 5 MINUTE STARTS '2021-04-12 14:28:27' ON COMPLETION NOT PRESERVE ENABLE DO CALL bs.zone_ETD_byTime() */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `zone_ETD_byTime_Refresh` ON SCHEDULE EVERY 5 MINUTE STARTS '2022-01-28 09:52:45' ON COMPLETION NOT PRESERVE ENABLE DO CALL bs.zone_ETD_byTime() */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -3643,7 +3768,8 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `tramo`(vDateTime DATETIME) RETURNS varchar(20) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `tramo`(vDateTime DATETIME) RETURNS varchar(20) CHARSET utf8 COLLATE utf8_unicode_ci
+ NO SQL
BEGIN
DECLARE vTramo VARCHAR(20);
@@ -3668,13 +3794,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `analisisComponentes__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `analisisComponentes__`()
BEGIN
DECLARE vDateStart DATE DEFAULT '2016-01-01';
@@ -3721,11 +3847,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `bancos_evolution_add`(vStartingDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `bancos_evolution_add`(vStartingDate DATE)
BEGIN
/**
* Inserta en la tabla bancos_evolution los saldos acumulados de cada banco
@@ -3846,11 +3972,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `bancos_evolution_add__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `bancos_evolution_add__`()
BEGIN
/**
* Inserta en la tabla bancos_evolution los saldos acumulados de cada banco
@@ -3960,13 +4086,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `campaignComparative`(vDateFrom DATE, vDateTo DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `campaignComparative`(vDateFrom DATE, vDateTo DATE)
BEGIN
SELECT
workerName,
@@ -4012,17 +4138,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `carteras_add` */;
-ALTER DATABASE `bs` CHARACTER SET latin1 COLLATE latin1_swedish_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `carteras_add`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `carteras_add`()
BEGIN
DELETE FROM bs.carteras
@@ -4044,33 +4169,32 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `bs` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP PROCEDURE IF EXISTS `carteras_add2` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `carteras_add2`()
-BEGIN
-/**
- * Inserta en "bs.carteras".
- */
- DELETE FROM bs.carteras
- WHERE Año >= YEAR(CURDATE()) - 1;
-
- INSERT INTO bs.carteras(Año,Mes,CodigoTrabajador,Peso)
- SELECT t.year AS Año, t.month AS Mes, w.code AS CodigoTrabajador, SUM(v.importe) AS Peso
- FROM vn.time t
- JOIN bs.ventas v on t.dated = v.fecha
- JOIN vn.client c on c.id = v.Id_Cliente
- JOIN vn.worker w ON w.id = c.salesPersonFk
- WHERE t.year >= YEAR(CURDATE()) - 1
- GROUP BY w.code, t.year , t.month;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `carteras_add2`()
+BEGIN
+/**
+ * Inserta en "bs.carteras".
+ */
+ DELETE FROM bs.carteras
+ WHERE Año >= YEAR(CURDATE()) - 1;
+
+ INSERT INTO bs.carteras(Año,Mes,CodigoTrabajador,Peso)
+ SELECT t.year AS Año, t.month AS Mes, w.code AS CodigoTrabajador, SUM(v.importe) AS Peso
+ FROM vn.time t
+ JOIN bs.ventas v on t.dated = v.fecha
+ JOIN vn.client c on c.id = v.Id_Cliente
+ JOIN vn.worker w ON w.id = c.salesPersonFk
+ WHERE t.year >= YEAR(CURDATE()) - 1
+ GROUP BY w.code, t.year , t.month;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -4081,13 +4205,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clean`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clean`()
BEGIN
DECLARE vFourYearsAgo DATETIME;
DECLARE vOneYearAgo DATETIME;
@@ -4118,11 +4242,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientDied_recalc`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientDied_recalc`()
BEGIN
SET @primerAviso := TIMESTAMPADD(MONTH,-1,CURDATE());
SET @segundoAviso := TIMESTAMPADD(MONTH,-2,CURDATE());
@@ -4143,8 +4267,7 @@ BEGIN
END as Aviso
FROM vn.client c
JOIN vn.worker w ON w.id = c.salesPersonFk
- JOIN vn2008.jerarquia j ON j.worker_id = w.id
- JOIN vn.worker b ON b.id = j.boss_id
+ JOIN vn.worker b ON b.id = w.bossFk
JOIN bs.mana_spellers ms ON ms.Id_Trabajador = c.salesPersonFk
LEFT JOIN (SELECT clientFk, max(issued) as maxIssued FROM vn.invoiceOut GROUP BY clientFk) io ON io.clientFk = c.id
WHERE (maxIssued IS NULL OR maxIssued < @primerAviso)
@@ -4165,11 +4288,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientNewBorn_recalc`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientNewBorn_recalc`()
BLOCK1: BEGIN
DECLARE vClientFk INT;
@@ -4244,6 +4367,15 @@ BLOCK1: BEGIN
END LOOP LOOP2;
END BLOCK2;
END LOOP LOOP1;
+
+ UPDATE bs.clientNewBorn cnb
+ LEFT JOIN (SELECT DISTINCT t.clientFk
+ FROM vn.ticket t
+ JOIN vn.productionConfig pc
+ WHERE t.shipped BETWEEN curdate() + INTERVAL -(`notBuyingMonths`) MONTH
+ AND curdate() + INTERVAL -(`pc`.`rookieDays`) DAY) notRookie ON notRookie.clientFk = cnb.clientFk
+ SET cnd.isRookie = ISNULL(notRookie.clientFk);
+
END BLOCK1 ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -4256,11 +4388,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `comercialesCompleto`(IN vWorker INT, vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `comercialesCompleto`(IN vWorker INT, vDate DATE)
BEGIN
DECLARE vAYearAgoStarted DATE DEFAULT DATE_FORMAT(TIMESTAMPADD(YEAR, - 1, vDate), '%Y-%m-01');
DECLARE vAYearAgoEnded DATE DEFAULT TIMESTAMPADD(YEAR, - 1, LAST_DAY(vDate));
@@ -4381,11 +4513,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `comercialesCompleto__`(IN vWorker INT, vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `comercialesCompleto__`(IN vWorker INT, vDate DATE)
BEGIN
DECLARE vAYearAgoStarted DATE DEFAULT DATE_FORMAT(TIMESTAMPADD(YEAR, - 1, vDate), '%Y-%m-01');
DECLARE vAYearAgoEnded DATE DEFAULT TIMESTAMPADD(YEAR, - 1, LAST_DAY(vDate));
@@ -4501,17 +4633,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `compradores_add` */;
-ALTER DATABASE `bs` CHARACTER SET latin1 COLLATE latin1_swedish_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `compradores_add`(IN intYEAR INT, IN intWEEK_START INT, IN intWEEK_END INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `compradores_add`(IN intYEAR INT, IN intWEEK_START INT, IN intWEEK_END INT)
BEGIN
REPLACE bs.compradores
@@ -4538,18 +4669,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `bs` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP PROCEDURE IF EXISTS `compradores_add2` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `compradores_add2`(IN vYear INT, IN vWeekFrom INT, IN vWeekTo INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `compradores_add2`(IN vYear INT, IN vWeekFrom INT, IN vWeekTo INT)
BEGIN
/**
* Sustituye los registros de "bs.compradores".
@@ -4577,13 +4707,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `compradores_add_launcher`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `compradores_add_launcher`()
BEGIN
DECLARE vYear INT;
@@ -4631,13 +4761,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `compradores_evolution_add`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `compradores_evolution_add`()
BEGIN
/*
@@ -4717,17 +4847,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `fondo_evolution_add` */;
-ALTER DATABASE `bs` CHARACTER SET latin1 COLLATE latin1_swedish_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `fondo_evolution_add`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `fondo_evolution_add`()
BEGIN
/*
@@ -4802,18 +4931,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `bs` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP PROCEDURE IF EXISTS `fondo_evolution_add2` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `fondo_evolution_add2`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `fondo_evolution_add2`()
BEGIN
/**
* Inserta en la tabla fondo_maniobra los saldos acumulados en los ultimos 365 dias
@@ -4887,11 +5015,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `fruitsEvolution`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `fruitsEvolution`()
BEGIN
select Id_Cliente,
Cliente, count(semana) as semanas, (w.code IS NOT NULL) isWorker
@@ -4917,11 +5045,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `indicatorsUpdate`(vDated DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `indicatorsUpdate`(vDated DATE)
BEGIN
DECLARE oneYearBefore DATE DEFAULT TIMESTAMPADD(YEAR,-1,vDated);
@@ -5101,13 +5229,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `indicatorsUpdateLauncher`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `indicatorsUpdateLauncher`()
BEGIN
DECLARE vDated DATE;
@@ -5136,13 +5264,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inspeccionSS_2021_add`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `inspeccionSS_2021_add`()
BEGIN
TRUNCATE bs.inspeccionSS_2021;
@@ -5190,13 +5318,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `m3Add`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `m3Add`()
BEGIN
DECLARE datSTART DATE;
@@ -5235,13 +5363,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `manaCustomerUpdate`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `manaCustomerUpdate`()
BEGIN
DECLARE vToDated DATE;
DECLARE vFromDated DATE;
@@ -5335,13 +5463,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `manaSpellers_actualize`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `manaSpellers_actualize`()
BEGIN
/* PAK 2019/08/09 updated
@@ -5370,13 +5498,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `mermasCacheUpdate__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `mermasCacheUpdate__`()
BEGIN
DECLARE vTimeRange INT DEFAULT 30;
@@ -5409,11 +5537,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nightTask_launchAll`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nightTask_launchAll`()
BEGIN
/**
* Runs all nightly tasks.
@@ -5506,11 +5634,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nightTask_launchTask`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nightTask_launchTask`(
vSchema VARCHAR(255),
vProcedure VARCHAR(255),
OUT vError VARCHAR(255),
@@ -5543,13 +5671,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `payMethodClientAdd`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `payMethodClientAdd`()
BEGIN
INSERT IGNORE INTO `bs`.`payMethodClient` (dated, payMethodFk, clientFk)
SELECT CURDATE(), c.payMethodFk, c.id
@@ -5577,13 +5705,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `produccionAdd`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `produccionAdd`(vDate DATE)
BEGIN
DECLARE vDateStart DATETIME DEFAULT vDate;
@@ -5628,13 +5756,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `produccion_launcher`(vDateFrom DATE, vDateTo DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `produccion_launcher`(vDateFrom DATE, vDateTo DATE)
BEGIN
WHILE vDateFrom <= vDateTo DO
@@ -5690,13 +5818,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `produccion_launcher_auto`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `produccion_launcher_auto`()
BEGIN
DECLARE vDate DATE DEFAULT TIMESTAMPADD(WEEK, -1, CURDATE());
@@ -5729,13 +5857,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `pruebas`(IN vDateStart DATE, IN vDateEnd DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `pruebas`(IN vDateStart DATE, IN vDateEnd DATE)
BEGIN
WHILE vDateStart <> vDateEnd
@@ -5771,11 +5899,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleGraphic`(IN vItemFk INT, IN vTypeFk INT, IN vCategoryFk INT, IN vFromDate DATE,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleGraphic`(IN vItemFk INT, IN vTypeFk INT, IN vCategoryFk INT, IN vFromDate DATE,
IN vToDate DATE, IN vProducerFk INT)
BEGIN
@@ -5821,13 +5949,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `salePersonEvolutionAdd`(IN vDateStart DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `salePersonEvolutionAdd`(IN vDateStart DATETIME)
BEGIN
DELETE FROM bs.salePersonEvolution
WHERE dated <= DATE_SUB(CURDATE(), INTERVAL 1 YEAR);
@@ -5856,11 +5984,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `salesByclientSalesPerson_add`(vDatedFrom DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `salesByclientSalesPerson_add`(vDatedFrom DATE)
BEGIN
IF vDatedFrom IS NULL THEN
@@ -5901,7 +6029,7 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `salesMonthlySnapshot_add`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `salesMonthlySnapshot_add`()
BEGIN
DECLARE vPlusNewClient INT DEFAULT 100;
DECLARE vScoreNewClient INT DEFAULT 100;
@@ -6058,7 +6186,7 @@ BEGIN
END IF;
END LOOP my_loop;
- INSERT INTO bs.salesMonthlySnapshot
+ INSERT INTO bs.salesMonthlySnapshot (salesPersonName, teamName, `year`, `month`, currentSale, commissionSale, individualPlus, teamPlus, teamScore, newClientPlus, newClientScore, teamBossPlus)
SELECT *
FROM (
SELECT sp.salesPersonName,
@@ -6099,13 +6227,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `salesPersonClient_add`(intYEAR INT, vQuarter INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `salesPersonClient_add`(intYEAR INT, vQuarter INT)
BEGIN
DECLARE vCommissionRate DOUBLE DEFAULT 0.029;
@@ -6251,11 +6379,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `salesPersonEvolution_add`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `salesPersonEvolution_add`()
BEGIN
DECLARE vDated DATE;
DECLARE vCont INT DEFAULT 1;
@@ -6302,7 +6430,7 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `vendedores_add` */;
+/*!50003 DROP PROCEDURE IF EXISTS `salesPerson_updatePortfolio` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -6312,7 +6440,50 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add`(intYEAR INT, vQuarter INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `salesPerson_updatePortfolio`()
+BEGIN
+ /**
+ * Actualiza el campo portfolioWeight que indica el peso de la cartera del comercial
+ *
+ */
+ DECLARE vStarted DATE DEFAULT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -17 MONTH), '%Y-%m-01');
+
+ UPDATE vendedores v
+ JOIN vn.`time` t ON t.`year` = v.año AND t.`month` = v.mes
+ SET v.portfolioWeight = NULL
+ WHERE t.dated BETWEEN vStarted AND CURDATE();
+
+ UPDATE vendedores v
+ JOIN (
+ SELECT c.lastSalesPersonFk
+ , t.`year`
+ , t.`month`
+ , SUM(v.importe) importe
+ FROM vn.`time` t
+ STRAIGHT_JOIN bs.ventas v ON t.dated = v.fecha
+ JOIN vn.`client` c ON c.id = v.Id_Cliente
+ WHERE c.lastSalesPersonFk IS NOT NULL
+ AND v.fecha BETWEEN vStarted AND CURDATE()
+ GROUP BY c.lastSalesPersonFk, t.`year`, t.`month`
+ ) sub ON sub.lastSalesPersonFk = v.Id_Trabajador AND sub.`year` = v.año AND sub.`month`= v.mes
+ SET v.portfolioWeight = sub.importe;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `vendedores_add` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vendedores_add`(intYEAR INT, vQuarter INT)
BEGIN
DECLARE vCommissionRate DOUBLE;
@@ -6385,11 +6556,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add_launcher`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vendedores_add_launcher`()
BEGIN
DECLARE vDatedFrom DATE;
@@ -6411,11 +6582,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add_launcher__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vendedores_add_launcher__`()
BEGIN
CALL bs.vendedores_add(YEAR(CURDATE()),QUARTER(CURDATE()));
@@ -6434,11 +6605,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_evolution_add`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vendedores_evolution_add`()
BEGIN
/*
Inserta en la tabla compradores_evolution las ventas acumuladas en el ultimo mes
@@ -6491,53 +6662,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `vendedores_updatePortfolio` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_updatePortfolio`()
-BEGIN
- /**
- * Actualiza el campo portfolioWeight que indica el peso de la cartera del comercial
- *
- */
- DECLARE vStarted DATE DEFAULT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -17 MONTH), '%Y-%m-01');
-
- INSERT INTO vendedores(Id_Trabajador, año, mes, portfolioWeight)
- SELECT c.salesPersonFk
- , t.`year`
- , t.`month`
- , SUM(v.importe)
- FROM ventas v
- JOIN vn.`client` c on c.id = v.Id_Cliente
- JOIN vn.`time` t on t.dated = v.fecha
- WHERE c.lastSalesPersonFk is not null
- AND v.fecha >= vStarted
- GROUP BY c.salesPersonFk, t.`month`, t.`year`
- ON DUPLICATE KEY UPDATE portfolioWeight = VALUES(portfolioWeight);
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ventas_add` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ventas_add`(IN datSTART DATETIME, IN datEND DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_add`(IN datSTART DATETIME, IN datEND DATETIME)
BEGIN
/**
@@ -6625,11 +6760,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ventas_add_launcher`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_add_launcher`()
BEGIN
/**
@@ -6652,109 +6787,109 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ventas_contables_add`(IN vYear INT, IN vMonth INT)
-BEGIN
-
- /**
- * Reemplaza las ventas contables del último año.
- * Es el origen de datos para el balance de Entradas
- *
- * @param vYear Año a reemplazar
- * @param vMonth Mes a reemplazar
- *
- **/
-
- DECLARE TIPO_PATRIMONIAL INT DEFAULT 188;
-
- DELETE FROM bs.ventas_contables
- WHERE year = vYear
- AND month = vMonth;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
- CREATE TEMPORARY TABLE tmp.ticket_list
- (PRIMARY KEY (Id_Ticket))
- ENGINE = MEMORY
- SELECT Id_Ticket
- FROM vn2008.Tickets t
- JOIN vn2008.Facturas f ON f.Id_Factura = t.Factura
- WHERE year(f.Fecha) = vYear
- AND month(f.Fecha) = vMonth;
-
- INSERT INTO bs.ventas_contables(year
- , month
- , venta
- , grupo
- , reino_id
- , tipo_id
- , empresa_id
- , gasto)
-
- SELECT vYear
- , vMonth
- , round(sum(Cantidad * Preu * (100 - m.Descuento)/100))
- , IF(
- e.empresa_grupo = e2.empresa_grupo
- ,1
- ,IF(e2.empresa_grupo,2,0)
- ) as grupo
- , tp.reino_id
- , a.tipo_id
- , t.empresa_id
- , 7000000000
- + IF(e.empresa_grupo = e2.empresa_grupo
- ,1
- ,IF(e2.empresa_grupo,2,0)
- ) * 1000000
- + tp.reino_id * 10000 as Gasto
- FROM vn2008.Movimientos m
- JOIN vn2008.Tickets t on t.Id_Ticket = m.Id_Ticket
- JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
- JOIN vn2008.Clientes c on c.Id_Cliente = cs.Id_Cliente
- JOIN tmp.ticket_list tt on tt.Id_Ticket = t.Id_Ticket
- JOIN vn2008.Articles a on m.Id_Article = a.Id_Article
- JOIN vn2008.empresa e on e.id = t.empresa_id
- LEFT JOIN vn2008.empresa e2 on e2.Id_Cliente = c.Id_Cliente
- JOIN vn2008.Tipos tp on tp.tipo_id = a.tipo_id
- WHERE Cantidad <> 0
- AND Preu <> 0
- AND m.Descuento <> 100
- AND a.tipo_id != TIPO_PATRIMONIAL
- GROUP BY grupo, reino_id, tipo_id, empresa_id, Gasto;
-
- INSERT INTO bs.ventas_contables(year
- , month
- , venta
- , grupo
- , reino_id
- , tipo_id
- , empresa_id
- , gasto)
- SELECT vYear
- , vMonth
- , sum(ts.quantity * ts.price)
- , IF(
- c.companyGroupFk = c2.companyGroupFk
- ,1
- ,IF(c2.companyGroupFk, 2, 0)
- ) as grupo
- , NULL
- , NULL
- , t.companyFk
- , 7050000000
- FROM vn.ticketService ts
- JOIN vn.ticket t ON ts.ticketFk = t.id
- JOIN vn.address a on a.id = t.addressFk
- JOIN vn.client cl on cl.id = a.clientFk
- JOIN tmp.ticket_list tt on tt.Id_Ticket = t.id
- JOIN vn.company c on c.id = t.companyFk
- LEFT JOIN vn.company c2 on c2.clientFk = cl.id
- GROUP BY grupo, t.companyFk ;
-
- DROP TEMPORARY TABLE tmp.ticket_list;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_contables_add`(IN vYear INT, IN vMonth INT)
+BEGIN
+
+ /**
+ * Reemplaza las ventas contables del último año.
+ * Es el origen de datos para el balance de Entradas
+ *
+ * @param vYear Año a reemplazar
+ * @param vMonth Mes a reemplazar
+ *
+ **/
+
+ DECLARE TIPO_PATRIMONIAL INT DEFAULT 188;
+
+ DELETE FROM bs.ventas_contables
+ WHERE year = vYear
+ AND month = vMonth;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
+ CREATE TEMPORARY TABLE tmp.ticket_list
+ (PRIMARY KEY (Id_Ticket))
+ ENGINE = MEMORY
+ SELECT Id_Ticket
+ FROM vn2008.Tickets t
+ JOIN vn2008.Facturas f ON f.Id_Factura = t.Factura
+ WHERE year(f.Fecha) = vYear
+ AND month(f.Fecha) = vMonth;
+
+ INSERT INTO bs.ventas_contables(year
+ , month
+ , venta
+ , grupo
+ , reino_id
+ , tipo_id
+ , empresa_id
+ , gasto)
+
+ SELECT vYear
+ , vMonth
+ , round(sum(Cantidad * Preu * (100 - m.Descuento)/100))
+ , IF(
+ e.empresa_grupo = e2.empresa_grupo
+ ,1
+ ,IF(e2.empresa_grupo,2,0)
+ ) as grupo
+ , tp.reino_id
+ , a.tipo_id
+ , t.empresa_id
+ , 7000000000
+ + IF(e.empresa_grupo = e2.empresa_grupo
+ ,1
+ ,IF(e2.empresa_grupo,2,0)
+ ) * 1000000
+ + tp.reino_id * 10000 as Gasto
+ FROM vn2008.Movimientos m
+ JOIN vn2008.Tickets t on t.Id_Ticket = m.Id_Ticket
+ JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
+ JOIN vn2008.Clientes c on c.Id_Cliente = cs.Id_Cliente
+ JOIN tmp.ticket_list tt on tt.Id_Ticket = t.Id_Ticket
+ JOIN vn2008.Articles a on m.Id_Article = a.Id_Article
+ JOIN vn2008.empresa e on e.id = t.empresa_id
+ LEFT JOIN vn2008.empresa e2 on e2.Id_Cliente = c.Id_Cliente
+ JOIN vn2008.Tipos tp on tp.tipo_id = a.tipo_id
+ WHERE Cantidad <> 0
+ AND Preu <> 0
+ AND m.Descuento <> 100
+ AND a.tipo_id != TIPO_PATRIMONIAL
+ GROUP BY grupo, reino_id, tipo_id, empresa_id, Gasto;
+
+ INSERT INTO bs.ventas_contables(year
+ , month
+ , venta
+ , grupo
+ , reino_id
+ , tipo_id
+ , empresa_id
+ , gasto)
+ SELECT vYear
+ , vMonth
+ , sum(ts.quantity * ts.price)
+ , IF(
+ c.companyGroupFk = c2.companyGroupFk
+ ,1
+ ,IF(c2.companyGroupFk, 2, 0)
+ ) as grupo
+ , NULL
+ , NULL
+ , t.companyFk
+ , 7050000000
+ FROM vn.ticketService ts
+ JOIN vn.ticket t ON ts.ticketFk = t.id
+ JOIN vn.address a on a.id = t.addressFk
+ JOIN vn.client cl on cl.id = a.clientFk
+ JOIN tmp.ticket_list tt on tt.Id_Ticket = t.id
+ JOIN vn.company c on c.id = t.companyFk
+ LEFT JOIN vn.company c2 on c2.clientFk = cl.id
+ GROUP BY grupo, t.companyFk ;
+
+ DROP TEMPORARY TABLE tmp.ticket_list;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -6767,11 +6902,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ventas_contables_add_launcher`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_contables_add_launcher`()
BEGIN
/**
@@ -6792,13 +6927,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ventas_contables_add__`(IN vYear INT, IN vMonth INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_contables_add__`(IN vYear INT, IN vMonth INT)
BEGIN
/**
* Reemplaza las ventas contables. Es el origen de datos para el balance de Entradas
@@ -6880,11 +7015,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ventas_contables_por_cliente`(IN vYear INT, IN vMonth INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_contables_por_cliente`(IN vYear INT, IN vMonth INT)
BEGIN
/**
@@ -6940,11 +7075,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `vivosMuertos`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vivosMuertos`()
BEGIN
/**
@@ -7014,13 +7149,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `waste_addSales`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `waste_addSales`()
BEGIN
DECLARE vWeek INT;
DECLARE vYear INT;
@@ -7054,44 +7189,44 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `waste_addSales_lastWeek` */;
+/*!50003 DROP PROCEDURE IF EXISTS `waste_addSales_lastWeek__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `waste_addSales_lastWeek`()
-BEGIN
- DECLARE vWeek INT;
- DECLARE vYear INT;
-
- SELECT week, year
- INTO vWeek, vYear
- FROM vn.time
- WHERE dated = TIMESTAMPADD(WEEK, -1, CURDATE());
-
- REPLACE bs.waste
- SELECT *, 100 * mermas / total as porcentaje
- FROM (
- SELECT buyer,
- year,
- week,
- family,
- itemFk,
- itemTypeFk,
- floor(sum(value)) as total,
- floor(sum(IF(clientTypeFk = 'loses', value, 0))) as mermas
- FROM vn.saleValue
- where year = vYear and week = vWeek
-
- GROUP BY family, itemFk
-
- ) sub
- ORDER BY mermas DESC;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `waste_addSales_lastWeek__`()
+BEGIN
+ DECLARE vWeek INT;
+ DECLARE vYear INT;
+
+ SELECT week, year
+ INTO vWeek, vYear
+ FROM vn.time
+ WHERE dated = TIMESTAMPADD(WEEK, -1, CURDATE());
+
+ REPLACE bs.waste
+ SELECT *, 100 * mermas / total as porcentaje
+ FROM (
+ SELECT buyer,
+ year,
+ week,
+ family,
+ itemFk,
+ itemTypeFk,
+ floor(sum(value)) as total,
+ floor(sum(IF(clientTypeFk = 'loses', value, 0))) as mermas
+ FROM vn.saleValue
+ where year = vYear and week = vWeek
+
+ GROUP BY family, itemFk
+
+ ) sub
+ ORDER BY mermas DESC;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -7108,7 +7243,130 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerLabour_getData`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerLabour_getData`()
+BEGIN
+/**
+ * Carga los datos de la plantilla de trabajadores, altas y bajas en la tabla workerLabourDataByMonth para facilitar el cálculo del gráfico en grafana.
+ * Se carga el día 21 de cada mes, elimina los registros del último año y los vuelve a calcular
+ *
+ */
+ DECLARE vFristDay DATE;
+ DECLARE vLastDay DATE;
+ DECLARE vDone BOOL DEFAULT FALSE;
+ DECLARE vDateStarted DATE;
+ DECLARE vDateEnded DATE;
+
+ DECLARE vCursor CURSOR FOR
+ SELECT util.firstDayOfMonth(t.dated), LAST_DAY(t.dated)
+ FROM vn.time t
+ WHERE t.dated BETWEEN vDateStarted AND vDateEnded
+ GROUP BY year,month;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ IF DAY(CURDATE()) = 21 THEN
+
+ SELECT util.firstDayOfMonth(DATE_SUB(CURDATE(), INTERVAL 12 MONTH)),
+ LAST_DAY(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))
+ INTO vDateStarted,
+ vDateEnded;
+
+ DELETE FROM workerLabourDataByMonth
+ WHERE CONCAT(`year`, '-',`month`, '-01') BETWEEN vDateStarted AND vDateEnded;
+
+ OPEN vCursor;
+
+ l: LOOP
+ SET vDone = FALSE;
+
+ FETCH vCursor INTO vFristDay, vLastDay;
+
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+
+ -- Altas periodo
+ INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)
+ SELECT 'hiring', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)
+ FROM vn.workerLabour w
+ JOIN postgresql.workcenter wc ON wc.workcenter_id = w.workCenterFk
+ JOIN postgresql.business_labour_payroll bl ON bl.business_id = w.businessFk
+ JOIN postgresql.person p ON p.id_trabajador = w.workerFk
+ LEFT JOIN vn.workerBusinessType wbt ON wbt.id = bl.cod_contrato
+ LEFT JOIN (SELECT w.workerFk
+ FROM vn.workerLabour w
+ LEFT JOIN (SELECT ended, workerFk FROM vn.workerLabour) wl ON wl.ended = DATE_SUB(w.started, INTERVAL 1 DAY)
+ AND wl.workerFk = w.workerFk
+ WHERE w.started BETWEEN vFristDay AND vLastDay AND wl.ended
+ )sub ON sub.workerFk = w.workerFk
+ WHERE wc.center_id IS NOT NULL
+ AND w.started BETWEEN vFristDay AND vLastDay
+ AND sub.workerFk IS NULL
+ AND NOT p.isFreelance;
+
+ -- Bajas periodo
+ INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)
+ SELECT 'layoffs', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)
+ FROM vn.workerLabour w
+ JOIN postgresql.workcenter wc ON wc.workcenter_id = w.workCenterFk
+ JOIN postgresql.business_labour_payroll bl ON bl.business_id = w.businessFk
+ JOIN postgresql.person p ON p.id_trabajador = w.workerFk
+ LEFT JOIN vn.workerBusinessType wbt ON wbt.id = bl.cod_contrato
+ LEFT JOIN (SELECT started, workerFk FROM vn.workerLabour) wl ON wl.started >= w.ended
+ AND wl.workerFk = w.workerFk
+ WHERE wc.center_id IS NOT NULL
+ AND w.ended BETWEEN vFristDay AND vLastDay
+ AND wl.started IS NULL
+ AND NOT p.isFreelance;
+
+ -- Anterior al periodo
+ SET vLastDay = LAST_DAY(DATE_SUB(vFristDay, INTERVAL 1 DAY));
+
+ INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)
+ SELECT 'staff', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)
+ FROM vn.workerLabour w
+ JOIN postgresql.workcenter wc ON wc.workcenter_id = w.workCenterFk
+ JOIN postgresql.business_labour_payroll bl ON bl.business_id = w.businessFk
+ JOIN postgresql.person p ON p.id_trabajador = w.workerFk
+ LEFT JOIN vn.workerBusinessType wbt ON wbt.id = bl.cod_contrato
+ WHERE wc.center_id IS NOT NULL
+ AND vLastDay BETWEEN started AND IFNULL(ended, vLastDay)
+ AND NOT p.isFreelance;
+
+ -- Discapacidad
+ INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent)
+ SELECT 'disabled', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent)
+ FROM vn.workerLabour w
+ JOIN postgresql.workcenter wc ON wc.workcenter_id = w.workCenterFk
+ JOIN postgresql.business_labour_payroll bl ON bl.business_id = w.businessFk
+ JOIN postgresql.person p ON p.id_trabajador = w.workerFk
+ LEFT JOIN vn.workerBusinessType wbt ON wbt.id = bl.cod_contrato
+ WHERE wc.center_id IS NOT NULL
+ AND vLastDay BETWEEN started AND IFNULL(ended, vLastDay)
+ AND p.isDisable
+ AND NOT p.isFreelance;
+
+ END LOOP;
+ CLOSE vCursor;
+
+ END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `workerLabour_getData__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerLabour_getData__`()
BEGIN
/**
* Carga los datos de la plantilla de trabajadores, altas y bajas en la tabla workerLabourDataByMonth para facilitar el cálculo del gráfico en grafana.
@@ -7227,11 +7485,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerProductivity_add`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerProductivity_add`()
BEGIN
DECLARE vDateFrom DATE;
SELECT DATE_SUB(CURDATE(),INTERVAL 30 DAY) INTO vDateFrom;
@@ -7239,98 +7497,94 @@ BEGIN
DELETE FROM workerProductivity
WHERE dated >= vDateFrom;
- -- SACADORES
- INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, roleFk)
- SELECT sub.dated,
+ -- SACADORES Y ARTIFICIAL
+ INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, actionFk)
+ SELECT sub.dated,
sub.warehouseFk,
sub.workerFk,
SUM(sub.volume),
SUM(sub.seconds) ,
- r.id
- FROM( SELECT t.warehouseFk AS warehouseFk,
+ sub.accion_id
+ FROM(SELECT t.warehouseFk warehouseFk,
st.workerFk,
DATE(t.shipped) dated,
SUM((ic.cm3delivery * s.quantity)/1000000) volume,
- TIME_TO_SEC(TIMEDIFF( MAX(st.created),MIN(st.created))) + w.minSeconsItemPicker seconds
+ TIME_TO_SEC(TIMEDIFF( MAX(st.created),MIN(st.created))) + w.minSeconsItemPicker seconds,
+ a.accion_id
FROM vn.saleTracking st
LEFT JOIN vn.salesPreviousPreparated sp ON sp.saleFk = st.saleFk
JOIN vn.sale s ON s.id = st.saleFk
JOIN vn.ticket t ON t.id = s.ticketFk
- JOIN vn.itemCost ic ON ic.warehouseFk = t.warehouseFk AND
- ic.itemFk = s.itemFk
+ JOIN vn.itemCost ic ON ic.warehouseFk = t.warehouseFk AND ic.itemFk = s.itemFk
JOIN vn.worker w ON w.id = st.workerFk
- JOIN vn.state e ON e.id = st.stateFk
JOIN vncontrol.accion a ON a.accion_id = st.actionFk
LEFT JOIN vn.workerDepartment wd ON wd.workerFk = st.workerFk
- LEFT JOIN vn.department d ON d.id = wd.departmentFk
JOIN workerProductivityConfig w ON TRUE
WHERE t.shipped >= vDateFrom
AND ISNULL(sp.saleFk)
- AND a.accion='SACAR'
+ AND (a.accion = 'SACAR'
+ OR a.accion = 'PRESACAR')
GROUP BY t.id, t.warehouseFk, st.workerFk
) sub
- JOIN account.role r ON r.name='itemPicker'
GROUP BY sub.warehouseFk, sub.workerFk, sub.dated;
-- ENCAJADORES
- INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, roleFk)
+ INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, actionFk)
SELECT sub2.shipped,
sub2.warehouseFk,
sub2.workerFK,
SUM(sub2.volume),
SUM(sub2.seconds),
- r.id
+ a.accion_id
FROM (SELECT t.warehouseFk,
SUM(s.volume) volume,
sub.workerFk,
DATE(t.shipped) shipped,
- sub.seconds + w.minSeconsPackager seconds
+ sub.seconds + w.minSeconsPackager seconds,
+ s.saleFk
FROM vn.saleVolume s
JOIN vn.ticket t ON t.id = s.ticketFk
JOIN(SELECT e.workerFk, e.ticketFk,TIME_TO_SEC(TIMEDIFF( MAX(e.created), MIN(e.created))) seconds
FROM vn.expedition e
JOIN vn.ticket t ON t.id = e.ticketFk
WHERE e.workerFk IS NOT NULL AND
- t.shipped >= vDateFrom
+ t.shipped >= vDateFrom
GROUP BY e.ticketFk
)sub ON sub.ticketFk = t.id
JOIN workerProductivityConfig w ON TRUE
- WHERE t.shipped >= vDateFrom
GROUP BY s.ticketFk, t.warehouseFk
)sub2
- JOIN account.role r ON r.name='packager'
+ JOIN vncontrol.accion a ON a.accion = 'ENCAJAR'
GROUP BY sub2.warehouseFk,sub2.workerFk, sub2.shipped;
-- REVISADORES
- INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, roleFk)
+ INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, actionFk)
SELECT sub2.shipped,
sub2.warehouseFk,
sub2.workerFK,
SUM(sub2.volume),
SUM(sub2.seconds),
- r.id
+ sub2.accion_id
FROM (SELECT t.warehouseFk,
SUM(s.volume) volume,
sub.workerFk,
DATE(t.shipped) shipped,
- sub.seconds + w.minSeconsPackager seconds
+ sub.seconds + w.minSeconsPackager seconds,
+ sub.accion_id
FROM vn.saleVolume s
- JOIN vn.ticket t ON t.id = s.ticketFk
- JOIN(SELECT st.workerFk, t.id ticketFk,TIME_TO_SEC(TIMEDIFF( MAX(st.created), MIN(st.created))) seconds
- FROM vn.state ss
- JOIN vn.saleTracking st ON st.stateFk = ss.id
- JOIN vn.worker w ON st.workerFk = w.id
+ JOIN vn.ticket t ON t.id = s.ticketFk
+ JOIN(SELECT st.workerFk, t.id ticketFk,TIME_TO_SEC(TIMEDIFF( MAX(st.created), MIN(st.created))) seconds, a.accion_id
+ FROM vn.saleTracking st
+ JOIN vncontrol.accion a ON a.accion_id = st.actionFk
JOIN vn.sale s ON s.id = st.saleFk
JOIN vn.ticket t ON s.ticketFk = t.id
- WHERE ss.code = 'CHECKED' AND
- t.shipped >= vDateFrom
+ WHERE a.accion = 'CONTROLAR'
+ AND t.shipped >= vDateFrom
GROUP BY t.id
)sub ON sub.ticketFk = t.id
JOIN workerProductivityConfig w ON TRUE
- WHERE t.shipped >= vDateFrom
GROUP BY s.ticketFk, t.warehouseFk
)sub2
- JOIN account.role r ON r.name='checker'
GROUP BY sub2.warehouseFk,sub2.workerFk, sub2.shipped;
END ;;
DELIMITER ;
@@ -7342,13 +7596,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `zone_ETD_byTime`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_ETD_byTime`()
BEGIN
SET @m := 0;
@@ -7611,14 +7865,14 @@ DELIMITER ;;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection = utf8_general_ci */ ;;
+/*!50003 SET character_set_client = utf8mb4 */ ;;
+/*!50003 SET character_set_results = utf8mb4 */ ;;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `cacheCalc_clean` ON SCHEDULE EVERY 30 MINUTE STARTS '2017-01-23 13:15:58' ON COMPLETION NOT PRESERVE ENABLE DO CALL cacheCalc_clean */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `cacheCalc_clean` ON SCHEDULE EVERY 30 MINUTE STARTS '2022-01-28 09:29:18' ON COMPLETION NOT PRESERVE ENABLE DO CALL cacheCalc_clean */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -7629,14 +7883,14 @@ DELIMITER ;;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection = utf8_general_ci */ ;;
+/*!50003 SET character_set_client = utf8mb4 */ ;;
+/*!50003 SET character_set_results = utf8mb4 */ ;;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `cache_clean` ON SCHEDULE EVERY 5 MINUTE STARTS '2019-04-29 13:06:16' ON COMPLETION NOT PRESERVE ENABLE DO CALL cache_clean */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `cache_clean` ON SCHEDULE EVERY 5 MINUTE STARTS '2022-01-28 09:29:18' ON COMPLETION NOT PRESERVE ENABLE DO CALL cache_clean */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -7654,11 +7908,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `addressFriendship_Update`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `addressFriendship_Update`()
BEGIN
REPLACE cache.addressFriendship
@@ -7692,153 +7946,153 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `availableNoRaids_refresh`(OUT `vCalc` INT, IN `vRefresh` INT, IN `vWarehouse` INT, IN `vDate` DATE)
-proc: BEGIN
- DECLARE vStartDate DATE;
- DECLARE vEndDate DATETIME;
- DECLARE vReserveDate DATETIME;
- DECLARE vParams CHAR(100);
- DECLARE vInventoryDate DATE;
-
- DECLARE EXIT HANDLER FOR SQLEXCEPTION
- BEGIN
- CALL cache_calc_unlock (vCalc);
- RESIGNAL;
- END;
-
- IF vDate < CURDATE() THEN
- LEAVE proc;
- END IF;
-
- CALL vn.itemStock (vWarehouse, vDate, NULL);
-
- SET vParams = CONCAT_WS('/', vWarehouse, vDate);
- CALL cache_calc_start (vCalc, vRefresh, 'availableNoRaids', vParams);
-
- IF !vRefresh THEN
- LEAVE proc;
- END IF;
-
- -- Calcula algunos parámetros necesarios
-
- SET vStartDate = TIMESTAMP(vDate, '00:00:00');
- SET vEndDate = TIMESTAMP(TIMESTAMPADD(DAY, 4, vDate), '23:59:59');
-
- SELECT inventoried INTO vInventoryDate FROM vn.config;
-
- SELECT SUBTIME(NOW(), reserveTime) INTO vReserveDate
- FROM hedera.orderConfig;
-
- -- Calcula el ultimo dia de vida para cada producto
-
- DROP TEMPORARY TABLE IF EXISTS item_range;
- CREATE TEMPORARY TABLE item_range
- (PRIMARY KEY (item_id))
- ENGINE = MEMORY
- SELECT c.item_id, IF(it.life IS NULL, NULL,
- TIMESTAMP(TIMESTAMPADD(DAY, it.life, c.landing), '23:59:59')) AS date_end
- FROM (
- SELECT b.itemFk item_id, MAX(t.landed) landing
- FROM vn.buy b
- JOIN vn.entry e ON b.entryFk = e.id
- JOIN vn.travel t ON t.id = e.travelFk
- JOIN vn.warehouse w ON w.id = t.warehouseInFk
- WHERE t.landed BETWEEN vInventoryDate AND vStartDate
- AND t.warehouseInFk = vWarehouse
- AND NOT e.isInventory
- AND NOT e.isRaid
- GROUP BY b.itemFk
- ) c
- JOIN vn.item i ON i.id = c.item_id
- JOIN vn.itemType it ON it.id = i.typeFk
- HAVING date_end >= vStartDate OR date_end IS NULL;
-
- -- Replica la tabla item_range para poder usarla varias veces en la misma consulta
-
- DROP TEMPORARY TABLE IF EXISTS item_range_copy1;
- CREATE TEMPORARY TABLE item_range_copy1 LIKE item_range;
- INSERT INTO item_range_copy1
- SELECT * FROM item_range;
-
- DROP TEMPORARY TABLE IF EXISTS item_range_copy2;
- CREATE TEMPORARY TABLE item_range_copy2 LIKE item_range;
- INSERT INTO item_range_copy2
- SELECT * FROM item_range;
-
- DROP TEMPORARY TABLE IF EXISTS item_range_copy3;
- CREATE TEMPORARY TABLE item_range_copy3 LIKE item_range;
- INSERT INTO item_range_copy3
- SELECT * FROM item_range;
-
- DROP TEMPORARY TABLE IF EXISTS item_range_copy4;
- CREATE TEMPORARY TABLE item_range_copy4 LIKE item_range;
- INSERT INTO item_range_copy4
- SELECT * FROM item_range;
-
- -- Calcula el ATP
-
- DELETE FROM availableNoRaids WHERE calc_id = vCalc;
-
- INSERT INTO availableNoRaids (calc_id, item_id, available)
- SELECT vCalc, t.item_id, SUM(stock) amount FROM (
- SELECT il.itemFk AS item_id, stock
- FROM tmp.itemList il
- JOIN item_range ir ON ir.item_id = il.itemFk
- UNION ALL
- SELECT t.item_id, minacum(dt, amount, vDate) AS available FROM (
- SELECT itemFk AS item_id, DATE(dat) dt, SUM(quantity) amount FROM (
- SELECT i.itemFk, i.shipped AS dat, i.quantity
- FROM vn.itemTicketOut i
- JOIN item_range_copy1 ir ON ir.item_id = i.itemFk
- WHERE i.shipped >= vStartDate
- AND (ir.date_end IS NULL OR i.shipped <= ir.date_end)
- AND i.warehouseFk = vWarehouse
- UNION ALL
- SELECT i.itemFk, i.landed AS dat, i.quantity
- FROM vn.itemEntryIn i
- JOIN item_range_copy2 ir ON ir.item_id = i.itemFk
- WHERE i.landed >= vStartDate
- AND (ir.date_end IS NULL OR i.landed <= ir.date_end)
- AND i.warehouseInFk = vWarehouse
- AND i.isVirtualStock = FALSE
- UNION ALL
- SELECT i.itemFk, i.shipped AS dat, i.quantity
- FROM vn.itemEntryOut i
- JOIN item_range_copy3 ir ON ir.item_id = i.itemFk
- WHERE i.shipped >= vStartDate
- AND (ir.date_end IS NULL OR i.shipped <= ir.date_end)
- AND i.warehouseOutFk = vWarehouse
- UNION ALL
- SELECT r.item_id, r.shipment, -r.amount
- FROM hedera.order_row r
- JOIN hedera.`order` o ON o.id = r.order_id
- JOIN item_range_copy4 ir ON ir.item_id = r.item_id
- WHERE r.shipment >= vStartDate
- AND (ir.date_end IS NULL OR r.shipment <= ir.date_end)
- AND r.warehouse_id = vWarehouse
- AND r.created >= vReserveDate
- AND NOT o.confirmed
- ) t
- GROUP BY item_id, dt
- ) t
- GROUP BY t.item_id
- ) t GROUP BY t.item_id;
-
- DROP TEMPORARY TABLE IF EXISTS
- tmp.itemList
- ,item_range
- ,item_range_copy1
- ,item_range_copy2
- ,item_range_copy3
- ,item_range_copy4;
-
- CALL cache_calc_end (vCalc);
+CREATE DEFINER=`root`@`localhost` PROCEDURE `availableNoRaids_refresh`(OUT `vCalc` INT, IN `vRefresh` INT, IN `vWarehouse` INT, IN `vDate` DATE)
+proc: BEGIN
+ DECLARE vStartDate DATE;
+ DECLARE vEndDate DATETIME;
+ DECLARE vReserveDate DATETIME;
+ DECLARE vParams CHAR(100);
+ DECLARE vInventoryDate DATE;
+
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ CALL cache_calc_unlock (vCalc);
+ RESIGNAL;
+ END;
+
+ IF vDate < CURDATE() THEN
+ LEAVE proc;
+ END IF;
+
+ CALL vn.itemStock (vWarehouse, vDate, NULL);
+
+ SET vParams = CONCAT_WS('/', vWarehouse, vDate);
+ CALL cache_calc_start (vCalc, vRefresh, 'availableNoRaids', vParams);
+
+ IF !vRefresh THEN
+ LEAVE proc;
+ END IF;
+
+ -- Calcula algunos parámetros necesarios
+
+ SET vStartDate = TIMESTAMP(vDate, '00:00:00');
+ SET vEndDate = TIMESTAMP(TIMESTAMPADD(DAY, 4, vDate), '23:59:59');
+
+ SELECT inventoried INTO vInventoryDate FROM vn.config;
+
+ SELECT SUBTIME(NOW(), reserveTime) INTO vReserveDate
+ FROM hedera.orderConfig;
+
+ -- Calcula el ultimo dia de vida para cada producto
+
+ DROP TEMPORARY TABLE IF EXISTS item_range;
+ CREATE TEMPORARY TABLE item_range
+ (PRIMARY KEY (item_id))
+ ENGINE = MEMORY
+ SELECT c.item_id, IF(it.life IS NULL, NULL,
+ TIMESTAMP(TIMESTAMPADD(DAY, it.life, c.landing), '23:59:59')) AS date_end
+ FROM (
+ SELECT b.itemFk item_id, MAX(t.landed) landing
+ FROM vn.buy b
+ JOIN vn.entry e ON b.entryFk = e.id
+ JOIN vn.travel t ON t.id = e.travelFk
+ JOIN vn.warehouse w ON w.id = t.warehouseInFk
+ WHERE t.landed BETWEEN vInventoryDate AND vStartDate
+ AND t.warehouseInFk = vWarehouse
+ AND NOT e.isInventory
+ AND NOT e.isRaid
+ GROUP BY b.itemFk
+ ) c
+ JOIN vn.item i ON i.id = c.item_id
+ JOIN vn.itemType it ON it.id = i.typeFk
+ HAVING date_end >= vStartDate OR date_end IS NULL;
+
+ -- Replica la tabla item_range para poder usarla varias veces en la misma consulta
+
+ DROP TEMPORARY TABLE IF EXISTS item_range_copy1;
+ CREATE TEMPORARY TABLE item_range_copy1 LIKE item_range;
+ INSERT INTO item_range_copy1
+ SELECT * FROM item_range;
+
+ DROP TEMPORARY TABLE IF EXISTS item_range_copy2;
+ CREATE TEMPORARY TABLE item_range_copy2 LIKE item_range;
+ INSERT INTO item_range_copy2
+ SELECT * FROM item_range;
+
+ DROP TEMPORARY TABLE IF EXISTS item_range_copy3;
+ CREATE TEMPORARY TABLE item_range_copy3 LIKE item_range;
+ INSERT INTO item_range_copy3
+ SELECT * FROM item_range;
+
+ DROP TEMPORARY TABLE IF EXISTS item_range_copy4;
+ CREATE TEMPORARY TABLE item_range_copy4 LIKE item_range;
+ INSERT INTO item_range_copy4
+ SELECT * FROM item_range;
+
+ -- Calcula el ATP
+
+ DELETE FROM availableNoRaids WHERE calc_id = vCalc;
+
+ INSERT INTO availableNoRaids (calc_id, item_id, available)
+ SELECT vCalc, t.item_id, SUM(stock) amount FROM (
+ SELECT il.itemFk AS item_id, stock
+ FROM tmp.itemList il
+ JOIN item_range ir ON ir.item_id = il.itemFk
+ UNION ALL
+ SELECT t.item_id, minacum(dt, amount, vDate) AS available FROM (
+ SELECT itemFk AS item_id, DATE(dat) dt, SUM(quantity) amount FROM (
+ SELECT i.itemFk, i.shipped AS dat, i.quantity
+ FROM vn.itemTicketOut i
+ JOIN item_range_copy1 ir ON ir.item_id = i.itemFk
+ WHERE i.shipped >= vStartDate
+ AND (ir.date_end IS NULL OR i.shipped <= ir.date_end)
+ AND i.warehouseFk = vWarehouse
+ UNION ALL
+ SELECT i.itemFk, i.landed AS dat, i.quantity
+ FROM vn.itemEntryIn i
+ JOIN item_range_copy2 ir ON ir.item_id = i.itemFk
+ WHERE i.landed >= vStartDate
+ AND (ir.date_end IS NULL OR i.landed <= ir.date_end)
+ AND i.warehouseInFk = vWarehouse
+ AND i.isVirtualStock = FALSE
+ UNION ALL
+ SELECT i.itemFk, i.shipped AS dat, i.quantity
+ FROM vn.itemEntryOut i
+ JOIN item_range_copy3 ir ON ir.item_id = i.itemFk
+ WHERE i.shipped >= vStartDate
+ AND (ir.date_end IS NULL OR i.shipped <= ir.date_end)
+ AND i.warehouseOutFk = vWarehouse
+ UNION ALL
+ SELECT r.item_id, r.shipment, -r.amount
+ FROM hedera.order_row r
+ JOIN hedera.`order` o ON o.id = r.order_id
+ JOIN item_range_copy4 ir ON ir.item_id = r.item_id
+ WHERE r.shipment >= vStartDate
+ AND (ir.date_end IS NULL OR r.shipment <= ir.date_end)
+ AND r.warehouse_id = vWarehouse
+ AND r.created >= vReserveDate
+ AND NOT o.confirmed
+ ) t
+ GROUP BY item_id, dt
+ ) t
+ GROUP BY t.item_id
+ ) t GROUP BY t.item_id;
+
+ DROP TEMPORARY TABLE IF EXISTS
+ tmp.itemList
+ ,item_range
+ ,item_range_copy1
+ ,item_range_copy2
+ ,item_range_copy3
+ ,item_range_copy4;
+
+ CALL cache_calc_end (vCalc);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -7851,11 +8105,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `available_clean`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `available_clean`()
BEGIN
DROP TEMPORARY TABLE IF EXISTS tCalc;
CREATE TEMPORARY TABLE tCalc
@@ -7884,13 +8138,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `available_refresh`(OUT `vCalc` INT, IN `vRefresh` INT, IN `vWarehouse` INT, IN `vDate` DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `available_refresh`(OUT `vCalc` INT, IN `vRefresh` INT, IN `vWarehouse` INT, IN `vDate` DATE)
proc: BEGIN
DECLARE vStartDate DATE;
DECLARE vEndDate DATETIME;
@@ -8059,9 +8313,9 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cacheCalc_clean`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `cacheCalc_clean`()
BEGIN
DECLARE vCleanTime DATETIME DEFAULT TIMESTAMPADD(MINUTE, -5, NOW());
DELETE FROM cache_calc WHERE expires < vCleanTime;
@@ -8075,34 +8329,34 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cache_calc_end`(IN `v_calc` INT)
-BEGIN
- DECLARE v_cache_name VARCHAR(255);
- DECLARE v_params VARCHAR(255);
-
- -- Libera el bloqueo y actualiza la fecha de ultimo refresco.
-
- UPDATE cache_calc cc JOIN cache c ON c.id = cc.cache_id
- SET
- cc.last_refresh = NOW(),
- cc.expires = LEAST(ADDTIME(NOW(), c.lifetime), util.midNight()),
- cc.connection_id = NULL
- WHERE cc.id = v_calc;
-
- SELECT c.name, ca.params INTO v_cache_name, v_params
- FROM cache c
- JOIN cache_calc ca ON c.id = ca.cache_id
- WHERE ca.id = v_calc;
-
- IF v_cache_name IS NOT NULL THEN
- DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, '')));
- END IF;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `cache_calc_end`(IN `v_calc` INT)
+BEGIN
+ DECLARE v_cache_name VARCHAR(255);
+ DECLARE v_params VARCHAR(255);
+
+ -- Libera el bloqueo y actualiza la fecha de ultimo refresco.
+
+ UPDATE cache_calc cc JOIN cache c ON c.id = cc.cache_id
+ SET
+ cc.last_refresh = NOW(),
+ cc.expires = LEAST(ADDTIME(NOW(), c.lifetime), util.midNight()),
+ cc.connection_id = NULL
+ WHERE cc.id = v_calc;
+
+ SELECT c.name, ca.params INTO v_cache_name, v_params
+ FROM cache c
+ JOIN cache_calc ca ON c.id = ca.cache_id
+ WHERE ca.id = v_calc;
+
+ IF v_cache_name IS NOT NULL THEN
+ DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, '')));
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -8113,95 +8367,95 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cache_calc_start`(OUT `v_calc` INT, INOUT `v_refresh` INT, IN `v_cache_name` VARCHAR(50), IN `v_params` VARCHAR(100))
-proc: BEGIN
- DECLARE v_valid BOOL;
- DECLARE v_lock_id VARCHAR(100);
- DECLARE v_cache_id INT;
- DECLARE v_expires DATETIME;
- DECLARE v_clean_time DATETIME;
-
- DECLARE EXIT HANDLER FOR SQLEXCEPTION
- BEGIN
- IF v_lock_id IS NOT NULL THEN
- DO RELEASE_LOCK(v_lock_id);
- END IF;
-
- RESIGNAL;
- END;
-
- SET v_params = IFNULL(v_params, '');
-
- -- Si el servidor se ha reiniciado invalida todos los calculos.
-
- SELECT COUNT(*) > 0 INTO v_valid FROM cache_valid;
-
- IF !v_valid
- THEN
- DELETE FROM cache_calc;
- INSERT INTO cache_valid (valid) VALUES (TRUE);
- END IF;
-
- -- Obtiene un bloqueo exclusivo para que no haya problemas de concurrencia.
-
- SET v_lock_id = CONCAT_WS('/', v_cache_name, v_params);
-
- IF !GET_LOCK(v_lock_id, 30)
- THEN
- SET v_calc = NULL;
- SET v_refresh = FALSE;
- LEAVE proc;
- END IF;
-
- -- Comprueba si el calculo solicitado existe y esta actualizado.
-
- SELECT c.id, ca.id, ca.expires
- INTO v_cache_id, v_calc, v_expires
- FROM cache c
- LEFT JOIN cache_calc ca
- ON ca.cache_id = c.id AND ca.params = v_params COLLATE 'utf8_general_ci'
- WHERE c.name = v_cache_name COLLATE 'utf8_general_ci';
-
- -- Si existe una calculo valido libera el bloqueo y devuelve su identificador.
-
- IF !v_refresh AND NOW() < v_expires
- THEN
- DO RELEASE_LOCK(v_lock_id);
- SET v_refresh = FALSE;
- LEAVE proc;
- END IF;
-
- -- Si el calculo no existe le crea una entrada en la tabla de calculos.
-
- IF v_calc IS NULL
- THEN
- INSERT INTO cache_calc SET
- cache_id = v_cache_id,
- cacheName = v_cache_name,
- params = v_params,
- last_refresh = NULL,
- expires = NULL,
- connection_id = CONNECTION_ID();
-
- SET v_calc = LAST_INSERT_ID();
- ELSE
- UPDATE cache_calc
- SET
- last_refresh = NULL,
- expires = NULL,
- connection_id = CONNECTION_ID()
- WHERE id = v_calc;
- END IF;
-
- -- Si se debe recalcular mantiene el bloqueo y devuelve su identificador.
-
- SET v_refresh = TRUE;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `cache_calc_start`(OUT `v_calc` INT, INOUT `v_refresh` INT, IN `v_cache_name` VARCHAR(50), IN `v_params` VARCHAR(100))
+proc: BEGIN
+ DECLARE v_valid BOOL;
+ DECLARE v_lock_id VARCHAR(100);
+ DECLARE v_cache_id INT;
+ DECLARE v_expires DATETIME;
+ DECLARE v_clean_time DATETIME;
+
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ IF v_lock_id IS NOT NULL THEN
+ DO RELEASE_LOCK(v_lock_id);
+ END IF;
+
+ RESIGNAL;
+ END;
+
+ SET v_params = IFNULL(v_params, '');
+
+ -- Si el servidor se ha reiniciado invalida todos los calculos.
+
+ SELECT COUNT(*) > 0 INTO v_valid FROM cache_valid;
+
+ IF !v_valid
+ THEN
+ DELETE FROM cache_calc;
+ INSERT INTO cache_valid (valid) VALUES (TRUE);
+ END IF;
+
+ -- Obtiene un bloqueo exclusivo para que no haya problemas de concurrencia.
+
+ SET v_lock_id = CONCAT_WS('/', v_cache_name, v_params);
+
+ IF !GET_LOCK(v_lock_id, 30)
+ THEN
+ SET v_calc = NULL;
+ SET v_refresh = FALSE;
+ LEAVE proc;
+ END IF;
+
+ -- Comprueba si el calculo solicitado existe y esta actualizado.
+
+ SELECT c.id, ca.id, ca.expires
+ INTO v_cache_id, v_calc, v_expires
+ FROM cache c
+ LEFT JOIN cache_calc ca
+ ON ca.cache_id = c.id AND ca.params = v_params COLLATE 'utf8_general_ci'
+ WHERE c.name = v_cache_name COLLATE 'utf8_general_ci';
+
+ -- Si existe una calculo valido libera el bloqueo y devuelve su identificador.
+
+ IF !v_refresh AND NOW() < v_expires
+ THEN
+ DO RELEASE_LOCK(v_lock_id);
+ SET v_refresh = FALSE;
+ LEAVE proc;
+ END IF;
+
+ -- Si el calculo no existe le crea una entrada en la tabla de calculos.
+
+ IF v_calc IS NULL
+ THEN
+ INSERT INTO cache_calc SET
+ cache_id = v_cache_id,
+ cacheName = v_cache_name,
+ params = v_params,
+ last_refresh = NULL,
+ expires = NULL,
+ connection_id = CONNECTION_ID();
+
+ SET v_calc = LAST_INSERT_ID();
+ ELSE
+ UPDATE cache_calc
+ SET
+ last_refresh = NULL,
+ expires = NULL,
+ connection_id = CONNECTION_ID()
+ WHERE id = v_calc;
+ END IF;
+
+ -- Si se debe recalcular mantiene el bloqueo y devuelve su identificador.
+
+ SET v_refresh = TRUE;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -8216,27 +8470,27 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cache_calc_unlock`(IN `v_calc` INT)
-proc: BEGIN
- DECLARE v_cache_name VARCHAR(50);
- DECLARE v_params VARCHAR(100);
-
- IF v_calc IS NULL THEN
- LEAVE proc;
- END IF;
-
- SELECT c.name, ca.params INTO v_cache_name, v_params
- FROM cache c
- JOIN cache_calc ca ON c.id = ca.cache_id
- WHERE ca.id = v_calc;
-
- DELETE FROM cache_calc WHERE id = v_calc;
-
- IF v_cache_name IS NOT NULL THEN
- DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, '')));
- END IF;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `cache_calc_unlock`(IN `v_calc` INT)
+proc: BEGIN
+ DECLARE v_cache_name VARCHAR(50);
+ DECLARE v_params VARCHAR(100);
+
+ IF v_calc IS NULL THEN
+ LEAVE proc;
+ END IF;
+
+ SELECT c.name, ca.params INTO v_cache_name, v_params
+ FROM cache c
+ JOIN cache_calc ca ON c.id = ca.cache_id
+ WHERE ca.id = v_calc;
+
+ DELETE FROM cache_calc WHERE id = v_calc;
+
+ IF v_cache_name IS NOT NULL THEN
+ DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, '')));
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -8247,13 +8501,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cache_clean`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `cache_clean`()
NO SQL
BEGIN
CALL available_clean;
@@ -8272,16 +8526,16 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clean`()
-BEGIN
-
- DECLARE vDateShort DATETIME;
-
- SET vDateShort = TIMESTAMPADD(MONTH, -1, CURDATE());
-
- DELETE FROM cache.departure_limit WHERE Fecha < vDateShort;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clean`()
+BEGIN
+
+ DECLARE vDateShort DATETIME;
+
+ SET vDateShort = TIMESTAMPADD(MONTH, -1, CURDATE());
+
+ DELETE FROM cache.departure_limit WHERE Fecha < vDateShort;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -8294,11 +8548,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `departure_timing`(vWarehouseId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `departure_timing`(vWarehouseId INT)
BEGIN
DECLARE done BOOL DEFAULT FALSE;
@@ -8379,13 +8633,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `departure_timing_beta__`(vWarehouseId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `departure_timing_beta__`(vWarehouseId INT)
BEGIN
DECLARE done BOOL DEFAULT FALSE;
@@ -8474,12 +8728,12 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `last_buy_refresh`(vRefresh BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `last_buy_refresh`(vRefresh BOOL)
proc: BEGIN
/**
* Crea o actualiza la cache con la última compra y fecha de cada
* artículo hasta ayer. Para obtener la última compra hasta una fecha
- * determinada utilizar el procedimiento vn2008.item_last_buy_().
+ * determinada utilizar el procedimiento vn.buyUltimate().
*
* @param vRefresh %TRUE para forzar el recálculo de la cache
*/
@@ -8526,13 +8780,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `prod_graphic_refresh`(v_refresh BOOL, wh_id INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `prod_graphic_refresh`(v_refresh BOOL, wh_id INT)
proc: BEGIN
DECLARE datEQ DATETIME;
DECLARE timDIF TIME;
@@ -8577,11 +8831,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stock_refresh`(v_refresh BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stock_refresh`(v_refresh BOOL)
proc: BEGIN
/**
* Crea o actualiza la cache con el disponible hasta el dÃa de
@@ -8643,11 +8897,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stock_refresh__`(v_refresh BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stock_refresh__`(v_refresh BOOL)
proc: BEGIN
/**
* bernat: WORKING IN THIS FILE
@@ -8707,11 +8961,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `visible_clean`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `visible_clean`()
BEGIN
DROP TEMPORARY TABLE IF EXISTS tCalc;
CREATE TEMPORARY TABLE tCalc
@@ -8737,11 +8991,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `visible_refresh`(OUT v_calc INT, v_refresh BOOL, v_warehouse INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `visible_refresh`(OUT v_calc INT, v_refresh BOOL, v_warehouse INT)
proc: BEGIN
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
@@ -8790,11 +9044,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `visible_refresh__`(OUT v_calc INT, v_refresh BOOL, v_warehouse INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `visible_refresh__`(OUT v_calc INT, v_refresh BOOL, v_warehouse INT)
proc: BEGIN
-- bernat working in this file
DECLARE EXIT HANDLER FOR SQLEXCEPTION
@@ -9215,7 +9469,8 @@ DROP TABLE IF EXISTS `floraHollandConfig`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `floraHollandConfig` (
- `defaultAdminNumber` int(11) NOT NULL DEFAULT '66011'
+ `defaultAdminNumber` int(11) NOT NULL DEFAULT '66011',
+ `floramondoMargin` decimal(10,2) NOT NULL DEFAULT '0.17'
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -9345,13 +9600,15 @@ CREATE TABLE `item_feature` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = '' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `item_feature_bi` BEFORE INSERT ON `item_feature` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`item_feature_bi`
+ BEFORE INSERT ON `item_feature`
+ FOR EACH ROW
BEGIN
IF NEW.expiry_date = '0000-00-00' THEN
SET NEW.expiry_date = NULL;
@@ -9372,6 +9629,7 @@ DROP TABLE IF EXISTS `item_free`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `item_free` (
`id` int(11) NOT NULL,
+ `token` int(11) DEFAULT NULL COMMENT 'campo para asegurar que solo el usuario coge uno de los valores',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -9597,22 +9855,27 @@ CREATE TABLE `putOrder` (
`barcode` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`FHAdminNumber` int(11) DEFAULT '66011',
+ `saleFk` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `orderTradelineItemID_UNIQUE` (`orderTradelineItemID`),
KEY `deliveryInformationID_idx` (`deliveryInformationID`),
- KEY `supplyResponseID_idx` (`supplyResponseID`)
+ KEY `supplyResponseID_idx` (`supplyResponseID`),
+ KEY `putOrder_FK` (`saleFk`),
+ CONSTRAINT `putOrder_FK` FOREIGN KEY (`saleFk`) REFERENCES `vn`.`sale` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `edi`.`putOrder_BEFORE_INSERT` BEFORE INSERT ON `putOrder` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`putOrder_BEFORE_INSERT`
+ BEFORE INSERT ON `putOrder`
+ FOR EACH ROW
BEGIN
DECLARE nextID INT;
@@ -9630,15 +9893,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `BEFORE UPDATE`
-BEFORE UPDATE
-ON putOrder FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`BEFORE UPDATE`
+ BEFORE UPDATE ON `putOrder`
+ FOR EACH ROW
BEGIN
DECLARE vError VARCHAR(100) DEFAULT 'Orderregel niet meer teruggevonden op basis van de orderps';
@@ -9680,23 +9943,21 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `edi`.`putOrder_AFTER_UPDATE` AFTER UPDATE ON `putOrder` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`putOrder_AFTER_UPDATE`
+ AFTER UPDATE ON `putOrder`
+ FOR EACH ROW
BEGIN
DECLARE vSaleFk INT;
- DECLARE vOrderStatusDenied INT DEFAULT 3;
- DECLARE vOrderStatusOK INT DEFAULT 2;
- DECLARE vIsEktSender BOOLEAN;
-
-
- -- CALL util.debugAdd(NEW.OrderStatus, OLD.OrderStatus);
-
-
+ DECLARE vOrderStatusDenied INT DEFAULT 3;
+ DECLARE vOrderStatusOK INT DEFAULT 2;
+ DECLARE vIsEktSender BOOLEAN;
+
IF NEW.OrderStatus = vOrderStatusDenied AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN
SELECT s.id INTO vSaleFk
@@ -9707,7 +9968,7 @@ BEGIN
WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= CURDATE()
AND i.supplyResponseFk = NEW.supplyResponseID
LIMIT 1;
-
+
UPDATE vn.sale s
JOIN vn.ticket t ON s.ticketFk = t.id
JOIN vn.item i ON i.id = s.itemFk
@@ -9715,7 +9976,7 @@ BEGIN
SET s.quantity = 0
WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= CURDATE()
AND i.supplyResponseFk = NEW.supplyResponseID;
-
+
INSERT INTO vn.mail (sender, `subject`, body)
SELECT IF(u.id IS NOT NULL AND c.email IS NOT NULL,
c.email,
@@ -9727,39 +9988,39 @@ BEGIN
IF (u.id IS NOT NULL AND c.email IS NOT NULL ,
CONCAT('https://verdnatura.es/#!form=ecomerce%2Fticket&ticket=', t.id ),
CONCAT('https://salix.verdnatura.es/#!/ticket/', t.id ,'/summary')))
- FROM vn.sale s
- JOIN vn.ticket t ON t.id = s.ticketFk
- JOIN vn.`client` c ON c.id = t.clientFk
- LEFT JOIN account.user u ON u.id= c.salesPersonFk AND u.name IN ('ruben', 'ismaelalcolea')
- WHERE s.id = vSaleFk;
+ FROM vn.sale s
+ JOIN vn.ticket t ON t.id = s.ticketFk
+ JOIN vn.`client` c ON c.id = t.clientFk
+ LEFT JOIN account.user u ON u.id= c.salesPersonFk AND u.name IN ('ruben', 'ismaelalcolea')
+ WHERE s.id = vSaleFk;
END IF;
IF NEW.OrderStatus = vOrderStatusOK AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN
-
- SELECT v.isEktSender INTO vIsEktSender
- FROM edi.VMPSettings v
- JOIN edi.supplyResponse sr ON sr.vmpID = v.VMPID
- WHERE sr.id = NEW.supplyResponseID;
-
- IF NOT vIsEktSender THEN
-
- CALL edi.ekt_add(NEW.id);
-
- END IF;
-
- IF NEW.barcode THEN
-
- INSERT IGNORE INTO vn.itemBarcode(itemFk, code)
- SELECT i.id, NEW.barcode
- FROM vn.item i
- WHERE i.supplyResponseFk = NEW.supplyResponseID;
-
- END IF;
-
- END IF;
-
+
+ SELECT v.isEktSender INTO vIsEktSender
+ FROM edi.VMPSettings v
+ JOIN edi.supplyResponse sr ON sr.vmpID = v.VMPID
+ WHERE sr.id = NEW.supplyResponseID;
+
+ IF NOT vIsEktSender THEN
+
+ CALL edi.ekt_add(NEW.id);
+
+ END IF;
+
+ IF NEW.barcode THEN
+
+ INSERT IGNORE INTO vn.itemBarcode(itemFk, code)
+ SELECT i.id, NEW.barcode
+ FROM vn.item i
+ WHERE i.supplyResponseFk = NEW.supplyResponseID;
+
+ END IF;
+
+ END IF;
+
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -9807,6 +10068,61 @@ CREATE TABLE `supplier` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='/tmp/floricode/FEC010104/CC090916.txt';
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Temporary table structure for view `supplyOffer`
+--
+
+DROP TABLE IF EXISTS `supplyOffer`;
+/*!50001 DROP VIEW IF EXISTS `supplyOffer`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `supplyOffer` (
+ `vmpID` tinyint NOT NULL,
+ `diId` tinyint NOT NULL,
+ `srId` tinyint NOT NULL,
+ `Item_ArticleCode` tinyint NOT NULL,
+ `product_name` tinyint NOT NULL,
+ `company_name` tinyint NOT NULL,
+ `Price` tinyint NOT NULL,
+ `Quality` tinyint NOT NULL,
+ `s1` tinyint NOT NULL,
+ `s2` tinyint NOT NULL,
+ `s3` tinyint NOT NULL,
+ `s4` tinyint NOT NULL,
+ `s5` tinyint NOT NULL,
+ `s6` tinyint NOT NULL,
+ `NumberOfUnits` tinyint NOT NULL,
+ `EmbalageCode` tinyint NOT NULL,
+ `LatestDeliveryDateTime` tinyint NOT NULL,
+ `EarliestDespatchDateTime` tinyint NOT NULL,
+ `FirstOrderDateTime` tinyint NOT NULL,
+ `LatestOrderDateTime` tinyint NOT NULL,
+ `NumberOfItemsPerCask` tinyint NOT NULL,
+ `NumberOfLayersPerTrolley` tinyint NOT NULL,
+ `MinimumNumberToOrder` tinyint NOT NULL,
+ `MaximumNumberToOrder` tinyint NOT NULL,
+ `IncrementalOrderableQuantity` tinyint NOT NULL,
+ `PackingPrice` tinyint NOT NULL,
+ `MarketPlaceID` tinyint NOT NULL,
+ `PictureReference` tinyint NOT NULL,
+ `supplyResponseUpdated` tinyint NOT NULL,
+ `group_id` tinyint NOT NULL,
+ `marketPlace` tinyint NOT NULL,
+ `DeliveryPrice` tinyint NOT NULL,
+ `ChargeAmount` tinyint NOT NULL,
+ `MinimumQuantity` tinyint NOT NULL,
+ `MaximumQuantity` tinyint NOT NULL,
+ `OrderUnit` tinyint NOT NULL,
+ `IncrementalOrderUnit` tinyint NOT NULL,
+ `isEarlyBird` tinyint NOT NULL,
+ `isVNHSupplier` tinyint NOT NULL,
+ `expenseFk` tinyint NOT NULL,
+ `intrastatFk` tinyint NOT NULL,
+ `originFk` tinyint NOT NULL,
+ `itemTypeFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
--
-- Table structure for table `supplyResponse`
--
@@ -9886,16 +10202,15 @@ CREATE TABLE `supplyResponse` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER supplyResponse_AFTER_UPDATE
- AFTER UPDATE
- ON supplyResponse
- FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `edi`.`supplyResponse_AFTER_UPDATE`
+ AFTER UPDATE ON `supplyResponse`
+ FOR EACH ROW
BEGIN
UPDATE vn.buy b
@@ -10003,14 +10318,14 @@ DELIMITER ;;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection = utf8_general_ci */ ;;
+/*!50003 SET character_set_client = utf8mb4 */ ;;
+/*!50003 SET character_set_results = utf8mb4 */ ;;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `floramondo` ON SCHEDULE EVERY 6 MINUTE STARTS '2020-07-29 01:58:29' ON COMPLETION NOT PRESERVE ENABLE DO CALL edi.floramondo_offerRefresh() */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `floramondo` ON SCHEDULE EVERY 6 MINUTE STARTS '2022-01-28 09:52:45' ON COMPLETION NOT PRESERVE ENABLE DO CALL edi.floramondo_offerRefresh() */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -10026,30 +10341,30 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `imageName`(vPictureReference VARCHAR(255)) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `imageName`(vPictureReference VARCHAR(255)) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
-BEGIN
-
- SET vPictureReference = REPLACE(vPictureReference,'.','');
-
- SET vPictureReference = REPLACE(vPictureReference,'/','');
-
- SET vPictureReference = REPLACE(vPictureReference,'%','');
-
- SET vPictureReference = REPLACE(vPictureReference,':','');
-
- SET vPictureReference = REPLACE(vPictureReference,'?','');
-
- SET vPictureReference = REPLACE(vPictureReference,'=','');
-
- RETURN vPictureReference;
-
+BEGIN
+
+ SET vPictureReference = REPLACE(vPictureReference,'.','');
+
+ SET vPictureReference = REPLACE(vPictureReference,'/','');
+
+ SET vPictureReference = REPLACE(vPictureReference,'%','');
+
+ SET vPictureReference = REPLACE(vPictureReference,':','');
+
+ SET vPictureReference = REPLACE(vPictureReference,'?','');
+
+ SET vPictureReference = REPLACE(vPictureReference,'=','');
+
+ RETURN vPictureReference;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -10060,17 +10375,17 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clean`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clean`()
BEGIN
DECLARE vFourYearsAgo DATE DEFAULT TIMESTAMPADD(YEAR,-4,CURDATE());
- DECLARE vOneWeekAgo DATE DEFAULT TIMESTAMPADD(WEEK,-1,CURDATE());
+ DECLARE vOneWeekAgo DATE DEFAULT TIMESTAMPADD(WEEK,-1,CURDATE());
DELETE FROM ekt WHERE fec < vFourYearsAgo;
@@ -10092,35 +10407,35 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `deliveryInformation_Delete`()
-BEGIN
-
- DECLARE vID INT;
- DECLARE vGap INT DEFAULT 100;
- DECLARE vTope INT;
-
- SELECT MIN(ID), MAX(ID)
- INTO vID, vTope
- FROM edi.deliveryInformation;
-
- WHILE vID <= vTope DO
-
- SET vID = vID + vGap;
-
- DELETE
- FROM edi.deliveryInformation
- WHERE ID < vID
- AND EarliestDespatchDateTime IS NULL;
-
- END WHILE;
-
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `deliveryInformation_Delete`()
+BEGIN
+
+ DECLARE vID INT;
+ DECLARE vGap INT DEFAULT 100;
+ DECLARE vTope INT;
+
+ SELECT MIN(ID), MAX(ID)
+ INTO vID, vTope
+ FROM edi.deliveryInformation;
+
+ WHILE vID <= vTope DO
+
+ SET vID = vID + vGap;
+
+ DELETE
+ FROM edi.deliveryInformation
+ WHERE ID < vID
+ AND EarliestDespatchDateTime IS NULL;
+
+ END WHILE;
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -10131,13 +10446,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ekt_add`(vPutOrderFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ekt_add`(vPutOrderFk INT)
BEGIN
/**
@@ -10214,8 +10529,9 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ekt_load`(IN `vSelf` INT)
-BEGIN
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ekt_load`(IN `vSelf` INT)
+proc:BEGIN
+
DECLARE vRef INT;
DECLARE vBuy INT;
DECLARE vItem INT;
@@ -10226,18 +10542,36 @@ BEGIN
DECLARE vForceToPacking INT DEFAULT 2;
DECLARE vEntryFk INT;
DECLARE vHasToChangePackagingFk BOOLEAN;
+ DECLARE vIsFloramondoDirect BOOLEAN;
+ DECLARE vTicketFk INT;
+ DECLARE vHasItemGroup BOOL;
+ DECLARE vDescription VARCHAR(255);
+ DECLARE vSaleFk INT;
-- Carga los datos necesarios del EKT
- SELECT ref, qty, package, putOrderFk MOD 1000000, i2.id
- INTO vRef, vQty, vPackage, vPutOrderFk, vItem
- FROM ekt e
- LEFT JOIN item i ON e.ref = i.id
+ SELECT e.ref, qty, package, putOrderFk MOD 1000000, i2.id , NOT ISNULL(eea.addressFk), NOT ISNULL(igto.group_code),
+ CONCAT(e.`ref`, ' ', e.item, ' ', e.sub, ' EktFk:', e.id)
+ INTO vRef, vQty, vPackage, vPutOrderFk, vItem, vIsFloramondoDirect, vHasItemGroup, vDescription
+ FROM edi.ekt e
+ LEFT JOIN edi.item i ON e.ref = i.id
LEFT JOIN edi.putOrder po ON po.id = e.putOrderFk
LEFT JOIN vn.item i2 ON i2.supplyResponseFk = po.supplyResponseID
+ LEFT JOIN vn.ektEntryAssign eea ON eea.sub = e.sub
+ LEFT JOIN edi.item_groupToOffer igto ON igto.group_code = i.group_id
WHERE e.id = vSelf
LIMIT 1;
+ IF NOT vHasItemGroup THEN
+
+ CALL vn.mail_insert('logistica@verdnatura.es', 'nocontestar@verdnatura.es', 'Nuevo grupo en Floramondo', vDescription);
+
+ CALL vn.mail_insert('pako@verdnatura.es', 'nocontestar@verdnatura.es', CONCAT('Nuevo grupo en Floramondo: ', vDescription), vDescription);
+
+ LEAVE proc;
+
+ END IF;
+
-- Asigna la entrada
SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk;
@@ -10276,7 +10610,7 @@ BEGIN
END IF;
END IF;
- -- Si es una compra de Floramondo obtiene el articulo
+ -- Si es una compra de Logiflora obtiene el articulo
IF vPutOrderFk THEN
SELECT i.id INTO vItem
@@ -10291,6 +10625,7 @@ BEGIN
item_id = vRef;
IF IFNULL(vItem,0) = 0 THEN
+
-- Intenta obtener el artículo en base a los atributos holandeses
SELECT b.id, IFNULL(b.itemOriginalFk ,b.itemFk) INTO vBuy, vItem
@@ -10298,6 +10633,7 @@ BEGIN
JOIN edi.item_track t ON t.item_id = e.ref
LEFT JOIN edi.ekt l ON l.ref = e.ref
LEFT JOIN vn.buy b ON b.ektFk = l.id
+ LEFT JOIN vn.item i ON i.id = b.itemFk
JOIN vn2008.config cfg
WHERE e.id = vSelf
AND l.id != vSelf
@@ -10308,19 +10644,24 @@ BEGIN
AND IF(t.s4, l.s4 = e.s4, TRUE)
AND IF(t.s5, l.s5 = e.s5, TRUE)
AND IF(t.s6, l.s6 = e.s6, TRUE)
- AND IF(t.kop, l.kop = e.kop, TRUE)
AND IF(t.pac, l.pac = e.pac, TRUE)
AND IF(t.cat, l.cat = e.cat, TRUE)
AND IF(t.ori, l.ori = e.ori, TRUE)
AND IF(t.pro, l.pro = e.pro, TRUE)
- AND IF(t.sub, l.sub = e.sub, TRUE)
AND IF(t.package, l.package = e.package, TRUE)
AND IF(t.item, l.item = e.item, TRUE)
- AND b.itemFk < 170000
- ORDER BY l.now DESC, b.id ASC LIMIT 1;
+ AND i.isFloramondo = vIsFloramondoDirect
+ ORDER BY l.now DESC, b.id ASC
+ LIMIT 1;
END IF;
+ -- Si no encuentra el articulo lo crea en el caso de las compras directas en Floramondo
+ IF ISNULL(vItem) AND vIsFloramondoDirect THEN
+
+ CALL edi.item_getNewByEkt(vSelf, vItem);
+
+ END IF;
INSERT INTO vn.buy
(
@@ -10357,186 +10698,160 @@ BEGIN
JOIN vn2008.config cfg
WHERE e.id = vSelf
LIMIT 1;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
-
+
CREATE TEMPORARY TABLE tmp.buyRecalc
SELECT buy.id
FROM vn.buy
- WHERE ektFk = vSelf;
-
- CALL vn.buy_recalcPrices();
-
+ WHERE ektFk = vSelf;
+
+ CALL vn.buy_recalcPrices();
+
+ -- Si es una compra de Logiflora hay que informar la tabla vn.saleBuy
+ IF vPutOrderFk THEN
+
+ REPLACE vn.saleBuy(saleFk, buyFk, workerFk)
+ SELECT po.saleFk, b.id, account.myUser_getId()
+ FROM edi.putOrder po
+ JOIN vn.buy b ON b.ektFk = vSelf
+ WHERE po.id = vPutOrderFk;
+
+ END IF;
+ -- Si es una compra directa en Floramondo hay que añadirlo al ticket
+
+ IF vIsFloramondoDirect THEN
+
+ SELECT t.id INTO vTicketFk
+ FROM vn.ticket t
+ JOIN vn.ektEntryAssign eea ON eea.addressFk = t.addressFk
+ JOIN vn.warehouse w ON w.id = t.warehouseFk AND w.name = 'Floramondo'
+ JOIN edi.ekt e ON e.sub = eea.sub AND e.id = vSelf
+ WHERE e.fec = t.shipped
+ LIMIT 1;
+
+ IF ISNULL(vTicketFk) THEN
+
+ INSERT INTO vn.ticket (
+ clientFk,
+ shipped,
+ addressFk,
+ agencyModeFk,
+ nickname,
+ warehouseFk,
+ companyFk,
+ landed,
+ zoneFk,
+ zonePrice,
+ zoneBonus
+ )
+ SELECT
+ a.clientFk,
+ e.fec,
+ a.id,
+ a.agencyModeFk,
+ a.nickname,
+ w.id,
+ c.id,
+ e.fec,
+ z.id,
+ z.price,
+ z.bonus
+ FROM edi.ekt e
+ JOIN vn.ektEntryAssign eea ON eea.sub = e.sub
+ JOIN vn.address a ON a.id = eea.addressFk
+ JOIN vn.warehouse w ON w.name = 'Floramondo'
+ JOIN vn.company c ON c.code = 'VNL'
+ JOIN vn.`zone` z ON z.code = 'FLORAMONDO'
+ WHERE e.id = vSelf
+ LIMIT 1;
+
+ SET vTicketFk = LAST_INSERT_ID();
+
+ INSERT INTO vn.ticketLog
+ SET originFk = vTicketFk,
+ userFk = account.myUser_getId(),
+ `action` = 'insert',
+ description = CONCAT('EktLoad ha creado el ticket:', ' ', vTicketFk);
+
+ END IF;
+
+ INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, price)
+ SELECT vItem, vTicketFk, e.item, e.qty * e.pac, e.pri * ( 1 + fhc.floramondoMargin )
+ FROM edi.ekt e
+ JOIN edi.floraHollandConfig fhc
+ WHERE e.id = vSelf;
+
+ SELECT LAST_INSERT_ID() INTO vSaleFk;
+
+ REPLACE vn.saleBuy(saleFk, buyFk, workerFk)
+ SELECT vSaleFk, b.id, account.myUser_getId()
+ FROM vn.buy b
+ WHERE b.ektFk = vSelf;
+
+ INSERT INTO vn.saleComponent(saleFk, componentFk, value)
+ SELECT vSaleFk, c.id, e.pri
+ FROM edi.ekt e
+ JOIN vn.component c ON c.code = 'purchaseValue'
+ WHERE e.id = vSelf;
+
+ INSERT INTO vn.saleComponent(saleFk, componentFk, value)
+ SELECT vSaleFk, c.id, e.pri * fhc.floramondoMargin
+ FROM edi.ekt e
+ JOIN edi.floraHollandConfig fhc
+ JOIN vn.component c ON c.code = 'margin'
+ WHERE e.id = vSelf;
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ekt_load_beta` */;
+/*!50003 DROP PROCEDURE IF EXISTS `ekt_loadNotBuy` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ekt_load_beta`(IN `vSelf` INT)
-BEGIN
- DECLARE vRef INT;
- DECLARE vBuy INT;
- DECLARE vItem INT;
- DECLARE vQty INT;
- DECLARE vPackage INT;
- DECLARE vPutOrderFk INT;
- DECLARE vIsLot BOOLEAN;
- DECLARE vForceToPacking INT DEFAULT 2;
- DECLARE vEntryFk INT;
- DECLARE vHasToChangePackagingFk BOOLEAN;
-
- -- Carga los datos necesarios del EKT
-
- SELECT ref, qty, package, putOrderFk, i2.id INTO vRef, vQty, vPackage, vPutOrderFk, vItem
- FROM ekt e
- LEFT JOIN item i ON e.ref = i.id
- LEFT JOIN edi.putOrder po ON po.id = e.putOrderFk
- LEFT JOIN vn.item i2 ON i2.supplyResponseFk = po.supplyResponseID
- WHERE e.id = vSelf
- LIMIT 1;
-
- SELECT vItem;
-
- -- Asigna la entrada
- SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk;
-
- -- Inserta el cubo si no existe
-
- IF vPackage = 800 THEN
-
- SET vHasToChangePackagingFk = TRUE;
-
- IF vItem THEN
-
- SELECT vn.item_getPackage(vItem) INTO vPackage ;
-
- ELSE
-
- SET vPackage = 8000 + vQty;
-
- INSERT IGNORE INTO vn.packaging(id, width, `depth`)
- SELECT vPackage, vc.ccLength / vQty, vc.ccWidth
- FROM vn.volumeConfig vc;
-
- END IF;
-
- ELSE
-
- INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z)
- SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10)
- FROM bucket WHERE bucket_id = vPackage;
-
- IF ROW_COUNT() > 0
- THEN
- INSERT INTO vn2008.mail SET
- `subject` = 'Cubo añadido',
- `text` = CONCAT('Se ha añadido el cubo: ', vPackage),
- `to` = 'ekt@verdnatura.es';
- END IF;
- END IF;
-
- -- Si es una compra de Floramondo obtiene el articulo
- IF vPutOrderFk THEN
-
- SELECT i.id INTO vItem
- FROM edi.putOrder po
- JOIN vn.item i ON i.supplyResponseFk = po.supplyResponseID
- WHERE po.id = vPutOrderFk
- LIMIT 1;
-
- END IF;
-
- INSERT IGNORE INTO item_track SET
- item_id = vRef;
-
- IF IFNULL(vItem,0) = 0 THEN
- -- Intenta obtener el artículo en base a los atributos holandeses
-
- SELECT b.id, b.itemFk INTO vBuy, vItem
- FROM edi.ekt e
- JOIN edi.item_track t ON t.item_id = e.ref
- LEFT JOIN edi.ekt l ON l.ref = e.ref
- LEFT JOIN vn.buy b ON b.ektFk = l.id
- JOIN vn2008.config cfg
- WHERE e.id = vSelf
- AND l.id != vSelf
- AND b.itemFk != cfg.generic_item
- AND IF(t.s1, l.s1 = e.s1, TRUE)
- AND IF(t.s2, l.s2 = e.s2, TRUE)
- AND IF(t.s3, l.s3 = e.s3, TRUE)
- AND IF(t.s4, l.s4 = e.s4, TRUE)
- AND IF(t.s5, l.s5 = e.s5, TRUE)
- AND IF(t.s6, l.s6 = e.s6, TRUE)
- AND IF(t.kop, l.kop = e.kop, TRUE)
- AND IF(t.pac, l.pac = e.pac, TRUE)
- AND IF(t.cat, l.cat = e.cat, TRUE)
- AND IF(t.ori, l.ori = e.ori, TRUE)
- AND IF(t.pro, l.pro = e.pro, TRUE)
- AND IF(t.sub, l.sub = e.sub, TRUE)
- AND IF(t.package, l.package = e.package, TRUE)
- AND IF(t.item, l.item = e.item, TRUE)
- AND b.itemFk < 170000
- ORDER BY l.now DESC, b.id ASC LIMIT 1;
-
- END IF;
-
-
- INSERT INTO vn.buy
- (
- entryFk
- ,ektFk
- ,buyingValue
- ,itemFk
- ,stickers
- ,packing
- ,`grouping`
- ,quantity
- ,groupingMode
- ,producer
- ,packageFk
- ,weight
- )
- SELECT
- vEntryFk
- ,vSelf
- ,(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue
- ,IFNULL(vItem, cfg.generic_item) itemFk
- ,e.qty stickers
- ,@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing
- ,IFNULL(b.`grouping`, e.pac)
- ,@pac * e.qty
- ,vForceToPacking
- ,s.`name`
- ,IF(vHasToChangePackagingFk OR ISNULL(b.packageFk), vPackage, b.packageFk)
- ,i.density * (vn.item_getVolume(i.id, IFNULL(b.packageFk, e.package)) / 1000000)
- FROM edi.ekt e
- LEFT JOIN vn.buy b ON b.id = vBuy
- LEFT JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN vn.supplier s ON e.pro = s.id
- JOIN vn2008.config cfg
- WHERE e.id = vSelf
- LIMIT 1;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
-
- CREATE TEMPORARY TABLE tmp.buyRecalc
- SELECT buy.id
- FROM vn.buy
- WHERE ektFk = vSelf;
-
- CALL vn.buy_recalcPrices();
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ekt_loadNotBuy`()
+BEGIN
+
+ /**
+ * Ejecuta ekt_load para aquellos ekt de hoy que no tienen vn.buy
+ */
+
+ DECLARE vEktFk INTEGER;
+ DECLARE done BOOL;
+
+
+ DECLARE cursor1 CURSOR FOR SELECT e.id
+ FROM edi.ekt e
+ LEFT JOIN vn.buy b ON b.ektFk = e.id
+ WHERE e.fec >= CURDATE()
+ AND ISNULL(b.ektFk);
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
+
+ OPEN cursor1;
+ bucle: LOOP
+
+ FETCH cursor1 INTO vEktFk;
+
+ IF done THEN
+ LEAVE bucle;
+ END IF;
+
+ CALL edi.ekt_load(vEktFk);
+
+ END LOOP bucle;
+ CLOSE cursor1;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -10547,13 +10862,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `exchange_new`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `exchange_new`(
IN `vMailFk` INT,
IN `vItem` VARCHAR(255),
IN `vType` MEDIUMINT,
@@ -10769,7 +11084,7 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `floramondo_offerRefresh`()
proc: BEGIN
DECLARE vLanded DATETIME;
@@ -10777,19 +11092,19 @@ proc: BEGIN
DECLARE vFreeId INT;
DECLARE vSupplyResponseFk INT;
DECLARE vLastInserted DATETIME;
- DECLARE vIsAuctionDay BOOLEAN;
- DECLARE vMaxNewItems INT DEFAULT 10000;
- DECLARE vStartingTime DATETIME;
- DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043';
-
+ DECLARE vIsAuctionDay BOOLEAN;
+ DECLARE vMaxNewItems INT DEFAULT 10000;
+ DECLARE vStartingTime DATETIME;
+ DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043';
+
DECLARE cur1 CURSOR FOR
SELECT id
FROM edi.item_free;
-
+
DECLARE cur2 CURSOR FOR
SELECT srId
FROM itemToInsert;
-
+
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
DECLARE EXIT HANDLER FOR SQLSTATE '45000'
BEGIN
@@ -10809,35 +11124,34 @@ proc: BEGIN
AND sr.EmbalageCode != 999
GROUP BY sr.vmpID;
- UPDATE edi.offerList o
+ UPDATE edi.offerList o
JOIN (SELECT v.name, COUNT(*) total
- FROM edi.supplyOffer sr
+ FROM edi.supplyOffer sr
JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
GROUP BY sr.vmpID) sub ON o.supplier = sub.name
SET o.`filter` = sub.total;
-
+
-- Refresca las fotos de los items existentes, con prioridad baja (0.7 seg)
- INSERT IGNORE INTO vn.itemImageQueue(itemFk, url,priority)
+ INSERT IGNORE INTO vn.itemImageQueue(itemFk, url,priority)
SELECT i.id, sr.PictureReference , 100
FROM edi.supplyResponse sr
JOIN vn.item i ON i.supplyResponseFk = sr.ID
WHERE i.image != edi.imageName(sr.PictureReference)
AND sr.NumberOfUnits > 0;
-
+
-- Elimina de la lista de items libres aquellos que ya existen
- DELETE itf.*
+ DELETE itf.*
FROM edi.item_free itf
JOIN vn.item i ON i.id = itf.id;
- DROP TEMPORARY TABLE IF EXISTS tmp;
+ DROP TEMPORARY TABLE IF EXISTS tmp;
CREATE TEMPORARY TABLE tmp (INDEX (`Item_ArticleCode`)) ENGINE = MEMORY
SELECT t.*
FROM (
SELECT *
FROM edi.supplyOffer
ORDER BY (MarketPlaceID = vAalsmeerMarketPlaceID) DESC, NumberOfUnits DESC) t
- GROUP BY t.srId
- ;
+ GROUP BY t.srId;
DROP TEMPORARY TABLE IF EXISTS edi.offer;
CREATE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`),
@@ -10845,17 +11159,17 @@ proc: BEGIN
INDEX (`s1Value`), INDEX (`s2Value`), INDEX (`s3Value`), INDEX (`s4Value`),INDEX (`s5Value`), INDEX (`s6Value`))
ENGINE = MEMORY
SELECT so.*,
- ev1.type_description s1Value,
- ev2.type_description s2Value,
- ev3.type_description s3Value,
- ev4.type_description s4Value,
- ev5.type_description s5Value,
+ ev1.type_description s1Value,
+ ev2.type_description s2Value,
+ ev3.type_description s3Value,
+ ev4.type_description s4Value,
+ ev5.type_description s5Value,
ev6.type_description s6Value,
- eif1.feature ef1,
- eif2.feature ef2,
- eif3.feature ef3,
- eif4.feature ef4,
- eif5.feature ef5,
+ eif1.feature ef1,
+ eif2.feature ef2,
+ eif3.feature ef3,
+ eif4.feature ef4,
+ eif5.feature ef5,
eif6.feature ef6
FROM tmp so
LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
@@ -10896,36 +11210,36 @@ proc: BEGIN
OR(t5.id IS NOT NULL AND CONVERT(s5Value, UNSIGNED) > fc.itemMaxSize)
OR(t6.id IS NOT NULL AND CONVERT(s6Value, UNSIGNED) > fc.itemMaxSize);
- START TRANSACTION;
-
+ START TRANSACTION;
+
-- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
UPDATE IGNORE edi.offer o
JOIN vn.item i
ON i.name = o.product_name
AND i.subname <=> o.company_name
AND i.value5 <=> o.s1Value
- AND i.value6 <=> o.s2Value
+ AND i.value6 <=> o.s2Value
AND i.value7 <=> o.s3Value
- AND i.value8 <=> o.s4Value
+ AND i.value8 <=> o.s4Value
AND i.value9 <=> o.s5Value
- AND i.value10 <=> o.s6Value
- AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
- AND i.EmbalageCode <=> o.EmbalageCode
- AND i.quality <=> o.Quality
- JOIN vn.itemType it ON it.id = i.typeFk
- LEFT JOIN vn.sale s ON s.itemFk = i.id
- LEFT JOIN vn.ticket t ON t.id = s.ticketFk AND t.shipped > TIMESTAMPADD(WEEK, -1, CURDATE())
+ AND i.value10 <=> o.s6Value
+ AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
+ AND i.EmbalageCode <=> o.EmbalageCode
+ AND i.quality <=> o.Quality
+ JOIN vn.itemType it ON it.id = i.typeFk
+ LEFT JOIN vn.sale s ON s.itemFk = i.id
+ LEFT JOIN vn.ticket t ON t.id = s.ticketFk AND t.shipped > TIMESTAMPADD(WEEK, -1, CURDATE())
LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
- LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
- LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk AND po.OrderTradeLineDateTime > TIMESTAMPADD(WEEK, -1, CURDATE())
+ LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
+ LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk AND po.OrderTradeLineDateTime > TIMESTAMPADD(WEEK, -1, CURDATE())
SET i.supplyResponseFk = o.srID
WHERE ( sr.ID IS NULL
OR sr.NumberOfUnits = 0
OR di.LatestOrderDateTime < NOW()
OR di.ID IS NULL)
- AND it.isInventory
- AND t.id IS NULL
- AND po.id IS NULL;
+ AND it.isInventory
+ AND t.id IS NULL
+ AND po.id IS NULL;
-- select now(),'Antes de crear ITO';
DROP TEMPORARY TABLE IF EXISTS itemToInsert;
CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY
@@ -10940,12 +11254,12 @@ proc: BEGIN
OPEN cur2;
read_loop: LOOP
-
+
FETCH cur2 INTO vSupplyResponseFk;
FETCH cur1 INTO vFreeId;
IF done THEN
- LEAVE read_loop;
+ LEAVE read_loop;
END IF;
UPDATE itemToInsert
@@ -10958,32 +11272,32 @@ proc: BEGIN
CLOSE cur2;
-- Insertamos todos los items en Articles de la oferta
- INSERT INTO vn.item( id,
- `name`,
- longName,
- subName,
- expenceFk,
- typeFk,
- intrastatFk,
- originFk,
- supplyResponseFk,
- numberOfItemsPerCask,
- embalageCode,
- quality,
- isFloramondo)
+ INSERT INTO vn.item(id,
+ `name`,
+ longName,
+ subName,
+ expenceFk,
+ typeFk,
+ intrastatFk,
+ originFk,
+ supplyResponseFk,
+ numberOfItemsPerCask,
+ embalageCode,
+ quality,
+ isFloramondo)
SELECT iti.itemFk,
iti.product_name,
iti.product_name,
- iti.company_name,
+ iti.company_name,
iti.expenseFk,
iti.itemTypeFk,
iti.intrastatFk,
iti.originFk,
iti.`srId`,
iti.NumberOfItemsPerCask,
- iti.EmbalageCode,
- iti.Quality,
- TRUE
+ iti.EmbalageCode,
+ iti.Quality,
+ TRUE
FROM itemToInsert iti;
INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
@@ -11010,19 +11324,22 @@ proc: BEGIN
SELECT i.id, t.id , ii.product_name, 1
FROM itemToInsert ii
JOIN vn.tag t ON t.`name` = 'Producto'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+ JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+ WHERE NOT ISNULL(ii.product_name);
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id , ii.Quality, 3
FROM itemToInsert ii
JOIN vn.tag t ON t.`name` = 'Calidad'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+ JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+ WHERE NOT ISNULL(ii.Quality);
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id , ii.company_name, 4
FROM itemToInsert ii
JOIN vn.tag t ON t.`name` = 'Productor'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+ JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+ WHERE NOT ISNULL(ii.company_name);
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id , s1Value, 5
@@ -11080,16 +11397,14 @@ proc: BEGIN
UPDATE vn.item i
JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`
- JOIN vn.packaging p ON p.id LIKE ii.EmbalageCode AND hasCompressionVariations
- JOIN vn.itemTag diameter ON diameter.itemFk = i.id
- JOIN vn.tag tDiameter ON tDiameter.overwrite = 'diameter' AND tDiameter.id = diameter.tagFk
- JOIN vn.itemTag size ON size.itemFk = i.id
- JOIN vn.tag tSize ON tSize.overwrite = 'size' AND tSize.id = size.tagFk
- SET i.`compression` =
- (PI() * POW(diameter.`value`/ 2, 2) * size.`value`)
- /
- ((p.width * p.depth * p.height) / ii.NumberOfItemsPerCask);
-
+ JOIN vn.packaging p ON p.id LIKE ii.EmbalageCode -- AND hasCompressionVariations
+ JOIN vn.itemTag it ON it.itemFk = i.id
+ JOIN vn.tag tSize ON tSize.overwrite = 'size' AND tSize.id = it.tagFk
+ JOIN vn.volumeConfig vc
+ SET i.packingOut = vc.standardFlowerBox * 1000
+ * ii.NumberOfItemsPerCask
+ / (p.width * p.depth * IFNULL(p.height, it.value ));
+
DROP TABLE IF EXISTS tmp.item;
CREATE TABLE tmp.item
(PRIMARY KEY (id))
@@ -11129,7 +11444,7 @@ proc: BEGIN
-- Localiza las entradas de cada almacen
UPDATE edi.warehouseFloramondo
- SET entryFk = vn.floramondo_getEntry(TIMESTAMPADD(DAY,travellingDays,vLanded), warehouseFk);
+ SET entryFk = vn.entry_getForLogiflora(TIMESTAMPADD(DAY,travellingDays,vLanded), warehouseFk);
IF vLanded IS NOT NULL THEN
@@ -11141,30 +11456,30 @@ proc: BEGIN
SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
b.buyingValue = o.price
WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price);
-
+/*
-- Se eliminan las ofertas ya incluidas en las entradas
DELETE o
FROM edi.offer o
JOIN vn.item i ON i.supplyResponseFk = o.srId
JOIN vn.buy b ON i.id = b.itemFk
JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk;
-
+ */
-- Se inserta el resto
SET vLastInserted := NOW();
-- Inserta la oferta
- INSERT INTO vn.buy(entryFk,
- itemFk,
- quantity,
- buyingValue,
- stickers,
- packing,
- `grouping`,
- groupingMode,
- packageFk,
- deliveryFk)
+ INSERT INTO vn.buy( entryFk,
+ itemFk,
+ quantity,
+ buyingValue,
+ stickers,
+ packing,
+ `grouping`,
+ groupingMode,
+ packageFk,
+ deliveryFk)
- SELECT wf.entryFk,
+ SELECT wf.entryFk,
i.id,
o.NumberOfUnits * o.NumberOfItemsPerCask as quantity,
o.Price,
@@ -11177,7 +11492,9 @@ proc: BEGIN
FROM edi.offer o
JOIN vn.item i ON i.supplyResponseFk = o.srId
JOIN edi.warehouseFloramondo wf
- JOIN vn.packaging p ON p.id LIKE o.embalageCode; -- llevar esta linea i mirar de crear els packages a temps real
+ JOIN vn.packaging p ON p.id LIKE o.embalageCode
+ LEFT JOIN vn.buy b ON b.itemFk = i.id AND b.entryFk = wf.entryFk
+ WHERE ISNULL(b.id); -- llevar esta linea i mirar de crear els packages a temps real
DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
@@ -11252,13 +11569,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh_beta`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `floramondo_offerRefresh_beta`()
proc: BEGIN
DECLARE vLanded DATETIME;
@@ -11266,19 +11583,19 @@ proc: BEGIN
DECLARE vFreeId INT;
DECLARE vSupplyResponseFk INT;
DECLARE vLastInserted DATETIME;
- DECLARE vIsAuctionDay BOOLEAN;
- DECLARE vMaxNewItems INT DEFAULT 10000;
- DECLARE vStartingTime DATETIME;
- DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043';
-
+ DECLARE vIsAuctionDay BOOLEAN;
+ DECLARE vMaxNewItems INT DEFAULT 10000;
+ DECLARE vStartingTime DATETIME;
+ DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043';
+
DECLARE cur1 CURSOR FOR
SELECT id
FROM edi.item_free;
-
+
DECLARE cur2 CURSOR FOR
SELECT srId
FROM itemToInsert;
-
+
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
DECLARE EXIT HANDLER FOR SQLSTATE '45000'
BEGIN
@@ -11298,27 +11615,27 @@ proc: BEGIN
AND sr.EmbalageCode != 999
GROUP BY sr.vmpID;
- UPDATE edi.offerList o
+ UPDATE edi.offerList o
JOIN (SELECT v.name, COUNT(*) total
- FROM edi.supplyOffer sr
+ FROM edi.supplyOffer sr
JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
GROUP BY sr.vmpID) sub ON o.supplier = sub.name
SET o.`filter` = sub.total;
-
+
-- Refresca las fotos de los items existentes, con prioridad baja (0.7 seg)
- INSERT IGNORE INTO vn.itemImageQueue(itemFk, url,priority)
+ INSERT IGNORE INTO vn.itemImageQueue(itemFk, url,priority)
SELECT i.id, sr.PictureReference , 100
FROM edi.supplyResponse sr
JOIN vn.item i ON i.supplyResponseFk = sr.ID
WHERE i.image != edi.imageName(sr.PictureReference)
AND sr.NumberOfUnits > 0;
-
+
-- Elimina de la lista de items libres aquellos que ya existen
- DELETE itf.*
+ DELETE itf.*
FROM edi.item_free itf
JOIN vn.item i ON i.id = itf.id;
- DROP TEMPORARY TABLE IF EXISTS tmp;
+ DROP TEMPORARY TABLE IF EXISTS tmp;
CREATE TEMPORARY TABLE tmp (INDEX (`Item_ArticleCode`)) ENGINE = MEMORY
SELECT t.*
FROM (
@@ -11333,17 +11650,17 @@ proc: BEGIN
INDEX (`s1Value`), INDEX (`s2Value`), INDEX (`s3Value`), INDEX (`s4Value`),INDEX (`s5Value`), INDEX (`s6Value`))
ENGINE = MEMORY
SELECT so.*,
- ev1.type_description s1Value,
- ev2.type_description s2Value,
- ev3.type_description s3Value,
- ev4.type_description s4Value,
- ev5.type_description s5Value,
+ ev1.type_description s1Value,
+ ev2.type_description s2Value,
+ ev3.type_description s3Value,
+ ev4.type_description s4Value,
+ ev5.type_description s5Value,
ev6.type_description s6Value,
- eif1.feature ef1,
- eif2.feature ef2,
- eif3.feature ef3,
- eif4.feature ef4,
- eif5.feature ef5,
+ eif1.feature ef1,
+ eif2.feature ef2,
+ eif3.feature ef3,
+ eif4.feature ef4,
+ eif5.feature ef5,
eif6.feature ef6
FROM tmp so
LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
@@ -11384,36 +11701,36 @@ proc: BEGIN
OR(t5.id IS NOT NULL AND CONVERT(s5Value, UNSIGNED) > fc.itemMaxSize)
OR(t6.id IS NOT NULL AND CONVERT(s6Value, UNSIGNED) > fc.itemMaxSize);
- START TRANSACTION;
-
+ START TRANSACTION;
+
-- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
UPDATE IGNORE edi.offer o
JOIN vn.item i
ON i.name = o.product_name
AND i.subname <=> o.company_name
AND i.value5 <=> o.s1Value
- AND i.value6 <=> o.s2Value
+ AND i.value6 <=> o.s2Value
AND i.value7 <=> o.s3Value
- AND i.value8 <=> o.s4Value
+ AND i.value8 <=> o.s4Value
AND i.value9 <=> o.s5Value
- AND i.value10 <=> o.s6Value
- AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
- AND i.EmbalageCode <=> o.EmbalageCode
- AND i.quality <=> o.Quality
- JOIN vn.itemType it ON it.id = i.typeFk
- LEFT JOIN vn.sale s ON s.itemFk = i.id
- LEFT JOIN vn.ticket t ON t.id = s.ticketFk AND t.shipped > TIMESTAMPADD(WEEK, -1, CURDATE())
+ AND i.value10 <=> o.s6Value
+ AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
+ AND i.EmbalageCode <=> o.EmbalageCode
+ AND i.quality <=> o.Quality
+ JOIN vn.itemType it ON it.id = i.typeFk
+ LEFT JOIN vn.sale s ON s.itemFk = i.id
+ LEFT JOIN vn.ticket t ON t.id = s.ticketFk AND t.shipped > TIMESTAMPADD(WEEK, -1, CURDATE())
LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
- LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
- LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk AND po.OrderTradeLineDateTime > TIMESTAMPADD(WEEK, -1, CURDATE())
+ LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
+ LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk AND po.OrderTradeLineDateTime > TIMESTAMPADD(WEEK, -1, CURDATE())
SET i.supplyResponseFk = o.srID
WHERE ( sr.ID IS NULL
OR sr.NumberOfUnits = 0
OR di.LatestOrderDateTime < NOW()
OR di.ID IS NULL)
- AND it.isInventory
- AND t.id IS NULL
- AND po.id IS NULL;
+ AND it.isInventory
+ AND t.id IS NULL
+ AND po.id IS NULL;
-- select now(),'Antes de crear ITO';
DROP TEMPORARY TABLE IF EXISTS itemToInsert;
CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY
@@ -11428,12 +11745,12 @@ proc: BEGIN
OPEN cur2;
read_loop: LOOP
-
+
FETCH cur2 INTO vSupplyResponseFk;
FETCH cur1 INTO vFreeId;
IF done THEN
- LEAVE read_loop;
+ LEAVE read_loop;
END IF;
UPDATE itemToInsert
@@ -11446,32 +11763,32 @@ proc: BEGIN
CLOSE cur2;
-- Insertamos todos los items en Articles de la oferta
- INSERT INTO vn.item( id,
- `name`,
- longName,
- subName,
- expenceFk,
- typeFk,
- intrastatFk,
- originFk,
- supplyResponseFk,
- numberOfItemsPerCask,
- embalageCode,
- quality,
- isFloramondo)
+ INSERT INTO vn.item(id,
+ `name`,
+ longName,
+ subName,
+ expenceFk,
+ typeFk,
+ intrastatFk,
+ originFk,
+ supplyResponseFk,
+ numberOfItemsPerCask,
+ embalageCode,
+ quality,
+ isFloramondo)
SELECT iti.itemFk,
iti.product_name,
iti.product_name,
- iti.company_name,
+ iti.company_name,
iti.expenseFk,
iti.itemTypeFk,
iti.intrastatFk,
iti.originFk,
iti.`srId`,
iti.NumberOfItemsPerCask,
- iti.EmbalageCode,
- iti.Quality,
- TRUE
+ iti.EmbalageCode,
+ iti.Quality,
+ TRUE
FROM itemToInsert iti;
INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
@@ -11498,19 +11815,22 @@ proc: BEGIN
SELECT i.id, t.id , ii.product_name, 1
FROM itemToInsert ii
JOIN vn.tag t ON t.`name` = 'Producto'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+ JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+ WHERE NOT ISNULL(ii.product_name);
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id , ii.Quality, 3
FROM itemToInsert ii
JOIN vn.tag t ON t.`name` = 'Calidad'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+ JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+ WHERE NOT ISNULL(ii.Quality);
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id , ii.company_name, 4
FROM itemToInsert ii
JOIN vn.tag t ON t.`name` = 'Productor'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+ JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+ WHERE NOT ISNULL(ii.company_name);
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id , s1Value, 5
@@ -11617,7 +11937,7 @@ proc: BEGIN
-- Localiza las entradas de cada almacen
UPDATE edi.warehouseFloramondo
- SET entryFk = vn.floramondo_getEntry(TIMESTAMPADD(DAY,travellingDays,vLanded), warehouseFk);
+ SET entryFk = vn.entry_getForLogiflora(TIMESTAMPADD(DAY,travellingDays,vLanded), warehouseFk);
IF vLanded IS NOT NULL THEN
@@ -11629,30 +11949,30 @@ proc: BEGIN
SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
b.buyingValue = o.price
WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price);
-
+/*
-- Se eliminan las ofertas ya incluidas en las entradas
DELETE o
FROM edi.offer o
JOIN vn.item i ON i.supplyResponseFk = o.srId
JOIN vn.buy b ON i.id = b.itemFk
JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk;
-
+ */
-- Se inserta el resto
SET vLastInserted := NOW();
-- Inserta la oferta
- INSERT INTO vn.buy(entryFk,
- itemFk,
- quantity,
- buyingValue,
- stickers,
- packing,
- `grouping`,
- groupingMode,
- packageFk,
- deliveryFk)
+ INSERT INTO vn.buy( entryFk,
+ itemFk,
+ quantity,
+ buyingValue,
+ stickers,
+ packing,
+ `grouping`,
+ groupingMode,
+ packageFk,
+ deliveryFk)
- SELECT wf.entryFk,
+ SELECT wf.entryFk,
i.id,
o.NumberOfUnits * o.NumberOfItemsPerCask as quantity,
o.Price,
@@ -11665,496 +11985,9 @@ proc: BEGIN
FROM edi.offer o
JOIN vn.item i ON i.supplyResponseFk = o.srId
JOIN edi.warehouseFloramondo wf
- JOIN vn.packaging p ON p.id LIKE o.embalageCode; -- llevar esta linea i mirar de crear els packages a temps real
-
- DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
-
- CREATE TEMPORARY TABLE tmp.buyRecalc
- SELECT b.id
- FROM vn.buy b
- JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
- WHERE b.created >= vLastInserted;
-
- CALL vn.buy_recalcPrices();
-
- UPDATE edi.offerList o
- JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
- FROM vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
- JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
- JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
- JOIN vn.warehouse w ON w.id = wf.warehouseFk
- WHERE w.name = 'VNH'
- AND b.quantity > 0
- GROUP BY sr.vmpID) sub ON o.supplier = sub.name
- SET o.vnh = sub.total;
-
- UPDATE edi.offerList o
- JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
- FROM vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
- JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
- JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
- JOIN vn.warehouse w ON w.id = wf.warehouseFk
- WHERE w.name = 'ALGEMESI'
- AND b.quantity > 0
- GROUP BY sr.vmpID) sub ON o.supplier = sub.name
- SET o.algemesi = sub.total;
-
-
- END IF;
-
- DROP TEMPORARY TABLE
- edi.offer,
- itemToInsert;
-
- DROP TABLE tmp.item;
-
- COMMIT;
-
- -- Esto habria que pasarlo a procesos programados o trabajar con tags y dejar las familias
- UPDATE vn.item i
- SET typeFk = 121
- WHERE i.longName LIKE 'Rosa Garden %'
- AND typeFk = 17;
-
- UPDATE vn.item i
- SET typeFk = 156
- WHERE i.longName LIKE 'Rosa ec %'
- AND typeFk = 17;
-
- INSERT INTO edi.log(tableName, fieldName,fieldValue)
- VALUES('floramondo_offerRefresh','Tiempo de proceso',TIMEDIFF(NOW(),vStartingTime));
-
-
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `floramondo_offerRefresh_beta2` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh_beta2`()
-proc: BEGIN
-
- DECLARE vLanded DATETIME;
- DECLARE done INT DEFAULT FALSE;
- DECLARE vFreeId INT;
- DECLARE vSupplyResponseFk INT;
- DECLARE vLastInserted DATETIME;
- DECLARE vIsAuctionDay BOOLEAN;
- DECLARE vMaxNewItems INT DEFAULT 10000;
- DECLARE vStartingTime DATETIME;
- DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043';
-
- DECLARE cur1 CURSOR FOR
- SELECT id
- FROM edi.item_free;
-
- DECLARE cur2 CURSOR FOR
- SELECT srId
- FROM itemToInsert;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
- DECLARE EXIT HANDLER FOR SQLSTATE '45000'
- BEGIN
- ROLLBACK;
- RESIGNAL;
- END;
-
- SET vStartingTime = NOW();
-
- TRUNCATE edi.offerList ;
-
- INSERT INTO edi.offerList(supplier, total)
- SELECT v.name, COUNT(DISTINCT sr.ID) total
- FROM edi.supplyResponse sr
- JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
- WHERE sr.NumberOfUnits > 0
- AND sr.EmbalageCode != 999
- GROUP BY sr.vmpID;
-
- UPDATE edi.offerList o
- JOIN (SELECT v.name, COUNT(*) total
- FROM edi.supplyOffer sr
- JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
- GROUP BY sr.vmpID) sub ON o.supplier = sub.name
- SET o.`filter` = sub.total;
-
- -- Refresca las fotos de los items existentes, con prioridad baja (0.7 seg)
- INSERT IGNORE INTO vn.itemImageQueue(itemFk, url,priority)
- SELECT i.id, sr.PictureReference , 100
- FROM edi.supplyResponse sr
- JOIN vn.item i ON i.supplyResponseFk = sr.ID
- WHERE i.image != edi.imageName(sr.PictureReference)
- AND sr.NumberOfUnits > 0;
-
- -- Elimina de la lista de items libres aquellos que ya existen
- DELETE itf.*
- FROM edi.item_free itf
- JOIN vn.item i ON i.id = itf.id;
-
- DROP TEMPORARY TABLE IF EXISTS tmp;
- CREATE TEMPORARY TABLE tmp (INDEX (`Item_ArticleCode`)) ENGINE = MEMORY
- SELECT t.*
- FROM (
- SELECT *
- FROM edi.supplyOffer
- ORDER BY (MarketPlaceID = vAalsmeerMarketPlaceID) DESC, NumberOfUnits DESC) t
- GROUP BY t.srId
- ;
-
- DROP TEMPORARY TABLE IF EXISTS edi.offer;
- CREATE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`),
- INDEX (`ef1`), INDEX (`ef2`), INDEX (`ef3`), INDEX (`ef4`),INDEX (`ef5`), INDEX (`ef6`),
- INDEX (`s1Value`), INDEX (`s2Value`), INDEX (`s3Value`), INDEX (`s4Value`),INDEX (`s5Value`), INDEX (`s6Value`))
- ENGINE = MEMORY
- SELECT so.*,
- ev1.type_description s1Value,
- ev2.type_description s2Value,
- ev3.type_description s3Value,
- ev4.type_description s4Value,
- ev5.type_description s5Value,
- ev6.type_description s6Value,
- eif1.feature ef1,
- eif2.feature ef2,
- eif3.feature ef3,
- eif4.feature ef4,
- eif5.feature ef5,
- eif6.feature ef6
- FROM tmp so
- LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
- AND eif1.presentation_order = 1 AND eif1.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
- AND eif2.presentation_order = 2 AND eif2.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
- AND eif3.presentation_order = 3 AND eif3.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
- AND eif4.presentation_order = 4 AND eif4.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
- AND eif5.presentation_order = 5 AND eif5.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
- AND eif6.presentation_order = 6 AND eif6.expiry_date IS NULL
- LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature AND so.s1 = ev1.type_value
- LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature AND so.s2 = ev2.type_value
- LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature AND so.s3 = ev3.type_value
- LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature AND so.s4 = ev4.type_value
- LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature AND so.s5 = ev5.type_value
- LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature AND so.s6 = ev6.type_value
- ORDER BY Price;
-
- DROP TEMPORARY TABLE tmp;
-
- DELETE o
- FROM edi.offer o
- LEFT JOIN vn.tag t1 ON t1.ediTypeFk = o.ef1 AND t1.overwrite = 'size'
- LEFT JOIN vn.tag t2 ON t2.ediTypeFk = o.ef2 AND t2.overwrite = 'size'
- LEFT JOIN vn.tag t3 ON t3.ediTypeFk = o.ef3 AND t3.overwrite = 'size'
- LEFT JOIN vn.tag t4 ON t4.ediTypeFk = o.ef4 AND t4.overwrite = 'size'
- LEFT JOIN vn.tag t5 ON t5.ediTypeFk = o.ef5 AND t5.overwrite = 'size'
- LEFT JOIN vn.tag t6 ON t6.ediTypeFk = o.ef6 AND t6.overwrite = 'size'
- JOIN vn.floramondoConfig fc ON TRUE
- WHERE (t1.id IS NOT NULL AND CONVERT(s1Value, UNSIGNED) > fc.itemMaxSize)
- OR(t2.id IS NOT NULL AND CONVERT(s2Value, UNSIGNED) > fc.itemMaxSize)
- OR(t3.id IS NOT NULL AND CONVERT(s3Value, UNSIGNED) > fc.itemMaxSize)
- OR(t4.id IS NOT NULL AND CONVERT(s4Value, UNSIGNED) > fc.itemMaxSize)
- OR(t5.id IS NOT NULL AND CONVERT(s5Value, UNSIGNED) > fc.itemMaxSize)
- OR(t6.id IS NOT NULL AND CONVERT(s6Value, UNSIGNED) > fc.itemMaxSize);
-
- START TRANSACTION;
-
- -- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
- UPDATE IGNORE edi.offer o
- JOIN vn.item i
- ON i.name = o.product_name
- AND i.subname <=> o.company_name
- AND i.value5 <=> o.s1Value
- AND i.value6 <=> o.s2Value
- AND i.value7 <=> o.s3Value
- AND i.value8 <=> o.s4Value
- AND i.value9 <=> o.s5Value
- AND i.value10 <=> o.s6Value
- AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
- AND i.EmbalageCode <=> o.EmbalageCode
- AND i.quality <=> o.Quality
- JOIN vn.itemType it ON it.id = i.typeFk
- LEFT JOIN vn.sale s ON s.itemFk = i.id
- LEFT JOIN vn.ticket t ON t.id = s.ticketFk AND t.shipped > TIMESTAMPADD(WEEK, -1, CURDATE())
- LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
- LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
- LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk AND po.OrderTradeLineDateTime > TIMESTAMPADD(WEEK, -1, CURDATE())
- SET i.supplyResponseFk = o.srID
- WHERE ( sr.ID IS NULL
- OR sr.NumberOfUnits = 0
- OR di.LatestOrderDateTime < NOW()
- OR di.ID IS NULL)
- AND it.isInventory
- AND t.id IS NULL
- AND po.id IS NULL;
- -- select now(),'Antes de crear ITO';
- DROP TEMPORARY TABLE IF EXISTS itemToInsert;
- CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY
- SELECT o.*, CAST(NULL AS DECIMAL(6,0)) as itemFk
- FROM edi.offer o
- LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
- WHERE i.id IS NULL
- LIMIT vMaxNewItems;
-
- -- Reciclado de nº de item
- OPEN cur1;
- OPEN cur2;
-
- read_loop: LOOP
-
- FETCH cur2 INTO vSupplyResponseFk;
- FETCH cur1 INTO vFreeId;
-
- IF done THEN
- LEAVE read_loop;
- END IF;
-
- UPDATE itemToInsert
- SET itemFk = vFreeId
- WHERE srId = vSupplyResponseFk;
-
- END LOOP;
-
- CLOSE cur1;
- CLOSE cur2;
-
- -- Insertamos todos los items en Articles de la oferta
- INSERT INTO vn.item( id,
- `name`,
- longName,
- subName,
- expenceFk,
- typeFk,
- intrastatFk,
- originFk,
- supplyResponseFk,
- numberOfItemsPerCask,
- embalageCode,
- quality,
- isFloramondo)
- SELECT iti.itemFk,
- iti.product_name,
- iti.product_name,
- iti.company_name,
- iti.expenseFk,
- iti.itemTypeFk,
- iti.intrastatFk,
- iti.originFk,
- iti.`srId`,
- iti.NumberOfItemsPerCask,
- iti.EmbalageCode,
- iti.Quality,
- TRUE
- FROM itemToInsert iti;
-
- INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
- SELECT i.id, PictureReference
- FROM itemToInsert ii
- JOIN vn.item i ON i.supplyResponseFk = ii.srId
- WHERE PictureReference IS NOT NULL;
-
- INSERT INTO edi.log(tableName, fieldName,fieldValue)
- SELECT 'itemImageQueue','NumImagenesPtes', COUNT(*)
- FROM vn.itemImageQueue
- WHERE attempts = 0;
-
- -- Inserta si se añadiesen tags nuevos
- INSERT IGNORE INTO vn.tag (name, ediTypeFk)
- SELECT description, type_id FROM edi.type;
-
- -- Inserta los tags sólo en los articulos nuevos
-
- -- desabilita el trigger para recalcular los tags al final
- SET @isTriggerDisabled = TRUE;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , ii.product_name, 1
- FROM itemToInsert ii
- JOIN vn.tag t ON t.`name` = 'Producto'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , ii.Quality, 3
- FROM itemToInsert ii
- JOIN vn.tag t ON t.`name` = 'Calidad'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , ii.company_name, 4
- FROM itemToInsert ii
- JOIN vn.tag t ON t.`name` = 'Productor'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s1Value, 5
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef1
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE NOT ISNULL(s1Value);
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s2Value, 6
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef2
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE NOT ISNULL(s2Value);
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s3Value, 7
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef3
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE NOT ISNULL(s3Value);
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s4Value, 8
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef4
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE NOT ISNULL(s4Value);
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s5Value, 9
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef5
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE NOT ISNULL(s5Value);
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s6Value, 10
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef6
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE NOT ISNULL(s6Value);
-
- INSERT IGNORE INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id, IFNULL(ink.name, ik.color), 11
- FROM itemToInsert ii
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- JOIN vn.tag t ON t.`name` = 'Color'
- LEFT JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
- LEFT JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1'
- LEFT JOIN vn.ink ON ink.dutchCode = f.feature_value
- LEFT JOIN vn.itemInk ik ON ik.longName = i.longName
- WHERE ink.name IS NOT NULL
- OR ik.color IS NOT NULL;
-
- UPDATE vn.item i
- JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`
- JOIN vn.packaging p ON p.id LIKE ii.EmbalageCode AND hasCompressionVariations
- JOIN vn.itemTag diameter ON diameter.itemFk = i.id
- JOIN vn.tag tDiameter ON tDiameter.overwrite = 'diameter' AND tDiameter.id = diameter.tagFk
- JOIN vn.itemTag size ON size.itemFk = i.id
- JOIN vn.tag tSize ON tSize.overwrite = 'size' AND tSize.id = size.tagFk
- SET i.`compression` =
- (PI() * POW(diameter.`value`/ 2, 2) * size.`value`)
- /
- ((p.width * p.depth * p.height) / ii.NumberOfItemsPerCask);
-
- DROP TABLE IF EXISTS tmp.item;
- CREATE TABLE tmp.item
- (PRIMARY KEY (id))
- SELECT i.id FROM vn.item i
- JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
-
- CALL vn.item_refreshTags();
-
- SET @isTriggerDisabled = FALSE;
-
- SELECT MIN(LatestDeliveryDateTime) INTO vLanded
- FROM edi.supplyResponse sr
- JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
- JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
- JOIN vn.floramondoConfig fc
- WHERE mp.isLatestOrderDateTimeRelevant
- AND di.LatestOrderDateTime > IF(fc.MaxLatestOrderHour > HOUR(NOW()), CURDATE(), TIMESTAMPADD(DAY,1,CURDATE()));
-
- UPDATE vn.floramondoConfig
- SET nextLanded = vLanded
- WHERE vLanded IS NOT NULL;
-
- -- Elimina la oferta obsoleta
- UPDATE vn.buy b
- JOIN vn.entry e ON e.id = b.entryFk
- JOIN vn.travel tr ON tr.id = e.travelFk
- JOIN vn.agencyMode am ON am.id = tr.agencyFk
- JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID
- LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk
- SET b.quantity = 0
- WHERE (IFNULL(di.LatestOrderDateTime,NOW()) <= NOW()
- OR i.supplyResponseFk IS NULL
- OR sr.NumberOfUnits = 0)
- AND am.name = 'LOGIFLORA'
- AND e.isRaid;
-
- -- Localiza las entradas de cada almacen
- UPDATE edi.warehouseFloramondo
- SET entryFk = vn.floramondo_getEntry(TIMESTAMPADD(DAY,travellingDays,vLanded), warehouseFk);
-
-
- IF vLanded IS NOT NULL THEN
- -- actualiza la oferta existente
- UPDATE vn.buy b
- JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
- JOIN vn.item i ON i.id = b.itemFk
- JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
- b.buyingValue = o.price
- WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price);
-
- -- Se eliminan las ofertas ya incluidas en las entradas
- DELETE o
- FROM edi.offer o
- JOIN vn.item i ON i.supplyResponseFk = o.srId
- JOIN vn.buy b ON i.id = b.itemFk
- JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk;
-
- -- Se inserta el resto
- SET vLastInserted := NOW();
-
- -- Inserta la oferta
- INSERT INTO vn.buy(entryFk,
- itemFk,
- quantity,
- buyingValue,
- stickers,
- packing,
- `grouping`,
- groupingMode,
- packageFk,
- deliveryFk)
-
- SELECT wf.entryFk,
- i.id,
- o.NumberOfUnits * o.NumberOfItemsPerCask as quantity,
- o.Price,
- o.NumberOfUnits as etiquetas,
- o.NumberOfItemsPerCask as packing,
- GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask as `grouping`,
- 2, -- Obliga al Packing
- o.embalageCode,
- o.diId
- FROM edi.offer o
- JOIN vn.item i ON i.supplyResponseFk = o.srId
- JOIN edi.warehouseFloramondo wf
- JOIN vn.packaging p ON p.id LIKE o.embalageCode; -- llevar esta linea i mirar de crear els packages a temps real
+ JOIN vn.packaging p ON p.id LIKE o.embalageCode
+ LEFT JOIN vn.buy b ON b.itemFk = i.id AND b.entryFk = wf.entryFk
+ WHERE ISNULL(b.id); -- llevar esta linea i mirar de crear els packages a temps real
DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
@@ -12229,13 +12062,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `floramondo_offerRefresh__`()
proc: BEGIN
DECLARE vLanded DATETIME;
@@ -12665,6 +12498,265 @@ proc: BEGIN
INSERT INTO edi.log(tableName, fieldName,fieldValue)
VALUES('floramondo_offerRefresh','Tiempo de proceso',TIMEDIFF(NOW(),vStartingTime));
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_freeAdd` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_freeAdd`()
+BEGIN
+
+ /**
+ * Rellena la tabla item_free con los id ausentes en vn.item
+ *
+ */
+
+ DECLARE vCounter INT DEFAULT 400000;
+
+ DECLARE vCounterNewItems INT DEFAULT 0;
+
+ DECLARE vMaxItem INT;
+
+ DECLARE vExists BOOLEAN DEFAULT FALSE;
+
+ SELECT MAX(id)
+ INTO vMaxItem
+ FROM vn.item;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.itemBusy;
+ CREATE TEMPORARY TABLE tmp.itemBusy
+ (id INT PRIMARY KEY)
+ SELECT i.id
+ FROM vn.item i
+ WHERE id >= 400000
+ UNION ALL
+ SELECT ifr.id
+ FROM edi.item_free ifr;
+
+ WHILE vCounter < vMaxItem DO
+
+ SET vCounter = vCounter + 1;
+
+ SELECT count(*) INTO vExists
+ FROM tmp.itemBusy
+ WHERE id = vCounter;
+
+ IF NOT vExists THEN
+
+ SET vCounterNewItems = vCounterNewItems + 1;
+
+ INSERT INTO edi.item_free(id)
+ VALUES (vCounter);
+
+ END IF;
+
+ END WHILE;
+
+ DROP TEMPORARY TABLE tmp.itemBusy;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_getNewByEkt` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getNewByEkt`(vEktFk INT, OUT vItemFk INT)
+BEGIN
+
+/**
+ * Devuelve un número nuevo de item a partir de un registro de la tabla edi.ekt
+ *
+ * @param vEktFk Identificador de la tabla edi.ekt
+ */
+
+ START TRANSACTION;
+
+ SELECT MIN(id) id INTO vItemFk
+ FROM edi.item_free;
+
+ DELETE FROM edi.item_free
+ WHERE id = vItemFk;
+
+ COMMIT;
+
+ IF ISNULL(vItemFk) THEN
+ SELECT MAX(i.id) + 1
+ INTO vItemFk
+ FROM vn.item i;
+ END IF;
+
+
+
+ INSERT INTO vn.item(id,
+ `name`,
+ longName,
+ subName,
+ expenceFk,
+ typeFk,
+ intrastatFk,
+ originFk,
+ numberOfItemsPerCask,
+ embalageCode,
+ quality,
+ isFloramondo)
+ SELECT vItemFk,
+ e.item,
+ e.item,
+ e.item,
+ igto.expenseFk ,
+ igto.itemTypeFk ,
+ igto.intrastatFk ,
+ igto.originFk,
+ e.pac,
+ least(IF((e.package = 800),((e.package * 10) + e.pac), e.package), ifnull(idt.bucket_id, '999')) packageFk,
+ e.cat,
+ TRUE
+ FROM edi.ekt e
+ JOIN edi.item i ON i.id = e.`ref`
+ JOIN edi.item_groupToOffer igto ON igto.group_code = i.group_id
+ LEFT JOIN edi.item_defaultType idt ON idt.item_id = e.`ref`
+ WHERE e.id = vEktFk;
+
+ SET @isTriggerDisabled = TRUE;
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemFk, t.id , e.item , 1
+ FROM edi.ekt e
+ JOIN vn.tag t ON t.`name` = 'Producto'
+ WHERE e.id = vEktFk
+ AND NOT ISNULL(e.item);
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemFk, t.id , e.cat , 3
+ FROM edi.ekt e
+ JOIN vn.tag t ON t.`name` = 'Calidad'
+ WHERE e.id = vEktFk
+ AND NOT ISNULL(e.cat);
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemFk, t.id , s.company_name , 4
+ FROM edi.ekt e
+ JOIN edi.supplier s ON s.supplier_id = e.pro
+ JOIN vn.tag t ON t.`name` = 'Productor'
+ WHERE e.id = vEktFk
+ AND NOT ISNULL(s.company_name);
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemFk, t.id , e.s1, 5
+ FROM edi.ekt e
+ LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
+ AND eif.presentation_order = 1
+ AND eif.expiry_date IS NULL
+ LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+ AND e.s1 = ev.type_value
+ JOIN vn.tag t ON t.ediTypeFk = eif.feature
+ WHERE e.id = vEktFk
+ AND NOT ISNULL(e.s1);
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemFk, t.id , e.s2, 6
+ FROM edi.ekt e
+ LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
+ AND eif.presentation_order = 2
+ AND eif.expiry_date IS NULL
+ LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+ AND e.s2 = ev.type_value
+ JOIN vn.tag t ON t.ediTypeFk = eif.feature
+ WHERE e.id = vEktFk
+ AND NOT ISNULL(e.s2);
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemFk, t.id , e.s3, 7
+ FROM edi.ekt e
+ LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
+ AND eif.presentation_order = 3
+ AND eif.expiry_date IS NULL
+ LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+ AND e.s3 = ev.type_value
+ JOIN vn.tag t ON t.ediTypeFk = eif.feature
+ WHERE e.id = vEktFk
+ AND NOT ISNULL(e.s3);
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemFk, t.id , e.s4, 8
+ FROM edi.ekt e
+ LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
+ AND eif.presentation_order = 4
+ AND eif.expiry_date IS NULL
+ LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+ AND e.s4 = ev.type_value
+ JOIN vn.tag t ON t.ediTypeFk = eif.feature
+ WHERE e.id = vEktFk
+ AND NOT ISNULL(e.s4);
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemFk, t.id , e.s5, 9
+ FROM edi.ekt e
+ LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
+ AND eif.presentation_order = 5
+ AND eif.expiry_date IS NULL
+ LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+ AND e.s5 = ev.type_value
+ JOIN vn.tag t ON t.ediTypeFk = eif.feature
+ WHERE e.id = vEktFk
+ AND NOT ISNULL(e.s5);
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemFk, t.id , e.s6, 10
+ FROM edi.ekt e
+ LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref`
+ AND eif.presentation_order = 6
+ AND eif.expiry_date IS NULL
+ LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature
+ AND e.s6 = ev.type_value
+ JOIN vn.tag t ON t.ediTypeFk = eif.feature
+ WHERE e.id = vEktFk
+ AND NOT ISNULL(e.s6);
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemFk, t.id, IFNULL(ink.name, ik.color), 11
+ FROM edi.ekt e
+ JOIN vn.tag t ON t.`name` = 'Color'
+ LEFT JOIN edi.feature f ON f.item_id = e.`ref`
+ LEFT JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1'
+ LEFT JOIN vn.ink ON ink.dutchCode = f.feature_value
+ LEFT JOIN vn.itemInk ik ON ik.longName = e.item
+ WHERE e.id = vEktFk
+ AND ( ink.name IS NOT NULL
+ OR ik.color IS NOT NULL)
+ LIMIT 1;
+
+ DROP TABLE IF EXISTS tmp.item;
+
+ CREATE TABLE tmp.item
+ (PRIMARY KEY (id))
+ SELECT vItemFk id ;
+
+ CALL vn.item_refreshTags();
+
+ SET @isTriggerDisabled = FALSE;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -12677,11 +12769,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `mail_new`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `mail_new`(
vMessageId VARCHAR(100)
,vSender VARCHAR(150)
,OUT vSelf INT
@@ -12730,54 +12822,120 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `orderLog__`(vItemFk INT)
-BEGIN
-
- DECLARE vSupplyResponseFk INT;
- DECLARE vDescription VARCHAR(100);
-
- SELECT supplyResponseFk, CONCAT(id, ' ',longName) INTO vSupplyResponseFk, vDescription
- FROM vn.item
- WHERE id = vItemFk;
-
- SELECT * FROM
- (
- SELECT 'Cliente confirma' accion, or2.created hora, amount Cantidad
- FROM hedera.order_row or2
- JOIN vn.item i ON i.id = or2.item_id
- WHERE i.supplyResponseFk = vSupplyResponseFk
-
- UNION ALL
-
- SELECT vDescription, NULL, NULL
-
- UNION ALL
-
- SELECT 'Cliente se conecta' , o.date_make , NULL
- FROM hedera.`order` o
- JOIN hedera.order_row or2 ON or2.order_id = o.id
- JOIN vn.item i ON i.id = or2.item_id
- WHERE i.supplyResponseFk = vSupplyResponseFk
-
- UNION ALL
-
- SELECT DISTINCT 'Subasta cambia cantidad', srl.created, srl.NumberOfUnitsNew * sr.NumberOfItemsPerCask
- FROM edi.supplyResponseLog srl
- JOIN edi.supplyResponse sr ON sr.ID = srl.supplyResponseFk
- WHERE srl.supplyResponseFk = vSupplyResponseFk
-
- UNION ALL
-
- SELECT 'Linea de venta definitiva', s.created, s.quantity
- FROM vn.sale s
- JOIN vn.item i ON i.id = s.itemFk
- WHERE i.supplyResponseFk = vSupplyResponseFk) sub
- ORDER BY hora;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `orderLog__`(vItemFk INT)
+BEGIN
+
+ DECLARE vSupplyResponseFk INT;
+ DECLARE vDescription VARCHAR(100);
+
+ SELECT supplyResponseFk, CONCAT(id, ' ',longName) INTO vSupplyResponseFk, vDescription
+ FROM vn.item
+ WHERE id = vItemFk;
+
+ SELECT * FROM
+ (
+ SELECT 'Cliente confirma' accion, or2.created hora, amount Cantidad
+ FROM hedera.order_row or2
+ JOIN vn.item i ON i.id = or2.item_id
+ WHERE i.supplyResponseFk = vSupplyResponseFk
+
+ UNION ALL
+
+ SELECT vDescription, NULL, NULL
+
+ UNION ALL
+
+ SELECT 'Cliente se conecta' , o.date_make , NULL
+ FROM hedera.`order` o
+ JOIN hedera.order_row or2 ON or2.order_id = o.id
+ JOIN vn.item i ON i.id = or2.item_id
+ WHERE i.supplyResponseFk = vSupplyResponseFk
+
+ UNION ALL
+
+ SELECT DISTINCT 'Subasta cambia cantidad', srl.created, srl.NumberOfUnitsNew * sr.NumberOfItemsPerCask
+ FROM edi.supplyResponseLog srl
+ JOIN edi.supplyResponse sr ON sr.ID = srl.supplyResponseFk
+ WHERE srl.supplyResponseFk = vSupplyResponseFk
+
+ UNION ALL
+
+ SELECT 'Linea de venta definitiva', s.created, s.quantity
+ FROM vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ WHERE i.supplyResponseFk = vSupplyResponseFk) sub
+ ORDER BY hora;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticket_calcCompByFloramondo` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_calcCompByFloramondo`(vSelf INT)
+BEGIN
+
+ /**
+ * Recalcula "a pelo" los componentes para un ticket de Floramondo
+ *
+ * Pendiente de concretar la solución cuando Logiflora conteste.
+ *
+ * @param vSelf Identificador de vn.ticket
+ */
+
+ CALL cache.last_buy_refresh(TRUE);
+
+ DELETE sc.*
+ FROM vn.saleComponent sc
+ JOIN vn.sale s ON s.id = sc.saleFk
+ WHERE s.ticketFk = vSelf;
+
+ UPDATE vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN edi.floraHollandConfig fhc
+ LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
+ LEFT JOIN vn.buy b ON b.id = lb.buy_id
+ LEFT JOIN vn.warehouse w ON w.id = lb.warehouse_id AND w.name = 'Floramondo'
+ SET s.price = b.buyingValue * (1 + fhc.floramondoMargin)
+ WHERE s.ticketFk = vSelf;
+
+ INSERT INTO vn.saleComponent(saleFk, componentFk, value)
+ SELECT s.id, c.id, MAX(b.buyingValue)
+ FROM vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
+ LEFT JOIN vn.buy b ON b.id = lb.buy_id
+ LEFT JOIN vn.warehouse w ON w.id = lb.warehouse_id AND w.name = 'Floramondo'
+ JOIN vn.component c ON c.code = 'purchaseValue'
+ WHERE s.ticketFk = vSelf
+ GROUP BY s.id;
+
+ INSERT INTO vn.saleComponent(saleFk, componentFk, value)
+ SELECT s.id, c.id, MAX(b.buyingValue) * fhc.floramondoMargin
+ FROM vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN edi.floraHollandConfig fhc
+ LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
+ LEFT JOIN vn.buy b ON b.id = lb.buy_id
+ LEFT JOIN vn.warehouse w ON w.id = lb.warehouse_id AND w.name = 'Floramondo'
+ JOIN vn.component c ON c.code = 'margin'
+ WHERE s.ticketFk = vSelf
+ GROUP BY s.id;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -13000,13 +13158,13 @@ CREATE TABLE `link` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`link_afterInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`link_afterInsert`
AFTER INSERT ON `link`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL image_ref('link', NEW.image);
END */;;
@@ -13020,11 +13178,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`link_afterUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`link_afterUpdate`
AFTER UPDATE ON `link`
FOR EACH ROW
BEGIN
@@ -13043,13 +13201,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`link_afterDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`link_afterDelete`
AFTER DELETE ON `link`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL image_unref('link', OLD.image);
END */;;
@@ -13507,13 +13665,13 @@ CREATE TABLE `news` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`news_afterInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`news_afterInsert`
AFTER INSERT ON `news`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL image_ref('news', NEW.image);
END */;;
@@ -13527,13 +13685,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`news_afterUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`news_afterUpdate`
AFTER UPDATE ON `news`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
IF !(NEW.image <=> OLD.image) THEN
CALL image_unref('news', OLD.image);
@@ -13550,13 +13708,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`news_afterDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`news_afterDelete`
AFTER DELETE ON `news`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL image_unref('news', OLD.image);
END */;;
@@ -13624,13 +13782,13 @@ CREATE TABLE `order` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER order_afterInsert
-AFTER INSERT
-ON `order` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`order_afterInsert`
+ AFTER INSERT ON `order`
+ FOR EACH ROW
BEGIN
IF NEW.address_id = 2850 THEN
-- Fallo que se insertan no se sabe como tickets en este cliente
@@ -13651,33 +13809,33 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`order_afterUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`order_afterUpdate`
AFTER UPDATE ON `order`
- FOR EACH ROW
-BEGIN
- CALL stock.log_add('order', NEW.id, OLD.id);
-
- IF !(OLD.address_id <=> NEW.address_id)
- OR !(OLD.company_id <=> NEW.company_id)
- OR !(OLD.customer_id <=> NEW.customer_id) THEN
- CALL order_requestRecalc(NEW.id);
- END IF;
-
- IF !(OLD.address_id <=> NEW.address_id) AND NEW.address_id = 2850 THEN
- -- Fallo que se actualiza no se sabe como tickets en este cliente
- CALL vn.mail_insert(
- 'jgallego@verdnatura.es',
- 'noreply@verdnatura.es',
- 'Actualizada order al address 2850',
- CONCAT(account.myUserGetName(), ' ha creado la order ',NEW.id)
- );
- END IF;
+ FOR EACH ROW
+BEGIN
+ CALL stock.log_add('order', NEW.id, OLD.id);
+
+ IF !(OLD.address_id <=> NEW.address_id)
+ OR !(OLD.company_id <=> NEW.company_id)
+ OR !(OLD.customer_id <=> NEW.customer_id) THEN
+ CALL order_requestRecalc(NEW.id);
+ END IF;
+
+ IF !(OLD.address_id <=> NEW.address_id) AND NEW.address_id = 2850 THEN
+ -- Fallo que se actualiza no se sabe como tickets en este cliente
+ CALL vn.mail_insert(
+ 'jgallego@verdnatura.es',
+ 'noreply@verdnatura.es',
+ 'Actualizada order al address 2850',
+ CONCAT(account.myUserGetName(), ' ha creado la order ',NEW.id)
+ );
+ END IF;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -13689,13 +13847,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`order_beforeDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`order_beforeDelete`
BEFORE DELETE ON `order`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
DELETE FROM orderRow WHERE orderFk = OLD.id;
END */;;
@@ -13782,13 +13940,13 @@ CREATE TABLE `orderRow` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `orderRow_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`orderRow_beforeInsert`
BEFORE INSERT ON `orderRow`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
DECLARE vIsFirst BOOL;
@@ -13811,13 +13969,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`orderRow_afterInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`orderRow_afterInsert`
AFTER INSERT ON `orderRow`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL stock.log_add('orderRow', NEW.id, NULL);
CALL order_requestRecalc(NEW.orderFk);
@@ -13832,11 +13990,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`orderRow_afterUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`orderRow_afterUpdate`
AFTER UPDATE ON `orderRow`
FOR EACH ROW
BEGIN
@@ -13854,11 +14012,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `hedera`.`orderRow_afterDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`orderRow_afterDelete`
AFTER DELETE ON `orderRow`
FOR EACH ROW
BEGIN
@@ -14318,10 +14476,10 @@ DELIMITER ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `order_doRecalc` ON SCHEDULE EVERY 10 SECOND STARTS '2019-08-29 14:18:04' ON COMPLETION PRESERVE ENABLE DO CALL order_doRecalc */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `order_doRecalc` ON SCHEDULE EVERY 10 SECOND STARTS '2019-08-29 14:18:04' ON COMPLETION PRESERVE ENABLE DO CALL order_doRecalc */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -14339,11 +14497,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `MYBASKET_GETID`() RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `MYBASKET_GETID`() RETURNS int(11)
DETERMINISTIC
BEGIN
DECLARE vOrder INT;
@@ -14364,11 +14522,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myClient_getDebt`(vDate DATE) RETURNS decimal(10,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `myClient_getDebt`(vDate DATE) RETURNS decimal(10,2)
DETERMINISTIC
BEGIN
/**
@@ -14389,11 +14547,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myUser_checkRestPriv`(vMethodPath VARCHAR(255)) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `myUser_checkRestPriv`(vMethodPath VARCHAR(255)) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
/**
@@ -14422,11 +14580,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `order_getTotal`(vSelf INT) RETURNS decimal(10,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `order_getTotal`(vSelf INT) RETURNS decimal(10,2)
READS SQL DATA
DETERMINISTIC
BEGIN
@@ -14465,11 +14623,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_calcFromMyAddress`(vDelivery DATE, vAddress INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_calcFromMyAddress`(vDelivery DATE, vAddress INT)
BEGIN
/**
* Gets the available items list.
@@ -14515,13 +14673,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_calcFromMyAddress_beta`(vDelivery DATE, vAddress INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_calcFromMyAddress_beta`(vDelivery DATE, vAddress INT)
BEGIN
/**
* Gets the available items list.
@@ -14533,21 +14691,21 @@ BEGIN
* @return tmp.ticketComponent
* @return tmp.ticketLot
* @return tmp.zoneGetShipped
- */
- DECLARE vAgencyMode INT;
-
+ */
+ DECLARE vAgencyMode INT;
+
SELECT a.agencyModeFk
INTO vAgencyMode
FROM myClient c
JOIN vn.address a ON a.clientFk = c.id
- WHERE a.id = vAddress;
+ WHERE a.id = vAddress;
CALL vn.available_calc(vDelivery, vAddress, vAgencyMode);
DROP TEMPORARY TABLE IF EXISTS tmp.item;
CREATE TEMPORARY TABLE tmp.item
(INDEX (itemFk))
- ENGINE = MEMORY
+ ENGINE = MEMORY
SELECT c.item_id itemFk
FROM `cache`.available c
JOIN tmp.availableCalc a ON a.calcFk = c.calc_id
@@ -14567,13 +14725,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_getTags__`(vLimit INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_getTags__`(vLimit INT)
BEGIN
/**
* Returns the main tags for a list of items.
@@ -14609,13 +14767,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_getTagValues__`(vTag INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_getTagValues__`(vTag INT)
BEGIN
/**
* Returns the list of available values for a tag and a list of items.
@@ -14644,11 +14802,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `image_ref`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `image_ref`(
vCollection VARCHAR(255),
vName VARCHAR(255)
)
@@ -14682,11 +14840,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `image_unref`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `image_unref`(
vCollection VARCHAR(255),
vName VARCHAR(255)
)
@@ -14712,11 +14870,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_calcCatalog`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_calcCatalog`(
vSelf INT,
vLanded DATE,
vAddressFk INT,
@@ -14760,11 +14918,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getList`(IN `vWarehouse` SMALLINT, IN `vShipping` DATE, IN `vCategory` INT, IN `vRate` TINYINT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getList`(IN `vWarehouse` SMALLINT, IN `vShipping` DATE, IN `vCategory` INT, IN `vRate` TINYINT)
BEGIN
DECLARE vCalc INT;
@@ -14809,11 +14967,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getVisible`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getVisible`(
vWarehouse TINYINT,
vDate DATE,
vType INT,
@@ -14945,11 +15103,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getVisible__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getVisible__`(
vWarehouse TINYINT,
vDate DATE,
vType INT,
@@ -15068,33 +15226,33 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_listAllocation`(IN `vWh` TINYINT, IN `vDate` DATE, IN `vType` INT, IN `vPrefix` VARCHAR(255), IN `vUseIds` BOOLEAN)
-BEGIN
-/**
- * Lists visible items and it's box sizes of the specified
- * type at specified date.
- *
- * @param vWh The warehouse id
- * @param vDate The visible date
- * @param vType The type id
- * @param vPrefix The article prefix to filter or %NULL for all
- * @param vUseIds Whether to order the result by item id
- * @select List of visible items with it's box sizes
- */
- CALL item_getVisible(vWh, vDate, vType, vPrefix);
-
- IF vUseIds
- THEN
- SELECT * FROM tmp.itemVisible
- ORDER BY Id_Article;
- ELSE
- SELECT * FROM tmp.itemVisible
- ORDER BY Article, packing;
- END IF;
-
- DROP TEMPORARY TABLE tmp.itemVisible;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_listAllocation`(IN `vWh` TINYINT, IN `vDate` DATE, IN `vType` INT, IN `vPrefix` VARCHAR(255), IN `vUseIds` BOOLEAN)
+BEGIN
+/**
+ * Lists visible items and it's box sizes of the specified
+ * type at specified date.
+ *
+ * @param vWh The warehouse id
+ * @param vDate The visible date
+ * @param vType The type id
+ * @param vPrefix The article prefix to filter or %NULL for all
+ * @param vUseIds Whether to order the result by item id
+ * @select List of visible items with it's box sizes
+ */
+ CALL item_getVisible(vWh, vDate, vType, vPrefix);
+
+ IF vUseIds
+ THEN
+ SELECT * FROM tmp.itemVisible
+ ORDER BY Id_Article;
+ ELSE
+ SELECT * FROM tmp.itemVisible
+ ORDER BY Article, packing;
+ END IF;
+
+ DROP TEMPORARY TABLE tmp.itemVisible;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -15107,11 +15265,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_addItem`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myBasket_addItem`(
vWarehouse INT,
vItem INT,
vAmount INT)
@@ -15127,13 +15285,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_calcCatalogFromItem`(vItem INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myBasket_calcCatalogFromItem`(vItem INT)
BEGIN
/**
* Gets the availability and prices for the given item
@@ -15157,13 +15315,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_calcCatalogFull`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myBasket_calcCatalogFull`()
BEGIN
/**
* Gets the availability and prices for the given items
@@ -15189,11 +15347,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_check`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myBasket_check`()
BEGIN
/**
* Comprueba que la cesta esta creada y que su configuración es
@@ -15235,88 +15393,88 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_configure`(
- vDelivery DATE,
- vDeliveryMethod VARCHAR(45),
- vAgency INT,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myBasket_configure`(
+ vDelivery DATE,
+ vDeliveryMethod VARCHAR(45),
+ vAgency INT,
vAddress INT)
-BEGIN
-/**
- * Configura la cesta de la compra utilizando los parámetros
- * pasados. Si los parámetros no son válidos devuelve un error.
- *
- * @param vDelivery Fecha de recogida
- * @param vAgency Id de la agencia
- * @param vAddress Id de dirección de envío, @NULL si es recogida
- */
- DECLARE vSelf INT;
- DECLARE vCompany INT;
- DECLARE vDeliveryMethodId INT;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
- DECLARE EXIT HANDLER FOR SQLSTATE '45000'
- BEGIN
- ROLLBACK;
- RESIGNAL;
- END;
-
- START TRANSACTION;
-
- SELECT id INTO vDeliveryMethodId
- FROM vn.deliveryMethod
- WHERE code = vDeliveryMethod;
-
- IF vDeliveryMethod = 'PICKUP' AND vAddress IS NULL
- THEN
- SELECT defaultAddressFk INTO vAddress
- FROM myClient;
- END IF;
-
- SET vSelf = myBasket_getId();
-
- IF vSelf IS NULL
- THEN
-
- SELECT defaultCompanyFk INTO vCompany
- FROM orderConfig;
-
- INSERT INTO `order`
- SET
- customer_id = account.userGetId(),
- date_send = vDelivery,
- delivery_method_id = vDeliveryMethodId,
- agency_id = vAgency,
- address_id = vAddress,
- source_app = 'WEB',
- company_id = vCompany;
-
- SET vSelf = LAST_INSERT_ID();
-
- INSERT INTO basketOrder SET
- clientFk = account.userGetId(),
- orderFk = vSelf;
- ELSE
- UPDATE `order`
- SET
- date_send = vDelivery,
- delivery_method_id = vDeliveryMethodId,
- agency_id = vAgency,
- address_id = vAddress
- WHERE
- id = vSelf;
-
- CALL order_update(vSelf);
- END IF;
-
- CALL order_checkConfig(vSelf);
-
- COMMIT;
+BEGIN
+/**
+ * Configura la cesta de la compra utilizando los parámetros
+ * pasados. Si los parámetros no son válidos devuelve un error.
+ *
+ * @param vDelivery Fecha de recogida
+ * @param vAgency Id de la agencia
+ * @param vAddress Id de dirección de envío, @NULL si es recogida
+ */
+ DECLARE vSelf INT;
+ DECLARE vCompany INT;
+ DECLARE vDeliveryMethodId INT;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
+ DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+ BEGIN
+ ROLLBACK;
+ RESIGNAL;
+ END;
+
+ START TRANSACTION;
+
+ SELECT id INTO vDeliveryMethodId
+ FROM vn.deliveryMethod
+ WHERE code = vDeliveryMethod;
+
+ IF vDeliveryMethod = 'PICKUP' AND vAddress IS NULL
+ THEN
+ SELECT defaultAddressFk INTO vAddress
+ FROM myClient;
+ END IF;
+
+ SET vSelf = myBasket_getId();
+
+ IF vSelf IS NULL
+ THEN
+
+ SELECT defaultCompanyFk INTO vCompany
+ FROM orderConfig;
+
+ INSERT INTO `order`
+ SET
+ customer_id = account.userGetId(),
+ date_send = vDelivery,
+ delivery_method_id = vDeliveryMethodId,
+ agency_id = vAgency,
+ address_id = vAddress,
+ source_app = 'WEB',
+ company_id = vCompany;
+
+ SET vSelf = LAST_INSERT_ID();
+
+ INSERT INTO basketOrder SET
+ clientFk = account.userGetId(),
+ orderFk = vSelf;
+ ELSE
+ UPDATE `order`
+ SET
+ date_send = vDelivery,
+ delivery_method_id = vDeliveryMethodId,
+ agency_id = vAgency,
+ address_id = vAddress
+ WHERE
+ id = vSelf;
+
+ CALL order_update(vSelf);
+ END IF;
+
+ CALL order_checkConfig(vSelf);
+
+ COMMIT;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -15329,11 +15487,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_configureForGuest`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myBasket_configureForGuest`()
BEGIN
DECLARE vMethod VARCHAR(255);
DECLARE vAgency INT;
@@ -15364,11 +15522,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_confirm`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myBasket_confirm`()
BEGIN
DECLARE vSelf INT DEFAULT myBasket_getId();
@@ -15388,13 +15546,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_getAvailable`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myBasket_getAvailable`()
BEGIN
/**
* Gets the available items list.
@@ -15414,11 +15572,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_getTax`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myBasket_getTax`()
READS SQL DATA
BEGIN
/**
@@ -15446,11 +15604,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myOrder_addItem`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myOrder_addItem`(
vSelf INT,
vWarehouse INT,
vItem INT,
@@ -15477,11 +15635,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myOrder_confirm`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myOrder_confirm`(vSelf INT)
BEGIN
DECLARE vIsMine BOOL;
@@ -15502,13 +15660,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myOrder_getAvailable`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myOrder_getAvailable`(vSelf INT)
BEGIN
/**
* Gets the available items list.
@@ -15535,68 +15693,68 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myOrder_newWithAddress`(
- OUT vSelf INT,
- vLandingDate DATE,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myOrder_newWithAddress`(
+ OUT vSelf INT,
+ vLandingDate DATE,
vAddressFk INT)
-BEGIN
-/**
- * Crea una nueva orden para el usuario actual especificando
- * una fecha de entrega.
- *
- * @param vSelf Id de la nueva orden
- * @param vLandingDate Fecha de entrega
- */
- DECLARE vCompany INT;
- DECLARE vDeliveryMethodId INT;
- DECLARE vAgencyMode INT;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
- DECLARE EXIT HANDLER FOR SQLSTATE '45000'
- BEGIN
- ROLLBACK;
- SET vSelf = NULL;
- RESIGNAL;
- END;
-
- START TRANSACTION;
-
- SELECT a.agencyModeFk, a.id
- INTO vAgencyMode, vAddressFk
- FROM vn.address a
- WHERE a.id = vAddressFk;
-
- SELECT deliveryMethodFk INTO vDeliveryMethodId
- FROM vn.agencyMode am
- WHERE am.id = vAgencyMode;
-
- IF vCompany IS NULL
- THEN
- SELECT defaultCompanyFk INTO vCompany
- FROM orderConfig;
- END IF;
-
- INSERT INTO `order`
- SET
- customer_id = account.userGetId(),
- date_send = vLandingDate,
- delivery_method_id = vDeliveryMethodId,
- agency_id = vAgencyMode,
- address_id = vAddressFk,
- source_app = 'WEB',
- company_id = vCompany;
-
- SET vSelf = LAST_INSERT_ID();
-
- CALL order_checkConfig(vSelf);
-
- COMMIT;
+BEGIN
+/**
+ * Crea una nueva orden para el usuario actual especificando
+ * una fecha de entrega.
+ *
+ * @param vSelf Id de la nueva orden
+ * @param vLandingDate Fecha de entrega
+ */
+ DECLARE vCompany INT;
+ DECLARE vDeliveryMethodId INT;
+ DECLARE vAgencyMode INT;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
+ DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+ BEGIN
+ ROLLBACK;
+ SET vSelf = NULL;
+ RESIGNAL;
+ END;
+
+ START TRANSACTION;
+
+ SELECT a.agencyModeFk, a.id
+ INTO vAgencyMode, vAddressFk
+ FROM vn.address a
+ WHERE a.id = vAddressFk;
+
+ SELECT deliveryMethodFk INTO vDeliveryMethodId
+ FROM vn.agencyMode am
+ WHERE am.id = vAgencyMode;
+
+ IF vCompany IS NULL
+ THEN
+ SELECT defaultCompanyFk INTO vCompany
+ FROM orderConfig;
+ END IF;
+
+ INSERT INTO `order`
+ SET
+ customer_id = account.userGetId(),
+ date_send = vLandingDate,
+ delivery_method_id = vDeliveryMethodId,
+ agency_id = vAgencyMode,
+ address_id = vAddressFk,
+ source_app = 'WEB',
+ company_id = vCompany;
+
+ SET vSelf = LAST_INSERT_ID();
+
+ CALL order_checkConfig(vSelf);
+
+ COMMIT;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -15607,68 +15765,68 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myOrder_newWithDate`(
- OUT vSelf INT,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myOrder_newWithDate`(
+ OUT vSelf INT,
vLandingDate DATE)
-BEGIN
-/**
- * Crea una nueva orden para el usuario actual especificando
- * una fecha de entrega.
- *
- * @param vSelf Id de la nueva orden
- * @param vLandingDate Fecha de entrega
- */
- DECLARE vCompany INT;
- DECLARE vDeliveryMethodId INT;
- DECLARE vAgencyMode INT;
- DECLARE vAddress INT;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
- DECLARE EXIT HANDLER FOR SQLSTATE '45000'
- BEGIN
- ROLLBACK;
- SET vSelf = NULL;
- RESIGNAL;
- END;
-
- START TRANSACTION;
-
- SELECT a.agencyModeFk, a.id
- INTO vAgencyMode, vAddress
- FROM myClient c
- JOIN vn.address a ON a.id = c.defaultAddressFk;
-
- SELECT deliveryMethodFk INTO vDeliveryMethodId
- FROM vn.agencyMode am
- WHERE am.id = vAgencyMode;
-
- IF vCompany IS NULL
- THEN
- SELECT defaultCompanyFk INTO vCompany
- FROM orderConfig;
- END IF;
-
- INSERT INTO `order`
- SET
- customer_id = account.userGetId(),
- date_send = vLandingDate,
- delivery_method_id = vDeliveryMethodId,
- agency_id = vAgencyMode,
- address_id = vAddress,
- source_app = 'WEB',
- company_id = vCompany;
-
- SET vSelf = LAST_INSERT_ID();
-
- CALL order_checkConfig(vSelf);
-
- COMMIT;
+BEGIN
+/**
+ * Crea una nueva orden para el usuario actual especificando
+ * una fecha de entrega.
+ *
+ * @param vSelf Id de la nueva orden
+ * @param vLandingDate Fecha de entrega
+ */
+ DECLARE vCompany INT;
+ DECLARE vDeliveryMethodId INT;
+ DECLARE vAgencyMode INT;
+ DECLARE vAddress INT;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
+ DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+ BEGIN
+ ROLLBACK;
+ SET vSelf = NULL;
+ RESIGNAL;
+ END;
+
+ START TRANSACTION;
+
+ SELECT a.agencyModeFk, a.id
+ INTO vAgencyMode, vAddress
+ FROM myClient c
+ JOIN vn.address a ON a.id = c.defaultAddressFk;
+
+ SELECT deliveryMethodFk INTO vDeliveryMethodId
+ FROM vn.agencyMode am
+ WHERE am.id = vAgencyMode;
+
+ IF vCompany IS NULL
+ THEN
+ SELECT defaultCompanyFk INTO vCompany
+ FROM orderConfig;
+ END IF;
+
+ INSERT INTO `order`
+ SET
+ customer_id = account.userGetId(),
+ date_send = vLandingDate,
+ delivery_method_id = vDeliveryMethodId,
+ agency_id = vAgencyMode,
+ address_id = vAddress,
+ source_app = 'WEB',
+ company_id = vCompany;
+
+ SET vSelf = LAST_INSERT_ID();
+
+ CALL order_checkConfig(vSelf);
+
+ COMMIT;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -15681,11 +15839,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myTicket_get`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myTicket_get`(vSelf INT)
BEGIN
/**
* Returns a current user ticket header.
@@ -15735,11 +15893,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myTicket_getPackages`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myTicket_getPackages`(vSelf INT)
BEGIN
/**
* Returns a current user ticket packages.
@@ -15768,11 +15926,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myTicket_getRows`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myTicket_getRows`(vSelf INT)
BEGIN
SELECT r.itemFk, r.quantity, r.concept, r.price, r.discount,
i.category, i.size, i.stems, i.inkFk,
@@ -15795,13 +15953,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myTicket_getServices`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myTicket_getServices`(vSelf INT)
BEGIN
/**
* Returns a current user ticket services.
@@ -15824,11 +15982,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myTicket_list`(vFrom DATE, vTo DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myTicket_list`(vFrom DATE, vTo DATE)
BEGIN
/**
* Returns the current user list of tickets between two dates reange.
@@ -15876,11 +16034,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myTicket_logAccess`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myTicket_logAccess`(vSelf INT)
BEGIN
/**
* Logs an access to a ticket.
@@ -15904,11 +16062,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myTpvTransaction_end`(vSelf INT, vStatus VARCHAR(12))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myTpvTransaction_end`(vSelf INT, vStatus VARCHAR(12))
BEGIN
/**
* Finaliza una transaccción estableciendo su estado a 'ok' o
@@ -15937,11 +16095,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myTpvTransaction_start`(vAmount INT, vCompany INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `myTpvTransaction_start`(vAmount INT, vCompany INT)
BEGIN
/**
* Inicia una nueva transacción con el TPV virtual, generando
@@ -16022,13 +16180,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_addItem`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_addItem`(
vSelf INT,
vWarehouse INT,
vItem INT,
@@ -16140,11 +16298,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_calcCatalog`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_calcCatalog`(vSelf INT)
BEGIN
/**
* Gets the availability and prices for order items.
@@ -16185,13 +16343,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_calcCatalogFromItem`(vSelf INT, vItem INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_calcCatalogFromItem`(vSelf INT, vItem INT)
BEGIN
/**
* Gets the availability and prices for the given item
@@ -16227,11 +16385,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_calcCatalogFull`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_calcCatalogFull`(vSelf INT)
BEGIN
/**
* Gets the availability and prices for the given items
@@ -16273,11 +16431,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_checkConfig`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_checkConfig`(vSelf INT)
BEGIN
/**
* Comprueba que la configuración del pedido es correcta.
@@ -16331,11 +16489,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_confirm`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_confirm`(vSelf INT)
BEGIN
/**
* Confirms an order, creating each of its tickets on
@@ -16355,13 +16513,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_confirmWithUser`(IN `vOrder` INT, IN `vUserId` INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_confirmWithUser`(IN `vOrder` INT, IN `vUserId` INT)
BEGIN
/**
@@ -16391,8 +16549,8 @@ BEGIN
DECLARE vCompanyId INT;
DECLARE vAgencyModeId INT;
DECLARE TICKET_FREE INT DEFAULT 2;
- DECLARE vIsFloramondoWarehouse BOOL;
- DECLARE vCalc INT;
+ DECLARE vIsFloramondoWarehouse BOOL;
+ DECLARE vCalc INT;
DECLARE cDates CURSOR FOR
SELECT zgs.shipped, r.warehouse_id
@@ -16513,7 +16671,7 @@ BEGIN
THEN
INSERT INTO vn.ticketObservation SET
ticketFk = vTicket,
- observationTypeFk = 4 /* salesperson */ ,
+ observationTypeFk = 4 /* salesperson */,
`description` = vNotes
ON DUPLICATE KEY UPDATE
`description` = CONCAT(VALUES(`description`),'. ', `description`);
@@ -16589,13 +16747,15 @@ BEGIN
quantity ,
EndUserPartyId,
EndUserPartyGLN,
- FHAdminNumber)
+ FHAdminNumber,
+ saleFk)
SELECT di.ID,
i.supplyResponseFk,
CEIL((vAmount - @available)/ sr.NumberOfItemsPerCask ),
o.address_id ,
vClientId,
- IFNULL(ca.fhAdminNumber, fhc.defaultAdminNumber)
+ IFNULL(ca.fhAdminNumber, fhc.defaultAdminNumber),
+ vSale
FROM edi.deliveryInformation di
JOIN vn.item i ON i.supplyResponseFk = di.supplyResponseID
JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
@@ -16662,13 +16822,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_doRecalc`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_doRecalc`()
proc: BEGIN
/**
* Recalculates modified orders.
@@ -16724,13 +16884,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_getAvailable`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_getAvailable`(vSelf INT)
BEGIN
/**
* Gets the available items list.
@@ -16769,13 +16929,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_getTax`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_getTax`()
READS SQL DATA
BEGIN
/**
@@ -16846,11 +17006,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_getTotal`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_getTotal`()
BEGIN
/**
* Calcula el total con IVA para un conjunto de orders.
@@ -16884,11 +17044,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_recalc`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_recalc`(vSelf INT)
BEGIN
/**
* Recalculates the order total.
@@ -16930,11 +17090,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_requestRecalc`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_requestRecalc`(vSelf INT)
proc: BEGIN
/**
* Adds a request to recalculate the order total.
@@ -16956,13 +17116,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_update`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_update`(vSelf INT)
proc: BEGIN
/**
* Actualiza las líneas de un pedido.
@@ -17038,11 +17198,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `survey_vote`(vAnswer INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `survey_vote`(vAnswer INT)
BEGIN
DECLARE vSurvey INT;
DECLARE vCount TINYINT;
@@ -17068,13 +17228,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `tpvTransaction_confirm`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `tpvTransaction_confirm`(
vAmount INT
,vOrder INT
,vMerchant INT
@@ -17195,11 +17355,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `tpvTransaction_confirmAll`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `tpvTransaction_confirmAll`(vDate DATE)
BEGIN
/**
* Confirma todas las transacciones confirmadas por el cliente pero no
@@ -17246,11 +17406,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `tpvTransaction_confirmById`(vOrder INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `tpvTransaction_confirmById`(vOrder INT)
BEGIN
/**
* Confirma manualmente una transacción espedificando su identificador.
@@ -17283,17 +17443,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `tpvTransaction_undo` */;
-ALTER DATABASE `hedera` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `tpvTransaction_undo`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `tpvTransaction_undo`(vSelf INT)
p: BEGIN
DECLARE vCustomer INT;
DECLARE vAmount DOUBLE;
@@ -17377,18 +17536,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `hedera` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP PROCEDURE IF EXISTS `visitUser_new` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `visitUser_new`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `visitUser_new`(
vAccess INT
,vSsid VARCHAR(64)
)
@@ -17418,11 +17576,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `visit_listByBrowser`(vFrom DATE, vTo DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `visit_listByBrowser`(vFrom DATE, vTo DATE)
BEGIN
/**
* Lists visits grouped by browser.
@@ -17455,11 +17613,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `visit_register`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `visit_register`(
vVisit INT
,vPlatform VARCHAR(30)
,vBrowser VARCHAR(30)
@@ -17631,13 +17789,13 @@ CREATE TABLE `nst` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nodeAdd`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vParentFk` INT, IN `vChild` VARCHAR(100))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nodeAdd`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vParentFk` INT, IN `vChild` VARCHAR(100))
BEGIN
DECLARE vSql TEXT;
DECLARE vTableClone VARCHAR(45);
@@ -17706,13 +17864,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nodeDelete`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vNodeId` INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nodeDelete`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vNodeId` INT)
BEGIN
DECLARE vMyRight INT;
DECLARE vMyLeft INT;
@@ -17749,13 +17907,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nodeMove`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vNodeId` INT, IN `vFatherId` INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nodeMove`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vNodeId` INT, IN `vFatherId` INT)
BEGIN
-- Averiguamos el ancho de la rama
CALL util.exec (sql_printf (
@@ -17832,13 +17990,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nodeRecalc`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nodeRecalc`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45))
BEGIN
CALL util.exec(CONCAT (
'UPDATE ', vScheme, '.', vTable, ' d',
@@ -17864,13 +18022,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nodeTree`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vGap` INT, IN `vShouldShow` BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nodeTree`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vGap` INT, IN `vShouldShow` BOOLEAN)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.nest;
@@ -17907,13 +18065,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nodeTree_pako`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vGap` INT, IN `vShouldShow` BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nodeTree_pako`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vGap` INT, IN `vShouldShow` BOOLEAN)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.nest;
@@ -17973,13 +18131,13 @@ CREATE TABLE `blacklist` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`blacklist_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`blacklist_beforeInsert`
BEFORE INSERT ON `blacklist`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL phone_isValid(NEW.phone);
END */;;
@@ -17993,13 +18151,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`blacklist_berforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`blacklist_berforeUpdate`
BEFORE UPDATE ON `blacklist`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL phone_isValid(NEW.phone);
END */;;
@@ -18106,13 +18264,13 @@ CREATE TABLE `followme` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`followme_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`followme_beforeInsert`
BEFORE INSERT ON `followme`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL pbx.phone_isValid(NEW.phone);
END */;;
@@ -18126,13 +18284,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`followme_beforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`followme_beforeUpdate`
BEFORE UPDATE ON `followme`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL pbx.phone_isValid(NEW.phone);
END */;;
@@ -18217,13 +18375,13 @@ CREATE TABLE `queue` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`queue_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`queue_beforeInsert`
BEFORE INSERT ON `queue`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL queue_isValid(NEW.`name`);
END */;;
@@ -18237,13 +18395,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`queue_beforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`queue_beforeUpdate`
BEFORE UPDATE ON `queue`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL queue_isValid(NEW.`name`);
END */;;
@@ -18347,13 +18505,13 @@ CREATE TABLE `queuePhone` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`queuePhone_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`queuePhone_beforeInsert`
BEFORE INSERT ON `queuePhone`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL phone_isValid(NEW.phone);
END */;;
@@ -18367,13 +18525,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`queuePhone_beforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`queuePhone_beforeUpdate`
BEFORE UPDATE ON `queuePhone`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL phone_isValid(NEW.phone);
END */;;
@@ -18425,13 +18583,13 @@ CREATE TABLE `sip` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`sip_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`sip_beforeInsert`
BEFORE INSERT ON `sip`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL sip_isValid(NEW.extension);
END */;;
@@ -18443,15 +18601,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `sip_afterInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`sip_afterInsert`
AFTER INSERT ON `sip`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
INSERT INTO sipReg
SET userId = NEW.user_id;
@@ -18470,13 +18628,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`sip_beforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`sip_beforeUpdate`
BEFORE UPDATE ON `sip`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL sip_isValid(NEW.extension);
END */;;
@@ -18488,15 +18646,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `pbx`.`sip_afterUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `pbx`.`sip_afterUpdate`
AFTER UPDATE ON `sip`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
IF !(OLD.extension <=> NEW.extension)
OR !(OLD.user_id <=> NEW.user_id) THEN
@@ -18614,11 +18772,11 @@ CREATE TABLE `sipReg` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `clientFromPhone`(vPhone VARCHAR(255)) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `clientFromPhone`(vPhone VARCHAR(255)) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -18637,11 +18795,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `phone_format`(vPhone VARCHAR(255)) RETURNS varchar(255) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `phone_format`(vPhone VARCHAR(255)) RETURNS varchar(255) CHARSET utf8
DETERMINISTIC
BEGIN
DECLARE vI INT DEFAULT 0;
@@ -18685,11 +18843,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `phone_isValid`(vPhone VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `phone_isValid`(vPhone VARCHAR(255))
BEGIN
/**
* Check if an phone has the correct format and
@@ -18720,12 +18878,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `queue_isValid`(vQueue VARCHAR(255))
- DETERMINISTIC
+CREATE DEFINER=`root`@`localhost` PROCEDURE `queue_isValid`(vQueue VARCHAR(255))
BEGIN
/**
* Check if an queue has the correct format and
@@ -18754,24 +18911,24 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sip_getExtension`(vUserId INT(10))
-BEGIN
-
- /*
- * Devuelve la extensión pbx del usuario
- *
- * @param vUserId Id del usuario
- *
- */
-
- SELECT extension
- FROM sip s
- WHERE s.user_id = vUserId;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sip_getExtension`(vUserId INT(10))
+BEGIN
+
+ /*
+ * Devuelve la extensión pbx del usuario
+ *
+ * @param vUserId Id del usuario
+ *
+ */
+
+ SELECT extension
+ FROM sip s
+ WHERE s.user_id = vUserId;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -18784,12 +18941,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sip_isValid`(vExtension VARCHAR(255))
- DETERMINISTIC
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sip_isValid`(vExtension VARCHAR(255))
BEGIN
/**
* Check if an extension has the correct format and
@@ -18819,11 +18975,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sip_setPassword`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sip_setPassword`(
vUser VARCHAR(255),
vPassword VARCHAR(255)
)
@@ -18961,6 +19117,7 @@ CREATE TABLE `business` (
`date_end` date DEFAULT NULL,
`workerBusiness` longtext,
`reasonEndFk` int(11) DEFAULT NULL,
+ `payedHolidays` int(11) DEFAULT NULL,
`occupationCodeFk` varchar(1) DEFAULT NULL,
PRIMARY KEY (`business_id`),
KEY `business_client` (`client_id`),
@@ -18976,35 +19133,36 @@ CREATE TABLE `business` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `postgresql`.`business_beforeUpdate`
- BEFORE UPDATE ON `business` FOR EACH ROW
-BEGIN
- DECLARE isOverlapping BOOL;
-
- IF !(OLD.date_start <=> NEW.date_start AND OLD.date_end <=> NEW.date_end) THEN
-
- SELECT COUNT(*) > 0 INTO isOverlapping
- FROM business b
- WHERE (util.hasDateOverlapped(
- NEW.date_start,
- IFNULL(NEW.date_end,b.date_start),
- b.date_start,
- IFNULL(b.date_end,NEW.date_start))
- OR (NEW.date_end <=> NULL AND b.date_end <=> NULL))
- AND b.business_id <> OLD.business_id
- AND client_id = OLD.client_id
- ;
-
- IF isOverlapping THEN
- CALL util.throw ('IS_OVERLAPPING');
- END IF;
-
- END IF;
-
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `postgresql`.`business_beforeUpdate`
+ BEFORE UPDATE ON `business`
+ FOR EACH ROW
+BEGIN
+ DECLARE isOverlapping BOOL;
+
+ IF !(OLD.date_start <=> NEW.date_start AND OLD.date_end <=> NEW.date_end) THEN
+
+ SELECT COUNT(*) > 0 INTO isOverlapping
+ FROM business b
+ WHERE (util.hasDateOverlapped(
+ NEW.date_start,
+ IFNULL(NEW.date_end,b.date_start),
+ b.date_start,
+ IFNULL(b.date_end,NEW.date_start))
+ OR (NEW.date_end <=> NULL AND b.date_end <=> NULL))
+ AND b.business_id <> OLD.business_id
+ AND client_id = OLD.client_id
+ ;
+
+ IF isOverlapping THEN
+ CALL util.throw ('IS_OVERLAPPING');
+ END IF;
+
+ END IF;
+
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -19028,7 +19186,7 @@ CREATE TABLE `business_labour` (
`calendar_labour_type_id` int(11) DEFAULT '1',
`porhoras` smallint(6) NOT NULL DEFAULT '0',
`labour_agreement_id` int(11) DEFAULT NULL,
- `workcenter_id` int(11) DEFAULT NULL,
+ `workcenter_id` int(11) NOT NULL,
PRIMARY KEY (`business_id`),
KEY `fki_business_labour_agreement` (`labour_agreement_id`),
KEY `fki_workcenter_labour` (`workcenter_id`),
@@ -19038,7 +19196,7 @@ CREATE TABLE `business_labour` (
CONSTRAINT `business_labour_agreement` FOREIGN KEY (`labour_agreement_id`) REFERENCES `labour_agreement` (`labour_agreement_id`) ON UPDATE CASCADE,
CONSTRAINT `business_labour_department_id` FOREIGN KEY (`department_id`) REFERENCES `vn`.`department` (`id`) ON UPDATE CASCADE,
CONSTRAINT `horario_tipo` FOREIGN KEY (`calendar_labour_type_id`) REFERENCES `calendar_labour_type` (`calendar_labour_type_id`) ON UPDATE CASCADE,
- CONSTRAINT `workcenter_labour` FOREIGN KEY (`workcenter_id`) REFERENCES `workcenter` (`workcenter_id`) ON DELETE NO ACTION ON UPDATE NO ACTION
+ CONSTRAINT `workcenter_labour` FOREIGN KEY (`workcenter_id`) REFERENCES `workcenter` (`workcenter_id`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -19059,7 +19217,7 @@ CREATE TABLE `business_labour_payroll` (
KEY `business_labour_payroll_cod_categoria_idx` (`cod_categoria`),
KEY `business_labour_payroll_cod_contrato` (`cod_contrato`),
CONSTRAINT `business_labour_payroll_cod_categoria` FOREIGN KEY (`cod_categoria`) REFERENCES `vn2008`.`payroll_categorias` (`codcategoria`) ON UPDATE CASCADE,
- CONSTRAINT `business_labour_payroll_cod_contrato` FOREIGN KEY (`cod_contrato`) REFERENCES `vn2008`.`payroll_contratos` (`CodContrato`) ON UPDATE CASCADE,
+ CONSTRAINT `business_labour_payroll_cod_contrato` FOREIGN KEY (`cod_contrato`) REFERENCES `vn2008`.`payroll_contratos__` (`CodContrato`) ON UPDATE CASCADE,
CONSTRAINT `business_labour_payroll_fk1` FOREIGN KEY (`business_id`) REFERENCES `business` (`business_id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -19214,16 +19372,16 @@ DROP TABLE IF EXISTS `income_employee`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `income_employee` (
`id` int(11) NOT NULL AUTO_INCREMENT,
- `debe` decimal(10,2) DEFAULT NULL,
- `haber` decimal(10,2) DEFAULT '0.00',
+ `debe` decimal(10,2) NOT NULL DEFAULT '0.00',
+ `haber` decimal(10,2) NOT NULL DEFAULT '0.00',
`id_incomeType` int(11) DEFAULT NULL,
`odbc_date` date DEFAULT NULL,
`person_id` int(11) DEFAULT NULL,
`concepto` longtext,
PRIMARY KEY (`id`),
- KEY `fincometype_id` (`id_incomeType`),
KEY `fperson_id` (`person_id`),
- CONSTRAINT `fincometype_id` FOREIGN KEY (`id_incomeType`) REFERENCES `incometype_employee` (`id_incometype`) ON DELETE NO ACTION ON UPDATE NO ACTION,
+ KEY `income_employeeId_incomeType_idx` (`id_incomeType`),
+ CONSTRAINT `income_employeeId_incomeType` FOREIGN KEY (`id_incomeType`) REFERENCES `vn2008`.`payroll_conceptos` (`conceptoid`) ON UPDATE CASCADE,
CONSTRAINT `income_employee_FK` FOREIGN KEY (`person_id`) REFERENCES `vn`.`person` (`id`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -19772,88 +19930,6 @@ CREATE TABLE `TiposTransacciones` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
---
--- Table structure for table `XDiario_movConta_IVA__`
---
-
-DROP TABLE IF EXISTS `XDiario_movConta_IVA__`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `XDiario_movConta_IVA__` (
- `id` int(11) NOT NULL,
- `CodigoDivisa` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
- `BaseIva1` double DEFAULT NULL,
- `PorBaseCorrectora1` double DEFAULT NULL,
- `PorIva1` double DEFAULT NULL,
- `CuotaIva1` double DEFAULT NULL,
- `PorRecargoEquivalencia1` double DEFAULT NULL,
- `RecargoEquivalencia1` double DEFAULT NULL,
- `CodigoTransaccion1` double NOT NULL DEFAULT '0',
- `CodigoIva1` smallint(6) NOT NULL,
- `BaseIva2` double DEFAULT NULL,
- `PorBaseCorrectora2` double DEFAULT NULL,
- `PorIva2` double DEFAULT NULL,
- `CuotaIva2` double DEFAULT NULL,
- `PorRecargoEquivalencia2` double DEFAULT NULL,
- `RecargoEquivalencia2` double DEFAULT NULL,
- `CodigoTransaccion2` double NOT NULL DEFAULT '0',
- `CodigoIva2` smallint(6) NOT NULL,
- `BaseIva3` double DEFAULT NULL,
- `PorBaseCorrectora3` double DEFAULT NULL,
- `PorIva3` double DEFAULT NULL,
- `CuotaIva3` double DEFAULT NULL,
- `PorRecargoEquivalencia3` double DEFAULT NULL,
- `RecargoEquivalencia3` double DEFAULT NULL,
- `CodigoTransaccion3` double NOT NULL DEFAULT '0',
- `CodigoIva3` smallint(6) NOT NULL,
- `BaseIva4` double DEFAULT NULL,
- `PorBaseCorrectora4` double DEFAULT NULL,
- `PorIva4` double DEFAULT NULL,
- `CuotaIva4` double DEFAULT NULL,
- `PorRecargoEquivalencia4` double DEFAULT NULL,
- `RecargoEquivalencia4` double DEFAULT NULL,
- `CodigoTransaccion4` double NOT NULL DEFAULT '0',
- `CodigoIva4` smallint(6) NOT NULL,
- `Año` int(11) DEFAULT NULL,
- `Serie` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
- `Factura` int(11) DEFAULT NULL,
- `SuFacturaNo` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL,
- `FechaFactura` date DEFAULT NULL,
- `ImporteFactura` double DEFAULT NULL,
- `TipoFactura` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
- `CodigoCuentaFactura` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
- `CifDni` varchar(13) COLLATE utf8_unicode_ci DEFAULT NULL,
- `Nombre` varchar(35) COLLATE utf8_unicode_ci DEFAULT NULL,
- `CodigoRetencion` int(2) DEFAULT NULL,
- `BaseRetencion` double DEFAULT NULL,
- `PorRetencion` double DEFAULT NULL,
- `ImporteRetencion` double DEFAULT NULL,
- `SiglaNacion` varchar(2) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'ES',
- `EjercicioFactura` int(2) DEFAULT NULL,
- `FechaOperacion` date DEFAULT NULL,
- `Exclusion347` int(2) DEFAULT NULL,
- `MantenerAsiento` int(2) DEFAULT '-1',
- `Metalico347` int(2) DEFAULT NULL,
- `ClaveOperacionFactura` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
- `TipoRectificativa` int(2) DEFAULT NULL,
- `FechaFacturaOriginal` date DEFAULT NULL,
- `CuotaIvaOriginal` double DEFAULT NULL,
- `BaseImponibleOriginal` double DEFAULT NULL,
- `ClaseAbonoRectificativas` int(2) DEFAULT NULL,
- `RecargoEquivalenciaOriginal` double DEFAULT NULL,
- `LibreA1` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
- `IvaDeducible1` int(2) NOT NULL DEFAULT '-1',
- `IvaDeducible2` int(2) NOT NULL DEFAULT '-1',
- `IvaDeducible3` int(2) NOT NULL DEFAULT '-1',
- `IvaDeducible4` int(2) NOT NULL DEFAULT '-1',
- `FechaGrabacion` date DEFAULT NULL,
- `Intracomunitaria` tinyint(1) DEFAULT '0',
- `moveData` tinyint(1) DEFAULT '1',
- PRIMARY KEY (`id`),
- CONSTRAINT `XDiario_movConta_IVA_fk1` FOREIGN KEY (`id`) REFERENCES `vn`.`XDiario` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Informa del valor de los campos de IVA para enlazar en la tabla vn.movConta';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
--
-- Temporary table structure for view `clientLastTwoMonths`
--
@@ -20198,7 +20274,7 @@ SET character_set_client = @saved_cs_client;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `accountingMovements_add`(vYear INT, vCompanyFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `accountingMovements_add`(vYear INT, vCompanyFk INT)
BEGIN
/**
* Traslada la info de contabilidad generada en base a vn.XDiario a la tabla sage.movConta para poder ejecutar posteriormente el proceso de importación de datos de SQL Server
@@ -20625,11 +20701,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientesProveedoresAdd__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientesProveedoresAdd__`()
BEGIN
TRUNCATE TABLE clientesProveedores;
INSERT INTO clientesProveedores
@@ -20746,11 +20822,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientSupplier_add`(vCompanyFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientSupplier_add`(vCompanyFk INT)
BEGIN
/**
* Prepara los datos de clientes y proveedores para exportarlos a Sage
@@ -20886,11 +20962,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientSupplier_add__`(vCompanyFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientSupplier_add__`(vCompanyFk INT)
BEGIN
/**
* Prepara los datos de clientes y proveedores para exportarlos a Sage
@@ -21026,11 +21102,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceIn_add`(vInvoiceInFk INT, vXDiarioFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceIn_add`(vInvoiceInFk INT, vXDiarioFk INT)
BEGIN
/**
* Traslada la info de contabilidad relacionada con las facturas recibidas
@@ -21225,11 +21301,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceIn_manager`(vYear INT, vCompanyFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceIn_manager`(vYear INT, vCompanyFk INT)
BEGIN
/**
* Traslada la info de contabilidad relacionada con las facturas recibidas
@@ -21511,11 +21587,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_add`(IN vInvoiceOutFk INT, IN vXDiarioFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_add`(IN vInvoiceOutFk INT, IN vXDiarioFk INT)
BEGIN
/**
* Traslada la info de contabilidad relacionada con las facturas emitidas
@@ -21711,11 +21787,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_manager`(vYear INT, vCompanyFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_manager`(vYear INT, vCompanyFk INT)
BEGIN
/**
* Traslada la info de contabilidad relacionada con las facturas emitidas
@@ -21778,11 +21854,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `movContaAdd__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `movContaAdd__`()
BEGIN
/* Copia en movConta los asientos de XDiario para que luego los importe el proceso automático que hay en SQL Server
*/
@@ -22333,11 +22409,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `pgc_add`(vCompanyFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `pgc_add`(vCompanyFk INT)
BEGIN
/**
* Añade cuentas del plan general contable para exportarlos a Sage
@@ -22387,11 +22463,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `planCuentasPgcAdd__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `planCuentasPgcAdd__`()
BEGIN
TRUNCATE TABLE planCuentasPGC;
@@ -22452,11 +22528,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `XDiario_movConta_IVA_InvoiceInAdd_Manager__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `XDiario_movConta_IVA_InvoiceInAdd_Manager__`()
BEGIN
DECLARE done BOOL DEFAULT FALSE;
DECLARE vInvoiceFk INT;
@@ -22706,11 +22782,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `XDiario_movConta_IVA_InvoiceInAdd__`(IN vInvoiceInFk INT, IN vXDiarioId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `XDiario_movConta_IVA_InvoiceInAdd__`(IN vInvoiceInFk INT, IN vXDiarioId INT)
BEGIN
DECLARE vDone BOOL DEFAULT FALSE;
@@ -22899,11 +22975,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `XDiario_movConta_IVA_InvoiceOutAdd_Manager__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `XDiario_movConta_IVA_InvoiceOutAdd_Manager__`()
BEGIN
DECLARE done BOOL DEFAULT FALSE;
@@ -22951,11 +23027,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `XDiario_movConta_IVA_InvoiceOutAdd__`(IN vInvoiceOutFk INT, IN vXDiarioId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `XDiario_movConta_IVA_InvoiceOutAdd__`(IN vInvoiceOutFk INT, IN vXDiarioId INT)
BEGIN
DECLARE vDone BOOL DEFAULT FALSE;
@@ -23389,19 +23465,18 @@ CREATE TABLE `inbound` (
KEY `isSync` (`isSync`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
-ALTER DATABASE `stock` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `stock`.`inbound_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `stock`.`inbound_beforeInsert`
BEFORE INSERT ON `inbound`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
SET NEW.isPicked = NEW.isPicked OR NEW.dated < CURDATE();
@@ -23417,19 +23492,18 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `stock` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `stock`.`inbound_afterDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `stock`.`inbound_afterDelete`
AFTER DELETE ON `inbound`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
UPDATE outbound o
JOIN inboundPick ou ON ou.outboundFk = o.id
@@ -23514,17 +23588,16 @@ CREATE TABLE `outbound` (
KEY `isSync` (`isSync`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
-ALTER DATABASE `stock` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `stock`.`outbound_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `stock`.`outbound_beforeInsert`
BEFORE INSERT ON `outbound`
FOR EACH ROW
BEGIN
@@ -23543,19 +23616,18 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `stock` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `stock`.`outbound_afterDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `stock`.`outbound_afterDelete`
AFTER DELETE ON `outbound`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
UPDATE inbound i
JOIN inboundPick ou ON ou.inboundFk = i.id
@@ -23607,10 +23679,10 @@ DELIMITER ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `log_clean` ON SCHEDULE EVERY 1 DAY STARTS '2019-06-17 02:45:00' ON COMPLETION PRESERVE ENABLE DO CALL log_clean */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `log_clean` ON SCHEDULE EVERY 1 DAY STARTS '2022-01-28 09:29:18' ON COMPLETION PRESERVE ENABLE DO CALL log_clean */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -23625,10 +23697,10 @@ DELIMITER ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `log_syncNoWait` ON SCHEDULE EVERY 5 SECOND STARTS '2017-06-27 17:15:02' ON COMPLETION NOT PRESERVE DISABLE DO CALL log_syncNoWait */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `log_syncNoWait` ON SCHEDULE EVERY 5 SECOND STARTS '2017-06-27 17:15:02' ON COMPLETION NOT PRESERVE DISABLE DO CALL log_syncNoWait */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -23646,11 +23718,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inbound_addPick`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `inbound_addPick`(
vSelf INT,
vOutboundFk INT,
vQuantity INT
@@ -23675,11 +23747,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inbound_removePick`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `inbound_removePick`(
vSelf INT,
vOutboundFk INT,
vQuantity INT,
@@ -23708,11 +23780,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inbound_requestQuantity`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `inbound_requestQuantity`(
vSelf INT,
vRequested INT,
vDated DATETIME,
@@ -23782,11 +23854,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inbound_sync`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `inbound_sync`(vSelf INT)
BEGIN
/**
* Associates a inbound with their possible outbounds, updating it's available.
@@ -23879,11 +23951,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `log_add`(IN `vTableName` VARCHAR(255), IN `vNewId` VARCHAR(255), IN `vOldId` VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `log_add`(IN `vTableName` VARCHAR(255), IN `vNewId` VARCHAR(255), IN `vOldId` VARCHAR(255))
proc: BEGIN
-- XXX: Disabled while testing
LEAVE proc;
@@ -23911,13 +23983,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `log_add_beta__`(IN `vTableName` VARCHAR(255), IN `vNewId` VARCHAR(255), IN `vOldId` VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `log_add_beta__`(IN `vTableName` VARCHAR(255), IN `vNewId` VARCHAR(255), IN `vOldId` VARCHAR(255))
proc: BEGIN
-- XXX: Disabled while testing
DECLARE vLanded DATE;
@@ -23983,11 +24055,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `log_clean`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `log_clean`()
BEGIN
DELETE FROM inbound WHERE dated = vn.getInventoryDate();
DELETE FROM outbound WHERE dated = vn.getInventoryDate();
@@ -24003,11 +24075,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `log_delete`(vTableName VARCHAR(255), vTableId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `log_delete`(vTableName VARCHAR(255), vTableId INT)
proc: BEGIN
/**
* Processes orphan transactions.
@@ -24035,11 +24107,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `log_refreshAll`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `log_refreshAll`()
BEGIN
/**
* Recalculates the entire cache. It takes a considerable time,
@@ -24081,11 +24153,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `log_refreshBuy`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `log_refreshBuy`(
`vTableName` VARCHAR(255),
`vTableId` INT)
BEGIN
@@ -24168,11 +24240,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `log_refreshOrder`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `log_refreshOrder`(
`vTableName` VARCHAR(255),
`vTableId` INT)
BEGIN
@@ -24228,11 +24300,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `log_refreshSale`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `log_refreshSale`(
`vTableName` VARCHAR(255),
`vTableId` INT)
BEGIN
@@ -24306,11 +24378,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `log_sync`(vSync BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `log_sync`(vSync BOOL)
proc: BEGIN
DECLARE vDone BOOL;
DECLARE vLogId INT;
@@ -24440,13 +24512,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `log_syncNoWait`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `log_syncNoWait`()
BEGIN
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
@@ -24471,11 +24543,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `outbound_requestQuantity`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `outbound_requestQuantity`(
vSelf INT,
vRequested INT,
vDated DATETIME,
@@ -24545,11 +24617,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `outbound_sync`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `outbound_sync`(vSelf INT)
BEGIN
/**
* Attaches a outbound with available inbounds.
@@ -24631,17 +24703,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `visible_log` */;
-ALTER DATABASE `stock` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `visible_log`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `visible_log`(
vIsPicked BOOL,
vWarehouseFk INT,
vItemFk INT,
@@ -24664,7 +24735,6 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `stock` CHARACTER SET utf8 COLLATE utf8_general_ci ;
--
-- Current Database: `util`
@@ -24729,19 +24799,21 @@ CREATE TABLE `version` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `versionUser`
+-- Table structure for table `versionLog`
--
-DROP TABLE IF EXISTS `versionUser`;
+DROP TABLE IF EXISTS `versionLog`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `versionUser` (
+CREATE TABLE `versionLog` (
`code` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
- `user` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
- `number` char(11) COLLATE utf8_unicode_ci DEFAULT NULL,
- `gitCommit` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `number` char(11) COLLATE utf8_unicode_ci NOT NULL,
+ `file` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `user` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
`updated` datetime NOT NULL,
- PRIMARY KEY (`code`,`user`)
+ `errorNumber` int(10) unsigned DEFAULT NULL,
+ `errorMessage` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`code`,`number`,`file`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -24754,14 +24826,14 @@ DELIMITER ;;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection = utf8_general_ci */ ;;
+/*!50003 SET character_set_client = utf8mb4 */ ;;
+/*!50003 SET character_set_results = utf8mb4 */ ;;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `slowLog_prune` ON SCHEDULE EVERY 1 DAY STARTS '2021-10-08 00:00:00' ON COMPLETION PRESERVE ENABLE DO CALL util.slowLog_prune */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `slowLog_prune` ON SCHEDULE EVERY 1 DAY STARTS '2021-10-08 00:00:00' ON COMPLETION PRESERVE ENABLE DO CALL util.slowLog_prune */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -24779,11 +24851,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `accountShortToStandard`(vAccount VARCHAR(10)) RETURNS varchar(10) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `accountShortToStandard`(vAccount VARCHAR(10)) RETURNS varchar(10) CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
BEGIN
RETURN REPLACE(vAccount, '.', REPEAT('0', 11 - LENGTH(vAccount)));
@@ -24797,13 +24869,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `capitalizeFirst`(vString VARCHAR(255)) RETURNS varchar(255) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `capitalizeFirst`(vString VARCHAR(255)) RETURNS varchar(255) CHARSET utf8
NO SQL
DETERMINISTIC
BEGIN
@@ -24851,13 +24923,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `crypt`(vText VARCHAR(255), vKey VARCHAR(255)) RETURNS varchar(255) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `crypt`(vText VARCHAR(255), vKey VARCHAR(255)) RETURNS varchar(255) CHARSET utf8
READS SQL DATA
BEGIN
@@ -24877,13 +24949,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `cryptOff`(vText VARCHAR(255), vKey VARCHAR(255)) RETURNS varchar(255) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `cryptOff`(vText VARCHAR(255), vKey VARCHAR(255)) RETURNS varchar(255) CHARSET utf8
READS SQL DATA
BEGIN
@@ -24903,13 +24975,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `dayend`(vDated DATE) RETURNS datetime
+CREATE DEFINER=`root`@`localhost` FUNCTION `dayend`(vDated DATE) RETURNS datetime
NO SQL
DETERMINISTIC
BEGIN
@@ -24932,11 +25004,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `firstDayOfMonth`(vDate DATE) RETURNS date
+CREATE DEFINER=`root`@`localhost` FUNCTION `firstDayOfMonth`(vDate DATE) RETURNS date
NO SQL
DETERMINISTIC
BEGIN
@@ -24957,13 +25029,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `firstDayOfYear`(vDate DATE) RETURNS date
+CREATE DEFINER=`root`@`localhost` FUNCTION `firstDayOfYear`(vDate DATE) RETURNS date
NO SQL
DETERMINISTIC
BEGIN
@@ -24986,11 +25058,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `hasDateOverlapped`(vSarted1 DATE, vEnded1 DATE, vSarted2 DATE, vEnded2 DATE) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `hasDateOverlapped`(vSarted1 DATE, vEnded1 DATE, vSarted2 DATE, vEnded2 DATE) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
@@ -25006,13 +25078,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `hmacSha2`(`vAlg` SMALLINT, `vMsg` MEDIUMBLOB, `vKey` MEDIUMBLOB) RETURNS varchar(128) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `hmacSha2`(`vAlg` SMALLINT, `vMsg` MEDIUMBLOB, `vKey` MEDIUMBLOB) RETURNS varchar(128) CHARSET utf8
NO SQL
DETERMINISTIC
BEGIN
@@ -25052,11 +25124,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `isLeapYear`(vYear INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `isLeapYear`(vYear INT) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
@@ -25072,13 +25144,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `lang`() RETURNS char(2) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `lang`() RETURNS char(2) CHARSET utf8
NO SQL
DETERMINISTIC
BEGIN
@@ -25100,11 +25172,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `lastDayOfYear`(vDate DATE) RETURNS date
+CREATE DEFINER=`root`@`localhost` FUNCTION `lastDayOfYear`(vDate DATE) RETURNS date
NO SQL
DETERMINISTIC
BEGIN
@@ -25125,13 +25197,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `midnight`() RETURNS datetime
+CREATE DEFINER=`root`@`localhost` FUNCTION `midnight`() RETURNS datetime
READS SQL DATA
BEGIN
@@ -25144,17 +25216,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP FUNCTION IF EXISTS `nextWeek` */;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `nextWeek`(vYearWeek INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `nextWeek`(vYearWeek INT) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -25175,18 +25246,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP FUNCTION IF EXISTS `quarterFirstDay` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `quarterFirstDay`(vYear INT, vQuarter INT) RETURNS date
+CREATE DEFINER=`root`@`localhost` FUNCTION `quarterFirstDay`(vYear INT, vQuarter INT) RETURNS date
DETERMINISTIC
BEGIN
RETURN CONCAT(vYear,"-", ((vQuarter - 1) * 3) + 1, "-01");
@@ -25200,13 +25270,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `stringXor`(vString MEDIUMBLOB, vConst TINYINT UNSIGNED) RETURNS mediumblob
+CREATE DEFINER=`root`@`localhost` FUNCTION `stringXor`(vString MEDIUMBLOB, vConst TINYINT UNSIGNED) RETURNS mediumblob
NO SQL
DETERMINISTIC
BEGIN
@@ -25233,17 +25303,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP FUNCTION IF EXISTS `today` */;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `today`() RETURNS date
+CREATE DEFINER=`root`@`localhost` FUNCTION `today`() RETURNS date
DETERMINISTIC
BEGIN
/**
@@ -25260,18 +25329,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP FUNCTION IF EXISTS `tomorrow` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `tomorrow`() RETURNS date
+CREATE DEFINER=`root`@`localhost` FUNCTION `tomorrow`() RETURNS date
DETERMINISTIC
BEGIN
/**
@@ -25287,17 +25355,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP FUNCTION IF EXISTS `twoDaysAgo` */;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `twoDaysAgo`() RETURNS date
+CREATE DEFINER=`root`@`localhost` FUNCTION `twoDaysAgo`() RETURNS date
DETERMINISTIC
BEGIN
/**
@@ -25312,19 +25379,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP FUNCTION IF EXISTS `yearRelativePosition` */;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `yearRelativePosition`(vYear INT) RETURNS varchar(20) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `yearRelativePosition`(vYear INT) RETURNS varchar(20) CHARSET utf8
DETERMINISTIC
BEGIN
/**
@@ -25355,19 +25420,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP FUNCTION IF EXISTS `yesterday` */;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `yesterday`() RETURNS date
+CREATE DEFINER=`root`@`localhost` FUNCTION `yesterday`() RETURNS date
DETERMINISTIC
BEGIN
/**
@@ -25382,18 +25445,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP PROCEDURE IF EXISTS `compareObjects` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `compareObjects`(vChain VARCHAR(45),vCompare VARCHAR(45))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `compareObjects`(vChain VARCHAR(45),vCompare VARCHAR(45))
READS SQL DATA
BEGIN
/**
@@ -25500,17 +25562,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `debugAdd` */;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `debugAdd`(vVariable VARCHAR(255), vValue VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `debugAdd`(vVariable VARCHAR(255), vValue VARCHAR(255))
MODIFIES SQL DATA
BEGIN
/**
@@ -25533,18 +25594,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP PROCEDURE IF EXISTS `exec` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `exec`(vSqlQuery TEXT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `exec`(vSqlQuery TEXT)
BEGIN
/**
* Executes a string with an SQL query.
@@ -25568,13 +25628,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `findObject`(vChain VARCHAR(45))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `findObject`(vChain VARCHAR(45))
READS SQL DATA
BEGIN
/**
@@ -25639,13 +25699,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `procNoOverlap`(procName VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `procNoOverlap`(procName VARCHAR(255))
SQL SECURITY INVOKER
proc: BEGIN
/**
@@ -25678,11 +25738,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `proc_changedPrivs`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `proc_changedPrivs`()
BEGIN
SELECT s.*
FROM proc_privs s
@@ -25706,11 +25766,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `proc_restorePrivs`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `proc_restorePrivs`()
BEGIN
/**
* Restores the privileges saved by proc_savePrivs().
@@ -25734,11 +25794,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `proc_savePrivs`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `proc_savePrivs`()
BEGIN
/**
* Saves routine privileges, used to simplify the task of keeping
@@ -25764,23 +25824,23 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `slowLog_prune`()
-BEGIN
-/**
- * Prunes MySQL slow query log table deleting all records older than one week.
- */
- DECLARE vSlowQueryLog INT DEFAULT @@slow_query_log;
-
- SET GLOBAL slow_query_log = 'OFF';
- RENAME TABLE `mysql`.`slow_log` TO `mysql`.`slow_log_temp`;
-
- DELETE FROM `mysql`.`slow_log_temp`
- WHERE start_time < TIMESTAMPADD(WEEK, -1, NOW());
-
- RENAME TABLE `mysql`.`slow_log_temp` TO `mysql`.`slow_log`;
- SET GLOBAL slow_query_log = vSlowQueryLog;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `slowLog_prune`()
+BEGIN
+/**
+ * Prunes MySQL slow query log table deleting all records older than one week.
+ */
+ DECLARE vSlowQueryLog INT DEFAULT @@slow_query_log;
+
+ SET GLOBAL slow_query_log = 'OFF';
+ RENAME TABLE `mysql`.`slow_log` TO `mysql`.`slow_log_temp`;
+
+ DELETE FROM `mysql`.`slow_log_temp`
+ WHERE start_time < TIMESTAMPADD(WEEK, -1, NOW());
+
+ RENAME TABLE `mysql`.`slow_log_temp` TO `mysql`.`slow_log`;
+ SET GLOBAL slow_query_log = vSlowQueryLog;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -25793,11 +25853,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `throw`(vMessage CHAR(55))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `throw`(vMessage CHAR(55))
BEGIN
/**
* Throws a user-defined exception.
@@ -25816,13 +25876,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `time_createTable`(vStarted DATE, vEnded DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `time_createTable`(vStarted DATE, vEnded DATE)
BEGIN
DECLARE vCurrentDate DATE;
@@ -25844,13 +25904,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `warn`(vCode CHAR(35))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `warn`(vCode CHAR(35))
BEGIN
DECLARE w VARCHAR(1) DEFAULT '__';
SET @warn = vCode;
@@ -25869,6 +25929,21 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `vn` /*!40100 DEFAULT CHARACTER SET utf
USE `vn`;
+--
+-- Temporary table structure for view `NewView`
+--
+
+DROP TABLE IF EXISTS `NewView`;
+/*!50001 DROP VIEW IF EXISTS `NewView`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `NewView` (
+ `clientFk` tinyint NOT NULL,
+ `lastShipped` tinyint NOT NULL,
+ `notBuyingMonths` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
--
-- Table structure for table `XDiario`
--
@@ -25959,11 +26034,13 @@ CREATE TABLE `XDiario` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`XDiario_beforeInsert` BEFORE INSERT ON `XDiario` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`XDiario_beforeInsert`
+ BEFORE INSERT ON `XDiario`
+ FOR EACH ROW
BEGIN
/*
IF NEW.EURODEBE < 0 THEN
@@ -26159,12 +26236,13 @@ CREATE TABLE `address` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`address_beforeInsert`
- BEFORE INSERT ON `vn`.`address` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`address_beforeInsert`
+ BEFORE INSERT ON `address`
+ FOR EACH ROW
BEGIN
DECLARE vIsEqualizated BOOL;
@@ -26195,12 +26273,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`address_beforeUpdate`
- BEFORE UPDATE ON `vn`.`address` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`address_beforeUpdate`
+ BEFORE UPDATE ON `address`
+ FOR EACH ROW
BEGIN
IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
@@ -26220,14 +26299,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`address_afterUpdate`
- AFTER UPDATE ON `address` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`address_afterUpdate`
+ AFTER UPDATE ON `address`
+ FOR EACH ROW
BEGIN
-- Recargos de equivalencia distintos implican facturacion por consignatario
IF NEW.isEqualizated != OLD.isEqualizated THEN
@@ -26285,7 +26365,7 @@ CREATE TABLE `addressFilter` (
CONSTRAINT `addressFilter_FK` FOREIGN KEY (`provinceFk`) REFERENCES `province` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `addressFilter_FK_1` FOREIGN KEY (`countryFk`) REFERENCES `country` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `addressFilter_FK_2` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Establece los criterios para habilitar las compras directas a Floraholland';
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Establece los criterios para habilitar las compras directas a Logiflora';
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -26341,7 +26421,7 @@ CREATE TABLE `agency` (
`labelZone` tinyint(4) NOT NULL DEFAULT '0',
`workCenterFk` int(11) DEFAULT NULL,
`supplierFk` int(11) DEFAULT NULL,
- `isAnyVolumeAllowed` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Permite vender productos cualquier volumen',
+ `isAnyVolumeAllowed` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Permite vender productos que tengan vn.itemType.IsUnconventionalSize = TRUE',
PRIMARY KEY (`id`),
KEY `warehouse_id` (`warehouseFk`),
KEY `Id_Banco` (`bankFk`),
@@ -26359,11 +26439,13 @@ CREATE TABLE `agency` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`agency_afterInsert` AFTER INSERT ON `vn`.`agency` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`agency_afterInsert`
+ AFTER INSERT ON `agency`
+ FOR EACH ROW
BEGIN
INSERT INTO agencyMode(name,agencyFk) VALUES(NEW.name,NEW.id);
END */;;
@@ -26460,7 +26542,7 @@ CREATE TABLE `agencyTerm` (
`routePrice` decimal(10,2) DEFAULT NULL COMMENT 'precio fijo por ruta',
`minimumKm` int(11) NOT NULL DEFAULT '0',
`minimumM3` decimal(10,2) NOT NULL DEFAULT '0.00',
- `m3Price` decimal(10,0) NOT NULL DEFAULT '0',
+ `m3Price` decimal(10,2) NOT NULL DEFAULT '0.00',
PRIMARY KEY (`agencyFk`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -26602,15 +26684,15 @@ CREATE TABLE `autonomy` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER autonomy_BI
-BEFORE INSERT
-ON autonomy FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_BI`
+ BEFORE INSERT ON `autonomy`
+ FOR EACH ROW
BEGIN
SET NEW.geoFk = zoneGeo_new('autonomy', NEW.`name`, (SELECT geoFk FROM country WHERE id = NEW.countryFk));
@@ -26624,15 +26706,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER autonomy_BU
-BEFORE UPDATE
-ON autonomy FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_BU`
+ BEFORE UPDATE ON `autonomy`
+ FOR EACH ROW
BEGIN
IF !(OLD.countryFk <=> NEW.countryFk) THEN
CALL zoneGeo_setParent(NEW.geoFk,
@@ -26652,15 +26734,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER autonomy_AD
-AFTER DELETE
-ON autonomy FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_AD`
+ AFTER DELETE ON `autonomy`
+ FOR EACH ROW
BEGIN
CALL zoneGeo_delete(OLD.geoFk);
END */;;
@@ -26722,11 +26804,13 @@ CREATE TABLE `awb` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`awb_bi` BEFORE INSERT ON `awb` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`awb_bi`
+ BEFORE INSERT ON `awb`
+ FOR EACH ROW
BEGIN
SET NEW.year= year(CURDATE());
@@ -26743,11 +26827,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`awb_au` AFTER UPDATE ON `awb` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`awb_au`
+ AFTER UPDATE ON `awb`
+ FOR EACH ROW
BEGIN
IF NEW.amount <> OLD.amount THEN
@@ -26961,11 +27047,13 @@ CREATE TABLE `botanicExport` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`botanicExport_beforeInsert` BEFORE INSERT ON `botanicExport` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`botanicExport_beforeInsert`
+ BEFORE INSERT ON `botanicExport`
+ FOR EACH ROW
BEGIN
IF (SELECT botanicExport_isUpdatable (NEW.ediGenusFk, NEW.ediSpecieFk, NEW.countryFk, NEW.restriction) ) > 0 THEN
CALL util.throw ('Datos duplicados');
@@ -26977,6 +27065,124 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
+--
+-- Table structure for table `budget`
+--
+
+DROP TABLE IF EXISTS `budget`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `budget` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `name` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+ `started` date DEFAULT NULL,
+ `finished` date DEFAULT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ `departmentFk` int(11) DEFAULT NULL,
+ `supplierFk` int(11) DEFAULT NULL,
+ `photo` blob,
+ `amount` decimal(10,2) DEFAULT NULL,
+ `projectFk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `budget_FK` (`projectFk`),
+ KEY `budget_FK_1` (`userFk`),
+ KEY `budget_FK_2` (`departmentFk`),
+ KEY `budget_FK_3` (`supplierFk`),
+ CONSTRAINT `budget_FK` FOREIGN KEY (`projectFk`) REFERENCES `project` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `budget_FK_1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `budget_FK_2` FOREIGN KEY (`departmentFk`) REFERENCES `department` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `budget_FK_3` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Master de presupuestos de project';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `budgetDms`
+--
+
+DROP TABLE IF EXISTS `budgetDms`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `budgetDms` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `budgetFk` int(11) NOT NULL,
+ `dmsFk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `budgetDms_FK` (`budgetFk`),
+ KEY `budgetDms_FK_1` (`dmsFk`),
+ CONSTRAINT `budgetDms_FK` FOREIGN KEY (`budgetFk`) REFERENCES `budget` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `budgetDms_FK_1` FOREIGN KEY (`dmsFk`) REFERENCES `dms` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Gestion documental de budget';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `budgetInvoiceIn`
+--
+
+DROP TABLE IF EXISTS `budgetInvoiceIn`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `budgetInvoiceIn` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `budgetFk` int(11) NOT NULL,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `invoiceInFk` mediumint(8) unsigned NOT NULL,
+ `amount` decimal(10,2) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `budgetInvoiceIn_FK` (`budgetFk`),
+ KEY `budgetInvoiceIn_FK_1` (`invoiceInFk`),
+ CONSTRAINT `budgetInvoiceIn_FK` FOREIGN KEY (`budgetFk`) REFERENCES `budget` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `budgetInvoiceIn_FK_1` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Facturas relativas al presupuesto';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `budgetNotes`
+--
+
+DROP TABLE IF EXISTS `budgetNotes`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `budgetNotes` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `budgetFk` int(11) NOT NULL,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `txt` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `budgetNotes_FK` (`budgetFk`),
+ KEY `budgetNotes_FK_2` (`userFk`),
+ CONSTRAINT `budgetNotes_FK` FOREIGN KEY (`budgetFk`) REFERENCES `budget` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `budgetNotes_FK_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Historico de budget';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`$manager`@`%`*/ /*!50003 TRIGGER budgetNotes_BeforeInsert
+BEFORE INSERT
+ON budgetNotes FOR EACH ROW
+BEGIN
+
+ IF ISNULL(NEW.userFk) THEN
+
+ SET NEW.userFk = account.myUser_getId();
+
+ END IF;
+
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+
--
-- Temporary table structure for view `businessCalendar`
--
@@ -27084,63 +27290,63 @@ CREATE TABLE `buy` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `buy_beforeInsert`
- BEFORE INSERT ON `buy`
- FOR EACH ROW
-trig: BEGIN
- DECLARE vWarehouse INT;
- DECLARE vLanding DATE;
- DECLARE vGrouping INT;
- DECLARE vGroupingMode TINYINT;
- DECLARE vGenericFk INT;
-
- IF @isModeInventory THEN
- LEAVE trig;
- END IF;
-
- CALL buy_checkGrouping(NEW.`grouping`);
-
- SELECT t.warehouseInFk, t.landed INTO vWarehouse, vLanding
- FROM entry e
- JOIN travel t ON t.id = e.travelFk
- WHERE e.id = NEW.entryFk;
-
- SELECT b.`grouping`, b.groupingMode INTO vGrouping, vGroupingMode
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel t ON t.id = e.travelFk
- WHERE t.landed <= vLanding
- AND b.itemFk = NEW.itemFk
- AND !b.isIgnored
- ORDER BY t.warehouseInFk = vWarehouse DESC, t.landed DESC, b.id DESC
- LIMIT 1;
-
- IF NEW.`grouping` IS NULL THEN
- SET NEW.`grouping` = vGrouping;
- END IF;
-
- IF NEW.groupingMode IS NULL THEN
- SET NEW.groupingMode = vGroupingMode;
- END IF;
-
- -- Generics
-
- SELECT i.genericFk INTO vGenericFk
- FROM vn.item i
- WHERE i.id = NEW.itemFk;
-
- IF vGenericFk THEN
-
- SET NEW.itemOriginalFk = NEW.itemFk;
-
- SET NEW.itemFk = vGenericFk;
-
- END IF;
-
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_beforeInsert`
+ BEFORE INSERT ON `buy`
+ FOR EACH ROW
+trig: BEGIN
+ DECLARE vWarehouse INT;
+ DECLARE vLanding DATE;
+ DECLARE vGrouping INT;
+ DECLARE vGroupingMode TINYINT;
+ DECLARE vGenericFk INT;
+
+ IF @isModeInventory THEN
+ LEAVE trig;
+ END IF;
+
+ CALL buy_checkGrouping(NEW.`grouping`);
+
+ SELECT t.warehouseInFk, t.landed INTO vWarehouse, vLanding
+ FROM entry e
+ JOIN travel t ON t.id = e.travelFk
+ WHERE e.id = NEW.entryFk;
+
+ SELECT b.`grouping`, b.groupingMode INTO vGrouping, vGroupingMode
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ WHERE t.landed <= vLanding
+ AND b.itemFk = NEW.itemFk
+ AND !b.isIgnored
+ ORDER BY t.warehouseInFk = vWarehouse DESC, t.landed DESC, b.id DESC
+ LIMIT 1;
+
+ IF NEW.`grouping` IS NULL THEN
+ SET NEW.`grouping` = vGrouping;
+ END IF;
+
+ IF NEW.groupingMode IS NULL THEN
+ SET NEW.groupingMode = vGroupingMode;
+ END IF;
+
+ -- Generics
+
+ SELECT i.genericFk INTO vGenericFk
+ FROM vn.item i
+ WHERE i.id = NEW.itemFk;
+
+ IF vGenericFk THEN
+
+ SET NEW.itemOriginalFk = NEW.itemFk;
+
+ SET NEW.itemFk = vGenericFk;
+
+ END IF;
+
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -27150,15 +27356,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `buy_afterInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_afterInsert`
AFTER INSERT ON `buy`
- FOR EACH ROW
+ FOR EACH ROW
trig: BEGIN
CALL stock.log_add('buy', NEW.id, NULL);
@@ -27176,43 +27382,43 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `buy_beforeUpdate`
- BEFORE UPDATE ON `buy`
- FOR EACH ROW
-trig:BEGIN
-
- DECLARE vGenericFk INT;
-
- IF @isTriggerDisabled THEN
-
- LEAVE trig;
-
- END IF;
-
- IF !(NEW.`grouping` <=> OLD.`grouping`) THEN
- CALL buy_checkGrouping(NEW.`grouping`);
- END IF;
-
- -- Generics
-
- SELECT i.genericFk INTO vGenericFk
- FROM vn.item i
- WHERE i.id = NEW.itemFk;
-
- IF vGenericFk THEN
-
- SET NEW.itemOriginalFk = NEW.itemFk;
-
- SET NEW.itemFk = vGenericFk;
-
- END IF;
-
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_beforeUpdate`
+ BEFORE UPDATE ON `buy`
+ FOR EACH ROW
+trig:BEGIN
+
+ DECLARE vGenericFk INT;
+
+ IF @isTriggerDisabled THEN
+
+ LEAVE trig;
+
+ END IF;
+
+ IF !(NEW.`grouping` <=> OLD.`grouping`) THEN
+ CALL buy_checkGrouping(NEW.`grouping`);
+ END IF;
+
+ -- Generics
+
+ SELECT i.genericFk INTO vGenericFk
+ FROM vn.item i
+ WHERE i.id = NEW.itemFk;
+
+ IF vGenericFk THEN
+
+ SET NEW.itemOriginalFk = NEW.itemFk;
+
+ SET NEW.itemFk = vGenericFk;
+
+ END IF;
+
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -27224,11 +27430,14 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `buy_afterUpdate` AFTER UPDATE ON `buy` FOR EACH ROW trig: BEGIN
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_afterUpdate`
+ AFTER UPDATE ON `buy`
+ FOR EACH ROW
+trig: BEGIN
DECLARE vLanded DATE;
DECLARE vBuyerFk INT;
DECLARE vIsBuyerToBeEmailed BOOL;
@@ -27294,38 +27503,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `buy_beforeDelete`
- BEFORE DELETE ON `buy`
- FOR EACH ROW
-BEGIN
- IF OLD.printedStickers > 0 THEN
- SIGNAL SQLSTATE '45000'
- SET MESSAGE_TEXT = 'A buy from which labels have been printed cannot be deleted';
- END IF;
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `buy_afterDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_afterDelete`
AFTER DELETE ON `buy`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL stock.log_add('buy', NULL, OLD.id);
END */;;
@@ -27597,15 +27783,15 @@ CREATE TABLE `claimBeginning` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`claimBeginning_afterInsert`
- AFTER INSERT ON `claimBeginning`
- FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`claimBeginning_afterInsert`
+ AFTER INSERT ON `claimBeginning`
+ FOR EACH ROW
BEGIN
DECLARE vTicket INT;
@@ -27885,7 +28071,7 @@ CREATE TABLE `client` (
`city` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
`provinceFk` smallint(5) unsigned DEFAULT NULL,
`postcode` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
- `socialName` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `socialName` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
`contact` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`wholesaler__` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'obsoleta (comprobar)',
`isReExpedition__` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'obsoleta (comprobar)',
@@ -27952,6 +28138,7 @@ CREATE TABLE `client` (
KEY `client_taxTypeSageFk_idx` (`taxTypeSageFk`),
KEY `client_transactionTypeSageFk_idx` (`transactionTypeSageFk`),
KEY `client_FK` (`businessTypeFk`),
+ KEY `client_lastSalesPersonFk_IDX` (`lastSalesPersonFk`) USING BTREE,
CONSTRAINT `canal_nuevo_cliente` FOREIGN KEY (`contactChannelFk`) REFERENCES `contactChannel` (`id`) ON UPDATE CASCADE,
CONSTRAINT `client_FK` FOREIGN KEY (`businessTypeFk`) REFERENCES `businessType` (`code`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `client_ibfk_1` FOREIGN KEY (`countryFk`) REFERENCES `country` (`id`) ON UPDATE CASCADE,
@@ -27970,11 +28157,11 @@ CREATE TABLE `client` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`client_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`client_beforeInsert`
BEFORE INSERT ON `client`
FOR EACH ROW
BEGIN
@@ -28001,13 +28188,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`client_beforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`client_beforeUpdate`
BEFORE UPDATE ON `client`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
DECLARE vText VARCHAR(255) DEFAULT NULL;
DECLARE vPayMethodFk INT;
@@ -28078,13 +28265,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`client_afterUpdate`
-AFTER UPDATE ON `client`
-FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`client_afterUpdate`
+ AFTER UPDATE ON `client`
+ FOR EACH ROW
BEGIN
IF !(NEW.defaultAddressFk <=> OLD.defaultAddressFk) THEN
UPDATE `address` SET isDefaultAddress = 0
@@ -28177,6 +28364,41 @@ CREATE TABLE `clientCredit` (
CONSTRAINT `workers_fk` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER clientCredit_AfterInsert
+AFTER INSERT
+ON clientCredit FOR EACH ROW
+BEGIN
+
+ DECLARE vSender VARCHAR(50);
+
+ SELECT u.name INTO vSender
+ FROM account.`user` u
+ WHERE u.id = NEW.workerFk;
+
+ IF vSender IN ('juanvi','pepe') THEN
+
+ CALL `vn`.`mail_insert`('pako@verdnatura.es',
+ NULL,
+ CONCAT('ClientCredit ',vSender, ' ', NEW.clientFk, ' ' , NEW.amount, ' €'),
+ CONCAT('ClientCredit ',vSender, ' ', NEW.clientFk, ' ' , NEW.amount, ' €'));
+
+ END IF;
+
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
--
-- Table structure for table `clientCreditLimit`
@@ -28240,6 +28462,21 @@ CREATE TABLE `clientLog` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Temporary table structure for view `clientLost`
+--
+
+DROP TABLE IF EXISTS `clientLost`;
+/*!50001 DROP VIEW IF EXISTS `clientLost`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `clientLost` (
+ `clientFk` tinyint NOT NULL,
+ `lastShipped` tinyint NOT NULL,
+ `notBuyingMonths` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
--
-- Table structure for table `clientManaCache`
--
@@ -28298,11 +28535,13 @@ CREATE TABLE `clientObservation` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`clientObservation_AFTER_INSERT` AFTER INSERT ON `clientObservation` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`clientObservation_AFTER_INSERT`
+ AFTER INSERT ON `clientObservation`
+ FOR EACH ROW
BEGIN
/* DECLARE vMailSender VARCHAR(90);
DECLARE vUserName VARCHAR(30);
@@ -28335,6 +28574,24 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
+--
+-- Table structure for table `clientPackagingGifts`
+--
+
+DROP TABLE IF EXISTS `clientPackagingGifts`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `clientPackagingGifts` (
+ `clientFk` int(11) NOT NULL,
+ `giftFk` int(11) NOT NULL,
+ `added` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`clientFk`,`giftFk`),
+ KEY `clientPackagingGifts_FK_1` (`giftFk`),
+ CONSTRAINT `clientPackagingGifts_FK` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`),
+ CONSTRAINT `clientPackagingGifts_FK_1` FOREIGN KEY (`giftFk`) REFERENCES `packagingGifts` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Temporary table structure for view `clientPhoneBook`
--
@@ -28494,13 +28751,15 @@ CREATE TABLE `cmr` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`cmr_BEFORE_INSERT` BEFORE INSERT ON `cmr` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`cmr_BEFORE_INSERT`
+ BEFORE INSERT ON `cmr`
+ FOR EACH ROW
BEGIN
DECLARE vLastSenderInstructions VARCHAR(255);
@@ -28641,43 +28900,43 @@ CREATE TABLE `collection` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER collection_BEFORE_UPDATE
-BEFORE UPDATE
-ON collection FOR EACH ROW
-BEGIN
-
- DECLARE vStateFk INT;
- DECLARE vTotalLines INT;
- DECLARE vPickedLines INT;
-
- IF NEW.saleTotalCount <= NEW.salePickedCount
- AND (NEW.saleTotalCount != OLD.saleTotalCount
- OR NEW.salePickedCount != OLD.salePickedCount)
- THEN
-
- SELECT id INTO vStateFk
- FROM vn.state
- WHERE code = 'PREPARED';
-
- SET NEW.stateFk = vStateFk;
-
- END IF;
-
- IF NEW.saleTotalCount > NEW.salePickedCount
- AND (NEW.saleTotalCount != OLD.saleTotalCount OR NEW.salePickedCount != OLD.salePickedCount) THEN
-
- SELECT id INTO vStateFk
- FROM vn.state
- WHERE code = 'ON_PREPARATION';
-
- SET NEW.stateFk = vStateFk;
-
- END IF;
-
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`collection_BEFORE_UPDATE`
+ BEFORE UPDATE ON `collection`
+ FOR EACH ROW
+BEGIN
+
+ DECLARE vStateFk INT;
+ DECLARE vTotalLines INT;
+ DECLARE vPickedLines INT;
+
+ IF NEW.saleTotalCount <= NEW.salePickedCount
+ AND (NEW.saleTotalCount != OLD.saleTotalCount
+ OR NEW.salePickedCount != OLD.salePickedCount)
+ THEN
+
+ SELECT id INTO vStateFk
+ FROM vn.state
+ WHERE code = 'PREPARED';
+
+ SET NEW.stateFk = vStateFk;
+
+ END IF;
+
+ IF NEW.saleTotalCount > NEW.salePickedCount
+ AND (NEW.saleTotalCount != OLD.saleTotalCount OR NEW.salePickedCount != OLD.salePickedCount) THEN
+
+ SELECT id INTO vStateFk
+ FROM vn.state
+ WHERE code = 'ON_PREPARATION';
+
+ SET NEW.stateFk = vStateFk;
+
+ END IF;
+
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -28790,23 +29049,6 @@ CREATE TABLE `collectionVolumetry` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
---
--- Table structure for table `collectionVolumetry_Paloma__`
---
-
-DROP TABLE IF EXISTS `collectionVolumetry_Paloma__`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `collectionVolumetry_Paloma__` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `level` int(10) unsigned NOT NULL DEFAULT '0',
- `lines` int(10) unsigned NOT NULL DEFAULT '1',
- `liters` int(10) unsigned NOT NULL DEFAULT '0',
- `height` int(10) unsigned NOT NULL DEFAULT '20',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
--
-- Table structure for table `commissionConfig`
--
@@ -28943,6 +29185,7 @@ CREATE TABLE `componentType` (
`type` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
`isBase` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Marca aquellas series que se utilizan para calcular el precio base de las ventas, a efectos estadisticos',
`isMargin` tinyint(4) NOT NULL DEFAULT '0',
+ `code` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `Serie_UNIQUE` (`type`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Permite organizar de forma ordenada los distintos componentes';
@@ -29121,7 +29364,7 @@ CREATE TABLE `contratos_subvencion_270619` (
KEY `contratos_subvencion_270619_fk1_idx` (`workerFk`),
CONSTRAINT `contratos_subvencion_270619_fk1` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
CONSTRAINT `contratos_subvencion_270619_fk2` FOREIGN KEY (`cod_centroFk`) REFERENCES `vn2008`.`payroll_centros` (`cod_centro`) ON UPDATE CASCADE,
- CONSTRAINT `contratos_subvencion_270619_fk3` FOREIGN KEY (`CodContratoFk`) REFERENCES `vn2008`.`payroll_contratos` (`CodContrato`) ON UPDATE CASCADE
+ CONSTRAINT `contratos_subvencion_270619_fk3` FOREIGN KEY (`CodContratoFk`) REFERENCES `vn2008`.`payroll_contratos__` (`CodContrato`) ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Segun los informes de vida laboral aportados por la SS';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -29296,12 +29539,13 @@ CREATE TABLE `country` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`country_beforeInsert`
- BEFORE INSERT ON `country` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`country_beforeInsert`
+ BEFORE INSERT ON `country`
+ FOR EACH ROW
BEGIN
SET NEW.geoFk = zoneGeo_new('country', NEW.country, NULL);
END */;;
@@ -29315,11 +29559,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`country_AFTER_INSERT` AFTER INSERT ON `country` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`country_AFTER_INSERT`
+ AFTER INSERT ON `country`
+ FOR EACH ROW
BEGIN
UPDATE sage.Naciones
@@ -29348,12 +29594,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`country_beforeUpdate`
- BEFORE UPDATE ON `country` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`country_beforeUpdate`
+ BEFORE UPDATE ON `country`
+ FOR EACH ROW
BEGIN
-- IF !(OLD.geoFk <=> NEW.geoFk) THEN
-- CALL zoneGeo_throwNotEditable;
@@ -29369,11 +29616,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`country_afterUpdate` AFTER UPDATE ON `country` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`country_afterUpdate`
+ AFTER UPDATE ON `country`
+ FOR EACH ROW
BEGIN
IF !(OLD.country <=> NEW.country) THEN
UPDATE zoneGeo SET `name` = NEW.country
@@ -29390,11 +29639,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`country_afterDelete` AFTER DELETE ON `country` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`country_afterDelete`
+ AFTER DELETE ON `country`
+ FOR EACH ROW
BEGIN
CALL zoneGeo_delete(OLD.geoFk);
END */;;
@@ -29553,11 +29804,13 @@ CREATE TABLE `creditClassification` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`creditClassification_beforeUpdate` BEFORE UPDATE ON `creditClassification` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`creditClassification_beforeUpdate`
+ BEFORE UPDATE ON `creditClassification`
+ FOR EACH ROW
BEGIN
IF NEW.client <> OLD.client THEN
CALL util.throw('NOT_ALLOWED_CHANGE_CLIENT');
@@ -29594,13 +29847,15 @@ CREATE TABLE `creditInsurance` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`creditInsurance_afterInsert` AFTER INSERT ON `creditInsurance` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`creditInsurance_afterInsert`
+ AFTER INSERT ON `creditInsurance`
+ FOR EACH ROW
BEGIN
UPDATE `client` c
JOIN vn.creditClassification cc ON cc.client = c.id
@@ -29683,6 +29938,26 @@ SET character_set_client = utf8;
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
+--
+-- Table structure for table `delivery`
+--
+
+DROP TABLE IF EXISTS `delivery`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `delivery` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `longitude` decimal(11,7) DEFAULT NULL,
+ `latitude` decimal(11,7) DEFAULT NULL,
+ `dated` datetime DEFAULT NULL,
+ `addressFk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `delivery_FK` (`addressFk`),
+ CONSTRAINT `delivery_FK` FOREIGN KEY (`addressFk`) REFERENCES `address` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Informa de los datos geográficos y temporales de las entregas de los repartidores';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `deliveryMethod`
--
@@ -29766,7 +30041,7 @@ CREATE TABLE `department` (
`isSelected` tinyint(1) NOT NULL DEFAULT '0',
`depth` int(11) NOT NULL DEFAULT '0',
`sons` decimal(10,0) NOT NULL DEFAULT '0',
- `parentFk` int(10) unsigned DEFAULT NULL,
+ `parentFk` int(10) unsigned DEFAULT '1',
`path` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
`chatName` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
`isTeleworking` tinyint(1) DEFAULT '0',
@@ -29774,6 +30049,7 @@ CREATE TABLE `department` (
`hasToRefill` tinyint(1) DEFAULT '0' COMMENT 'Rellenar días sin fichadas presenciales',
`hasToSendMail` tinyint(1) DEFAULT '0' COMMENT 'Para el envio de mail en el procedimiento workerTimeControl_sendMail()',
`hasToCheckLogin` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Para comprobar en el login de la app',
+ `hasToMistake` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indica si al departamento pueden serles puestos errores',
PRIMARY KEY (`id`),
UNIQUE KEY `name_UNIQUE` (`name`),
KEY `fk_department_Trabajadores1_idx` (`workerFk`),
@@ -29787,12 +30063,13 @@ CREATE TABLE `department` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`department_beforeInsert`
- BEFORE INSERT ON `department` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`department_beforeInsert`
+ BEFORE INSERT ON `department`
+ FOR EACH ROW
BEGIN
UPDATE vn.department_recalc SET isChanged = TRUE;
END */;;
@@ -29806,12 +30083,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`department_afterUpdate`
- AFTER UPDATE ON `department` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`department_afterUpdate`
+ AFTER UPDATE ON `department`
+ FOR EACH ROW
BEGIN
IF !(OLD.parentFk <=> NEW.parentFk) THEN
UPDATE vn.department_recalc SET isChanged = TRUE;
@@ -29825,44 +30103,54 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`department_afterDelete`
- AFTER DELETE ON `department` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER department_beforeDelete
+BEFORE DELETE
+ON department FOR EACH ROW
BEGIN
- UPDATE vn.department_recalc SET isChanged = TRUE;
+
+ UPDATE postgresql.business_labour bl
+ JOIN vn.department d ON d.id = bl.department_id
+ SET bl.department_id = d.parentFk
+ WHERE bl.department_id = OLD.id;
+
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`department_afterDelete`
+ AFTER DELETE ON `department`
+ FOR EACH ROW
+BEGIN
+
+ UPDATE vn.department_recalc SET isChanged = TRUE;
+
+ UPDATE postgresql.business_labour bl
+ JOIN vn.department d ON d.id = bl.department_id
+ SET bl.department_id = d.parentFk
+ WHERE bl.department_id = OLD.id;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-
---
--- Table structure for table `departmentItemType__`
---
-
-DROP TABLE IF EXISTS `departmentItemType__`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `departmentItemType__` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `departmentFk` int(11) NOT NULL,
- `itemTypeFk` smallint(5) unsigned NOT NULL,
- `workerFk` int(10) unsigned NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `departmentItemTypeIdx1_idx` (`departmentFk`,`itemTypeFk`),
- KEY `departmentItemTypeIdx2_idx` (`itemTypeFk`),
- KEY `departmentItemTypeIdx3_idx` (`workerFk`),
- CONSTRAINT `departmentItemTypeIdx1` FOREIGN KEY (`departmentFk`) REFERENCES `department` (`id`) ON UPDATE CASCADE,
- CONSTRAINT `departmentItemTypeIdx2` FOREIGN KEY (`itemTypeFk`) REFERENCES `itemType` (`id`) ON UPDATE CASCADE,
- CONSTRAINT `departmentItemTypeIdx3` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Temporary table structure for view `departmentTree`
@@ -29942,8 +30230,9 @@ CREATE TABLE `deviceProduction` (
`macWifi` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
`serialNumber` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
`departmentFk` int(11) DEFAULT NULL,
- `isOutOfService` tinyint(1) NOT NULL DEFAULT '0',
+ `isOutOfService` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0: Ok - 1: No disponible - 2: Sat',
`android_id` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `purchased` date NOT NULL DEFAULT '1900-01-01' COMMENT 'Fecha de compra',
PRIMARY KEY (`id`),
UNIQUE KEY `device_id_UNIQUE` (`id`),
UNIQUE KEY `sn_UNIQUE` (`imei`),
@@ -29974,12 +30263,12 @@ CREATE TABLE `deviceProductionConfig` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER deviceProductionConfig_afterUpdate
- AFTER UPDATE ON deviceProductionConfig
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`deviceProductionConfig_afterUpdate`
+ AFTER UPDATE ON `deviceProductionConfig`
FOR EACH ROW
BEGIN
IF NEW.isAllUsersAllowed = 1 OR NEW.isAllUsersAllowed = -1 THEN
@@ -30076,11 +30365,13 @@ CREATE TABLE `dms` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`dms_beforeInsert` BEFORE INSERT ON `vn`.`dms` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`dms_beforeInsert`
+ BEFORE INSERT ON `dms`
+ FOR EACH ROW
BEGIN
DECLARE vHardCopyNumber INT;
DECLARE vDmsTypeCode INT;
@@ -30111,33 +30402,37 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`dms_beforeUpdate` BEFORE UPDATE ON `vn`.`dms` FOR EACH ROW
-BEGIN
- DECLARE vHardCopyNumber INT;
-
- IF (NEW.hasFile <> 0) AND (OLD.hasFile = 0) AND (NEW.hardCopyNumber IS NULL) THEN
-
- IF (SELECT NOT hasDms FROM warehouse WHERE id = NEW.warehouseFk) THEN
- SET NEW.warehouseFk = (SELECT id FROM warehouse WHERE name = 'Algemesi');
- END IF;
-
- SELECT 1 + MAX(hardCopyNumber) INTO vHardCopyNumber
- FROM dms
- WHERE warehouseFk = NEW.warehouseFk;
-
- SET NEW.hardCopyNumber = IFNULL(vHardCopyNumber,1);
- END IF;
-
- IF ((NEW.hardCopyNumber = 0) OR NEW.hardCopyNumber IS NULL) AND (OLD.hardCopyNumber <> 0) THEN
-
- SET NEW.hasFile = 0;
- END IF;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`dms_beforeUpdate`
+ BEFORE UPDATE ON `dms`
+ FOR EACH ROW
+BEGIN
+ DECLARE vHardCopyNumber INT;
+
+ IF (NEW.hasFile <> 0) AND (OLD.hasFile = 0) AND (NEW.hardCopyNumber IS NULL)
+ OR
+ (NEW.hardCopyNumber = OLD.hardCopyNumber AND OLD.warehouseFk <> NEW.warehouseFk) THEN
+
+ IF (SELECT NOT hasDms FROM warehouse WHERE id = NEW.warehouseFk) THEN
+ SET NEW.warehouseFk = (SELECT id FROM warehouse WHERE name = 'Algemesi');
+ END IF;
+
+ SELECT 1 + MAX(hardCopyNumber) INTO vHardCopyNumber
+ FROM dms
+ WHERE warehouseFk = NEW.warehouseFk;
+
+ SET NEW.hardCopyNumber = IFNULL(vHardCopyNumber,1);
+ END IF;
+
+ IF ((NEW.hardCopyNumber = 0) OR NEW.hardCopyNumber IS NULL) AND (OLD.hardCopyNumber <> 0) THEN
+
+ SET NEW.hasFile = 0;
+ END IF;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -30185,6 +30480,20 @@ CREATE TABLE `dmsType` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `dock`
+--
+
+DROP TABLE IF EXISTS `dock`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `dock` (
+ `code` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+ `description` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Se utiliza para el panel de grafana: https://grafana.verdnatura.es/d/w9w3Uo-7z/';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `dua`
--
@@ -30305,11 +30614,13 @@ CREATE TABLE `duaTax` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`duaTax_BEFORE_INSERT` BEFORE INSERT ON `duaTax` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`duaTax_BEFORE_INSERT`
+ BEFORE INSERT ON `duaTax`
+ FOR EACH ROW
BEGIN
SET NEW.rate = duaTax_getRate(NEW.duaFk, NEW.taxClassFk);
SET NEW.tax = NEW.base * NEW.rate / 100;
@@ -30324,11 +30635,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`duaTax_BEFORE_UPDATE` BEFORE UPDATE ON `duaTax` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`duaTax_BEFORE_UPDATE`
+ BEFORE UPDATE ON `duaTax`
+ FOR EACH ROW
BEGIN
SET NEW.rate = duaTax_getRate(NEW.duaFk, NEW.taxClassFk);
SET NEW.tax = NEW.base * NEW.rate / 100;
@@ -30406,11 +30719,30 @@ CREATE TABLE `ektEntryAssign` (
`supplierFk` int(11) DEFAULT NULL,
`entryFk` int(11) DEFAULT NULL,
`ref` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `addressFk` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
- UNIQUE KEY `ektEntryAssign_ix1` (`kop`,`sub`,`pro`)
+ UNIQUE KEY `ektEntryAssign_ix1` (`kop`,`sub`,`pro`),
+ KEY `ektEntryAssign_FK` (`addressFk`),
+ CONSTRAINT `ektEntryAssign_FK` FOREIGN KEY (`addressFk`) REFERENCES `address` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='define las condiciones para asignar entradas a los ekt';
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Temporary table structure for view `ektSubAddress`
+--
+
+DROP TABLE IF EXISTS `ektSubAddress`;
+/*!50001 DROP VIEW IF EXISTS `ektSubAddress`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `ektSubAddress` (
+ `sub` tinyint NOT NULL,
+ `clientFk` tinyint NOT NULL,
+ `nickname` tinyint NOT NULL,
+ `addressFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
--
-- Table structure for table `emergencyMedia`
--
@@ -30506,13 +30838,13 @@ CREATE TABLE `entry` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `entry_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entry_beforeInsert`
BEFORE INSERT ON `entry`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
SET NEW.currencyFk = entry_getCurrency(NEW.currencyFk, NEW.supplierFk);
SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk,NEW.supplierFk);
@@ -30527,13 +30859,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `entry_afterInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entry_afterInsert`
AFTER INSERT ON `entry`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL travel_requestRecalc(NEW.travelFk);
END */;;
@@ -30547,13 +30879,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`entry_beforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entry_beforeUpdate`
BEFORE UPDATE ON `entry`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
DECLARE vIsVirtual BOOL;
DECLARE vPrintedCount INT;
@@ -30615,13 +30947,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `entry_afterUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entry_afterUpdate`
AFTER UPDATE ON `entry`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
IF !(NEW.id <=> OLD.id)
OR !(NEW.travelFk <=> OLD.travelFk)
@@ -30644,13 +30976,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `entry_beforeDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entry_beforeDelete`
BEFORE DELETE ON `entry`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
DELETE FROM buy WHERE entryFk = OLD.id;
END */;;
@@ -30664,13 +30996,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `entry_afterDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entry_afterDelete`
AFTER DELETE ON `entry`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL travel_requestRecalc(OLD.travelFk);
END */;;
@@ -30759,7 +31091,7 @@ CREATE TABLE `entryObservation` (
KEY `observationType_id_observationTypeFk` (`observationTypeFk`),
CONSTRAINT `entry_id_entryFk` FOREIGN KEY (`entryFk`) REFERENCES `entry` (`id`),
CONSTRAINT `observationType_id_observationTypeFk` FOREIGN KEY (`observationTypeFk`) REFERENCES `observationType` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -30813,11 +31145,13 @@ CREATE TABLE `envialiaAgency` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`envialiaAgency_bd` BEFORE DELETE ON `envialiaAgency` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`envialiaAgency_bd`
+ BEFORE DELETE ON `envialiaAgency`
+ FOR EACH ROW
BEGIN
CALL util.debugAdd("envialiaAgency", OLD.id);
END */;;
@@ -30849,11 +31183,13 @@ CREATE TABLE `envialiaCity` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`envialiaCity_bd` BEFORE DELETE ON `envialiaCity` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`envialiaCity_bd`
+ BEFORE DELETE ON `envialiaCity`
+ FOR EACH ROW
BEGIN
CALL util.debugAdd("envialiaCity", OLD.id);
END */;;
@@ -30913,8 +31249,8 @@ CREATE TABLE `errorProduction` (
`lastname` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
`rol` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
`ticketNumber` int(11) DEFAULT NULL,
+ `lineNumber` int(11) DEFAULT NULL,
`error` int(11) DEFAULT NULL,
- `ratio` double DEFAULT NULL,
`volume` double DEFAULT NULL,
`hourStart` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
`hourEnd` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -31073,6 +31409,7 @@ CREATE TABLE `expedition` (
`packagingFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
`itemPackingTypeFk` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
`hostFk` varchar(6) COLLATE utf8_unicode_ci NOT NULL,
+ `stateTypeFk` int(11) DEFAULT NULL COMMENT 'Ultimo estado de la expedicion',
PRIMARY KEY (`id`),
KEY `index1` (`agencyModeFk`),
KEY `index2` (`isBox`),
@@ -31081,6 +31418,8 @@ CREATE TABLE `expedition` (
KEY `expedition_fk3_idx` (`packagingFk`),
KEY `expedition_itemPackingTypeFk` (`itemPackingTypeFk`),
KEY `workerFk` (`workerFk`),
+ KEY `expedition_FK` (`stateTypeFk`),
+ CONSTRAINT `expedition_FK` FOREIGN KEY (`stateTypeFk`) REFERENCES `expeditionStateType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `expedition_fk1` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON UPDATE CASCADE,
CONSTRAINT `expedition_fk2` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `expedition_fk3` FOREIGN KEY (`packagingFk`) REFERENCES `packaging` (`id`) ON UPDATE CASCADE,
@@ -31093,14 +31432,17 @@ CREATE TABLE `expedition` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`expedition_beforeInsert`
- BEFORE INSERT ON `expedition` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expedition_beforeInsert`
+ BEFORE INSERT ON `expedition`
+ FOR EACH ROW
BEGIN
+
DECLARE intcounter INT;
+
DECLARE vShipFk INT;
IF NEW.isBox > 0 THEN
@@ -31119,11 +31461,13 @@ BEGIN
SET NEW.`counter` = intcounter;
END IF;
+/*
SELECT shipFk INTO vShipFk FROM stowaway WHERE id = NEW.ticketFk;
IF vShipFk THEN
CALL stowaway_unboarding(vShipFk, NEW.ticketFk);
END IF;
+*/
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -31135,13 +31479,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`expedition_beforeUpdate`
- BEFORE UPDATE ON `expedition` FOR EACH ROW
--- Edit trigger body code below this line. Do not edit lines above this one
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expedition_beforeUpdate`
+ BEFORE UPDATE ON `expedition`
+ FOR EACH ROW
BEGIN
IF NEW.counter <> OLD.counter THEN
IF (SELECT COUNT(*) FROM expedition e
@@ -31162,12 +31506,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`expedition_beforeDelete`
- BEFORE DELETE ON `expedition` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expedition_beforeDelete`
+ BEFORE DELETE ON `expedition`
+ FOR EACH ROW
BEGIN
UPDATE ticket t
SET packages = (SELECT COUNT(counter)-1
@@ -31240,13 +31585,15 @@ CREATE TABLE `expeditionPallet` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`expeditionPallet_BEFORE_INSERT` BEFORE INSERT ON `expeditionPallet` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionPallet_BEFORE_INSERT`
+ BEFORE INSERT ON `expeditionPallet`
+ FOR EACH ROW
BEGIN
DECLARE vNewPosition INT;
@@ -31346,13 +31693,15 @@ CREATE TABLE `expeditionScan` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`expeditionScan_BEFORE_INSERT` BEFORE INSERT ON `expeditionScan` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionScan_BEFORE_INSERT`
+ BEFORE INSERT ON `expeditionScan`
+ FOR EACH ROW
BEGIN
SET NEW.workerFk = vn.getUser();
@@ -31385,6 +31734,88 @@ SET character_set_client = utf8;
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
+--
+-- Table structure for table `expeditionState`
+--
+
+DROP TABLE IF EXISTS `expeditionState`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `expeditionState` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `expeditionFk` int(11) NOT NULL,
+ `typeFk` int(11) NOT NULL,
+ `userFk` int(11) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `expeditionState_FK` (`expeditionFk`),
+ KEY `expeditionState_FK_1` (`typeFk`),
+ CONSTRAINT `expeditionState_FK` FOREIGN KEY (`expeditionFk`) REFERENCES `expedition` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `expeditionState_FK_1` FOREIGN KEY (`typeFk`) REFERENCES `expeditionStateType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Historico de estados de las expediciones';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER expeditionState_BeforeInsert
+BEFORE INSERT
+ON expeditionState FOR EACH ROW
+BEGIN
+
+ SET NEW.userFk = account.myUser_getId();
+
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER expeditionState_AfterInsert
+AFTER INSERT
+ON expeditionState FOR EACH ROW
+BEGIN
+
+ UPDATE vn.expedition e
+ SET e.stateTypeFk = NEW.typeFk
+ WHERE e.id = NEW.expeditionFk;
+
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+
+--
+-- Table structure for table `expeditionStateType`
+--
+
+DROP TABLE IF EXISTS `expeditionStateType`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `expeditionStateType` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `description` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+ `code` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Posibles estados de una expedición';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Temporary table structure for view `expeditionSticker`
--
@@ -31491,13 +31922,15 @@ CREATE TABLE `expeditionTruck` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`expeditionTruck_BEFORE_INSERT` BEFORE INSERT ON `expeditionTruck` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionTruck_BEFORE_INSERT`
+ BEFORE INSERT ON `expeditionTruck`
+ FOR EACH ROW
BEGIN
SET NEW.description = UCASE(NEW.description);
@@ -31511,13 +31944,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`expeditionTruck_BEFORE_UPDATE` BEFORE UPDATE ON `expeditionTruck` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expeditionTruck_BEFORE_UPDATE`
+ BEFORE UPDATE ON `expeditionTruck`
+ FOR EACH ROW
BEGIN
SET NEW.description = UCASE(NEW.description);
@@ -31676,11 +32111,13 @@ CREATE TABLE `floramondoConfig` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`floramondoConfig_AFTER_INSERT` AFTER INSERT ON `floramondoConfig` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`floramondoConfig_AFTER_INSERT`
+ AFTER INSERT ON `floramondoConfig`
+ FOR EACH ROW
BEGIN
CALL util.throw ("Tabla config no permite añadir más registros");
END */;;
@@ -31691,13 +32128,13 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
--
--- Table structure for table `floramondoNotOfferDay`
+-- Table structure for table `floramondoNotOfferDay__`
--
-DROP TABLE IF EXISTS `floramondoNotOfferDay`;
+DROP TABLE IF EXISTS `floramondoNotOfferDay__`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `floramondoNotOfferDay` (
+CREATE TABLE `floramondoNotOfferDay__` (
`dated` date NOT NULL,
`warehouseFk` int(11) NOT NULL DEFAULT '60',
PRIMARY KEY (`dated`,`warehouseFk`)
@@ -31802,13 +32239,13 @@ CREATE TABLE `glsConfig` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `glsExpedition`
+-- Table structure for table `glsExpedition__`
--
-DROP TABLE IF EXISTS `glsExpedition`;
+DROP TABLE IF EXISTS `glsExpedition__`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `glsExpedition` (
+CREATE TABLE `glsExpedition__` (
`expeditionFk` int(11) NOT NULL,
`barcode` bigint(20) unsigned DEFAULT NULL,
`uid` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -31846,13 +32283,15 @@ CREATE TABLE `greuge` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`greuge_beforeUpdate` BEFORE UPDATE ON `greuge` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`greuge_beforeUpdate`
+ BEFORE UPDATE ON `greuge`
+ FOR EACH ROW
BEGIN
DECLARE vMaxDate DATETIME DEFAULT TIMESTAMPADD(YEAR,1,CURDATE());
@@ -31995,13 +32434,13 @@ CREATE TABLE `host` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER host_beforeUpdate
-BEFORE UPDATE ON vn.host
-FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`host_beforeUpdate`
+ BEFORE UPDATE ON `host`
+ FOR EACH ROW
BEGIN
SET new.updated = NOW();
END */;;
@@ -32261,13 +32700,16 @@ CREATE TABLE `invoiceIn` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `invoiceIn_bi` BEFORE INSERT ON `invoiceIn` FOR EACH ROW BEGIN
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceIn_bi`
+ BEFORE INSERT ON `invoiceIn`
+ FOR EACH ROW
+BEGIN
DECLARE vSerie CHAR(1) DEFAULT 'R';
DECLARE vNumReceived INT;
DECLARE vIssuingCountry, vhostCountry INT;
@@ -32330,11 +32772,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `invoiceIn_bu` BEFORE UPDATE ON `invoiceIn` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceIn_bu`
+ BEFORE UPDATE ON `invoiceIn`
+ FOR EACH ROW
BEGIN
DECLARE vWithholdingSageFk INT;
@@ -32366,11 +32810,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `invoiceIn_au` AFTER UPDATE ON `invoiceIn` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceIn_au`
+ AFTER UPDATE ON `invoiceIn`
+ FOR EACH ROW
BEGIN
IF NEW.issued != OLD.issued
@@ -32441,13 +32887,13 @@ CREATE TABLE `invoiceInDueDay` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceInDueDay_beforeInsert`
-BEFORE INSERT ON `vn`.`invoiceInDueDay`
-FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInDueDay_beforeInsert`
+ BEFORE INSERT ON `invoiceInDueDay`
+ FOR EACH ROW
BEGIN
DECLARE vIsNotified BOOLEAN;
@@ -32481,13 +32927,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceInDueDay_beforeUpdate`
-BEFORE UPDATE ON `vn`.`invoiceInDueDay`
-FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInDueDay_beforeUpdate`
+ BEFORE UPDATE ON `invoiceInDueDay`
+ FOR EACH ROW
BEGIN
DECLARE vIsNotified BOOLEAN;
@@ -32797,12 +33243,13 @@ CREATE TABLE `invoiceOut` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeInsert`
- BEFORE INSERT ON `invoiceOut` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeInsert`
+ BEFORE INSERT ON `invoiceOut`
+ FOR EACH ROW
-- Edit trigger body code below this line. Do not edit lines above this one
BEGIN
DECLARE vRef CHAR(10) ;
@@ -32842,11 +33289,14 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_afterInsert` AFTER INSERT ON `vn`.`invoiceOut` FOR EACH ROW BEGIN
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceOut_afterInsert`
+ AFTER INSERT ON `invoiceOut`
+ FOR EACH ROW
+BEGIN
CALL clientRisk_update(NEW.clientFk, NEW.companyFk, NEW.amount);
IF (SELECT COUNT(*)
FROM client
@@ -32869,13 +33319,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeUpdate` BEFORE UPDATE ON `vn`.`invoiceOut` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeUpdate`
+ BEFORE UPDATE ON `invoiceOut`
+ FOR EACH ROW
BEGIN
CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
CALL clientRisk_update (NEW.clientFk, NEW.companyFk, NEW.amount);
@@ -32888,13 +33340,16 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeDelete` BEFORE DELETE ON `invoiceOut` FOR EACH ROW BEGIN
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeDelete`
+ BEFORE DELETE ON `invoiceOut`
+ FOR EACH ROW
+BEGIN
CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
END */;;
DELIMITER ;
@@ -32969,6 +33424,30 @@ CREATE TABLE `invoiceOutTax` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `invoiceOutTaxConfig`
+--
+
+DROP TABLE IF EXISTS `invoiceOutTaxConfig`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `invoiceOutTaxConfig` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `taxClassCodeFk` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `taxTypeSageFk` smallint(6) DEFAULT NULL,
+ `transactionTypeSageFk` tinyint(4) DEFAULT NULL,
+ `isService` tinyint(1) DEFAULT '0',
+ `expenceFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `invoiceOutTaxConfig_FK` (`taxClassCodeFk`),
+ KEY `invoiceOutTaxConfig_FK_1` (`taxTypeSageFk`),
+ KEY `invoiceOutTaxConfig_FK_2` (`transactionTypeSageFk`),
+ CONSTRAINT `invoiceOutTaxConfig_FK` FOREIGN KEY (`taxClassCodeFk`) REFERENCES `taxClass` (`code`),
+ CONSTRAINT `invoiceOutTaxConfig_FK_1` FOREIGN KEY (`taxTypeSageFk`) REFERENCES `sage`.`TiposIva` (`CodigoIva`),
+ CONSTRAINT `invoiceOutTaxConfig_FK_2` FOREIGN KEY (`transactionTypeSageFk`) REFERENCES `sage`.`TiposTransacciones` (`CodigoTransaccion`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `item`
--
@@ -33071,14 +33550,15 @@ CREATE TABLE `item` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`item_beforeInsert`
- BEFORE INSERT ON `item` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`item_beforeInsert`
+ BEFORE INSERT ON `item`
+ FOR EACH ROW
BEGIN
DECLARE vDensity DOUBLE;
DECLARE vCompression DOUBLE;
@@ -33116,28 +33596,32 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`item_afterInsert`
- AFTER INSERT ON `item`
- FOR EACH ROW
-BEGIN
-
- CALL hedera.image_ref('catalog', NEW.image);
-
- INSERT INTO vn.itemTaxCountry(itemFk, countryFk)
- SELECT NEW.id, 1;
-
- INSERT INTO vn.itemTaxCountry(itemFk, countryFk)
- SELECT NEW.id, 5;
-
- INSERT INTO vn.itemTaxCountry(itemFk, countryFk)
- SELECT NEW.id, 30;
-
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`item_afterInsert`
+ AFTER INSERT ON `item`
+ FOR EACH ROW
+BEGIN
+
+ CALL hedera.image_ref('catalog', NEW.image);
+
+ INSERT INTO vn.itemTaxCountry(itemFk, countryFk)
+ SELECT NEW.id, 1;
+
+ INSERT INTO vn.itemTaxCountry(itemFk, countryFk)
+ SELECT NEW.id, 5;
+
+ INSERT INTO vn.itemTaxCountry(itemFk, countryFk)
+ SELECT NEW.id, 30;
+
+ DELETE ifr.*
+ FROM edi.item_free ifr
+ WHERE ifr.id = NEW.id;
+
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -33147,15 +33631,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER item_beforeUpdate
-BEFORE UPDATE
-ON item FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`item_beforeUpdate`
+ BEFORE UPDATE ON `item`
+ FOR EACH ROW
BEGIN
DECLARE vNewPackingShelve INT;
@@ -33210,15 +33694,16 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`item_afterDelete`
- AFTER DELETE ON `item` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`item_afterDelete`
+ AFTER DELETE ON `item`
+ FOR EACH ROW
BEGIN
CALL hedera.image_unref('catalog', OLD.image);
- IF OLD.id > 400000 THEN
+ IF OLD.id > 400000 THEN
INSERT IGNORE edi.item_free (id)
VALUES (OLD.id);
END IF;
@@ -33312,11 +33797,13 @@ CREATE TABLE `itemCategory` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemCategory_AFTER_INSERT` AFTER INSERT ON `itemCategory` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemCategory_AFTER_INSERT`
+ AFTER INSERT ON `itemCategory`
+ FOR EACH ROW
BEGIN
CALL mail_insert('cau@verdnatura.es',
NULL,
@@ -33373,13 +33860,13 @@ SET character_set_client = utf8;
SET character_set_client = @saved_cs_client;
--
--- Table structure for table `itemConversor`
+-- Table structure for table `itemConversor__`
--
-DROP TABLE IF EXISTS `itemConversor`;
+DROP TABLE IF EXISTS `itemConversor__`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `itemConversor` (
+CREATE TABLE `itemConversor__` (
`espItemFk` int(11) NOT NULL,
`genItemFk` int(11) DEFAULT NULL,
PRIMARY KEY (`espItemFk`),
@@ -33417,13 +33904,15 @@ CREATE TABLE `itemCost` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemCost_beforeInsert` BEFORE INSERT ON `vn`.`itemCost` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemCost_beforeInsert`
+ BEFORE INSERT ON `itemCost`
+ FOR EACH ROW
BEGIN
IF NEW.itemFk IN (95, 98) THEN
SET NEW.cm3 = 0;
@@ -33440,11 +33929,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemCost_beforeUpdate` BEFORE UPDATE ON `vn`.`itemCost` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemCost_beforeUpdate`
+ BEFORE UPDATE ON `itemCost`
+ FOR EACH ROW
BEGIN
IF NEW.itemFk IN (95, 98) THEN
SET NEW.cm3 = 0;
@@ -33666,13 +34157,15 @@ CREATE TABLE `itemPlacement` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemPlacement_BEFORE_INSERT` BEFORE INSERT ON `itemPlacement` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemPlacement_BEFORE_INSERT`
+ BEFORE INSERT ON `itemPlacement`
+ FOR EACH ROW
BEGIN
IF LENGTH(NEW.code) < 3 THEN
CALL util.throw('code too short');
@@ -33686,13 +34179,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemPlacement_BEFORE_UPDATE` BEFORE UPDATE ON `itemPlacement` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemPlacement_BEFORE_UPDATE`
+ BEFORE UPDATE ON `itemPlacement`
+ FOR EACH ROW
BEGIN
IF LENGTH(NEW.code) < 3 THEN
CALL util.throw('code too short');
@@ -33791,13 +34286,13 @@ CREATE TABLE `itemProposal` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `itemRepo`
+-- Table structure for table `itemRepo__`
--
-DROP TABLE IF EXISTS `itemRepo`;
+DROP TABLE IF EXISTS `itemRepo__`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `itemRepo` (
+CREATE TABLE `itemRepo__` (
`itemFk` int(11) NOT NULL,
`quantity` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`itemFk`),
@@ -33859,13 +34354,15 @@ CREATE TABLE `itemShelving` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_INSERT` BEFORE INSERT ON `itemShelving` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_INSERT`
+ BEFORE INSERT ON `itemShelving`
+ FOR EACH ROW
BEGIN
SET NEW.userFk = account.userGetId();
@@ -33880,16 +34377,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER itemShelving_AFTER_INSERT
-AFTER INSERT
-ON itemShelving FOR EACH ROW
-
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_AFTER_INSERT`
+ AFTER INSERT ON `itemShelving`
+ FOR EACH ROW
INSERT INTO vn.itemShelvingLog(itemShelvingFk,
workerFk,
accion,
@@ -33921,13 +34417,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_UPDATE` BEFORE UPDATE ON `itemShelving` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_UPDATE`
+ BEFORE UPDATE ON `itemShelving`
+ FOR EACH ROW
BEGIN
SET NEW.userFk = account.userGetId();
END */;;
@@ -33939,15 +34437,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER itemShelving_AFTER_UPDATE
-AFTER UPDATE
-ON itemShelving FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_AFTER_UPDATE`
+ AFTER UPDATE ON `itemShelving`
+ FOR EACH ROW
INSERT INTO vn.itemShelvingLog(itemShelvingFk,
workerFk,
accion,
@@ -33979,15 +34477,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER itemShelving_BEFORE_DELETE
-BEFORE DELETE
-ON itemShelving FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_BEFORE_DELETE`
+ BEFORE DELETE ON `itemShelving`
+ FOR EACH ROW
INSERT INTO vn.itemShelvingLog(itemShelvingFk,
workerFk,
accion,
@@ -34056,7 +34554,8 @@ SET character_set_client = utf8;
`longName` tinyint NOT NULL,
`size` tinyint NOT NULL,
`subName` tinyint NOT NULL,
- `parked` tinyint NOT NULL
+ `parked` tinyint NOT NULL,
+ `sectorFk` tinyint NOT NULL
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
@@ -34186,13 +34685,15 @@ CREATE TABLE `itemShelvingSale` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemShelvingSale_AFTER_INSERT` AFTER INSERT ON `itemShelvingSale` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelvingSale_AFTER_INSERT`
+ AFTER INSERT ON `itemShelvingSale`
+ FOR EACH ROW
BEGIN
UPDATE vn.sale
@@ -34208,13 +34709,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemShelvingSale_AFTER_DELETE` AFTER DELETE ON `itemShelvingSale` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelvingSale_AFTER_DELETE`
+ AFTER DELETE ON `itemShelvingSale`
+ FOR EACH ROW
BEGIN
UPDATE vn.itemShelving
@@ -34268,7 +34771,8 @@ SET character_set_client = utf8;
`parkingCode` tinyint NOT NULL,
`parkingFk` tinyint NOT NULL,
`itemShelvingFk` tinyint NOT NULL,
- `created` tinyint NOT NULL
+ `created` tinyint NOT NULL,
+ `isPreviousPrepared` tinyint NOT NULL
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
@@ -34356,12 +34860,13 @@ CREATE TABLE `itemTag` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_beforeInsert`
- BEFORE INSERT ON `itemTag` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemTag_beforeInsert`
+ BEFORE INSERT ON `itemTag`
+ FOR EACH ROW
BEGIN
SET NEW.intValue = itemTag_getIntValue(NEW.`value`);
END */;;
@@ -34375,11 +34880,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_AFTER_INSERT` AFTER INSERT ON `itemTag` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemTag_AFTER_INSERT`
+ AFTER INSERT ON `itemTag`
+ FOR EACH ROW
trig: BEGIN
DECLARE vItemFk INT;
IF @isTriggerDisabled THEN
@@ -34401,14 +34908,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_beforeUpdate`
- BEFORE UPDATE ON `itemTag` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemTag_beforeUpdate`
+ BEFORE UPDATE ON `itemTag`
+ FOR EACH ROW
BEGIN
IF !(OLD.`value` <=> NEW.`value`)
OR !(OLD.intValue <=> NEW.intValue) THEN
@@ -34423,14 +34931,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_afterUpdate`
- AFTER UPDATE ON `itemTag` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemTag_afterUpdate`
+ AFTER UPDATE ON `itemTag`
+ FOR EACH ROW
trig: BEGIN
DECLARE vItemFk INT;
IF @isTriggerDisabled THEN
@@ -34455,12 +34964,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_afterDelete`
- AFTER DELETE ON `itemTag` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemTag_afterDelete`
+ AFTER DELETE ON `itemTag`
+ FOR EACH ROW
trig: BEGIN
DECLARE vItemFk INT;
IF @isTriggerDisabled THEN
@@ -34591,13 +35101,15 @@ CREATE TABLE `itemType` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemType_beforeUpdate` BEFORE UPDATE ON `itemType` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemType_beforeUpdate`
+ BEFORE UPDATE ON `itemType`
+ FOR EACH ROW
-- Edit trigger body code below this line. Do not edit lines above this one
BEGIN
@@ -34691,13 +35203,13 @@ CREATE TABLE `itemTypeTag` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Table structure for table `itemVerdecora`
+-- Table structure for table `itemVerdecora__`
--
-DROP TABLE IF EXISTS `itemVerdecora`;
+DROP TABLE IF EXISTS `itemVerdecora__`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `itemVerdecora` (
+CREATE TABLE `itemVerdecora__` (
`itemFk` int(11) NOT NULL,
`codin` int(11) DEFAULT NULL,
PRIMARY KEY (`itemFk`),
@@ -34901,15 +35413,15 @@ CREATE TABLE `machine` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER machine_BI
-BEFORE INSERT
-ON machine FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`machine_BI`
+ BEFORE INSERT ON `machine`
+ FOR EACH ROW
BEGIN
SET NEW.workerFk = vn.getUser();
@@ -35031,12 +35543,13 @@ CREATE TABLE `mail` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`mail_beforeInsert`
-BEFORE INSERT ON `mail` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`mail_beforeInsert`
+ BEFORE INSERT ON `mail`
+ FOR EACH ROW
BEGIN
IF NEW.sender IS NOT NULL THEN
@@ -35094,15 +35607,15 @@ CREATE TABLE `mandate` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`mandate_beforeInsert`
- BEFORE INSERT ON `mandate`
- FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`mandate_beforeInsert`
+ BEFORE INSERT ON `mandate`
+ FOR EACH ROW
BEGIN
IF (NEW.code IS NULL) THEN
SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT
@@ -35398,6 +35911,7 @@ CREATE TABLE `observationType` (
`id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
`description` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
`code` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
+ `hasNewBornMessage` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indica aquellos que deben de recibir un mensaje advirtiendo de un cliente nuevo',
PRIMARY KEY (`id`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -35577,6 +36091,8 @@ CREATE TABLE `packaging` (
`freightItemFk` int(11) DEFAULT NULL,
`hasCompressionVariations` tinyint(1) DEFAULT '0' COMMENT 'Floramondo puede servirlos no llenos del todo',
`conveyorBuildingClassFk` int(11) DEFAULT NULL,
+ `isTrolley` tinyint(1) NOT NULL DEFAULT '0',
+ `isPallet` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `packaging_fk1` (`itemFk`),
KEY `packaging_fk2_idx` (`freightItemFk`),
@@ -35603,6 +36119,32 @@ CREATE TABLE `packagingConfig` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Altura mínima para preparar pedidos en preparacion previa';
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `packagingGifts`
+--
+
+DROP TABLE IF EXISTS `packagingGifts`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `packagingGifts` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `description` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `photo` blob,
+ `started` date NOT NULL,
+ `ended` date NOT NULL,
+ `warehouseFk` smallint(5) unsigned DEFAULT NULL,
+ `provinceFk` smallint(5) unsigned DEFAULT NULL,
+ `countryFk` mediumint(8) unsigned DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `PackagingGifts_FK_2` (`countryFk`),
+ KEY `PackagingGifts_FK` (`provinceFk`),
+ KEY `PackagingGifts_FK_1` (`warehouseFk`),
+ CONSTRAINT `PackagingGifts_FK` FOREIGN KEY (`provinceFk`) REFERENCES `province` (`id`),
+ CONSTRAINT `PackagingGifts_FK_1` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`),
+ CONSTRAINT `PackagingGifts_FK_2` FOREIGN KEY (`countryFk`) REFERENCES `country` (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Temporary table structure for view `packingSite`
--
@@ -35627,20 +36169,41 @@ DROP TABLE IF EXISTS `packingSiteLog`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `packingSiteLog` (
`id` int(11) NOT NULL AUTO_INCREMENT,
- `packingSiteFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `itemPackingTypeFk` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `packingSite` tinyint(3) unsigned DEFAULT NULL,
`hostFk` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
`workerFk` int(10) unsigned NOT NULL,
+ `printerModelFk` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `typeErrorFk` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
`creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
`description` text COLLATE utf8_unicode_ci,
PRIMARY KEY (`id`),
UNIQUE KEY `packingSiteLog_UN` (`id`),
KEY `packingSiteLog_FK` (`workerFk`),
- KEY `packingSiteLog_FK_1` (`packingSiteFk`),
+ KEY `packingSiteLog_FK_3` (`itemPackingTypeFk`),
+ KEY `packingSiteLog_FK_4` (`typeErrorFk`),
+ KEY `packingSiteLog_FK_1` (`printerModelFk`),
CONSTRAINT `packingSiteLog_FK` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`),
- CONSTRAINT `packingSiteLog_FK_1` FOREIGN KEY (`packingSiteFk`) REFERENCES `packingSite__` (`code`)
+ CONSTRAINT `packingSiteLog_FK_1` FOREIGN KEY (`printerModelFk`) REFERENCES `printerModel` (`code`) ON UPDATE CASCADE,
+ CONSTRAINT `packingSiteLog_FK_3` FOREIGN KEY (`itemPackingTypeFk`) REFERENCES `itemPackingType` (`code`) ON UPDATE CASCADE,
+ CONSTRAINT `packingSiteLog_FK_4` FOREIGN KEY (`typeErrorFk`) REFERENCES `packingSiteTypeError` (`code`) ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `packingSiteTypeError`
+--
+
+DROP TABLE IF EXISTS `packingSiteTypeError`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `packingSiteTypeError` (
+ `code` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+ `description` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `packingSite__`
--
@@ -35683,13 +36246,15 @@ CREATE TABLE `parking` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`parking_BEFORE_INSERT` BEFORE INSERT ON `parking` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`parking_BEFORE_INSERT`
+ BEFORE INSERT ON `parking`
+ FOR EACH ROW
BEGIN
-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
@@ -35703,13 +36268,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`parking_BEFORE_UPDATE` BEFORE UPDATE ON `parking` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`parking_BEFORE_UPDATE`
+ BEFORE UPDATE ON `parking`
+ FOR EACH ROW
BEGIN
-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
@@ -35735,6 +36302,34 @@ CREATE TABLE `payDem` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `payDemDetail`
+--
+
+DROP TABLE IF EXISTS `payDemDetail`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `payDemDetail` (
+ `id` tinyint(3) unsigned NOT NULL,
+ `detail` tinyint(3) unsigned NOT NULL,
+ PRIMARY KEY (`id`,`detail`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Temporary table structure for view `payDemDetail__`
+--
+
+DROP TABLE IF EXISTS `payDemDetail__`;
+/*!50001 DROP VIEW IF EXISTS `payDemDetail__`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `payDemDetail__` (
+ `id` tinyint NOT NULL,
+ `detail` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
--
-- Table structure for table `payMethod`
--
@@ -35752,6 +36347,8 @@ CREATE TABLE `payMethod` (
`isIbanRequiredForClients` tinyint(3) DEFAULT '0',
`isIbanRequiredForSuppliers` tinyint(3) DEFAULT '0',
`isNotified` tinyint(3) NOT NULL DEFAULT '1',
+ `hasVerified` tinyint(1) DEFAULT '0',
+ `graceMonthsDisableChecked` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Deshabilita la comprobación de los datos bancarios de todos aquellos proveedores que no hayan recibido un pago en los meses especificados',
PRIMARY KEY (`id`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -35779,6 +36376,7 @@ CREATE TABLE `payment` (
`isConciliated` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
`exchangeInsuranceFk` int(11) DEFAULT NULL,
`dueDated` date DEFAULT NULL,
+ `workerFk` int(10) unsigned DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `empresa_id` (`companyFk`),
KEY `id_banco` (`bankFk`),
@@ -35787,9 +36385,11 @@ CREATE TABLE `payment` (
KEY `fk_pago_pago_sdc1_idx` (`exchangeInsuranceFk`),
KEY `pagoDueDatedIdx` (`dueDated`),
KEY `pago_ibfk_3` (`supplierFk`),
+ KEY `payment_FK` (`workerFk`),
CONSTRAINT `pago_ibfk_3` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
CONSTRAINT `pago_moneda_1` FOREIGN KEY (`currencyFk`) REFERENCES `currency` (`id`) ON UPDATE CASCADE,
CONSTRAINT `pago_pay_met` FOREIGN KEY (`payMethodFk`) REFERENCES `payMethod` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `payment_FK` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`),
CONSTRAINT `payment_ibfk_1` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE,
CONSTRAINT `payment_ibfk_2` FOREIGN KEY (`bankFk`) REFERENCES `bank` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -35803,49 +36403,84 @@ CREATE TABLE `payment` (
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `payment_beforeInsert` BEFORE INSERT ON `payment` FOR EACH ROW
--- Edit trigger body code below this line. Do not edit lines above this one
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `payment_beforeInsert` BEFORE INSERT ON `payment` FOR EACH ROW
BEGIN
DECLARE cuenta_banco,cuenta_proveedor DOUBLE;
DECLARE vNewBookEntry INT;
- DECLARE bolCASH BOOLEAN;
- DECLARE isSupplierActive BOOLEAN;
-
- -- PAK 10/02/15 No se asientan los pagos directamente, salvo en el caso de las cajas de CASH
- SELECT (at2.code = 'cash') INTO bolCASH FROM vn.bank b JOIN vn.accountingType at2 ON at2.id = b.cash WHERE b.id = NEW.bankFk ;
-
- IF bolCASH THEN
-
- SELECT account INTO cuenta_banco
+ DECLARE bolCASH BOOLEAN;
+ DECLARE isSupplierActive BOOLEAN;
+
+ -- PAK 10/02/15 No se asientan los pagos directamente, salvo en el caso de las cajas de CASH
+ SELECT (at2.code = 'cash') INTO bolCASH
+ FROM vn.bank b
+ JOIN vn.accountingType at2 ON at2.id = b.cash
+ WHERE b.id = NEW.bankFk;
+
+ IF bolCASH THEN
+
+ SELECT account INTO cuenta_banco
FROM bank
WHERE id = NEW.bankFk;
- SELECT account INTO cuenta_proveedor
- FROM supplier
+ SELECT account INTO cuenta_proveedor
+ FROM supplier
WHERE id = NEW.supplierFk;
CALL vn.ledger_next(vNewBookEntry);
- INSERT INTO XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id)
- SELECT vNewBookEntry,NEW.received,SUBCTA,CONTRA,NEW.concept,EURODEBE,EUROHABER,NEW.companyFk
- FROM
- ( SELECT cuenta_banco SUBCTA,cuenta_proveedor CONTRA,0 EURODEBE, NEW.amount + NEW.bankingFees EUROHABER
- UNION ALL
- SELECT cuenta_proveedor SUBCTA, cuenta_banco CONTRA,NEW.amount EURODEBE, 0 EUROHABER
- ) gf;
+ INSERT INTO XDiario ( ASIEN,
+ FECHA,
+ SUBCTA,
+ CONTRA,
+ CONCEPTO,
+ EURODEBE,
+ EUROHABER,
+ empresa_id)
+ SELECT vNewBookEntry,
+ NEW.received,
+ SUBCTA,
+ CONTRA,
+ NEW.concept,
+ EURODEBE,
+ EUROHABER,
+ NEW.companyFk
+ FROM ( SELECT cuenta_banco SUBCTA,
+ cuenta_proveedor CONTRA,
+ 0 EURODEBE,
+ NEW.amount + NEW.bankingFees EUROHABER
+ UNION ALL
+ SELECT cuenta_proveedor SUBCTA,
+ cuenta_banco CONTRA,
+ NEW.amount EURODEBE,
+ 0 EUROHABER) gf;
IF NEW.bankingFees <> 0 THEN
- INSERT INTO XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id)
- SELECT vNewBookEntry,NEW.received,IF(c.id = 1,6260000002,IF(CEE = 1,6260000003,6260000004)),cuenta_banco,NEW.concept,NEW.bankingFees,0,NEW.companyFk
- FROM supplier s
- JOIN country c ON s.countryFk = c.id
+ INSERT INTO XDiario ( ASIEN,
+ FECHA,
+ SUBCTA,
+ CONTRA,
+ CONCEPTO,
+ EURODEBE,
+ EUROHABER,
+ empresa_id)
+ SELECT vNewBookEntry,
+ NEW.received,
+ IF(c.id = 1,6260000002,
+ IF(CEE = 1,6260000003,6260000004)),
+ cuenta_banco,
+ NEW.concept,
+ NEW.bankingFees,
+ 0,
+ NEW.companyFk
+ FROM supplier s
+ JOIN country c ON s.countryFk = c.id
WHERE s.id = NEW.supplierFk;
END IF;
END IF;
-
- SET NEW.dueDated = IFNULL(NEW.dueDated, NEW.received);
-
- SELECT isActive INTO isSupplierActive
+
+ SET NEW.dueDated = IFNULL(NEW.dueDated, NEW.received);
+
+ SELECT isActive INTO isSupplierActive
FROM supplier
WHERE id = NEW.supplierFk;
@@ -35853,12 +36488,82 @@ BEGIN
CALL util.throw('SUPPLIER_INACTIVE');
END IF;
+ IF ISNULL(NEW.workerFk) THEN
+ SET NEW.workerFk = account.myUser_getId();
+ END IF;
+
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`payment_afterInsert`
+ AFTER INSERT ON `payment`
+ FOR EACH ROW
+BEGIN
+ DECLARE vIsPayMethodChecked BOOLEAN;
+ DECLARE vEmail VARCHAR(150);
+
+ SELECT isPayMethodChecked INTO vIsPayMethodChecked
+ FROM supplier
+ WHERE id = NEW.supplierFk;
+
+
+ IF vIsPayMethodChecked = FALSE THEN
+
+ SELECT notificationEmail INTO vEmail
+ FROM department
+ WHERE name = 'FINANZAS';
+
+ CALL mail_insert(
+ vEmail,
+ NULL,
+ 'Pago con método sin verificar',
+ CONCAT(
+ 'Se ha realizado el pago ',
+ NEW.id,
+ ' al proveedor ',
+ NEW.supplierFk,
+ ' con el método de pago sin verificar.'
+ )
+ );
+ END IF;
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER payment_beforeUpdate BEFORE UPDATE ON payment FOR EACH ROW
+BEGIN
+ IF ISNULL(NEW.workerFk) THEN
+ SET NEW.workerFk = account.myUser_getId();
+ END IF;
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
--
-- Temporary table structure for view `payment__`
@@ -36110,12 +36815,13 @@ CREATE TABLE `postCode` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`postCode_beforeInsert`
- BEFORE INSERT ON `postCode` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`postCode_beforeInsert`
+ BEFORE INSERT ON `postCode`
+ FOR EACH ROW
BEGIN
SET NEW.geoFk = zoneGeo_new('postCode', NEW.`code`,
(SELECT geoFk FROM town WHERE id = NEW.townFk));
@@ -36130,12 +36836,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `postCode_beforeUpdate`
- BEFORE UPDATE ON `postCode` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`postCode_beforeUpdate`
+ BEFORE UPDATE ON `postCode`
+ FOR EACH ROW
BEGIN
-- IF !(OLD.geoFk <=> NEW.geoFk) THEN
-- CALL zoneGeo_throwNotEditable;
@@ -36151,12 +36858,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`postCode_afterUpdate`
- AFTER UPDATE ON `postCode` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`postCode_afterUpdate`
+ AFTER UPDATE ON `postCode`
+ FOR EACH ROW
BEGIN
IF !(OLD.townFk <=> NEW.townFk) THEN
CALL zoneGeo_setParent(NEW.geoFk,
@@ -36178,12 +36886,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`postCode_afterDelete`
- AFTER DELETE ON `postCode` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`postCode_afterDelete`
+ AFTER DELETE ON `postCode`
+ FOR EACH ROW
BEGIN
CALL zoneGeo_delete(OLD.geoFk);
END */;;
@@ -36344,13 +37053,14 @@ CREATE TABLE `priceFixed` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`priceFixed_beforeInsert` BEFORE INSERT ON `vn`.`priceFixed`
- FOR EACH ROW
- BEGIN
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`priceFixed_beforeInsert`
+ BEFORE INSERT ON `priceFixed`
+ FOR EACH ROW
+BEGIN
DECLARE vDated DATE;
IF NEW.started > NEW.ended THEN
SET vDated = NEW.started;
@@ -36368,12 +37078,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`priceFixed_beforeUpdate` BEFORE UPDATE ON `vn`.`priceFixed`
- FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`priceFixed_beforeUpdate`
+ BEFORE UPDATE ON `priceFixed`
+ FOR EACH ROW
BEGIN
DECLARE vDated DATE;
IF NEW.started > NEW.ended THEN
@@ -36453,6 +37164,19 @@ CREATE TABLE `printServerQueue2` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `printerModel`
+--
+
+DROP TABLE IF EXISTS `printerModel`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `printerModel` (
+ `code` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Temporary table structure for view `printer__`
--
@@ -36503,6 +37227,24 @@ CREATE TABLE `producer` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `productionConfig`
+--
+
+DROP TABLE IF EXISTS `productionConfig`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `productionConfig` (
+ `isPreviousPreparationRequired` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Impide que los sacadores reciban tickets que tengan productos de prep previa',
+ `ticketPrintedMax` int(10) unsigned NOT NULL DEFAULT '8' COMMENT 'numero máxido de tickets por carro que se ponen en impreso al pedir colección',
+ `ticketTrolleyMax` int(10) unsigned NOT NULL DEFAULT '4' COMMENT 'numero máximo de tickets por carro para asignar baldas en una colección',
+ `rookieDays` int(11) NOT NULL DEFAULT '3' COMMENT 'dias en que se cuida con especial cuidado los pedidos de un cliente por ser nuevo o recuperado',
+ `notBuyingMonths` int(11) NOT NULL DEFAULT '3' COMMENT 'numero de meses que han de pasar desde su ultima compra para considerar nueva la siguiente compra',
+ `id` int(11) NOT NULL DEFAULT '1',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Recoge los parámetros que condicionan la producción';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Temporary table structure for view `productionVolume`
--
@@ -36584,6 +37326,175 @@ CREATE TABLE `profileType` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `project`
+--
+
+DROP TABLE IF EXISTS `project`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `project` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `name` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+ `photo` blob,
+ `started` date DEFAULT NULL,
+ `finished` date DEFAULT NULL,
+ `userFk` int(11) unsigned NOT NULL,
+ `departmentFk` int(11) DEFAULT NULL,
+ `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
+ `location` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `amount` decimal(15,2) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `project_FK` (`userFk`),
+ KEY `project_FK_1` (`departmentFk`),
+ KEY `project_FK_2` (`companyFk`),
+ CONSTRAINT `project_FK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `project_FK_1` FOREIGN KEY (`departmentFk`) REFERENCES `department` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `project_FK_2` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tabla master de proyectos';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `projectNotes`
+--
+
+DROP TABLE IF EXISTS `projectNotes`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `projectNotes` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `txt` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ `projectFk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `projectNotes_FK` (`projectFk`),
+ KEY `projectNotes_FK_1` (`userFk`),
+ CONSTRAINT `projectNotes_FK` FOREIGN KEY (`projectFk`) REFERENCES `project` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `projectNotes_FK_1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Historico de notas para project';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER projectNotes_BeforeInsert
+BEFORE INSERT
+ON projectNotes FOR EACH ROW
+BEGIN
+
+ IF ISNULL(NEW.userFk) THEN
+
+ SET NEW.userFk = account.myUser_getId();
+
+ END IF;
+
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+
+--
+-- Table structure for table `property`
+--
+
+DROP TABLE IF EXISTS `property`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `property` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(250) COLLATE utf8_unicode_ci NOT NULL,
+ `cadaster` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `smallholding` int(11) DEFAULT NULL,
+ `area` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `townFk` int(11) NOT NULL,
+ `registry` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `volume` int(11) DEFAULT NULL,
+ `book` int(11) DEFAULT NULL,
+ `page` int(11) DEFAULT NULL,
+ `farm` int(11) DEFAULT NULL,
+ `registration` int(11) DEFAULT NULL,
+ `value` int(11) DEFAULT NULL,
+ `propertyGroupFk` int(11) NOT NULL,
+ `companyFk` smallint(5) unsigned NOT NULL,
+ `photo` blob,
+ `allocation` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `m2` decimal(10,2) DEFAULT NULL,
+ `tome` int(11) DEFAULT NULL,
+ `url` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `protocol` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'numero de protocolo notarial de la escritura de compra venta',
+ PRIMARY KEY (`id`),
+ KEY `property_FK` (`propertyGroupFk`),
+ KEY `property_FK_1` (`townFk`),
+ KEY `property_company` (`companyFk`),
+ CONSTRAINT `property_FK` FOREIGN KEY (`propertyGroupFk`) REFERENCES `propertyGroup` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `property_FK_1` FOREIGN KEY (`townFk`) REFERENCES `town` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `property_company` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `propertyDms`
+--
+
+DROP TABLE IF EXISTS `propertyDms`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `propertyDms` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `dmsFk` int(11) NOT NULL,
+ `propertyFk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `propertyDms_FK` (`dmsFk`),
+ KEY `propertyDms_FK_1` (`propertyFk`),
+ CONSTRAINT `propertyDms_FK` FOREIGN KEY (`dmsFk`) REFERENCES `dms` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `propertyDms_FK_1` FOREIGN KEY (`propertyFk`) REFERENCES `property` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `propertyGroup`
+--
+
+DROP TABLE IF EXISTS `propertyGroup`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `propertyGroup` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `description` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `propertyNotes`
+--
+
+DROP TABLE IF EXISTS `propertyNotes`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `propertyNotes` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `propertyFk` int(10) unsigned NOT NULL,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `note` text COLLATE utf8_unicode_ci NOT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `propertyNotes_FK_1` (`userFk`),
+ KEY `propertyNotes_FK` (`propertyFk`),
+ CONSTRAINT `propertyNotes_FK` FOREIGN KEY (`propertyFk`) REFERENCES `account`.`user` (`id`),
+ CONSTRAINT `propertyNotes_FK_1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `province`
--
@@ -36613,14 +37524,15 @@ CREATE TABLE `province` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`province_beforeInsert`
- BEFORE INSERT ON `province` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`province_beforeInsert`
+ BEFORE INSERT ON `province`
+ FOR EACH ROW
BEGIN
SET NEW.geoFk = zoneGeo_new('province', NEW.`name`,
@@ -36637,15 +37549,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER province_beforeUpdate
-BEFORE UPDATE
-ON province FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`province_beforeUpdate`
+ BEFORE UPDATE ON `province`
+ FOR EACH ROW
BEGIN
IF !(OLD.autonomyFk <=> NEW.autonomyFk) THEN
@@ -36663,24 +37575,25 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`province_afterUpdate`
- AFTER UPDATE ON `province` FOR EACH ROW
-BEGIN
- IF !(OLD.autonomyFk <=> NEW.autonomyFk) THEN
- CALL zoneGeo_setParent(NEW.geoFk,
- (SELECT geoFk FROM autonomy WHERE id = NEW.autonomyFk));
- END IF;
-
- IF !(OLD.`name` <=> NEW.`name`) THEN
- UPDATE zoneGeo SET `name` = NEW.`name`
- WHERE id = NEW.geoFk;
- END IF;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`province_afterUpdate`
+ AFTER UPDATE ON `province`
+ FOR EACH ROW
+BEGIN
+ IF !(OLD.autonomyFk <=> NEW.autonomyFk) THEN
+ CALL zoneGeo_setParent(NEW.geoFk,
+ (SELECT geoFk FROM autonomy WHERE id = NEW.autonomyFk));
+ END IF;
+
+ IF !(OLD.`name` <=> NEW.`name`) THEN
+ UPDATE zoneGeo SET `name` = NEW.`name`
+ WHERE id = NEW.geoFk;
+ END IF;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -36692,12 +37605,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`province_afterDelete`
- AFTER DELETE ON `province` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`province_afterDelete`
+ AFTER DELETE ON `province`
+ FOR EACH ROW
BEGIN
CALL zoneGeo_delete(OLD.geoFk);
END */;;
@@ -36873,26 +37787,26 @@ CREATE TABLE `receipt` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER vn.receipt_beforeInsert
-BEFORE INSERT
-ON receipt FOR EACH ROW
-BEGIN
- DECLARE vIsAutoConciliated BOOLEAN;
-
- IF NEW.isConciliate = FALSE THEN
- SELECT isAutoConciliated INTO vIsAutoConciliated
- FROM accounting a
- JOIN accountingType at2 ON at2.id = a.accountingTypeFk
- WHERE a.id = NEW.bankFk;
-
- SET NEW.isConciliate = vIsAutoConciliated;
- END IF;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`receipt_beforeInsert`
+ BEFORE INSERT ON `receipt`
+ FOR EACH ROW
+BEGIN
+ DECLARE vIsAutoConciliated BOOLEAN;
+
+ IF NEW.isConciliate = FALSE THEN
+ SELECT isAutoConciliated INTO vIsAutoConciliated
+ FROM accounting a
+ JOIN accountingType at2 ON at2.id = a.accountingTypeFk
+ WHERE a.id = NEW.bankFk;
+
+ SET NEW.isConciliate = vIsAutoConciliated;
+ END IF;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -36902,14 +37816,16 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_afterInsert` AFTER INSERT ON `receipt` FOR EACH ROW
- CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid) */;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`receipt_afterInsert`
+ AFTER INSERT ON `receipt`
+ FOR EACH ROW
+CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid) */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -36918,13 +37834,16 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_beforeUpdate` BEFORE UPDATE ON `receipt` FOR EACH ROW BEGIN
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`receipt_beforeUpdate`
+ BEFORE UPDATE ON `receipt`
+ FOR EACH ROW
+BEGIN
CALL clientRisk_update(OLD.clientFk, OLD.companyFk, OLD.amountPaid);
CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid);
SET NEW.workerFk = account.myUser_getId();
@@ -36939,20 +37858,22 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_afterUpdate` AFTER UPDATE ON `receipt` FOR EACH ROW
-BEGIN
- IF NEW.isConciliate = FALSE AND NEW.payed > OLD.payed THEN
- CALL mail_insert(
- 'finanzas@verdnatura.es',
- NULL,
- CONCAT('Cambios de recibos del cliente: ', NEW.clientFk),
- CONCAT('Se ha cambiado el recibo: ', NEW.Id, ' de ', OLD.payed, ' a ', NEW.payed)
- );
- END IF;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`receipt_afterUpdate`
+ AFTER UPDATE ON `receipt`
+ FOR EACH ROW
+BEGIN
+ IF NEW.isConciliate = FALSE AND NEW.payed > OLD.payed THEN
+ CALL mail_insert(
+ 'finanzas@verdnatura.es',
+ NULL,
+ CONCAT('Cambios de recibos del cliente: ', NEW.clientFk),
+ CONCAT('Se ha cambiado el recibo: ', NEW.Id, ' de ', OLD.payed, ' a ', NEW.payed)
+ );
+ END IF;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -36962,14 +37883,16 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_beforeDelete` BEFORE DELETE ON `receipt` FOR EACH ROW
- CALL clientRisk_update(OLD.clientFk, OLD.companyFk, OLD.amountPaid) */;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`receipt_beforeDelete`
+ BEFORE DELETE ON `receipt`
+ FOR EACH ROW
+CALL clientRisk_update(OLD.clientFk, OLD.companyFk, OLD.amountPaid) */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -37147,13 +38070,15 @@ CREATE TABLE `route` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`route_AFTER_INSERT` AFTER INSERT ON `route` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`route_AFTER_INSERT`
+ AFTER INSERT ON `route`
+ FOR EACH ROW
BEGIN
IF NEW.kmEnd < NEW.kmStart AND NEW.kmEnd <> 0 THEN
CALL util.throw ('KmEnd menor que kmStart');
@@ -37167,14 +38092,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`route_beforeUpdate`
- BEFORE UPDATE ON `route` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`route_beforeUpdate`
+ BEFORE UPDATE ON `route`
+ FOR EACH ROW
BEGIN
IF NEW.isOk <> FALSE AND OLD.isOk = FALSE THEN
SET NEW.m3 = ( SELECT SUM(litros)/1000
@@ -37197,12 +38123,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`route_afterUpdate`
- AFTER UPDATE ON `route` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`route_afterUpdate`
+ AFTER UPDATE ON `route`
+ FOR EACH ROW
BEGIN
IF IFNULL(NEW.gestdocFk,0) <> IFNULL(OLD.gestdocFk,0) AND NEW.gestdocFk > 0 THEN
-- JGF 09/09/14 cuando se añade un gestdoc a una ruta, se le asigna automagicamente a todos sus Tickets
@@ -37325,15 +38252,15 @@ CREATE TABLE `routeGate` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`routeGateBeforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`routeGateBeforeUpdate`
BEFORE UPDATE ON `routeGate`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
IF (NOT (NEW.expeditions <=> OLD.expeditions)
OR NOT (NEW.scanned <=> OLD.scanned))
@@ -37494,16 +38421,15 @@ CREATE TABLE `sale` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER sale_afterInsert
- AFTER INSERT
- ON sale
- FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_afterInsert`
+ AFTER INSERT ON `sale`
+ FOR EACH ROW
BEGIN
IF (SELECT COUNT(*) from item i WHERE id = NEW.itemFk AND family = 'SER') THEN
@@ -37544,14 +38470,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER sale_beforeUpdate
- BEFORE UPDATE
- ON sale
- FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_beforeUpdate`
+ BEFORE UPDATE ON `sale`
+ FOR EACH ROW
BEGIN
/*
IF (SELECT COUNT(*) from item i WHERE id = NEW.itemFk AND family = 'SER') THEN
@@ -37576,15 +38501,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `sale_afterUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_afterUpdate`
AFTER UPDATE ON `sale`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
DECLARE vIsToSendMail BOOL;
DECLARE vPickedLines INT;
@@ -37630,7 +38555,7 @@ BEGIN
CALL vn.mail_insert('jefesventas@verdnatura.es',
'noreply@verdnatura.es',
CONCAT('Ticket ', OLD.ticketFk ,' modificada cantidad tras encajado'),
- CONCAT('Ticket ', OLD.ticketFk ,'.
',
+ CONCAT('Ticket ', OLD.ticketFk ,'.
',
'Modificada la catidad de ', OLD.quantity, ' a ' , NEW.quantity,
' del artículo ', OLD.itemFk, ' tras estado encajado del ticket.
',
'Este email se ha generado automáticamente' )
@@ -37681,13 +38606,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`sale_BEFORE_DELETE` BEFORE DELETE ON `sale` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_BEFORE_DELETE`
+ BEFORE DELETE ON `sale`
+ FOR EACH ROW
BEGIN
IF OLD.quantity > 0 THEN
INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`)
@@ -37711,13 +38638,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `sale_afterDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_afterDelete`
AFTER DELETE ON `sale`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
DECLARE vIsToSendMail BOOL;
DECLARE vUserRole VARCHAR(255);
@@ -37740,7 +38667,7 @@ BEGIN
CALL vn.mail_insert('jefesventas@verdnatura.es',
'noreply@verdnatura.es',
CONCAT('Ticket ', OLD.ticketFk ,' eliminado artículo tras encajado' ),
- CONCAT('Ticket ', OLD.ticketFk ,'.
',
+ CONCAT('Ticket ', OLD.ticketFk ,'.
',
'Eliminado artículo ', OLD.itemFk, ' tras estado encajado del ticket.
Este email se ha generado automáticamente' )
);
END IF;
@@ -37774,7 +38701,7 @@ CREATE TABLE `saleBuy` (
`saleFk` int(11) NOT NULL,
`buyFk` int(11) NOT NULL,
`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `workerFk` int(11) NOT NULL,
+ `workerFk` int(11) DEFAULT NULL,
PRIMARY KEY (`saleFk`),
KEY `saleBuy_FK` (`buyFk`),
CONSTRAINT `saleBuy_FK` FOREIGN KEY (`buyFk`) REFERENCES `buy` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -37784,17 +38711,16 @@ CREATE TABLE `saleBuy` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER BEFORE_INSERT
-BEFORE INSERT
-ON saleBuy FOR EACH ROW
-
- BEGIN
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`BEFORE_INSERT`
+ BEFORE INSERT ON `saleBuy`
+ FOR EACH ROW
+BEGIN
SET NEW.workerFk = vn.getUser();
@@ -37807,15 +38733,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER saleBuy_AI
-AFTER INSERT
-ON saleBuy FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleBuy_AI`
+ AFTER INSERT ON `saleBuy`
+ FOR EACH ROW
BEGIN
/* Activar de nuevo cuando volvamos a vender fruta y verdura
*
@@ -38078,6 +39004,19 @@ CREATE TABLE `saleParking__` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='ubica las lineas de venta preparadas previamente';
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Temporary table structure for view `saleSaleTracking`
+--
+
+DROP TABLE IF EXISTS `saleSaleTracking`;
+/*!50001 DROP VIEW IF EXISTS `saleSaleTracking`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `saleSaleTracking` (
+ `saleFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
--
-- Table structure for table `saleState`
--
@@ -38108,18 +39047,17 @@ CREATE TABLE `saleTracking` (
`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`originalQuantity` double DEFAULT NULL,
`workerFk` int(11) NOT NULL,
- `actionFk` int(11) DEFAULT NULL,
+ `actionFk` int(11) NOT NULL,
`id` int(11) NOT NULL AUTO_INCREMENT,
`stateFk` tinyint(3) unsigned NOT NULL,
PRIMARY KEY (`id`),
- UNIQUE KEY `stateFk_UNIQUE` (`stateFk`,`saleFk`),
+ UNIQUE KEY `saleTracking_UN` (`saleFk`,`workerFk`,`actionFk`,`stateFk`),
KEY `Id_Movimiento` (`saleFk`),
KEY `fgnStateFk_idx` (`stateFk`),
KEY `saleTracking_idx5` (`created`),
KEY `saleTracking_fk2_idx` (`actionFk`),
CONSTRAINT `fgnStateFk` FOREIGN KEY (`stateFk`) REFERENCES `state` (`id`) ON UPDATE CASCADE,
- CONSTRAINT `saleTracking_FK` FOREIGN KEY (`saleFk`) REFERENCES `sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
- CONSTRAINT `saleTracking_FK_1` FOREIGN KEY (`actionFk`) REFERENCES `vncontrol`.`accion` (`accion_id`) ON UPDATE CASCADE
+ CONSTRAINT `saleTracking_FK` FOREIGN KEY (`saleFk`) REFERENCES `sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
@@ -38127,11 +39065,13 @@ CREATE TABLE `saleTracking` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`saleTracking_beforeInsert` BEFORE INSERT ON `saleTracking` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleTracking_beforeInsert`
+ BEFORE INSERT ON `saleTracking`
+ FOR EACH ROW
BEGIN
IF(NEW.stateFk = 14) THEN
SET NEW.actionFk = 3;
@@ -38152,13 +39092,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER saleTracking_After_Insert
-AFTER INSERT
-ON saleTracking FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleTracking_After_Insert`
+ AFTER INSERT ON `saleTracking`
+ FOR EACH ROW
BEGIN
IF NEW.isChecked THEN
@@ -38225,7 +39165,8 @@ SET character_set_client = utf8;
`zoneFk` tinyint NOT NULL,
`clientFk` tinyint NOT NULL,
`isPicked` tinyint NOT NULL,
- `eurosValue` tinyint NOT NULL
+ `eurosValue` tinyint NOT NULL,
+ `itemPackingTypeFk` tinyint NOT NULL
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
@@ -38415,6 +39356,46 @@ CREATE TABLE `sector` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `sectorCollection`
+--
+
+DROP TABLE IF EXISTS `sectorCollection`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sectorCollection` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `userFk` int(10) unsigned NOT NULL,
+ `sectorFk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `sectorCollection_FK` (`userFk`),
+ KEY `sectorCollection_FK_2` (`sectorFk`),
+ CONSTRAINT `sectorCollection_FK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `sectorCollection_FK_1` FOREIGN KEY (`sectorFk`) REFERENCES `sector` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Las lineas de preparacion de pedidos por sectores se agrupan bajo el identificador de esta tabla';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `sectorCollectionSaleGroup`
+--
+
+DROP TABLE IF EXISTS `sectorCollectionSaleGroup`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sectorCollectionSaleGroup` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `sectorCollectionFk` int(11) NOT NULL,
+ `saleGroupFk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `sectorCollectionSaleGroup_UN` (`sectorCollectionFk`,`saleGroupFk`),
+ KEY `sectorCollectionSaleGroup_FK_1` (`saleGroupFk`),
+ CONSTRAINT `sectorCollectionSaleGroup_FK` FOREIGN KEY (`sectorCollectionFk`) REFERENCES `sectorCollection` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `sectorCollectionSaleGroup_FK_1` FOREIGN KEY (`saleGroupFk`) REFERENCES `saleGroup` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona las lineas de venta con la coleccion del sector';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `sectorProductivity`
--
@@ -38430,6 +39411,7 @@ CREATE TABLE `sectorProductivity` (
`sector` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`ticketCount` int(11) DEFAULT NULL,
`saleCount` int(11) DEFAULT NULL,
+ `error` int(11) DEFAULT NULL,
`volume` decimal(10,6) DEFAULT NULL,
`hourWorked` decimal(10,2) DEFAULT NULL,
`dated` date DEFAULT NULL,
@@ -38463,11 +39445,13 @@ CREATE TABLE `sharingCart` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`sharingCart_beforeInsert` BEFORE INSERT ON `sharingCart` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sharingCart_beforeInsert`
+ BEFORE INSERT ON `sharingCart`
+ FOR EACH ROW
BEGIN
IF NEW.workerFk = NEW.workerSubstitute THEN
CALL util.throw ('worker and workerSubstitute must be different');
@@ -38488,11 +39472,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`sharingCart_beforeUpdate` BEFORE UPDATE ON `sharingCart` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sharingCart_beforeUpdate`
+ BEFORE UPDATE ON `sharingCart`
+ FOR EACH ROW
BEGIN
IF NEW.workerFk = NEW.workerSubstitute THEN
CALL util.throw ('worker and workerSubstitute must be different');
@@ -38519,11 +39505,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`sharingCart_beforeDelete` BEFORE DELETE ON `sharingCart` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sharingCart_beforeDelete`
+ BEFORE DELETE ON `sharingCart`
+ FOR EACH ROW
BEGIN
DELETE sc FROM sharingCartDaily sc
WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND
@@ -38582,11 +39570,13 @@ CREATE TABLE `sharingClient` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`sharingClient_beforeInsert` BEFORE INSERT ON `sharingClient` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sharingClient_beforeInsert`
+ BEFORE INSERT ON `sharingClient`
+ FOR EACH ROW
BEGIN
SET NEW.ended = GREATEST(CURDATE(),NEW.ended);
SET NEW.started = GREATEST(CURDATE(),NEW.started);
@@ -38601,11 +39591,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`sharingClient_beforeUpdate` BEFORE UPDATE ON `sharingClient` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sharingClient_beforeUpdate`
+ BEFORE UPDATE ON `sharingClient`
+ FOR EACH ROW
BEGIN
SET NEW.ended = GREATEST(CURDATE(),NEW.ended);
SET NEW.started = GREATEST(CURDATE(),NEW.started);
@@ -38631,6 +39623,7 @@ CREATE TABLE `shelving` (
`parked` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`userFk` int(10) unsigned DEFAULT NULL,
`isSpam` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'señala las matrículas con producto que se puede llevar a la reserva',
+ `isRecyclable` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'las matrículas marcadas como reciclables se liberan cada noche desde vn.shelving_clean para poder volver a utilizarlas',
PRIMARY KEY (`code`),
KEY `shelving_fk1_idx` (`parkingFk`),
KEY `shelving_fk2_idx` (`userFk`),
@@ -38643,12 +39636,13 @@ CREATE TABLE `shelving` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER shelving_beforeInsert BEFORE INSERT ON shelving FOR EACH ROW
-
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`shelving_beforeInsert`
+ BEFORE INSERT ON `shelving`
+ FOR EACH ROW
BEGIN
IF NEW.code = "" THEN
@@ -38668,11 +39662,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`shelving_BEFORE_UPDATE` BEFORE UPDATE ON `shelving` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`shelving_BEFORE_UPDATE`
+ BEFORE UPDATE ON `shelving`
+ FOR EACH ROW
BEGIN
IF OLD.parkingFk != NEW.parkingFk THEN
@@ -38829,8 +39825,8 @@ CREATE TABLE `sms` (
`sender` varchar(15) CHARACTER SET utf8 NOT NULL DEFAULT '693474205',
`destination` varchar(15) CHARACTER SET utf8 NOT NULL,
`message` varchar(160) COLLATE utf8_unicode_ci NOT NULL,
- `statusCode` smallint(9) NOT NULL DEFAULT '0',
- `status` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `statusCode` smallint(9) DEFAULT '0',
+ `status` varchar(255) COLLATE utf8_unicode_ci DEFAULT 'OK',
`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -38846,9 +39842,10 @@ DROP TABLE IF EXISTS `smsConfig`;
CREATE TABLE `smsConfig` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uri` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
- `user` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
- `password` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+ `user__` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+ `password__` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
`title` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+ `apiKey` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='SMS configuration parameters';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -38870,17 +39867,18 @@ CREATE TABLE `solunionCAP` (
CONSTRAINT `solunionCAP` FOREIGN KEY (`creditInsurance`) REFERENCES `creditInsurance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`solunionCAP_AFTER_INSERT` AFTER INSERT ON `solunionCAP` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_AFTER_INSERT`
+ AFTER INSERT ON `solunionCAP`
+ FOR EACH ROW
BEGIN
UPDATE vn2008.Clientes c
JOIN creditClassification cc ON c.Id_Cliente = cc.client
@@ -38892,18 +39890,18 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`solunionCAP_AFTER_UPDATE` AFTER UPDATE ON `solunionCAP` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_AFTER_UPDATE`
+ AFTER UPDATE ON `solunionCAP`
+ FOR EACH ROW
BEGIN
IF NEW.dateLeaving IS NOT NULL THEN
UPDATE vn2008.Clientes c
@@ -38922,18 +39920,18 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`solunionCAP_BEFORE_DELETE` BEFORE DELETE ON `solunionCAP` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_BEFORE_DELETE`
+ BEFORE DELETE ON `solunionCAP`
+ FOR EACH ROW
BEGIN
UPDATE vn2008.Clientes c
JOIN creditClassification cc ON c.Id_Cliente = cc.client
@@ -38945,7 +39943,6 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
--
-- Table structure for table `sorter`
@@ -39014,13 +40011,15 @@ CREATE TABLE `specie` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`specie_BEFORE_INSERT` BEFORE INSERT ON `specie` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`specie_BEFORE_INSERT`
+ BEFORE INSERT ON `specie`
+ FOR EACH ROW
BEGIN
SET NEW.name = LCASE(NEW.name);
END */;;
@@ -39032,13 +40031,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`specie_BEFORE_UPDATE` BEFORE UPDATE ON `specie` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`specie_BEFORE_UPDATE`
+ BEFORE UPDATE ON `specie`
+ FOR EACH ROW
BEGIN
SET NEW.name = LCASE(NEW.name);
END */;;
@@ -39223,6 +40224,42 @@ CREATE TABLE `supplier` (
CONSTRAINT `suppplier_supplierActivityFk` FOREIGN KEY (`supplierActivityFk`) REFERENCES `supplierActivity` (`code`) ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplier_beforeUpdate`
+ BEFORE UPDATE ON `supplier`
+ FOR EACH ROW
+BEGIN
+ DECLARE vHasChange BOOL DEFAULT FALSE;
+ DECLARE vPayMethodHasVerified BOOL;
+
+ SELECT hasVerified INTO vPayMethodHasVerified
+ FROM payMethod
+ WHERE id = NEW.payMethodFk;
+
+ SET vHasChange = (NEW.payDemFk <> OLD.payDemFk) OR (NEW.payDay <> OLD.payDay);
+
+ IF vPayMethodHasVerified AND !vHasChange THEN
+ SET vHasChange = (NEW.payMethodFk <> OLD.payMethodFk);
+ END IF;
+
+ IF vHasChange THEN
+ SET NEW.isPayMethodChecked = FALSE;
+ END IF;
+
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
--
-- Table structure for table `supplierAccount`
@@ -39449,13 +40486,15 @@ CREATE TABLE `tag` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`tag_BEFORE_INSERT` BEFORE INSERT ON `tag` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`tag_BEFORE_INSERT`
+ BEFORE INSERT ON `tag`
+ FOR EACH ROW
BEGIN
IF NEW.ediTypeFk IS NULL AND (SELECT COUNT(*) FROM tag WHERE `name` = NEW.`name`) THEN
CALL util.throw('name duplicated');
@@ -39711,23 +40750,24 @@ CREATE TABLE `ticket` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `ticket_afterInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_afterInsert`
AFTER INSERT ON `ticket`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
+
DECLARE vClientType VARCHAR(255);
DECLARE vStateCode VARCHAR(255);
- DECLARE vTransferorFirstShipped DATE;
+ DECLARE vTransferorFirstShipped DATE;
-- Borrar cuando se cambie el insert ticket en la APP móvil
- SELECT typeFk INTO vClientType
+ SELECT typeFk INTO vClientType
FROM vn.`client` WHERE id = NEW.clientFk;
IF vClientType = 'loses' THEN
@@ -39740,17 +40780,19 @@ BEGIN
SELECT NEW.id, id, account.myUser_getId()
FROM state
WHERE `code` = vStateCode COLLATE utf8_general_ci;
-
- IF YEAR(NEW.shipped) > 2000 THEN
+
+ IF YEAR(NEW.shipped) > 2000 THEN
+
SELECT cnb.firstShipped INTO vTransferorFirstShipped
FROM bs.clientNewBorn cnb
JOIN `client` c ON c.transferorFk = cnb.clientFk
- WHERE c.id = NEW.clientFk;
-
+ WHERE c.id = NEW.clientFk;
+
INSERT INTO bs.clientNewBorn(clientFk, firstShipped, lastShipped)
VALUES(NEW.clientFk, IFNULL(vTransferorFirstShipped, CURDATE()), CURDATE())
ON DUPLICATE KEY UPDATE lastShipped = CURDATE();
- END IF;
+
+ END IF;
END */;;
DELIMITER ;
@@ -39763,13 +40805,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `ticket_beforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_beforeUpdate`
BEFORE UPDATE ON `ticket`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
DECLARE vNewTime TIME;
@@ -39849,13 +40891,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER vn.`ticket_afterUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_afterUpdate`
AFTER UPDATE ON `ticket`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
IF !(NEW.id <=> OLD.id)
@@ -39889,15 +40931,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `ticket_beforeDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_beforeDelete`
BEFORE DELETE ON `ticket`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`)
SELECT r.id
@@ -39954,31 +40996,31 @@ CREATE TABLE `ticketCollection` (
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER ticketCollection_afterDelete
-AFTER DELETE
-ON ticketCollection FOR EACH ROW
-BEGIN
-
- DECLARE vSalesRemaining INT;
-
- SELECT count(*) INTO vSalesRemaining
- FROM vn.ticketCollection tc
- JOIN sale s ON s.ticketFk = tc.ticketFk
- WHERE collectionFk = OLD.collectionFk
- AND tc.id != OLD.id;
-
- IF NOT vSalesRemaining THEN
-
- DELETE FROM vn.collection WHERE id = OLD.collectionFk;
-
- ELSE
-
- UPDATE vn.collection
- SET saleTotalCount = vSalesRemaining
- WHERE id = OLD.collectionFk;
-
- END IF;
-
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER ticketCollection_afterDelete
+AFTER DELETE
+ON ticketCollection FOR EACH ROW
+BEGIN
+
+ DECLARE vSalesRemaining INT;
+
+ SELECT count(*) INTO vSalesRemaining
+ FROM vn.ticketCollection tc
+ JOIN sale s ON s.ticketFk = tc.ticketFk
+ WHERE collectionFk = OLD.collectionFk
+ AND tc.id != OLD.id;
+
+ IF NOT vSalesRemaining THEN
+
+ DELETE FROM vn.collection WHERE id = OLD.collectionFk;
+
+ ELSE
+
+ UPDATE vn.collection
+ SET saleTotalCount = vSalesRemaining
+ WHERE id = OLD.collectionFk;
+
+ END IF;
+
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -40022,11 +41064,13 @@ CREATE TABLE `ticketDms` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`ticketDms_beforeDelete` BEFORE DELETE ON `ticketDms` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketDms_beforeDelete`
+ BEFORE DELETE ON `ticketDms`
+ FOR EACH ROW
BEGIN
UPDATE dms
SET dmsTypeFk = (SELECT id
@@ -40314,11 +41358,13 @@ CREATE TABLE `ticketPackaging` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`ticketPackaging_BEFORE_INSERT` BEFORE INSERT ON `ticketPackaging` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketPackaging_BEFORE_INSERT`
+ BEFORE INSERT ON `ticketPackaging`
+ FOR EACH ROW
BEGIN
SET NEW.workerFk = account.myUser_getId();
@@ -40370,7 +41416,8 @@ SET character_set_client = utf8;
`itemFk` tinyint NOT NULL,
`concept` tinyint NOT NULL,
`quantity` tinyint NOT NULL,
- `litros` tinyint NOT NULL
+ `litros` tinyint NOT NULL,
+ `observaciones` tinyint NOT NULL
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
@@ -40398,13 +41445,15 @@ CREATE TABLE `ticketParking` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`ticketParking_BEFORE_INSERT` BEFORE INSERT ON `ticketParking` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketParking_BEFORE_INSERT`
+ BEFORE INSERT ON `ticketParking`
+ FOR EACH ROW
BEGIN
SET NEW.workerFk = vn.getUser();
@@ -40431,8 +41480,9 @@ SET character_set_client = utf8;
`alreadyMadeSaleLines` tinyint NOT NULL,
`madeRate` tinyint NOT NULL,
`created` tinyint NOT NULL,
+ `parking` tinyint NOT NULL,
`sectorFk` tinyint NOT NULL,
- `parking` tinyint NOT NULL
+ `alertCode` tinyint NOT NULL
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
@@ -40499,13 +41549,15 @@ CREATE TABLE `ticketRequest` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`ticketRequest_beforeInsert` BEFORE INSERT ON `ticketRequest` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketRequest_beforeInsert`
+ BEFORE INSERT ON `ticketRequest`
+ FOR EACH ROW
BEGIN
IF NEW.ticketFk IS NULL THEN
SET NEW.ticketFk = (SELECT s.ticketFk FROM sale s WHERE s.id = NEW.saleFk);
@@ -40527,13 +41579,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`ticketRequest_beforeUpdate` BEFORE UPDATE ON `ticketRequest` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketRequest_beforeUpdate`
+ BEFORE UPDATE ON `ticketRequest`
+ FOR EACH ROW
BEGIN
IF NEW.saleFk <> OLD.saleFk THEN
SET NEW.ticketFk = (SELECT s.ticketFk FROM sale s WHERE s.id = NEW.saleFk);
@@ -40582,11 +41636,13 @@ CREATE TABLE `ticketService` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`ticketService_ai` AFTER INSERT ON `ticketService` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_ai`
+ AFTER INSERT ON `ticketService`
+ FOR EACH ROW
BEGIN
CALL ticket_requestRecalc(NEW.ticketFk);
@@ -40602,11 +41658,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`ticketService_au` AFTER UPDATE ON `ticketService` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_au`
+ AFTER UPDATE ON `ticketService`
+ FOR EACH ROW
BEGIN
IF !(NEW.price <=> OLD.price)
OR !(NEW.ticketFk <=> OLD.ticketFk)
@@ -40625,11 +41683,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`ticketService_ad` AFTER DELETE ON `ticketService` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_ad`
+ AFTER DELETE ON `ticketService`
+ FOR EACH ROW
BEGIN
CALL ticket_requestRecalc(OLD.ticketFk);
@@ -40812,11 +41872,13 @@ CREATE TABLE `till` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`till_beforeInsert` BEFORE INSERT ON `till` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`till_beforeInsert`
+ BEFORE INSERT ON `till`
+ FOR EACH ROW
BEGIN
IF IFNULL(NEW.concept,"") = "" THEN
CALL util.throw ('Error. El concepto esta vacío');
@@ -40871,13 +41933,15 @@ CREATE TABLE `time` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`time_AFTER_UPDATE` AFTER UPDATE ON `time` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`time_AFTER_UPDATE`
+ AFTER UPDATE ON `time`
+ FOR EACH ROW
BEGIN
/*INSERT INTO vn.mail SET
`sender` = 'jgallego@verdnatura.es',
@@ -40934,12 +41998,13 @@ CREATE TABLE `town` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`town_beforeInsert`
- BEFORE INSERT ON `town` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_beforeInsert`
+ BEFORE INSERT ON `town`
+ FOR EACH ROW
BEGIN
SET NEW.geoFk = zoneGeo_new('town', NEW.`name`,
(SELECT geoFk FROM province WHERE id = NEW.provinceFk));
@@ -40954,12 +42019,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `town_beforeUpdate`
- BEFORE UPDATE ON `town` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_beforeUpdate`
+ BEFORE UPDATE ON `town`
+ FOR EACH ROW
BEGIN
-- IF !(OLD.geoFk <=> NEW.geoFk) THEN
-- CALL zoneGeo_throwNotEditable;
@@ -40975,12 +42041,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`town_afterUpdate`
- AFTER UPDATE ON `town` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_afterUpdate`
+ AFTER UPDATE ON `town`
+ FOR EACH ROW
BEGIN
IF !(OLD.provinceFk <=> NEW.provinceFk) THEN
CALL zoneGeo_setParent(NEW.geoFk,
@@ -41002,12 +42069,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`town_afterDelete`
- AFTER DELETE ON `town` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_afterDelete`
+ AFTER DELETE ON `town`
+ FOR EACH ROW
BEGIN
CALL zoneGeo_delete(OLD.geoFk);
END */;;
@@ -41192,15 +42260,15 @@ CREATE TABLE `travel` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `travel_beforeInsert`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travel_beforeInsert`
BEFORE INSERT ON `travel`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL travel_checkDates(NEW.shipped, NEW.landed);
END */;;
@@ -41214,13 +42282,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `travel_beforeUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travel_beforeUpdate`
BEFORE UPDATE ON `travel`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
IF !(NEW.landed <=> OLD.landed)
OR !(NEW.shipped <=> OLD.shipped) THEN
@@ -41237,13 +42305,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `travel_afterUpdate`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travel_afterUpdate`
AFTER UPDATE ON `travel`
- FOR EACH ROW
+ FOR EACH ROW
BEGIN
CALL stock.log_add('travel', NEW.id, OLD.id);
@@ -41361,11 +42429,13 @@ CREATE TABLE `travelThermograph` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`travelThermograph_beforeInsert` BEFORE INSERT ON `travelThermograph` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travelThermograph_beforeInsert`
+ BEFORE INSERT ON `travelThermograph`
+ FOR EACH ROW
BEGIN
IF NEW.temperature IS NULL THEN
@@ -41512,6 +42582,7 @@ CREATE TABLE `vehicle` (
`description` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
`deliveryPointFk` int(11) DEFAULT '6' COMMENT 'Direccion para Buscaman',
`isKmTruckRate` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Computar km como camión en el cálculo de salario de reparto',
+ `photo` blob,
PRIMARY KEY (`id`),
KEY `empresa_id` (`companyFk`),
KEY `provinceFk_idx` (`warehouseFk`),
@@ -41522,6 +42593,103 @@ CREATE TABLE `vehicle` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `vehicleDms`
+--
+
+DROP TABLE IF EXISTS `vehicleDms`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vehicleDms` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `vehicleFk` int(10) unsigned NOT NULL,
+ `dmsFk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `vehicleDms_FK` (`vehicleFk`),
+ KEY `vehicleDms_FK_1` (`dmsFk`),
+ CONSTRAINT `vehicleDms_FK` FOREIGN KEY (`vehicleFk`) REFERENCES `vehicle` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `vehicleDms_FK_1` FOREIGN KEY (`dmsFk`) REFERENCES `dms` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Gestion documental de vehicle';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `vehicleEvent`
+--
+
+DROP TABLE IF EXISTS `vehicleEvent`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vehicleEvent` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `started` date DEFAULT NULL,
+ `finished` date DEFAULT NULL,
+ `vehicleStateFk` int(11) DEFAULT NULL,
+ `description` varchar(250) COLLATE utf8_unicode_ci NOT NULL,
+ `vehicleFk` int(11) NOT NULL,
+ `userFk` int(10) unsigned NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `vehicleEvent_FK` (`vehicleStateFk`),
+ KEY `vehicleEvent_FK_1` (`userFk`),
+ CONSTRAINT `vehicleEvent_FK` FOREIGN KEY (`vehicleStateFk`) REFERENCES `vehicleState` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `vehicleEvent_FK_1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `vehicleInvoiceIn`
+--
+
+DROP TABLE IF EXISTS `vehicleInvoiceIn`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vehicleInvoiceIn` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `vehicleFk` int(10) unsigned NOT NULL,
+ `invoiceInFk` mediumint(8) unsigned NOT NULL,
+ `amount` decimal(10,2) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `vehicleInvoiceIn_FK` (`vehicleFk`),
+ KEY `vehicleInvoiceIn_FK_1` (`invoiceInFk`),
+ CONSTRAINT `vehicleInvoiceIn_FK` FOREIGN KEY (`vehicleFk`) REFERENCES `vehicle` (`id`),
+ CONSTRAINT `vehicleInvoiceIn_FK_1` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `vehicleNotes`
+--
+
+DROP TABLE IF EXISTS `vehicleNotes`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vehicleNotes` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `vehicleFk` int(10) unsigned NOT NULL,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `note` text COLLATE utf8_unicode_ci NOT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `vehicleNotes_FK_1` (`userFk`),
+ KEY `vehicleNotes_FK` (`vehicleFk`),
+ CONSTRAINT `vehicleNotes_FK` FOREIGN KEY (`vehicleFk`) REFERENCES `vehicle` (`id`),
+ CONSTRAINT `vehicleNotes_FK_1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `vehicleState`
+--
+
+DROP TABLE IF EXISTS `vehicleState`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vehicleState` (
+ `id` int(11) NOT NULL,
+ `state` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `volumeConfig`
--
@@ -41614,6 +42782,7 @@ CREATE TABLE `warehouse` (
`addressFk` int(11) DEFAULT NULL,
`hasMachine` tinyint(1) NOT NULL DEFAULT '0',
`isLogiflora` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Este almacén acepta productos de Logiflora',
+ `isBionic` tinyint(1) NOT NULL DEFAULT '1',
PRIMARY KEY (`id`),
UNIQUE KEY `name_UNIQUE` (`name`),
KEY `Id_Paises` (`countryFk`),
@@ -41630,11 +42799,13 @@ CREATE TABLE `warehouse` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `warehouse_afterInsert` AFTER INSERT ON `warehouse` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`warehouse_afterInsert`
+ AFTER INSERT ON `warehouse`
+ FOR EACH ROW
BEGIN
IF NEW.isFeedStock THEN
INSERT INTO warehouseAlias(`name`) VALUES(NEW.`name`);
@@ -41652,11 +42823,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `warehouse_afterUpdate` AFTER UPDATE ON `warehouse` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`warehouse_afterUpdate`
+ AFTER UPDATE ON `warehouse`
+ FOR EACH ROW
BEGIN
IF NEW.isFeedStock IS TRUE and OLD.isFeedStock IS FALSE then
INSERT INTO warehouseAlias(`name`) VALUES(NEW.`name`);
@@ -41757,6 +42930,7 @@ CREATE TABLE `worker` (
`seniority` date DEFAULT NULL,
`isTodayRelative` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Para el F11. Calcula los problemas de visiblidad en funcion del dia actual',
`isF11Allowed` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Usuario autorizado para abrir el F11',
+ `sectorFk` int(11) DEFAULT NULL COMMENT 'Sector que tiene asociado el trabajador.',
PRIMARY KEY (`id`),
UNIQUE KEY `CodigoTrabajador_UNIQUE` (`code`),
UNIQUE KEY `user` (`user__`),
@@ -41804,6 +42978,23 @@ SET character_set_client = utf8;
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
+--
+-- Table structure for table `workerBusinessType`
+--
+
+DROP TABLE IF EXISTS `workerBusinessType`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `workerBusinessType` (
+ `id` int(4) NOT NULL,
+ `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+ `isFullTime` tinyint(1) NOT NULL DEFAULT '1',
+ `isPermanent` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'Contrato fijo',
+ `hasHolidayEntitlement` tinyint(1) DEFAULT '1' COMMENT 'Tiene derecho a vacaciones',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Temporary table structure for view `workerCalendar`
--
@@ -42045,7 +43236,8 @@ SET character_set_client = utf8;
`workCenterFk` tinyint NOT NULL,
`started` tinyint NOT NULL,
`ended` tinyint NOT NULL,
- `departmentFk` tinyint NOT NULL
+ `departmentFk` tinyint NOT NULL,
+ `payedHolidays` tinyint NOT NULL
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
@@ -42144,6 +43336,40 @@ SET character_set_client = utf8;
) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client;
+--
+-- Table structure for table `workerMistake`
+--
+
+DROP TABLE IF EXISTS `workerMistake`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `workerMistake` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `userFk` int(10) unsigned NOT NULL,
+ `workerMistakeTypeFk` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
+ `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`),
+ KEY `workerMistake_fk1_idx` (`userFk`),
+ KEY `workerMistake_fk2_idx` (`workerMistakeTypeFk`),
+ CONSTRAINT `workerMistake_fk1` FOREIGN KEY (`userFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `workerMistake_fk2` FOREIGN KEY (`workerMistakeTypeFk`) REFERENCES `workerMistakeType` (`code`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `workerMistakeType`
+--
+
+DROP TABLE IF EXISTS `workerMistakeType`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `workerMistakeType` (
+ `code` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
+ `description` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `workerRelatives`
--
@@ -42290,21 +43516,18 @@ CREATE TABLE `workerTimeControl` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_AI` AFTER INSERT ON `workerTimeControl` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_AI`
+ AFTER INSERT ON `workerTimeControl`
+ FOR EACH ROW
BEGIN
IF NEW.timed > DATE_ADD(NOW(), INTERVAL 1 DAY) THEN
- CALL mail_insert(
- 'cau@verdnatura.es',
- NULL,
- 'Fichada fuera de rango',
- CONCAT('Se ha introducido una fichada con fecha/hora ', NEW.timed, ' del usuario ', NEW.userFk)
- );
+ CALL util.throw('date in the future');
END IF;
END */;;
DELIMITER ;
@@ -42338,6 +43561,9 @@ CREATE TABLE `workerTimeControlConfig` (
`startNightlyHours` time NOT NULL,
`endNightlyHours` time NOT NULL,
`maxTimePerDay` int(11) unsigned NOT NULL COMMENT 'Maximo tiempo transcurrido en segundos desde que se inicia la jornada hasta que se termina',
+ `breakTime` int(11) DEFAULT NULL COMMENT 'Tiempo de descanso expresado en segundos',
+ `timeToBreakTime` int(11) DEFAULT NULL COMMENT 'Tiempo mínimo que se debe trabajar para añadir descanso, expresado en segundos',
+ `dayMaxTime` int(11) DEFAULT NULL COMMENT 'Tiempo máximo desde la entrada hasta la salida, expresado en segundos',
PRIMARY KEY (`id`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='All values in seconds';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -42736,17 +43962,18 @@ CREATE TABLE `workingHours` (
CONSTRAINT `user_working_hour` FOREIGN KEY (`userId`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Almacena horas de Entrada y de Salida del personal';
/*!40101 SET character_set_client = @saved_cs_client */;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`workingHoursBeforeInsert` BEFORE INSERT ON `workingHours` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workingHoursBeforeInsert`
+ BEFORE INSERT ON `workingHours`
+ FOR EACH ROW
BEGIN
IF (SELECT COUNT(*) FROM workingHours WHERE userId = NEW.userId AND DATE(timeIn) = CURDATE()) > 0 THEN
CALL util.throw ('ALREADY_LOGGED');
@@ -42757,7 +43984,6 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
--
-- Table structure for table `zone`
@@ -42779,6 +44005,7 @@ CREATE TABLE `zone` (
`inflation` decimal(5,2) NOT NULL DEFAULT '1.00',
`m3Max` decimal(10,2) unsigned DEFAULT NULL,
`itemMaxSize` int(11) DEFAULT NULL COMMENT 'tamaño maximo de los articulos que esa ruta puede transportar',
+ `code` varchar(45) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `fk_zone_1_idx` (`warehouseFk__`),
KEY `fk_zone_2_idx` (`agencyModeFk`),
@@ -42905,15 +44132,15 @@ CREATE TABLE `zoneExclusion` (
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER zoneExclusion_BI
-BEFORE INSERT
-ON zoneExclusion FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_BI`
+ BEFORE INSERT ON `zoneExclusion`
+ FOR EACH ROW
BEGIN
SET NEW.userFk = account.myUser_getId();
@@ -42927,15 +44154,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER zoneExclusion_BU
-BEFORE UPDATE
-ON zoneExclusion FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_BU`
+ BEFORE UPDATE ON `zoneExclusion`
+ FOR EACH ROW
BEGIN
SET NEW.userFk = account.myUser_getId();
@@ -42996,12 +44223,13 @@ CREATE TABLE `zoneGeo` (
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`zoneGeo_beforeInsert`
- BEFORE INSERT ON `zoneGeo` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneGeo_beforeInsert`
+ BEFORE INSERT ON `zoneGeo`
+ FOR EACH ROW
BEGIN
CALL zoneGeo_checkName(NEW.`name`);
END */;;
@@ -43015,12 +44243,13 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`zoneGeo_beforeUpdate`
- BEFORE UPDATE ON `zoneGeo` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneGeo_beforeUpdate`
+ BEFORE UPDATE ON `zoneGeo`
+ FOR EACH ROW
BEGIN
IF !(OLD.`name` <=> NEW.`name`) THEN
CALL zoneGeo_checkName(NEW.`name`);
@@ -43162,10 +44391,10 @@ DELIMITER ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `department_doCalc` ON SCHEDULE EVERY 15 SECOND STARTS '2019-11-15 00:00:00' ON COMPLETION PRESERVE ENABLE DO CALL vn.department_doCalc */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `department_doCalc` ON SCHEDULE EVERY 15 SECOND STARTS '2019-11-15 00:00:00' ON COMPLETION PRESERVE ENABLE DO CALL vn.department_doCalc */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -43178,12 +44407,12 @@ DELIMITER ;;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
/*!50003 SET character_set_client = utf8mb4 */ ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `envialiaThreHoldChecker` ON SCHEDULE EVERY 1 DAY STARTS '2019-02-07 08:00:00' ON COMPLETION NOT PRESERVE ENABLE COMMENT 'comprueba el rango de numeros para las etiquetas de envialia' DO BEGIN
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `envialiaThreHoldChecker` ON SCHEDULE EVERY 1 DAY STARTS '2022-01-28 09:52:46' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
DECLARE vActualNumber BIGINT;
DECLARE vEndRange BIGINT;
DECLARE vIsAlreadyNotified BOOLEAN;
@@ -43226,10 +44455,10 @@ DELIMITER ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `mysqlConnectionsSorter_kill` ON SCHEDULE EVERY 1 MINUTE STARTS '2021-10-28 09:56:27' ON COMPLETION NOT PRESERVE ENABLE DO CALL mysqlConnectionsSorter_kill() */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `mysqlConnectionsSorter_kill` ON SCHEDULE EVERY 1 MINUTE STARTS '2021-10-28 09:56:27' ON COMPLETION NOT PRESERVE ENABLE DO CALL mysqlConnectionsSorter_kill() */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -43242,12 +44471,12 @@ DELIMITER ;;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
/*!50003 SET character_set_client = utf8mb4 */ ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `printQueue_check` ON SCHEDULE EVERY 10 MINUTE STARTS '2019-11-08 02:00:00' ON COMPLETION PRESERVE ENABLE COMMENT 'Notifica en caso de que el servidor de impresión este parado' DO BEGIN
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `printQueue_check` ON SCHEDULE EVERY 10 MINUTE STARTS '2022-01-28 09:52:46' ON COMPLETION PRESERVE ENABLE DO BEGIN
DECLARE vCurrentCount INT;
DECLARE vCheckSum INT;
@@ -43344,14 +44573,14 @@ DELIMITER ;;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection = utf8_general_ci */ ;;
+/*!50003 SET character_set_client = utf8mb4 */ ;;
+/*!50003 SET character_set_results = utf8mb4 */ ;;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `route_doRecalc` ON SCHEDULE EVERY 10 SECOND STARTS '2021-07-08 07:32:23' ON COMPLETION PRESERVE ENABLE DO CALL route_doRecalc */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `route_doRecalc` ON SCHEDULE EVERY 10 SECOND STARTS '2021-07-08 07:32:23' ON COMPLETION PRESERVE ENABLE DO CALL route_doRecalc */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -43366,10 +44595,10 @@ DELIMITER ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `sale_checkWithoutComponents` ON SCHEDULE EVERY 10 MINUTE STARTS '2020-05-04 11:56:23' ON COMPLETION PRESERVE DISABLE DO call sale_checkNoComponents(DATE_ADD(NOW(), INTERVAL -10 MINUTE),DATE_ADD(NOW(), INTERVAL -1 MINUTE)) */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `sale_checkWithoutComponents` ON SCHEDULE EVERY 10 MINUTE STARTS '2020-05-04 11:56:23' ON COMPLETION PRESERVE DISABLE DO call sale_checkNoComponents(DATE_ADD(NOW(), INTERVAL -10 MINUTE),DATE_ADD(NOW(), INTERVAL -1 MINUTE)) */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -43384,10 +44613,10 @@ DELIMITER ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `ticketClosure` ON SCHEDULE EVERY 1 DAY STARTS '2017-09-18 00:30:00' ON COMPLETION NOT PRESERVE DISABLE COMMENT 'Realiza el cierre de todos los almacenes del dia actual' DO CALL ticketClosureMultiWarehouse(DATE_ADD(CURDATE(), INTERVAL -1 DAY)) */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ticketClosure` ON SCHEDULE EVERY 1 DAY STARTS '2017-09-18 00:30:00' ON COMPLETION NOT PRESERVE DISABLE COMMENT 'Realiza el cierre de todos los almacenes del dia actual' DO CALL ticketClosureMultiWarehouse(DATE_ADD(CURDATE(), INTERVAL -1 DAY)) */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -43398,14 +44627,14 @@ DELIMITER ;;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client = utf8 */ ;;
-/*!50003 SET character_set_results = utf8 */ ;;
-/*!50003 SET collation_connection = utf8_general_ci */ ;;
+/*!50003 SET character_set_client = utf8mb4 */ ;;
+/*!50003 SET character_set_results = utf8mb4 */ ;;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `ticket_doRecalc` ON SCHEDULE EVERY 10 SECOND STARTS '2021-02-26 07:32:23' ON COMPLETION PRESERVE ENABLE DO CALL ticket_doRecalc */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ticket_doRecalc` ON SCHEDULE EVERY 10 SECOND STARTS '2022-01-28 09:29:18' ON COMPLETION PRESERVE ENABLE DO CALL ticket_doRecalc */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -43420,10 +44649,10 @@ DELIMITER ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `travel_doRecalc` ON SCHEDULE EVERY 15 SECOND STARTS '2019-05-17 10:52:29' ON COMPLETION PRESERVE ENABLE DO CALL travel_doRecalc */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `travel_doRecalc` ON SCHEDULE EVERY 15 SECOND STARTS '2019-05-17 10:52:29' ON COMPLETION PRESERVE ENABLE DO CALL travel_doRecalc */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -43438,19 +44667,19 @@ DELIMITER ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `workerTimeControl_sendMail` ON SCHEDULE EVERY 1 WEEK STARTS '2020-11-25 08:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
- DECLARE vWeek,vYear INT;
-
- SELECT week,year INTO vWeek,vYear
- FROM vn.time
- WHERE dated IN (DATE_ADD(CURDATE(), INTERVAL -10 DAY), DATE_ADD(CURDATE(), INTERVAL -4 DAY))
- GROUP BY year,week
- LIMIT 1;
-
- CALL vn.workerTimeControl_sendMail(vWeek, vYear, NULL);
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `workerTimeControl_sendMail` ON SCHEDULE EVERY 1 WEEK STARTS '2020-11-25 08:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ DECLARE vWeek,vYear INT;
+
+ SELECT week,year INTO vWeek,vYear
+ FROM vn.time
+ WHERE dated IN (DATE_ADD(CURDATE(), INTERVAL -10 DAY), DATE_ADD(CURDATE(), INTERVAL -4 DAY))
+ GROUP BY year,week
+ LIMIT 1;
+
+ CALL vn.workerTimeControl_sendMail(vWeek, vYear, NULL);
END */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
@@ -43466,10 +44695,10 @@ DELIMITER ;;
/*!50003 SET character_set_results = utf8mb4 */ ;;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `zoneGeo_doCalc` ON SCHEDULE EVERY 15 SECOND STARTS '2019-09-13 15:30:47' ON COMPLETION PRESERVE ENABLE DO CALL vn.zoneGeo_doCalc */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `zoneGeo_doCalc` ON SCHEDULE EVERY 15 SECOND STARTS '2019-09-13 15:30:47' ON COMPLETION PRESERVE ENABLE DO CALL vn.zoneGeo_doCalc */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -43485,13 +44714,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `addressTaxArea`(vAddresId INT, vCompanyId INT) RETURNS varchar(25) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `addressTaxArea`(vAddresId INT, vCompanyId INT) RETURNS varchar(25) CHARSET utf8
DETERMINISTIC
BEGIN
/**
@@ -43543,13 +44772,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `address_getGeo`(vSelf INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `address_getGeo`(vSelf INT) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -43585,7 +44814,7 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `barcodeToItem`(vBarcode VARCHAR(22)) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `barcodeToItem`(vBarcode VARCHAR(22)) RETURNS int(11)
DETERMINISTIC
BEGIN
@@ -43644,11 +44873,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `bionicCalcReverse__`(vWarehouse INT,
+CREATE DEFINER=`root`@`localhost` FUNCTION `bionicCalcReverse__`(vWarehouse INT,
vMargin DECIMAL(10,3),
vRetailedPrice DECIMAL(10,3),
vM3 DECIMAL(10,3),
@@ -43749,11 +44978,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `botanicExport_isUpdatable`(vEdiGenusFk MEDIUMINT,vEdiSpecieFk MEDIUMINT,
+CREATE DEFINER=`root`@`localhost` FUNCTION `botanicExport_isUpdatable`(vEdiGenusFk MEDIUMINT,vEdiSpecieFk MEDIUMINT,
vCountryFk MEDIUMINT,vRestriction MEDIUMINT) RETURNS int(11)
DETERMINISTIC
BEGIN
@@ -43777,11 +45006,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `buy_getUnitVolume`(vSelf INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `buy_getUnitVolume`(vSelf INT) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -43812,11 +45041,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `buy_getVolume`(vSelf INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `buy_getVolume`(vSelf INT) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -43843,13 +45072,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `buy_hasNotifyPassport__`(vBuyFk INT, vItemFk INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `buy_hasNotifyPassport__`(vBuyFk INT, vItemFk INT) RETURNS tinyint(1)
READS SQL DATA
BEGIN
DECLARE vHasPassport BOOL;
@@ -43887,13 +45116,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `catalog_componentReverse`(vWarehouse INT,
+CREATE DEFINER=`root`@`localhost` FUNCTION `catalog_componentReverse`(vWarehouse INT,
vCost DECIMAL(10,3),
vM3 DECIMAL(10,3),
vAddressFk INT,
@@ -43997,63 +45226,63 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `clientGetDebt`(`vClient` INT, `vDate` DATE) RETURNS decimal(10,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `clientGetDebt`(`vClient` INT, `vDate` DATE) RETURNS decimal(10,2)
READS SQL DATA
-BEGIN
-/**
- * Devuelve el saldo de un cliente.
- *
- * @param vClient Identificador del cliente
- * @param vDate Fecha hasta la que tener en cuenta
- * @return Saldo del cliente
- */
- DECLARE vDateEnd DATETIME;
- DECLARE vDateIni DATETIME;
- DECLARE vDebt DECIMAL(10,2);
- DECLARE vHasDebt BOOLEAN;
-
- SELECT COUNT(*) INTO vHasDebt
- FROM `client` c
- WHERE c.id = vClient AND c.typeFk = 'normal';
-
- IF NOT vHasDebt THEN
- RETURN 0;
- END IF;
-
- SET vDate = IFNULL(vDate, CURDATE());
-
- SET vDateIni = TIMESTAMPADD(MONTH, -2, CURDATE());
- SET vDateEnd = TIMESTAMP(vDate, '23:59:59');
-
- SELECT IFNULL(SUM(t.amount), 0) INTO vDebt
- FROM (
- SELECT SUM(IFNULL(totalWithVat,0)) amount
- FROM ticket
- WHERE clientFk = vClient
- AND refFk IS NULL
- AND shipped BETWEEN vDateIni AND vDateEnd
- UNION ALL
- SELECT SUM(amountPaid) amount
- FROM receipt
- WHERE clientFk = vClient
- AND payed > vDateEnd
- UNION ALL
- SELECT SUM(amount)
- FROM clientRisk
- WHERE clientFk = vClient
- UNION ALL
- SELECT CAST(-SUM(amount) / 100 AS DECIMAL(10,2))
- FROM hedera.tpvTransaction
- WHERE clientFk = vClient
- AND receiptFk IS NULL
- AND `status` = 'ok'
- ) t;
-
- RETURN vDebt;
+BEGIN
+/**
+ * Devuelve el saldo de un cliente.
+ *
+ * @param vClient Identificador del cliente
+ * @param vDate Fecha hasta la que tener en cuenta
+ * @return Saldo del cliente
+ */
+ DECLARE vDateEnd DATETIME;
+ DECLARE vDateIni DATETIME;
+ DECLARE vDebt DECIMAL(10,2);
+ DECLARE vHasDebt BOOLEAN;
+
+ SELECT COUNT(*) INTO vHasDebt
+ FROM `client` c
+ WHERE c.id = vClient AND c.typeFk = 'normal';
+
+ IF NOT vHasDebt THEN
+ RETURN 0;
+ END IF;
+
+ SET vDate = IFNULL(vDate, CURDATE());
+
+ SET vDateIni = TIMESTAMPADD(MONTH, -2, CURDATE());
+ SET vDateEnd = TIMESTAMP(vDate, '23:59:59');
+
+ SELECT IFNULL(SUM(t.amount), 0) INTO vDebt
+ FROM (
+ SELECT SUM(IFNULL(totalWithVat,0)) amount
+ FROM ticket
+ WHERE clientFk = vClient
+ AND refFk IS NULL
+ AND shipped BETWEEN vDateIni AND vDateEnd
+ UNION ALL
+ SELECT SUM(amountPaid) amount
+ FROM receipt
+ WHERE clientFk = vClient
+ AND payed > vDateEnd
+ UNION ALL
+ SELECT SUM(amount)
+ FROM clientRisk
+ WHERE clientFk = vClient
+ UNION ALL
+ SELECT CAST(-SUM(amount) / 100 AS DECIMAL(10,2))
+ FROM hedera.tpvTransaction
+ WHERE clientFk = vClient
+ AND receiptFk IS NULL
+ AND `status` = 'ok'
+ ) t;
+
+ RETURN vDebt;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -44064,13 +45293,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `clientGetMana`(vClient INT) RETURNS decimal(10,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `clientGetMana`(vClient INT) RETURNS decimal(10,2)
DETERMINISTIC
BEGIN
/**
@@ -44150,11 +45379,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `clientGetSalesPerson`(vClientFk INT, vDated DATE) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `clientGetSalesPerson`(vClientFk INT, vDated DATE) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -44171,13 +45400,14 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `clientTaxArea`(vClientId INT, vCompanyId INT) RETURNS varchar(25) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `clientTaxArea`(vClientId INT, vCompanyId INT) RETURNS varchar(25) CHARSET utf8
+ READS SQL DATA
BEGIN
/**
* Devuelve el area de un cliente,
@@ -44188,26 +45418,26 @@ BEGIN
* @return Código de area
*/
DECLARE vTaxArea VARCHAR(25);
- DECLARE vCee INT;
-
+ DECLARE vCee INT;
+
SELECT ct.Cee INTO vCee
- FROM `client` c
- JOIN country ct ON ct.id = c.countryFk
- JOIN supplier s ON s.id = vCompanyId
- WHERE
- c.id = vClientId
- AND c.isVies
- AND c.countryFk != s.countryFk;
-
+ FROM `client` c
+ JOIN country ct ON ct.id = c.countryFk
+ JOIN supplier s ON s.id = vCompanyId
+ WHERE
+ c.id = vClientId
+ AND c.isVies
+ AND c.countryFk != s.countryFk;
+
IF vCee < 2 THEN
- SET vTaxArea = 'CEE';
- ELSEIF vCee = 2 THEN
- SET vTaxArea = 'WORLD';
+ SET vTaxArea = 'CEE';
+ ELSEIF vCee = 2 THEN
+ SET vTaxArea = 'WORLD';
ELSE
- SET vTaxArea = 'NATIONAL';
- END IF;
-
- RETURN vTaxArea;
+ SET vTaxArea = 'NATIONAL';
+ END IF;
+
+ RETURN vTaxArea;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -44220,11 +45450,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `client_getFromPhone`(vPhone VARCHAR(255)) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `client_getFromPhone`(vPhone VARCHAR(255)) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -44277,11 +45507,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `client_getSalesPerson`(vClientFk INT, vDated DATE) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `client_getSalesPerson`(vClientFk INT, vDated DATE) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -44363,11 +45593,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `client_getSalesPersonByTicket`(vTicketFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `client_getSalesPersonByTicket`(vTicketFk INT) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -44396,13 +45626,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `client_getSalesPersonCode`(vClientFk INT, vDated DATE) RETURNS varchar(3) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `client_getSalesPersonCode`(vClientFk INT, vDated DATE) RETURNS varchar(3) CHARSET utf8
DETERMINISTIC
BEGIN
/**
@@ -44436,11 +45666,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `client_getSalesPersonCodeByTicket`(vTicketFk INT) RETURNS varchar(3) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `client_getSalesPersonCodeByTicket`(vTicketFk INT) RETURNS varchar(3) CHARSET utf8
DETERMINISTIC
BEGIN
/**
@@ -44471,35 +45701,35 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `collectionExpeditionLacks`(vCollectionFk INT) RETURNS varchar(100) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `collectionExpeditionLacks`(vCollectionFk INT) RETURNS varchar(100) CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
-BEGIN
-
- DECLARE vExpeditionLacks BOOL;
- DECLARE vAnswer VARCHAR(100) DEFAULT '';
-
- SELECT (COUNT(*) > 0) INTO vExpeditionLacks
- FROM vn.ticketCollection tc
- LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND ISNULL(e.id);
-
- IF vExpeditionLacks THEN
-
- SELECT CONCAT('Colección: ',tc.collectionFk,' Tickets: ' , GROUP_CONCAT(tc.ticketFk) ) INTO vAnswer
- FROM vn.ticketCollection tc
- LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND ISNULL(e.id);
-
- END IF;
-
- RETURN vAnswer;
-
+BEGIN
+
+ DECLARE vExpeditionLacks BOOL;
+ DECLARE vAnswer VARCHAR(100) DEFAULT '';
+
+ SELECT (COUNT(*) > 0) INTO vExpeditionLacks
+ FROM vn.ticketCollection tc
+ LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk
+ WHERE tc.collectionFk = vCollectionFk
+ AND ISNULL(e.id);
+
+ IF vExpeditionLacks THEN
+
+ SELECT CONCAT('Colección: ',tc.collectionFk,' Tickets: ' , GROUP_CONCAT(tc.ticketFk) ) INTO vAnswer
+ FROM vn.ticketCollection tc
+ LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk
+ WHERE tc.collectionFk = vCollectionFk
+ AND ISNULL(e.id);
+
+ END IF;
+
+ RETURN vAnswer;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -44510,13 +45740,14 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `currentRate`(vCurrencyFk INT, vDated DATE) RETURNS decimal(10,4)
+CREATE DEFINER=`root`@`localhost` FUNCTION `currentRate`(vCurrencyFk INT, vDated DATE) RETURNS decimal(10,4)
+ READS SQL DATA
BEGIN
DECLARE curRate DECIMAL(10,4);
@@ -44542,11 +45773,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `deviceProductionUser_accessGranted`(vUserFK INT(10) , android_id VARCHAR(50)) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `deviceProductionUser_accessGranted`(vUserFK INT(10) , android_id VARCHAR(50)) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
/*
@@ -44583,11 +45814,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `duaTax_getRate`(vDua INT, vTaxClass INT) RETURNS decimal(5,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `duaTax_getRate`(vDua INT, vTaxClass INT) RETURNS decimal(5,2)
DETERMINISTIC
BEGIN
DECLARE vCountryFk INTEGER;
@@ -44617,79 +45848,87 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ekt_getEntry`(vEktFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ekt_getEntry`(vEktFk INT) RETURNS int(11)
READS SQL DATA
-BEGIN
- DECLARE vTravelFk INT;
- DECLARE vEntryFk INT DEFAULT 0;
- DECLARE vEntryAssignFk INT;
-
- SET vTravelFk = vn.ekt_getTravel(vEktFk);
-
- IF vTravelFk THEN
-
- SELECT ea.id INTO vEntryAssignFk
- FROM edi.ekt e
- JOIN vn.travel tr ON tr.id = vTravelFk
- JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
- AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
- AND IFNULL(ea.sub, e.sub) <=> e.sub
- AND IFNULL(ea.kop, e.kop) <=> e.kop
- AND IFNULL(ea.pro, e.pro) <=> e.pro
- WHERE e.id = vEktFk
- ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
- ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
- ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
- ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
- ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
- ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
- ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
- LIMIT 1;
-
- SELECT MAX(e.id) INTO vEntryFk
- FROM vn.entry e
- JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
- WHERE e.travelFk = vTravelFk
- AND e.sub <=> ea.sub
- AND e.kop <=> ea.kop
- AND e.pro <=> ea.pro;
-
-
- IF IFNULL(vEntryFk,0) = 0 THEN
-
- INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro)
- SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref, ea.pro
- FROM vn.ektEntryAssign ea
- JOIN vn.company c ON c.code = 'VNL'
- JOIN vn.currency cu ON cu.code = 'EUR'
- WHERE ea.id = vEntryAssignFk;
-
- SELECT MAX(id) INTO vEntryFk
- FROM vn.entry
- WHERE travelFk = vTravelFk;
-
- END IF;
-
- UPDATE vn.ektEntryAssign
- SET entryFk = vEntryFk
- WHERE id = vEntryAssignFk;
-
- ELSE
-
- SET vEntryFk = 9200;
-
- INSERT IGNORE INTO vn.entry(id) VALUES(vEntryFk);
-
- END IF;
-
- RETURN vEntryFk;
+BEGIN
+
+ /**
+ * Devuelve el numero de entrada para el ekt
+ *
+ * @param vEktFk Identificador de edi.ekt
+ */
+
+ DECLARE vTravelFk INT;
+ DECLARE vEntryFk INT DEFAULT 0;
+ DECLARE vEntryAssignFk INT;
+
+ SET vTravelFk = vn.ekt_getTravel(vEktFk);
+
+ IF vTravelFk THEN
+
+ SELECT ea.id INTO vEntryAssignFk
+ FROM edi.ekt e
+ JOIN vn.travel tr ON tr.id = vTravelFk
+ JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
+ AND ea.warehouseInFk = tr.warehouseInFk
+ AND ea.agencyModeFk = tr.agencyFk
+ AND IFNULL(ea.sub, e.sub) <=> e.sub
+ AND IFNULL(ea.kop, e.kop) <=> e.kop
+ AND IFNULL(ea.pro, e.pro) <=> e.pro
+ WHERE e.id = vEktFk
+ ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
+ LIMIT 1;
+
+ SELECT MAX(e.id) INTO vEntryFk
+ FROM vn.entry e
+ JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
+ WHERE e.travelFk = vTravelFk
+ AND e.sub <=> ea.sub
+ AND e.kop <=> ea.kop
+ AND e.pro <=> ea.pro;
+
+
+ IF IFNULL(vEntryFk,0) = 0 THEN
+
+ INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro)
+ SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref, ea.pro
+ FROM vn.ektEntryAssign ea
+ JOIN vn.company c ON c.code = 'VNL'
+ JOIN vn.currency cu ON cu.code = 'EUR'
+ WHERE ea.id = vEntryAssignFk;
+
+ SELECT MAX(id) INTO vEntryFk
+ FROM vn.entry
+ WHERE travelFk = vTravelFk;
+
+ END IF;
+
+ UPDATE vn.ektEntryAssign
+ SET entryFk = vEntryFk
+ WHERE id = vEntryAssignFk;
+
+ ELSE
+
+ SELECT ec.defaultEntry INTO vEntryFk
+ FROM vn.entryConfig ec;
+
+ INSERT IGNORE INTO vn.entry(id) VALUES(vEntryFk);
+
+ END IF;
+
+ RETURN vEntryFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -44700,13 +45939,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ekt_getTravel`(vEktFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ekt_getTravel`(vEktFk INT) RETURNS int(11)
READS SQL DATA
BEGIN
@@ -44801,11 +46040,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `entry_calcCommission__`(
+CREATE DEFINER=`root`@`localhost` FUNCTION `entry_calcCommission__`(
vCurrentCommission INT,
vTravelFk INT,
vCurrencyFk INT
@@ -44840,13 +46079,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `entry_getCommission`(
+CREATE DEFINER=`root`@`localhost` FUNCTION `entry_getCommission`(
vTravelFk INT,
vCurrencyFk INT,
vSupplierFk INT
@@ -44912,11 +46151,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `entry_getCommission__`(
+CREATE DEFINER=`root`@`localhost` FUNCTION `entry_getCommission__`(
vTravelFk INT,
vCurrencyFk INT,
vSupplierFk INT
@@ -44959,11 +46198,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `entry_getCurrency`(
+CREATE DEFINER=`root`@`localhost` FUNCTION `entry_getCurrency`(
vCurrency INT,
vSupplierFk INT
) RETURNS int(11)
@@ -44985,83 +46224,39 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP FUNCTION IF EXISTS `expedition_checkRoute` */;
+/*!50003 DROP FUNCTION IF EXISTS `entry_getForLogiflora` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `expedition_checkRoute`(vPalletFk INT,vExpeditionFk INT) RETURNS tinyint(1)
- DETERMINISTIC
-BEGIN
-/**
-* Comprueba si las expediciones del pallet son todas
-* de la misma ruta.
-*
-* @param vExpeditionFk numero de expedition a comprobar
-* @param vPalletFk numero de pallet
-* @return vHasDistinctRoutes
-*/
- DECLARE vRouteFk INT;
- DECLARE vHasDistinctRoutes BOOL;
-
- SELECT t.routeFk INTO vRouteFk
- FROM vn.expedition e
- JOIN vn.ticket t ON e.ticketFk = t.id
- WHERE e.id = vExpeditionFk;
-
- SELECT COUNT(*) > 0 INTO vHasDistinctRoutes
- FROM vn.expeditionScan es
- JOIN vn.expedition e ON es.expeditionFk = e.id
- JOIN vn.ticket t ON e.ticketFk = t.id
- WHERE es.palletFk = vPalletFk
- AND t.routeFk <> vRouteFk;
-
- RETURN vHasDistinctRoutes;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP FUNCTION IF EXISTS `floramondo_getEntry` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `floramondo_getEntry`(vLanded DATE, vWarehouseFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `entry_getForLogiflora`(vLanded DATE, vWarehouseFk INT) RETURNS int(11)
READS SQL DATA
BEGIN
+
+ /**
+ * Devuelve una entrada para Logiflora. Si no existe la crea.
+ *
+ * @param vLanded Fecha de llegada al almacén
+ * @param vWarehouseFk Identificador de vn.warehouse
+ */
DECLARE vTravelFk INT;
- DECLARE vEntryFk INT;
- DECLARE previousEntryFk INT;
-
- IF (SELECT COUNT(*)
- FROM vn.floramondoNotOfferDay
- WHERE dated = vLanded
- AND warehouseFk = vWarehouseFk)
- THEN
- RETURN NULL;
- END IF;
-
- SET vTravelFk = floramondo_getTravel(vLanded, vWarehouseFk);
+ DECLARE vEntryFk INT;
+ DECLARE previousEntryFk INT;
+
+ SET vTravelFk = vn.travel_getForLogiflora(vLanded, vWarehouseFk);
IF vLanded THEN
SELECT IFNULL(MAX(id),0) INTO vEntryFk
FROM vn.entry
- WHERE travelFk = vTravelFk AND isRaid;
+ WHERE travelFk = vTravelFk
+ AND isRaid;
IF NOT vEntryFk THEN
@@ -45082,13 +46277,13 @@ BEGIN
SELECT entryFk INTO previousEntryFk
FROM edi.warehouseFloramondo wf
- WHERE wf.warehouseFk = vWarehouseFk;
+ WHERE wf.warehouseFk = vWarehouseFk;
IF IFNULL(previousEntryFk,0) != vEntryFk THEN
-
+
DELETE FROM buy WHERE entryFk = previousEntryFk;
- DELETE FROM entry WHERE id = previousEntryFk;
+ DELETE FROM entry WHERE id = previousEntryFk;
END IF;
@@ -45100,57 +46295,44 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP FUNCTION IF EXISTS `floramondo_getTravel` */;
+/*!50003 DROP FUNCTION IF EXISTS `expedition_checkRoute` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `floramondo_getTravel`(vLanded DATE, vWarehouseFk INT) RETURNS int(11)
- READS SQL DATA
-BEGIN
-
- DECLARE vTravelFk INT;
- DECLARE vWarehouseOutName VARCHAR(50) DEFAULT 'Holanda';
- -- DECLARE vWarehouseInName VARCHAR(50) DEFAULT 'VNH';
- DECLARE vAgencyModeName VARCHAR(50) DEFAULT 'LOGIFLORA';
-
- IF vLanded THEN
- SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk
- FROM vn.travel tr
- JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
- JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
- JOIN vn.agencyMode am ON am.id = tr.agencyFk
- WHERE wIn.id = vWarehouseFk
- AND wOut.name = vWarehouseOutName
- AND am.name = vAgencyModeName
- AND landed = vLanded;
-
- IF NOT vTravelFk THEN
-
- INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk)
- SELECT vLanded, curdate(), vWarehouseFk, wOut.id, am.id
- FROM vn.warehouse wOut
- JOIN vn.agencyMode am ON am.name = vAgencyModeName
- WHERE wOut.name = vWarehouseOutName;
-
- SELECT MAX(tr.id) INTO vTravelFk
- FROM vn.travel tr
- JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
- JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
- WHERE wIn.id = vWarehouseFk
- AND wOut.name = vWarehouseOutName
- AND landed = vLanded;
- END IF;
-
- END IF;
-
- RETURN vTravelFk;
-
+CREATE DEFINER=`root`@`localhost` FUNCTION `expedition_checkRoute`(vPalletFk INT,vExpeditionFk INT) RETURNS tinyint(1)
+ DETERMINISTIC
+BEGIN
+/**
+* Comprueba si las expediciones del pallet son todas
+* de la misma ruta.
+*
+* @param vExpeditionFk numero de expedition a comprobar
+* @param vPalletFk numero de pallet
+* @return vHasDistinctRoutes
+*/
+ DECLARE vRouteFk INT;
+ DECLARE vHasDistinctRoutes BOOL;
+
+ SELECT t.routeFk INTO vRouteFk
+ FROM vn.expedition e
+ JOIN vn.ticket t ON e.ticketFk = t.id
+ WHERE e.id = vExpeditionFk;
+
+ SELECT COUNT(*) > 0 INTO vHasDistinctRoutes
+ FROM vn.expeditionScan es
+ JOIN vn.expedition e ON es.expeditionFk = e.id
+ JOIN vn.ticket t ON e.ticketFk = t.id
+ WHERE es.palletFk = vPalletFk
+ AND t.routeFk <> vRouteFk;
+
+ RETURN vHasDistinctRoutes;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -45163,11 +46345,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getAlert3State`(vTicket INT) RETURNS varchar(45) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `getAlert3State`(vTicket INT) RETURNS varchar(45) CHARSET utf8 COLLATE utf8_unicode_ci
READS SQL DATA
BEGIN
DECLARE vDeliveryType INTEGER DEFAULT 0;
@@ -45211,13 +46393,14 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getAlert3StateTest`(vTicket INT) RETURNS varchar(45) CHARSET latin1
+CREATE DEFINER=`root`@`localhost` FUNCTION `getAlert3StateTest`(vTicket INT) RETURNS varchar(45) CHARSET latin1
+ READS SQL DATA
BEGIN
DECLARE vDeliveryType INTEGER DEFAULT 0;
DECLARE isWaitingForPickUp BOOLEAN DEFAULT FALSE;
@@ -45263,11 +46446,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getAlert3State__`(vTicket INT) RETURNS varchar(45) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `getAlert3State__`(vTicket INT) RETURNS varchar(45) CHARSET utf8 COLLATE utf8_unicode_ci
READS SQL DATA
BEGIN
DECLARE vDeliveryType INTEGER DEFAULT 0;
@@ -45311,20 +46494,21 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getDueDate`(vDated DATE, vDayToPay INT) RETURNS date
+CREATE DEFINER=`root`@`localhost` FUNCTION `getDueDate`(vDated DATE, vDayToPay INT) RETURNS date
+ NO SQL
BEGIN
DECLARE vDued DATE;
-
+
IF vDayToPay = 0 THEN
RETURN vDated;
END IF;
-
+
SET vDued = TIMESTAMPADD(DAY,vDayToPay MOD 30, LAST_DAY(TIMESTAMPADD(MONTH, vDayToPay DIV 30, vDated)));
RETURN vDued;
@@ -45335,17 +46519,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP FUNCTION IF EXISTS `getInventoryDate` */;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getInventoryDate`() RETURNS date
+CREATE DEFINER=`root`@`localhost` FUNCTION `getInventoryDate`() RETURNS date
DETERMINISTIC
BEGIN
RETURN vn2008.date_inv();
@@ -45355,23 +46538,22 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP FUNCTION IF EXISTS `getNewItemId` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getNewItemId`() RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `getNewItemId`() RETURNS int(11)
+ READS SQL DATA
BEGIN
-
DECLARE newItemId INT;
-
- SELECT i1.id + 1 INTO newItemId
+
+ SELECT i1.id + 1 INTO newItemId
FROM item i1
LEFT JOIN item i2 ON i1.id + 1 = i2.id
WHERE i2.id IS NULL
@@ -45379,7 +46561,35 @@ BEGIN
LIMIT 1;
RETURN newItemId;
-
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `getNextDueDate` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `getNextDueDate`(datFecha DATE,intDia INT,intPayDay INT) RETURNS date
+ NO SQL
+BEGIN
+
+ DECLARE n DATE;
+ DECLARE datVenc DATE;
+ DECLARE intVenc INT;
+
+ SELECT TIMESTAMPADD(DAY,intDia,datFecha) INTO datVenc;
+ SELECT DAY(datVenc) INTO intVenc;
+ SELECT MIN(TIMESTAMPADD(MONTH,(intVenc > intPayDay),DATE_FORMAT(datVenc,CONCAT('%y/%m/',intPayDay)))) INTO n;
+
+ RETURN n;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -45390,23 +46600,23 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getPlacementReserve`(vItemFk INT, vWarehouseFk INT) RETURNS varchar(25) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `getPlacementReserve`(vItemFk INT, vWarehouseFk INT) RETURNS varchar(25) CHARSET utf8
+ READS SQL DATA
BEGIN
-
DECLARE vPlacementReserve VARCHAR(25);
-
- SELECT CONCAT(IFNULL(`code`,'--'), ' / ', IFNULL(reserve,'--')) INTO vPlacementReserve
+
+ SELECT CONCAT(IFNULL(`code`,'--'), ' / ', IFNULL(reserve,'--')) INTO vPlacementReserve
FROM itemPlacement
- WHERE itemFk = vItemFk
- AND warehouseFk = vWarehouseFk;
+ WHERE itemFk = vItemFk
+ AND warehouseFk = vWarehouseFk;
-RETURN vPlacementReserve;
+ RETURN vPlacementReserve;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -45417,13 +46627,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getShipmentHour`(vTicket INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `getShipmentHour`(vTicket INT) RETURNS int(11)
READS SQL DATA
BEGIN
DECLARE vShipmentHour INT;
@@ -45462,22 +46672,23 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getSpecialPrice`(vItemFk int(11),vClientFk int(11)) RETURNS decimal(10,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `getSpecialPrice`(vItemFk int(11),vClientFk int(11)) RETURNS decimal(10,2)
+ READS SQL DATA
BEGIN
- DECLARE price DECIMAL(10,2);
+ DECLARE price DECIMAL(10,2);
- SELECT rate3 INTO price
+ SELECT rate3 INTO price
FROM vn.priceFixed
WHERE itemFk = vItemFk
AND CURDATE() BETWEEN started AND ended ORDER BY created DESC LIMIT 1;
-
- SELECT `value` INTO price
+
+ SELECT `value` INTO price
FROM vn.specialPrice
WHERE itemFk = vItemFk
AND clientFk = vClientFk ;
@@ -45494,11 +46705,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getTicketToPrepare`(`vWorker` INT, `vWarehouse` INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `getTicketToPrepare`(`vWorker` INT, `vWarehouse` INT) RETURNS int(11)
READS SQL DATA
BEGIN
/**
@@ -45619,50 +46830,47 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP FUNCTION IF EXISTS `getTicketTrolleyLabelCount` */;
-ALTER DATABASE `vn` CHARACTER SET latin1 COLLATE latin1_swedish_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getTicketTrolleyLabelCount`(vTicket INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `getTicketTrolleyLabelCount`(vTicket INT) RETURNS int(11)
+ READS SQL DATA
BEGIN
+ DECLARE vLabelCount INT DEFAULT 0;
-DECLARE vLabelCount INT DEFAULT 0;
+ SELECT labelCount INTO vLabelCount
+ FROM ticketTrolley
+ WHERE ticket = vTicket;
-SELECT labelCount INTO vLabelCount
-FROM ticketTrolley
-WHERE ticket = vTicket;
+ SET vLabelCount = vLabelCount +1 ;
-SET vLabelCount = vLabelCount +1 ;
-
-REPLACE ticketTrolley(ticket,labelCount)
-SELECT vTicket, vLabelCount;
-
-RETURN vlabelCount;
+ REPLACE ticketTrolley(ticket,labelCount)
+ SELECT vTicket, vLabelCount;
+ RETURN vlabelCount;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP FUNCTION IF EXISTS `getUser` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getUser`() RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `getUser`() RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -45676,24 +46884,24 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP FUNCTION IF EXISTS `getUserId` */;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getUserId`(userName varchar(30)) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `getUserId`(userName varchar(30)) RETURNS int(11)
+ READS SQL DATA
BEGIN
DECLARE vUser INT;
-
- SELECT id INTO vUser
+
+ SELECT id INTO vUser
FROM account.user
WHERE `name` = userName;
-
+
RETURN vUser;
END ;;
DELIMITER ;
@@ -45701,26 +46909,26 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP FUNCTION IF EXISTS `getWorkerCode` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getWorkerCode`() RETURNS varchar(3) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `getWorkerCode`() RETURNS varchar(3) CHARSET utf8
+ READS SQL DATA
BEGIN
-DECLARE vUserCode VARCHAR(3) CHARSET utf8 COLLATE utf8_unicode_ci;
+ DECLARE vUserCode VARCHAR(3) CHARSET utf8 COLLATE utf8_unicode_ci;
-SELECT code INTO vUserCode
-FROM worker
-WHERE userFk = account.userGetId();
+ SELECT code INTO vUserCode
+ FROM worker
+ WHERE userFk = account.userGetId();
-RETURN vUserCode;
+ RETURN vUserCode;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -45733,11 +46941,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `getWorker__`() RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `getWorker__`() RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -45760,13 +46968,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `hasAnyNegativeBase`() RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `hasAnyNegativeBase`() RETURNS tinyint(1)
DETERMINISTIC
BEGIN
@@ -45809,13 +47017,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `hasAnyNegativeBase__`() RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `hasAnyNegativeBase__`() RETURNS tinyint(1)
DETERMINISTIC
BEGIN
@@ -45859,13 +47067,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `hasItemsInSector`(vTicketFk INT, vSectorFk INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `hasItemsInSector`(vTicketFk INT, vSectorFk INT) RETURNS tinyint(1)
DETERMINISTIC
BEGIN
@@ -45891,38 +47099,37 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `hasSomeNegativeBase`(vTicket INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `hasSomeNegativeBase`(vTicket INT) RETURNS tinyint(1)
+ READS SQL DATA
BEGIN
-
- DECLARE vCountry INT;
+ DECLARE vCountry INT;
DECLARE hasSomeNegativeBase BOOLEAN;
- SELECT s.countryFk
- INTO vCountry
- FROM supplier s
- JOIN ticket t ON t.companyFk = s.id
- WHERE t.id = vTicket;
+ SELECT s.countryFk
+ INTO vCountry
+ FROM supplier s
+ JOIN ticket t ON t.companyFk = s.id
+ WHERE t.id = vTicket;
- SELECT COUNT(*) INTO hasSomeNegativeBase
- FROM (
- SELECT SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2)) taxableBase
- FROM sale s
- JOIN item i ON i.id = s.itemFk
- JOIN itemTaxCountry itc
- ON itc.itemFk = i.id AND itc.countryFk = vCountry
- WHERE s.ticketFk = vTicket
- GROUP BY itc.taxClassFk
- HAVING taxableBase < 0
- ) t1 ;
+ SELECT COUNT(*) INTO hasSomeNegativeBase
+ FROM (
+ SELECT SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2)) taxableBase
+ FROM sale s
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemTaxCountry itc
+ ON itc.itemFk = i.id AND itc.countryFk = vCountry
+ WHERE s.ticketFk = vTicket
+ GROUP BY itc.taxClassFk
+ HAVING taxableBase < 0
+ ) t1 ;
RETURN hasSomeNegativeBase;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -45933,31 +47140,31 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `invoiceOutAmount`(vInvoiceRef VARCHAR(15)) RETURNS decimal(10,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `invoiceOutAmount`(vInvoiceRef VARCHAR(15)) RETURNS decimal(10,2)
+ READS SQL DATA
BEGIN
DECLARE totalAmount DECIMAL(10,2);
SELECT SUM(vat) INTO totalAmount
- FROM
- (
- SELECT iot.vat
- FROM invoiceOutTax iot
- JOIN invoiceOut io ON io.id = iot.invoiceOutFk
- WHERE io.ref = vInvoiceRef
- UNION ALL
- SELECT ioe.amount
- FROM invoiceOutExpence ioe
- JOIN invoiceOut io ON io.id = ioe.invoiceOutFk
- WHERE io.ref = vInvoiceRef
+ FROM (
+ SELECT iot.vat
+ FROM invoiceOutTax iot
+ JOIN invoiceOut io ON io.id = iot.invoiceOutFk
+ WHERE io.ref = vInvoiceRef
+ UNION ALL
+ SELECT ioe.amount
+ FROM invoiceOutExpence ioe
+ JOIN invoiceOut io ON io.id = ioe.invoiceOutFk
+ WHERE io.ref = vInvoiceRef
) t1;
-
-RETURN totalAmount;
+
+ RETURN totalAmount;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -45970,11 +47177,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `invoiceOut_getPath`(vSelf INT) RETURNS varchar(255) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `invoiceOut_getPath`(vSelf INT) RETURNS varchar(255) CHARSET utf8
DETERMINISTIC
BEGIN
DECLARE vIssued DATE;
@@ -46001,13 +47208,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `invoiceSerial`(vClientFk INT, vCompanyFk INT, vType CHAR(1)) RETURNS char(1) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `invoiceSerial`(vClientFk INT, vCompanyFk INT, vType CHAR(1)) RETURNS char(1) CHARSET utf8
DETERMINISTIC
BEGIN
/**
@@ -46039,13 +47246,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `invoiceSerialArea`(vType CHAR(1), vTaxArea VARCHAR(25)) RETURNS char(1) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `invoiceSerialArea`(vType CHAR(1), vTaxArea VARCHAR(25)) RETURNS char(1) CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
BEGIN
@@ -46098,42 +47305,39 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `isIntrastatEntry`(vEntryFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `isIntrastatEntry`(vEntryFk INT) RETURNS int(11)
+ READS SQL DATA
BEGIN
-
DECLARE isIntrastatOperation BOOL DEFAULT FALSE;
- DECLARE vSupplierCountry INT DEFAULT -1;
- DECLARE vClientCountry INT DEFAULT -1;
+ DECLARE vSupplierCountry INT DEFAULT -1;
+ DECLARE vClientCountry INT DEFAULT -1;
SELECT c.id INTO vSupplierCountry
FROM vn.country c
- JOIN vn.supplier s ON s.countryFk = c.id
- JOIN vn.entry e ON e.supplierFk = s.id
- WHERE e.id = vEntryFk
+ JOIN vn.supplier s ON s.countryFk = c.id
+ JOIN vn.entry e ON e.supplierFk = s.id
+ WHERE e.id = vEntryFk
AND c.isUeeMember = TRUE;
-
+
SELECT c.id INTO vClientCountry
FROM vn.country c
- JOIN vn.supplier s ON s.countryFk = c.id
- JOIN vn.company co ON co.id = s.id
- JOIN vn.entry e ON e.companyFk = co.id
- WHERE e.id = vEntryFk
+ JOIN vn.supplier s ON s.countryFk = c.id
+ JOIN vn.company co ON co.id = s.id
+ JOIN vn.entry e ON e.companyFk = co.id
+ WHERE e.id = vEntryFk
AND c.isUeeMember = TRUE;
-
- IF vSupplierCountry != vClientCountry AND vSupplierCountry * vClientCountry > 0 THEN
-
+
+ IF vSupplierCountry != vClientCountry AND vSupplierCountry * vClientCountry > 0 THEN
SET isIntrastatOperation = TRUE;
-
END IF;
RETURN isIntrastatOperation;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -46144,27 +47348,27 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `isLogifloraDay`(vShipped DATE, vWarehouse INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `isLogifloraDay`(vShipped DATE, vWarehouse INT) RETURNS tinyint(1)
DETERMINISTIC
-BEGIN
-
- DECLARE vIsLogifloraDay BOOLEAN;
-
- SELECT COUNT(*) INTO vIsLogifloraDay
- FROM edi.warehouseFloramondo wf
- JOIN vn.floramondoConfig fc
- WHERE wf.warehouseFk = vWarehouse
- AND vShipped BETWEEN DATE(TIMESTAMPADD(DAY, wf.travellingDays , fc.nextLanded))
- AND DATE(TIMESTAMPADD(DAY, wf.travellingDays + wf.dayRange , fc.nextLanded));
-
- RETURN vIsLogifloraDay;
-
+BEGIN
+
+ DECLARE vIsLogifloraDay BOOLEAN;
+
+ SELECT COUNT(*) INTO vIsLogifloraDay
+ FROM edi.warehouseFloramondo wf
+ JOIN vn.floramondoConfig fc
+ WHERE wf.warehouseFk = vWarehouse
+ AND vShipped BETWEEN DATE(TIMESTAMPADD(DAY, wf.travellingDays , fc.nextLanded))
+ AND DATE(TIMESTAMPADD(DAY, wf.travellingDays + wf.dayRange , fc.nextLanded));
+
+ RETURN vIsLogifloraDay;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -46175,13 +47379,14 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `isPalletHomogeneus`(vExpedition INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `isPalletHomogeneus`(vExpedition INT) RETURNS tinyint(1)
+ READS SQL DATA
BEGIN
DECLARE vScanId INT;
DECLARE vDistinctRoutesInThePallet INT;
@@ -46189,9 +47394,9 @@ BEGIN
SELECT scan_id INTO vScanId
FROM vn2008.scan_line
WHERE code = vExpedition
- LIMIT 1;
+ LIMIT 1;
- SELECT COUNT(*) INTO vDistinctRoutesInThePallet
+ SELECT COUNT(*) INTO vDistinctRoutesInThePallet
FROM (
SELECT DISTINCT t.Id_Ruta
FROM vn2008.scan_line sl
@@ -46212,13 +47417,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `itemPacking`(vBarcode VARCHAR(22), vWarehouseFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `itemPacking`(vBarcode VARCHAR(22), vWarehouseFk INT) RETURNS int(11)
DETERMINISTIC
BEGIN
@@ -46265,23 +47470,24 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `itemPlacementGet`(vItemFk INT, vWarehouseFk INT) RETURNS varchar(25) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `itemPlacementGet`(vItemFk INT, vWarehouseFk INT) RETURNS varchar(25) CHARSET utf8
+ READS SQL DATA
BEGIN
-
DECLARE vPlacementReserve VARCHAR(25);
-
- SELECT CONCAT(IFNULL(`code`,'--'), ' / ', IFNULL(reserve,'--')) INTO vPlacementReserve
- FROM itemPlacement
- WHERE itemFk = vItemFk
- AND warehouseFk = vWarehouseFk;
-RETURN vPlacementReserve;
+ SELECT CONCAT(IFNULL(`code`,'--'), ' / ', IFNULL(reserve,'--'))
+ INTO vPlacementReserve
+ FROM itemPlacement
+ WHERE itemFk = vItemFk
+ AND warehouseFk = vWarehouseFk;
+
+ RETURN vPlacementReserve;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -46292,13 +47498,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `itemShelvingPlacementSupply_ClosestGet`(vParkingFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `itemShelvingPlacementSupply_ClosestGet`(vParkingFk INT) RETURNS int(11)
READS SQL DATA
BEGIN
@@ -46336,13 +47542,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `itemsInSector_get`(vTicketFk INT, vSectorFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `itemsInSector_get`(vTicketFk INT, vSectorFk INT) RETURNS int(11)
READS SQL DATA
BEGIN
@@ -46370,11 +47576,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `itemTag_getIntValue`(vValue VARCHAR(255)) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `itemTag_getIntValue`(vValue VARCHAR(255)) RETURNS int(11)
DETERMINISTIC
BEGIN
IF vValue NOT REGEXP '^-?[0-9]+' THEN
@@ -46392,25 +47598,25 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `item_getFhImage`(itemFk INT) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `item_getFhImage`(itemFk INT) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
-BEGIN
- DECLARE vImageUrl VARCHAR(255);
- SELECT sr.PictureReference INTO vImageUrl
- FROM vn.buy b
- JOIN edi.ekt e ON b.ektFk = e.id
- JOIN edi.supplyResponse sr ON sr.Item_ArticleCode =e.`ref`
- JOIN vn.item i ON i.id = b.itemFk
- WHERE b.itemFk = itemFk
- ORDER BY (sr.EmbalageCode = e.package) DESC
- LIMIT 1;
- RETURN vImageUrl;
+BEGIN
+ DECLARE vImageUrl VARCHAR(255);
+ SELECT sr.PictureReference INTO vImageUrl
+ FROM vn.buy b
+ JOIN edi.ekt e ON b.ektFk = e.id
+ JOIN edi.supplyResponse sr ON sr.Item_ArticleCode =e.`ref`
+ JOIN vn.item i ON i.id = b.itemFk
+ WHERE b.itemFk = itemFk
+ ORDER BY (sr.EmbalageCode = e.package) DESC
+ LIMIT 1;
+ RETURN vImageUrl;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -46421,38 +47627,38 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `item_getPackage`(vItemFk INT) RETURNS varchar(50) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `item_getPackage`(vItemFk INT) RETURNS varchar(50) CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
-BEGIN
-
- DECLARE vDiameter INT;
- DECLARE vPackageFk VARCHAR(50);
- DECLARE vCoeficient DOUBLE DEFAULT 1.08;
-
- SELECT MAX(LEFT(value,3)) INTO vDiameter
- FROM vn.itemTag it
- JOIN vn.tag t ON t.id = it.tagFk
- WHERE it.itemFk = vItemFk
- AND t.overwrite = 'diameter';
-
- SELECT 8000 + FLOOR(vc.ccLength * vc.ccWidth / (vCoeficient * PI() * (vDiameter / 2) * (vDiameter / 2)))
- INTO vPackageFk
- FROM vn.volumeConfig vc;
-
- INSERT IGNORE INTO vn.packaging(id, width, `depth`)
- SELECT vPackageFk,
- FLOOR(vc.ccWidth / FLOOR(vc.ccWidth / vDiameter)),
- FLOOR(vc.ccLength / FLOOR(vc.ccLength / vDiameter))
- FROM vn.volumeConfig vc;
-
- RETURN vPackageFk;
-
+BEGIN
+
+ DECLARE vDiameter INT;
+ DECLARE vPackageFk VARCHAR(50);
+ DECLARE vCoeficient DOUBLE DEFAULT 1.08;
+
+ SELECT MAX(LEFT(value,3)) INTO vDiameter
+ FROM vn.itemTag it
+ JOIN vn.tag t ON t.id = it.tagFk
+ WHERE it.itemFk = vItemFk
+ AND t.overwrite = 'diameter';
+
+ SELECT 8000 + FLOOR(vc.ccLength * vc.ccWidth / (vCoeficient * PI() * (vDiameter / 2) * (vDiameter / 2)))
+ INTO vPackageFk
+ FROM vn.volumeConfig vc;
+
+ INSERT IGNORE INTO vn.packaging(id, width, `depth`)
+ SELECT vPackageFk,
+ FLOOR(vc.ccWidth / FLOOR(vc.ccWidth / vDiameter)),
+ FLOOR(vc.ccLength / FLOOR(vc.ccLength / vDiameter))
+ FROM vn.volumeConfig vc;
+
+ RETURN vPackageFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -46463,13 +47669,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `item_getVolume`(vSelf INT, vPackaging VARCHAR(10)) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `item_getVolume`(vSelf INT, vPackaging VARCHAR(10)) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -46504,29 +47710,29 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `machineWorker_Worker`(vWorkerFk VARCHAR(10)) RETURNS varchar(20) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `machineWorker_Worker`(vWorkerFk VARCHAR(10)) RETURNS varchar(20) CHARSET utf8 COLLATE utf8_unicode_ci
READS SQL DATA
-BEGIN
-/**
- * Comprueba si existen registros en las últimas 12 horas del trabajador vWorkerFk y si tiene a nulo la hora outTimed (indica la hora que deja el vehículo)
- *
- * @param vWorkerFk id del trabajador
- * @return Devuelve REGISTERED/UNREGISTERED en caso de que haya registros
- */
-
- IF (SELECT COUNT(*)
- FROM machineWorker m
- WHERE m.workerFk = vWorkerFk
- AND m.inTimed >= TIMESTAMPADD(HOUR , -12,NOW()) AND ISNULL(m.outTimed))
- THEN
- RETURN "REGISTERED";
- ELSE
- RETURN "UNREGISTERED";
- END IF;
+BEGIN
+/**
+ * Comprueba si existen registros en las últimas 12 horas del trabajador vWorkerFk y si tiene a nulo la hora outTimed (indica la hora que deja el vehículo)
+ *
+ * @param vWorkerFk id del trabajador
+ * @return Devuelve REGISTERED/UNREGISTERED en caso de que haya registros
+ */
+
+ IF (SELECT COUNT(*)
+ FROM machineWorker m
+ WHERE m.workerFk = vWorkerFk
+ AND m.inTimed >= TIMESTAMPADD(HOUR , -12,NOW()) AND ISNULL(m.outTimed))
+ THEN
+ RETURN "REGISTERED";
+ ELSE
+ RETURN "UNREGISTERED";
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -46539,29 +47745,29 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `machine_checkPlate`(vPlate VARCHAR(10)) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `machine_checkPlate`(vPlate VARCHAR(10)) RETURNS tinyint(1)
READS SQL DATA
-BEGIN
-/**
- * Comprueba si existe matrícula
- *
- * @param vPlate matrícula del vehículo
- * @return Devuelve TRUE en caso de que exista
- *
- */
-
- IF (SELECT COUNT(*)
- FROM machine m
- WHERE m.plate = vPlate
- ) THEN
- RETURN TRUE;
- ELSE
- RETURN FALSE;
- END IF;
+BEGIN
+/**
+ * Comprueba si existe matrícula
+ *
+ * @param vPlate matrícula del vehículo
+ * @return Devuelve TRUE en caso de que exista
+ *
+ */
+
+ IF (SELECT COUNT(*)
+ FROM machine m
+ WHERE m.plate = vPlate
+ ) THEN
+ RETURN TRUE;
+ ELSE
+ RETURN FALSE;
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -46572,20 +47778,21 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `messageSend`(vRecipient VARCHAR(255) CHARSET utf8, vMessage TEXT CHARSET utf8) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `messageSend`(vRecipient VARCHAR(255) CHARSET utf8, vMessage TEXT CHARSET utf8) RETURNS int(11)
+ READS SQL DATA
BEGIN
DECLARE result INT;
DECLARE vSenderFk INT;
-
- SELECT id INTO vSenderFk
+
+ SELECT id INTO vSenderFk
FROM account.user WHERE `name` = account.userGetName();
-
+
RETURN (SELECT messageSendWithUser(vSenderFk, vRecipient, vMessage));
END ;;
DELIMITER ;
@@ -46597,13 +47804,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `messageSendWithUser`(vSenderFK INT, vRecipient VARCHAR(255) CHARSET utf8, vMessage TEXT CHARSET utf8) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `messageSendWithUser`(vSenderFK INT, vRecipient VARCHAR(255) CHARSET utf8, vMessage TEXT CHARSET utf8) RETURNS int(11)
DETERMINISTIC
BEGIN
@@ -46659,17 +47866,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP FUNCTION IF EXISTS `MIDNIGHT` */;
-ALTER DATABASE `vn` CHARACTER SET latin1 COLLATE latin1_swedish_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `MIDNIGHT`(vDate DATE) RETURNS datetime
+CREATE DEFINER=`root`@`localhost` FUNCTION `MIDNIGHT`(vDate DATE) RETURNS datetime
DETERMINISTIC
BEGIN
RETURN TIMESTAMP(vDate,'23:59:59');
@@ -46679,18 +47885,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP FUNCTION IF EXISTS `myWorker_getId__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `myWorker_getId__`() RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `myWorker_getId__`() RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -46718,11 +47923,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `nz`(vQuantity DOUBLE) RETURNS double
+CREATE DEFINER=`root`@`localhost` FUNCTION `nz`(vQuantity DOUBLE) RETURNS double
DETERMINISTIC
BEGIN
@@ -46742,13 +47947,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `orderTotalVolume`(vOrderId INT) RETURNS decimal(10,3)
+CREATE DEFINER=`root`@`localhost` FUNCTION `orderTotalVolume`(vOrderId INT) RETURNS decimal(10,3)
READS SQL DATA
BEGIN
-- Devuelte el volumen total de la orden sumada
@@ -46773,31 +47978,32 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `orderTotalVolumeBoxes`(vOrderId INT) RETURNS decimal(10,3)
+CREATE DEFINER=`root`@`localhost` FUNCTION `orderTotalVolumeBoxes`(vOrderId INT) RETURNS decimal(10,3)
+ READS SQL DATA
BEGIN
-
-/*
- * Devuelve el volumen estimado del ticket sumado, en cajas
+/**
+ * Devuelve el volumen estimado del ticket sumado, en cajas
*
- * idT Numero de ticket
- *
+ * @param vOrder Id del pedido
*/
DECLARE vVolumeBoxM3 DOUBLE;
- DECLARE vOrderTotalVolumeBoxes DECIMAL(10,1);
- DECLARE vVnBoxId VARCHAR(10) DEFAULT '94';
-
- SELECT volume / 1000000 INTO vVolumeBoxM3 FROM packaging WHERE id = vVnBoxId;
-
- SET vOrderTotalVolumeBoxes = orderTotalVolume(vOrderId) / vVolumeBoxM3;
-
- RETURN vOrderTotalVolumeBoxes;
+ DECLARE vOrderTotalVolumeBoxes DECIMAL(10,1);
+ DECLARE vVnBoxId VARCHAR(10) DEFAULT '94';
+ SELECT volume / 1000000
+ INTO vVolumeBoxM3
+ FROM packaging
+ WHERE id = vVnBoxId;
+
+ SET vOrderTotalVolumeBoxes = orderTotalVolume(vOrderId) / vVolumeBoxM3;
+
+ RETURN vOrderTotalVolumeBoxes;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -46810,11 +48016,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `phytoPassport`(vRef VARCHAR(15)) RETURNS text CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `phytoPassport`(vRef VARCHAR(15)) RETURNS text CHARSET utf8
DETERMINISTIC
BEGIN
DECLARE vPhyto TEXT CHARSET utf8 COLLATE utf8_unicode_ci;
@@ -46863,13 +48069,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `routeProposal`(vTicketFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `routeProposal`(vTicketFk INT) RETURNS int(11)
READS SQL DATA
BEGIN
@@ -46929,13 +48135,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `routeProposal_`(vTicketFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `routeProposal_`(vTicketFk INT) RETURNS int(11)
READS SQL DATA
BEGIN
@@ -46970,13 +48176,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `routeProposal_beta`(vTicketFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `routeProposal_beta`(vTicketFk INT) RETURNS int(11)
READS SQL DATA
BEGIN
@@ -47038,33 +48244,33 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `specie_IsForbidden`(vItemFk INT, vAddressFk INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `specie_IsForbidden`(vItemFk INT, vAddressFk INT) RETURNS tinyint(1)
READS SQL DATA
-BEGIN
-
- DECLARE vIsForbbiden BOOL;
- DECLARE vLeft INT;
-
- SELECT zg.lft INTO vLeft
- FROM vn.address a
- JOIN vn.zoneGeo zg ON zg.name = a.postalCode
- WHERE a.id = vAddressFk;
-
- SELECT sgi.isForbidden INTO vIsForbbiden
- FROM vn.specieGeoInvasive sgi
- JOIN vn.zoneGeo zg ON zg.id = sgi.zoneGeofk
- JOIN vn.itemBotanical ib ON ib.genusFk = sgi.genusFk AND sgi.specieFk IN ('sp.',ib.specieFk)
- WHERE vLeft BETWEEN zg.lft AND zg.rgt
- AND ib.itemFk = vItemFk
- ORDER BY zg.`depth` DESC
- LIMIT 1;
-
- RETURN IFNULL(vIsForbbiden, FALSE);
-
+BEGIN
+
+ DECLARE vIsForbbiden BOOL;
+ DECLARE vLeft INT;
+
+ SELECT zg.lft INTO vLeft
+ FROM vn.address a
+ JOIN vn.zoneGeo zg ON zg.name = a.postalCode
+ WHERE a.id = vAddressFk;
+
+ SELECT sgi.isForbidden INTO vIsForbbiden
+ FROM vn.specieGeoInvasive sgi
+ JOIN vn.zoneGeo zg ON zg.id = sgi.zoneGeofk
+ JOIN vn.itemBotanical ib ON ib.genusFk = sgi.genusFk AND sgi.specieFk IN ('sp.',ib.specieFk)
+ WHERE vLeft BETWEEN zg.lft AND zg.rgt
+ AND ib.itemFk = vItemFk
+ ORDER BY zg.`depth` DESC
+ LIMIT 1;
+
+ RETURN IFNULL(vIsForbbiden, FALSE);
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -47075,13 +48281,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `testCIF`(vCIF VARCHAR(9)) RETURNS varchar(10) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `testCIF`(vCIF VARCHAR(9)) RETURNS varchar(10) CHARSET utf8 COLLATE utf8_unicode_ci
DETERMINISTIC
BEGIN
@@ -47160,63 +48366,63 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `testNIE`(vNIE VARCHAR(9)) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `testNIE`(vNIE VARCHAR(9)) RETURNS tinyint(1)
DETERMINISTIC
-BEGIN
-
- DECLARE vIndice INT;
- DECLARE vNumero VARCHAR(7);
- DECLARE vOperador VARCHAR(9);
- DECLARE vParteNumerica DECIMAL(8,0);
- DECLARE vLetraInicial VARCHAR(1);
- DECLARE vLetraFinal VARCHAR(1);
- DECLARE vLetrasFinalesPosibles VARCHAR(24) DEFAULT "TRWAGMYFPDXBNJZSQVHLCKE";
- DECLARE vLetraInicialEsIncorrecta BOOL DEFAULT FALSE;
-
- SET vLetraInicial = SUBSTR(vNIE, 1, 1);
- SET vLetraFinal = SUBSTR(vNIE, 9, 1);
- SET vNumero = SUBSTR(vNIE, 2, 7);
-
- CASE vLetraInicial
-
- WHEN 'X' THEN
-
- SET vOperador = "0";
-
- WHEN 'Y' THEN
-
- SET vOperador = "1";
-
- WHEN 'Z' THEN
-
- SET vOperador = "2";
-
- ELSE
-
- SET vLetraInicialEsIncorrecta = TRUE;
-
- END CASE;
-
- SET vOperador = CONCAT(vOperador, vNumero);
- SET vParteNumerica = CAST(vOperador AS DECIMAL(8,0));
- SET vIndice = Round(vParteNumerica Mod 23, 0) + 1;
-
- IF SUBSTR(vLetrasFinalesPosibles, vIndice, 1) = vLetraFinal AND vLetraInicialEsIncorrecta = FALSE THEN
-
- RETURN TRUE;
-
- ELSE
-
- RETURN FALSE;
-
- END IF;
-
+BEGIN
+
+ DECLARE vIndice INT;
+ DECLARE vNumero VARCHAR(7);
+ DECLARE vOperador VARCHAR(9);
+ DECLARE vParteNumerica DECIMAL(8,0);
+ DECLARE vLetraInicial VARCHAR(1);
+ DECLARE vLetraFinal VARCHAR(1);
+ DECLARE vLetrasFinalesPosibles VARCHAR(24) DEFAULT "TRWAGMYFPDXBNJZSQVHLCKE";
+ DECLARE vLetraInicialEsIncorrecta BOOL DEFAULT FALSE;
+
+ SET vLetraInicial = SUBSTR(vNIE, 1, 1);
+ SET vLetraFinal = SUBSTR(vNIE, 9, 1);
+ SET vNumero = SUBSTR(vNIE, 2, 7);
+
+ CASE vLetraInicial
+
+ WHEN 'X' THEN
+
+ SET vOperador = "0";
+
+ WHEN 'Y' THEN
+
+ SET vOperador = "1";
+
+ WHEN 'Z' THEN
+
+ SET vOperador = "2";
+
+ ELSE
+
+ SET vLetraInicialEsIncorrecta = TRUE;
+
+ END CASE;
+
+ SET vOperador = CONCAT(vOperador, vNumero);
+ SET vParteNumerica = CAST(vOperador AS DECIMAL(8,0));
+ SET vIndice = Round(vParteNumerica Mod 23, 0) + 1;
+
+ IF SUBSTR(vLetrasFinalesPosibles, vIndice, 1) = vLetraFinal AND vLetraInicialEsIncorrecta = FALSE THEN
+
+ RETURN TRUE;
+
+ ELSE
+
+ RETURN FALSE;
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -47227,37 +48433,37 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `testNIF`(vNIF VARCHAR(9)) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `testNIF`(vNIF VARCHAR(9)) RETURNS tinyint(1)
DETERMINISTIC
-BEGIN
-
- DECLARE vIndice INT;
- DECLARE vParteNumerica DECIMAL(8,0);
- DECLARE vLetra VARCHAR(1);
- DECLARE vLetrasPosibles VARCHAR(24) DEFAULT "TRWAGMYFPDXBNJZSQVHLCKE";
-
- SET vLetra = SUBSTRING(vNIF, 9, 1);
-
- SET vParteNumerica = CAST(SUBSTRING(vNIF, 1, 8) AS DECIMAL(8,0));
-
- SET vIndice = Round(vParteNumerica MOD 23, 0) + 1;
-
- If SUBSTRING(vLetrasPosibles, vIndice, 1) = vLetra Then
-
- RETURN TRUE;
-
- ELSE
-
- RETURN FALSE;
-
- END IF;
-
+BEGIN
+
+ DECLARE vIndice INT;
+ DECLARE vParteNumerica DECIMAL(8,0);
+ DECLARE vLetra VARCHAR(1);
+ DECLARE vLetrasPosibles VARCHAR(24) DEFAULT "TRWAGMYFPDXBNJZSQVHLCKE";
+
+ SET vLetra = SUBSTRING(vNIF, 9, 1);
+
+ SET vParteNumerica = CAST(SUBSTRING(vNIF, 1, 8) AS DECIMAL(8,0));
+
+ SET vIndice = Round(vParteNumerica MOD 23, 0) + 1;
+
+ If SUBSTRING(vLetrasPosibles, vIndice, 1) = vLetra Then
+
+ RETURN TRUE;
+
+ ELSE
+
+ RETURN FALSE;
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -47268,13 +48474,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticketGetTotal`(vTicketId INT) RETURNS decimal(10,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticketGetTotal`(vTicketId INT) RETURNS decimal(10,2)
READS SQL DATA
DETERMINISTIC
BEGIN
@@ -47313,85 +48519,85 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticketPositionInPath`(vTicketId INT) RETURNS varchar(10) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticketPositionInPath`(vTicketId INT) RETURNS varchar(10) CHARSET utf8
DETERMINISTIC
-BEGIN
-
- DECLARE vRestTicketsMaxOrder INT;
- DECLARE vRestTicketsMinOrder INT;
- DECLARE vRestTicketsPacking INT;
- DECLARE vMyProductionOrder INT;
- DECLARE vPosition VARCHAR(10) DEFAULT 'MID';
- DECLARE vMyPath INT;
- DECLARE vMyWarehouse INT;
- DECLARE PACKING_ORDER INT;
- DECLARE vExpeditionsCount INT;
- DECLARE vIsValenciaPath BOOLEAN DEFAULT FALSE;
-
-SELECT `order`
- INTO PACKING_ORDER
- FROM state
- WHERE code = 'PACKING';
-
-SELECT t.routeFk, t.warehouseFk, IFNULL(ts.productionOrder,0)
- INTO vMyPath, vMyWarehouse, vMyProductionOrder
- FROM ticket t
- LEFT JOIN ticketState ts on ts.ticket = t.id
- WHERE t.id = vTicketId;
-
-SELECT (ag.`name` = 'VN_VALENCIA')
- INTO vIsValenciaPath
- FROM vn2008.Rutas r
- JOIN vn2008.Agencias a on a.Id_Agencia = r.Id_Agencia
- JOIN vn2008.agency ag on ag.agency_id = a.agency_id
- WHERE r.Id_Ruta = vMyPath;
-
-IF vIsValenciaPath THEN -- Rutas Valencia
-
- SELECT COUNT(*)
- INTO vExpeditionsCount
- FROM expedition e
- JOIN ticket t ON t.id = e.ticketFk
- WHERE t.routeFk = vMyPath;
-
- SELECT MAX(ts.productionOrder), MIN(ts.productionOrder)
- INTO vRestTicketsMaxOrder, vRestTicketsMinOrder
- FROM ticket t
- LEFT JOIN ticketState ts on t.id = ts.ticket
- WHERE t.routeFk = vMyPath
- AND t.warehouseFk = vMyWarehouse
- AND t.id != vTicketid;
-
- SELECT COUNT(*)
- INTO vRestTicketsPacking
- FROM ticket t
- LEFT JOIN ticketState ts on t.id = ts.ticket
- WHERE ts.productionOrder = PACKING_ORDER
- AND t.routeFk = vMyPath
- AND t.warehouseFk = vMyWarehouse
- AND t.id != vTicketid;
-
- IF vExpeditionsCount = 1 THEN
- SET vPosition = 'FIRST';
- ELSEIF vRestTicketsMinOrder > PACKING_ORDER THEN
- SET vPosition = 'LAST';
- ELSEIF vRestTicketsPacking THEN
- SET vPosition = 'SHARED';
- ELSE
- SET vPosition = 'MID';
- END IF;
-
-ELSE
- SET vPosition = 'MID';
-
-END IF;
-
-RETURN vPosition;
-
+BEGIN
+
+ DECLARE vRestTicketsMaxOrder INT;
+ DECLARE vRestTicketsMinOrder INT;
+ DECLARE vRestTicketsPacking INT;
+ DECLARE vMyProductionOrder INT;
+ DECLARE vPosition VARCHAR(10) DEFAULT 'MID';
+ DECLARE vMyPath INT;
+ DECLARE vMyWarehouse INT;
+ DECLARE PACKING_ORDER INT;
+ DECLARE vExpeditionsCount INT;
+ DECLARE vIsValenciaPath BOOLEAN DEFAULT FALSE;
+
+SELECT `order`
+ INTO PACKING_ORDER
+ FROM state
+ WHERE code = 'PACKING';
+
+SELECT t.routeFk, t.warehouseFk, IFNULL(ts.productionOrder,0)
+ INTO vMyPath, vMyWarehouse, vMyProductionOrder
+ FROM ticket t
+ LEFT JOIN ticketState ts on ts.ticket = t.id
+ WHERE t.id = vTicketId;
+
+SELECT (ag.`name` = 'VN_VALENCIA')
+ INTO vIsValenciaPath
+ FROM vn2008.Rutas r
+ JOIN vn2008.Agencias a on a.Id_Agencia = r.Id_Agencia
+ JOIN vn2008.agency ag on ag.agency_id = a.agency_id
+ WHERE r.Id_Ruta = vMyPath;
+
+IF vIsValenciaPath THEN -- Rutas Valencia
+
+ SELECT COUNT(*)
+ INTO vExpeditionsCount
+ FROM expedition e
+ JOIN ticket t ON t.id = e.ticketFk
+ WHERE t.routeFk = vMyPath;
+
+ SELECT MAX(ts.productionOrder), MIN(ts.productionOrder)
+ INTO vRestTicketsMaxOrder, vRestTicketsMinOrder
+ FROM ticket t
+ LEFT JOIN ticketState ts on t.id = ts.ticket
+ WHERE t.routeFk = vMyPath
+ AND t.warehouseFk = vMyWarehouse
+ AND t.id != vTicketid;
+
+ SELECT COUNT(*)
+ INTO vRestTicketsPacking
+ FROM ticket t
+ LEFT JOIN ticketState ts on t.id = ts.ticket
+ WHERE ts.productionOrder = PACKING_ORDER
+ AND t.routeFk = vMyPath
+ AND t.warehouseFk = vMyWarehouse
+ AND t.id != vTicketid;
+
+ IF vExpeditionsCount = 1 THEN
+ SET vPosition = 'FIRST';
+ ELSEIF vRestTicketsMinOrder > PACKING_ORDER THEN
+ SET vPosition = 'LAST';
+ ELSEIF vRestTicketsPacking THEN
+ SET vPosition = 'SHARED';
+ ELSE
+ SET vPosition = 'MID';
+ END IF;
+
+ELSE
+ SET vPosition = 'MID';
+
+END IF;
+
+RETURN vPosition;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -47402,13 +48608,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticketSplitCounter`(vTicketFk INT) RETURNS varchar(15) CHARSET utf8
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticketSplitCounter`(vTicketFk INT) RETURNS varchar(15) CHARSET utf8
READS SQL DATA
BEGIN
DECLARE vSplitCounter VARCHAR(15);
@@ -47434,13 +48640,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticketTotalVolume`(vTicketId INT) RETURNS decimal(10,3)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticketTotalVolume`(vTicketId INT) RETURNS decimal(10,3)
READS SQL DATA
BEGIN
-- Devuelte el volumen total del ticket sumado
@@ -47462,13 +48668,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticketTotalVolumeBoxes`(vTicketId INT) RETURNS decimal(10,1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticketTotalVolumeBoxes`(vTicketId INT) RETURNS decimal(10,1)
DETERMINISTIC
BEGIN
@@ -47499,15 +48705,15 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticketWarehouseGet`(vTicketFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticketWarehouseGet`(vTicketFk INT) RETURNS int(11)
+ READS SQL DATA
BEGIN
-
DECLARE vWarehouseFk INT;
SELECT warehouseFk INTO vWarehouseFk
@@ -47515,7 +48721,6 @@ BEGIN
WHERE id = vTicketFk;
RETURN vWarehouseFk;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -47526,29 +48731,29 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticket_CC_volume`(vTicketFk INT) RETURNS decimal(10,1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_CC_volume`(vTicketFk INT) RETURNS decimal(10,1)
READS SQL DATA
-BEGIN
-
- DECLARE vCC DECIMAL(10,1);
-
- SELECT sum(sv.volume * IF(i.itemPackingTypeFk = 'H', vc.dutchCompressionRate, 1)) / (p.volume / 1000000)
- INTO vCC
- FROM vn.saleVolume sv
- JOIN vn.sale s ON s.id = sv.saleFk
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.packaging p ON p.id = 'CC'
- JOIN vn.volumeConfig vc
- WHERE sv.ticketFk = vTicketFk;
-
- RETURN vCC;
-
+BEGIN
+
+ DECLARE vCC DECIMAL(10,1);
+
+ SELECT sum(sv.volume * IF(i.itemPackingTypeFk = 'H', vc.dutchCompressionRate, 1)) / (p.volume / 1000000)
+ INTO vCC
+ FROM vn.saleVolume sv
+ JOIN vn.sale s ON s.id = sv.saleFk
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.packaging p ON p.id = 'CC'
+ JOIN vn.volumeConfig vc
+ WHERE sv.ticketFk = vTicketFk;
+
+ RETURN vCC;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -47559,13 +48764,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticket_get`(vParamFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_get`(vParamFk INT) RETURNS int(11)
READS SQL DATA
proc:BEGIN
@@ -47636,11 +48841,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticket_getFreightCost`(vTicketFk INT) RETURNS decimal(10,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_getFreightCost`(vTicketFk INT) RETURNS decimal(10,2)
DETERMINISTIC
BEGIN
/**
@@ -47676,27 +48881,27 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticket_getWeight`(vTicketFk INT) RETURNS decimal(10,3)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_getWeight`(vTicketFk INT) RETURNS decimal(10,3)
READS SQL DATA
-BEGIN
-/**
- * Devuelve el peso total del ticket
- *
- * @return Total peso
- */
-
- DECLARE vWeight DECIMAL(10,3);
-
- SELECT sum(weight) INTO vWeight
- FROM saleVolume
- WHERE ticketFk = vTicketFk;
-
- RETURN vWeight;
-
+BEGIN
+/**
+ * Devuelve el peso total del ticket
+ *
+ * @return Total peso
+ */
+
+ DECLARE vWeight DECIMAL(10,3);
+
+ SELECT sum(weight) INTO vWeight
+ FROM saleVolume
+ WHERE ticketFk = vTicketFk;
+
+ RETURN vWeight;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -47709,11 +48914,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticket_getWithParameters`(vClientFk INT, vWarehouseFk INT, vShipped DATE, vAddressFk INT, vCompanyFk INT, vAgencyModeFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_getWithParameters`(vClientFk INT, vWarehouseFk INT, vShipped DATE, vAddressFk INT, vCompanyFk INT, vAgencyModeFk INT) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -47765,26 +48970,26 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ticket_HasUbication`(vTicketFk INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_HasUbication`(vTicketFk INT) RETURNS tinyint(1)
READS SQL DATA
-BEGIN
-
- DECLARE hasUbication BOOL;
-
- SELECT COUNT(*) INTO hasUbication
- FROM vn.ticket t
- JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
- WHERE rm.beachFk
- AND t.id = vTicketFk;
-
- RETURN hasUbication;
-
+BEGIN
+
+ DECLARE hasUbication BOOL;
+
+ SELECT COUNT(*) INTO hasUbication
+ FROM vn.ticket t
+ JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
+ WHERE rm.beachFk
+ AND t.id = vTicketFk;
+
+ RETURN hasUbication;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -47797,11 +49002,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `till_new`(
+CREATE DEFINER=`root`@`localhost` FUNCTION `till_new`(
vClient INT
,vBank INT
,vAmount DOUBLE
@@ -47889,11 +49094,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `timeWorkerControl_getDirection`(vUserFk INT, vTimed DATETIME) RETURNS varchar(6) CHARSET utf8 COLLATE utf8_unicode_ci
+CREATE DEFINER=`root`@`localhost` FUNCTION `timeWorkerControl_getDirection`(vUserFk INT, vTimed DATETIME) RETURNS varchar(6) CHARSET utf8 COLLATE utf8_unicode_ci
READS SQL DATA
BEGIN
/**
@@ -47963,13 +49168,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `time_getSalesYear`(vMonth INT, vYear INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `time_getSalesYear`(vMonth INT, vYear INT) RETURNS int(11)
DETERMINISTIC
BEGIN
DECLARE vSalesYear INT;
@@ -47978,6 +49183,69 @@ FROM `time`
WHERE `month` = vMonth AND `year` = vYear
LIMIT 1;
RETURN vSalesYear;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `travel_getForLogiflora` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `travel_getForLogiflora`(vLanded DATE, vWarehouseFk INT) RETURNS int(11)
+ READS SQL DATA
+BEGIN
+
+ /**
+ * Devuelve un número de travel para compras de Logiflora a partir de la fecha de llegada y del almacén.
+ * Si no existe lo genera.
+ *
+ * @param vLanded Fecha de llegada al almacén
+ * @param vWarehouseFk Identificador de vn.warehouse
+ */
+
+ DECLARE vTravelFk INT;
+
+ IF vLanded THEN
+
+ SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk
+ FROM vn.travel tr
+ JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
+ JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
+ JOIN vn.agencyMode am ON am.id = tr.agencyFk
+ WHERE wIn.id = vWarehouseFk
+ AND wOut.name = 'Holanda'
+ AND am.name = 'LOGIFLORA'
+ AND landed = vLanded;
+
+ IF NOT vTravelFk THEN
+
+ INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk)
+ SELECT vLanded, curdate(), vWarehouseFk, wOut.id, am.id
+ FROM vn.warehouse wOut
+ JOIN vn.agencyMode am ON am.name = 'LOGIFLORA'
+ WHERE wOut.name = 'Holanda';
+
+ SELECT MAX(tr.id) INTO vTravelFk
+ FROM vn.travel tr
+ JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
+ JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
+ WHERE wIn.id = vWarehouseFk
+ AND wOut.name = 'Holanda'
+ AND landed = vLanded;
+ END IF;
+
+ END IF;
+
+ RETURN vTravelFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -47988,13 +49256,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `validationCode`(vString VARCHAR(255)) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `validationCode`(vString VARCHAR(255)) RETURNS int(11)
DETERMINISTIC
BEGIN
@@ -48029,13 +49297,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `validationCode_beta`(vString VARCHAR(255)) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `validationCode_beta`(vString VARCHAR(255)) RETURNS int(11)
DETERMINISTIC
BEGIN
@@ -48072,11 +49340,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `workerIsBoss`(vUserId INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `workerIsBoss`(vUserId INT) RETURNS int(11)
DETERMINISTIC
BEGIN
/**
@@ -48131,30 +49399,30 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `workerMachinery_isRegistered`(vWorkerFk VARCHAR(10)) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `workerMachinery_isRegistered`(vWorkerFk VARCHAR(10)) RETURNS tinyint(1)
READS SQL DATA
-BEGIN
-/**
- * Comprueba si existen registros en las últimas horas (maxHours de machineWorkerConfig) del trabajador vWorkerFk y si tiene a nulo la hora outTimed (indica la hora que deja el vehículo)
- *
- * @param vWorkerFk id del trabajador
- * @return Devuelve TRUE/FALSE en caso de que haya o no registros
- */
-
- IF (SELECT COUNT(*)
- FROM machineWorker m
- WHERE m.workerFk = vWorkerFk
- AND m.inTimed >= TIMESTAMPADD(HOUR , -(SELECT maxHours from machineWorkerConfig), NOW()) AND ISNULL(m.outTimed))
- THEN
- RETURN TRUE;
- ELSE
- RETURN FALSE;
- END IF;
-
+BEGIN
+/**
+ * Comprueba si existen registros en las últimas horas (maxHours de machineWorkerConfig) del trabajador vWorkerFk y si tiene a nulo la hora outTimed (indica la hora que deja el vehículo)
+ *
+ * @param vWorkerFk id del trabajador
+ * @return Devuelve TRUE/FALSE en caso de que haya o no registros
+ */
+
+ IF (SELECT COUNT(*)
+ FROM machineWorker m
+ WHERE m.workerFk = vWorkerFk
+ AND m.inTimed >= TIMESTAMPADD(HOUR , -(SELECT maxHours from machineWorkerConfig), NOW()) AND ISNULL(m.outTimed))
+ THEN
+ RETURN TRUE;
+ ELSE
+ RETURN FALSE;
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -48167,11 +49435,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `workerNigthlyHours_calculate`(vTimeIn DATETIME, vTimeOut DATETIME) RETURNS decimal(5,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `workerNigthlyHours_calculate`(vTimeIn DATETIME, vTimeOut DATETIME) RETURNS decimal(5,2)
READS SQL DATA
BEGIN
/**
@@ -48204,13 +49472,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `workerTimeControl_add`( vUserFk INT, vWarehouseFk INT, vTimed DATETIME, vIsManual BOOL) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `workerTimeControl_add`( vUserFk INT, vWarehouseFk INT, vTimed DATETIME, vIsManual BOOL) RETURNS int(11)
DETERMINISTIC
BEGIN
DECLARE vDirection VARCHAR(6);
@@ -48275,11 +49543,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `workerTimeControl_addDirection`( vUserFk INT, vWarehouseFk INT, vTimed DATETIME, vIsManual BOOL) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `workerTimeControl_addDirection`( vUserFk INT, vWarehouseFk INT, vTimed DATETIME, vIsManual BOOL) RETURNS int(11)
DETERMINISTIC
BEGIN
DECLARE vDirection VARCHAR(6);
@@ -48342,13 +49610,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `worker_isWorking`(vWorkerFk INT) RETURNS tinyint(1)
+CREATE DEFINER=`root`@`localhost` FUNCTION `worker_isWorking`(vWorkerFk INT) RETURNS tinyint(1)
READS SQL DATA
BEGIN
/**
@@ -48383,11 +49651,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `xdiario_new`(
+CREATE DEFINER=`root`@`localhost` FUNCTION `xdiario_new`(
vAsiento INT,
vDated DATE,
vSubaccount VARCHAR(12),
@@ -48439,11 +49707,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `zoneGeo_new`(vType VARCHAR(255), vName VARCHAR(255), vParentFk INT) RETURNS int(11)
+CREATE DEFINER=`root`@`localhost` FUNCTION `zoneGeo_new`(vType VARCHAR(255), vName VARCHAR(255), vParentFk INT) RETURNS int(11)
NO SQL
BEGIN
/**
@@ -48477,13 +49745,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `addNoteFromDelivery`(idTicket INT,nota TEXT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `addNoteFromDelivery`(idTicket INT,nota TEXT)
BEGIN
DECLARE observationTypeFk INT DEFAULT 3; /*3 = REPARTIDOR*/
@@ -48503,13 +49771,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `addressTaxArea`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `addressTaxArea`()
READS SQL DATA
BEGIN
/**
@@ -48551,13 +49819,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `agencyHourGetFirstShipped`(vAgencyMode INT, vAddress INT, vWarehouse INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `agencyHourGetFirstShipped`(vAgencyMode INT, vAddress INT, vWarehouse INT)
BEGIN
/**
* DEPRECATED usar zoneGetFirstShipped
@@ -48599,13 +49867,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `agencyHourGetLanded`(vDated DATE, vAddress INT, vAgency INT, vWarehouse INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `agencyHourGetLanded`(vDated DATE, vAddress INT, vAgency INT, vWarehouse INT)
BEGIN
/**
* DEPRECATED usar zoneGetLanded
@@ -48649,13 +49917,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `agencyHourGetWarehouse`(vAddress INT, vDate DATE, vWarehouse INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `agencyHourGetWarehouse`(vAddress INT, vDate DATE, vWarehouse INT)
BEGIN
/**
* DEPRECATED usar zoneGetWarehouse
@@ -48740,13 +50008,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `agencyHourListGetShipped`(vDate DATE, vAddress INT, vAgency INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `agencyHourListGetShipped`(vDate DATE, vAddress INT, vAgency INT)
BEGIN
/* * DEPRECATED usar zoneGetShipped
*/
@@ -48768,28 +50036,28 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `agencyVolume__`(vDated DATE, vAgency INT)
-BEGIN
-
- SELECT ELT(it.temperature + 1,'Calientes','Frios','Secos') AS Temp,
- CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
- vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.carro / 1000000 ,1) AS DECIMAL(10,2)) AS carros ,
- CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
- vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.espai / 1000000,1) AS DECIMAL(10,2)) AS espais
- FROM vn.buy b
- INNER JOIN vn.entry e ON e.id = b.entryFk
- INNER JOIN vn.travel tr ON tr.id = e.travelFk
- INNER JOIN vn.volumeConfig vc
- INNER JOIN vn.item i ON i.id = b.itemFk
- INNER JOIN vn.itemType it ON it.id = i.typeFk
- WHERE tr.landed = vDated
- AND tr.agencyFk IN (0, vAgency)
- GROUP BY Temp;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `agencyVolume__`(vDated DATE, vAgency INT)
+BEGIN
+
+ SELECT ELT(it.temperature + 1,'Calientes','Frios','Secos') AS Temp,
+ CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
+ vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.carro / 1000000 ,1) AS DECIMAL(10,2)) AS carros ,
+ CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
+ vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.espai / 1000000,1) AS DECIMAL(10,2)) AS espais
+ FROM vn.buy b
+ INNER JOIN vn.entry e ON e.id = b.entryFk
+ INNER JOIN vn.travel tr ON tr.id = e.travelFk
+ INNER JOIN vn.volumeConfig vc
+ INNER JOIN vn.item i ON i.id = b.itemFk
+ INNER JOIN vn.itemType it ON it.id = i.typeFk
+ WHERE tr.landed = vDated
+ AND tr.agencyFk IN (0, vAgency)
+ GROUP BY Temp;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -48800,13 +50068,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `available_calc`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `available_calc`(
vDate DATE,
vAddress INT,
vAgencyMode INT)
@@ -48870,13 +50138,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `available_calc__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `available_calc__`(
vDate DATE,
vAddress INT,
vAgencyMode INT)
@@ -48942,11 +50210,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `bankPolicy_notifyExpired`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `bankPolicy_notifyExpired`()
BEGIN
/**
*
@@ -48975,13 +50243,201 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buyUltimate`(vWarehouseFk SMALLINT, vDated DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buyUltimate`(vWarehouseFk SMALLINT, vDated DATE)
+BEGIN
+/**
+ * Calcula las últimas compras realizadas hasta una fecha
+ *
+ * @param vWarehouseFk Id del almacén
+ * @param vDated Compras hasta fecha
+ * @return tmp.buyUltimate
+ */
+ CALL cache.last_buy_refresh (FALSE);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.buyUltimate;
+ CREATE TEMPORARY TABLE tmp.buyUltimate
+ (PRIMARY KEY (itemFk, warehouseFk),
+ INDEX(itemFk))
+ ENGINE = MEMORY
+ SELECT item_id itemFk, buy_id buyFk, warehouse_id warehouseFk, landing
+ FROM cache.last_buy
+ WHERE warehouse_id = vWarehouseFk OR vWarehouseFk IS NULL;
+
+ CALL buyUltimateFromInterval(vWarehouseFk, CURDATE(), vDated);
+
+ REPLACE INTO tmp.buyUltimate
+ SELECT itemFk, buyFk, warehouseFk, landed landing
+ FROM tmp.buyUltimateFromInterval
+ WHERE (warehouseFk = vWarehouseFk OR vWarehouseFk IS NULL)
+ AND landed <= vDated;
+
+ INSERT IGNORE INTO tmp.buyUltimate
+ SELECT itemFk, buyFk, warehouseFk, landed landing
+ FROM tmp.buyUltimateFromInterval
+ WHERE (warehouseFk = vWarehouseFk OR vWarehouseFk IS NULL)
+ AND landed > vDated;
+
+ DROP TEMPORARY TABLE tmp.buyUltimateFromInterval;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `buyUltimateFromInterval` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buyUltimateFromInterval`(vWarehouseFk SMALLINT, vStarted DATE, vEnded DATE)
+BEGIN
+/**
+ * Calcula las últimas compras realizadas
+ * desde un rango de fechas.
+ *
+ * @param vWarehouseFk Id del almacén si es NULL se actualizan todos
+ * @param vStarted Fecha inicial
+ * @param vEnded Fecha fin
+ * @return tmp.buyUltimateFromInterval
+ */
+ IF vEnded IS NULL THEN
+ SET vEnded = vStarted;
+ END IF;
+
+ IF vEnded < vStarted THEN
+ SET vStarted = TIMESTAMPADD(MONTH, -1, vEnded);
+ END IF;
+
+ -- Item
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.buyUltimateFromInterval;
+ CREATE TEMPORARY TABLE tmp.buyUltimateFromInterval
+ (PRIMARY KEY (itemFk, warehouseFk), INDEX(buyFk), INDEX(landed), INDEX(warehouseFk), INDEX(itemFk))
+ ENGINE = MEMORY
+ SELECT
+ b.itemFk,
+ t.warehouseInFk warehouseFk,
+ MULTIMAX(t.landed, b.id) buyFk,
+ MAX(t.landed) landed
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ WHERE t.landed BETWEEN vStarted AND vEnded
+ AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+ AND b.price2 > 0
+ AND NOT b.isIgnored
+ AND b.quantity > 0
+ GROUP BY itemFk, warehouseInFk;
+
+ INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed)
+ SELECT
+ b.itemFk,
+ t.warehouseInFk warehouseFk,
+ b.id buyFk,
+ t.landed
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ WHERE t.landed > vEnded
+ AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+ AND b.price2 > 0
+ AND NOT b.isIgnored
+ GROUP BY itemFk, warehouseInFk;
+
+ INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed)
+ SELECT
+ b.itemFk,
+ t.warehouseInFk warehouseFk,
+ b.id buyFk,
+ t.landed
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ WHERE t.landed BETWEEN vStarted AND vEnded
+ AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+ AND b.quantity = 0
+ GROUP BY itemFk, warehouseInFk;
+
+
+
+ -- ItemOriginal
+
+ INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed)
+ SELECT
+ b.itemFk,
+ t.warehouseInFk warehouseFk,
+ MULTIMAX(t.landed, b.id) buyFk,
+ MAX(t.landed) landed
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ WHERE t.landed BETWEEN vStarted AND vEnded
+ AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+ AND b.price2 > 0
+ AND NOT b.isIgnored
+ AND b.quantity > 0
+ AND itemOriginalFk
+ GROUP BY itemOriginalFk, warehouseInFk;
+
+ INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed)
+ SELECT
+ b.itemFk,
+ t.warehouseInFk warehouseFk,
+ b.id buyFk,
+ t.landed
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ WHERE t.landed > vEnded
+ AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+ AND b.price2 > 0
+ AND NOT b.isIgnored
+ AND itemOriginalFk
+ GROUP BY itemOriginalFk, warehouseInFk;
+
+ INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed)
+ SELECT
+ b.itemFk,
+ t.warehouseInFk warehouseFk,
+ b.id buyFk,
+ t.landed
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ WHERE t.landed BETWEEN vStarted AND vEnded
+ AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+ AND b.quantity = 0
+ AND itemOriginalFk
+ GROUP BY itemOriginalFk, warehouseInFk;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `buyUltimate__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buyUltimate__`(vWarehouseFk SMALLINT, vDated DATE)
BEGIN
/**
* Calcula las �ltimas compras realizadas hasta una fecha
@@ -49022,215 +50478,78 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `buyUltimateFromInterval` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buyUltimateFromInterval`(vWarehouseFk SMALLINT, vStarted DATE, vEnded DATE)
-BEGIN
-/**
- * Calcula las últimas compras realizadas
- * desde un rango de fechas.
- *
- * @param vWarehouseFk Id del almacén si es NULL se actualizan todos
- * @param vStarted Fecha inicial
- * @param vEnded Fecha fin
- * @return tmp.buyUltimateFromInterval
- */
- IF vEnded IS NULL THEN
- SET vEnded = vStarted;
- END IF;
-
- IF vEnded < vStarted THEN
- SET vStarted = TIMESTAMPADD(MONTH, -1, vEnded);
- END IF;
-
- -- Item
-
- DROP TEMPORARY TABLE IF EXISTS tmp.buyUltimateFromInterval;
- CREATE TEMPORARY TABLE tmp.buyUltimateFromInterval
- (PRIMARY KEY (itemFk, warehouseFk), INDEX(buyFk), INDEX(landed), INDEX(warehouseFk), INDEX(itemFk))
- ENGINE = MEMORY
- SELECT
- b.itemFk,
- t.warehouseInFk warehouseFk,
- MULTIMAX(t.landed, b.id) buyFk,
- MAX(t.landed) landed
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel t ON t.id = e.travelFk
- WHERE t.landed BETWEEN vStarted AND vEnded
- AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
- AND b.price2 > 0
- AND NOT b.isIgnored
- AND b.quantity > 0
- GROUP BY itemFk, warehouseInFk;
-
- INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed)
- SELECT
- b.itemFk,
- t.warehouseInFk warehouseFk,
- b.id buyFk,
- t.landed
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel t ON t.id = e.travelFk
- WHERE t.landed > vEnded
- AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
- AND b.price2 > 0
- AND NOT b.isIgnored
- GROUP BY itemFk, warehouseInFk;
-
- INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed)
- SELECT
- b.itemFk,
- t.warehouseInFk warehouseFk,
- b.id buyFk,
- t.landed
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel t ON t.id = e.travelFk
- WHERE t.landed BETWEEN vStarted AND vEnded
- AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
- AND b.quantity = 0
- GROUP BY itemFk, warehouseInFk;
-
-
-
- -- ItemOriginal
-
- INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed)
- SELECT
- b.itemFk,
- t.warehouseInFk warehouseFk,
- MULTIMAX(t.landed, b.id) buyFk,
- MAX(t.landed) landed
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel t ON t.id = e.travelFk
- WHERE t.landed BETWEEN vStarted AND vEnded
- AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
- AND b.price2 > 0
- AND NOT b.isIgnored
- AND b.quantity > 0
- AND itemOriginalFk
- GROUP BY itemOriginalFk, warehouseInFk;
-
- INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed)
- SELECT
- b.itemFk,
- t.warehouseInFk warehouseFk,
- b.id buyFk,
- t.landed
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel t ON t.id = e.travelFk
- WHERE t.landed > vEnded
- AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
- AND b.price2 > 0
- AND NOT b.isIgnored
- AND itemOriginalFk
- GROUP BY itemOriginalFk, warehouseInFk;
-
- INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed)
- SELECT
- b.itemFk,
- t.warehouseInFk warehouseFk,
- b.id buyFk,
- t.landed
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel t ON t.id = e.travelFk
- WHERE t.landed BETWEEN vStarted AND vEnded
- AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
- AND b.quantity = 0
- AND itemOriginalFk
- GROUP BY itemOriginalFk, warehouseInFk;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `buy_afterUpsert` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buy_afterUpsert`(vSelf INT)
-BEGIN
-/**
- * Triggered actions when a buy is updated or inserted.
- *
- * @param vSelf The buy reference
- */
- DECLARE vEntryFk INT;
- DECLARE vItemFk INT;
- DECLARE vPackingOut DECIMAL(10,2);
- DECLARE vWarehouse INT;
- DECLARE vStandardFlowerBox INT;
- DECLARE vWarehouseOut INT;
- DECLARE vIsMerchandise BOOL;
- DECLARE vIsFeedStock BOOL;
-
- SELECT b.entryFk, b.itemFk, i.packingOut, ic.merchandise, vc.standardFlowerBox
- INTO vEntryFk, vItemFk, vPackingOut, vIsMerchandise, vStandardFlowerBox
- FROM buy b
- LEFT JOIN item i ON i.id = b.itemFk
- LEFT JOIN itemType it ON it.id = i.typeFk
- LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.isBox
- JOIN volumeConfig vc ON TRUE
- WHERE b.id = vSelf;
-
- SELECT t.warehouseInFk, t.warehouseOutFk
- INTO vWarehouse, vWarehouseOut
- FROM entry e
- JOIN travel t ON t.id = e.travelFk
- WHERE e.id = vEntryFk;
-
- IF vIsMerchandise THEN
-
- REPLACE itemCost SET
- itemFk = vItemFk,
- warehouseFk = vWarehouse,
- cm3 = buy_getUnitVolume(vSelf),
- cm3Delivery = IFNULL((vStandardFlowerBox * 1000) / vPackingOut, buy_getUnitVolume(vSelf));
-
- UPDATE vn.itemCost ic
- JOIN cache.last_buy lb ON lb.item_id = ic.itemFk AND lb.warehouse_id = ic.warehouseFk
- JOIN vn.buy b ON b.id = lb.buy_id
- SET ic.grams = b.weight * 1000 / b.packing
- WHERE ic.itemFk = vItemFk AND
- ic.warehouseFk = vWarehouse;
-
- END IF;
-
- SELECT isFeedStock INTO vIsFeedStock
- FROM warehouse WHERE id = vWarehouseOut AND id <> 13;
-
- IF vIsFeedStock THEN
- INSERT IGNORE INTO producer(`name`)
- SELECT es.company_name
- FROM buy b
- JOIN edi.ekt be ON be.id = b.ektFk
- JOIN edi.supplier es ON es.supplier_id = be.pro
- WHERE b.id = vSelf;
-
- END IF;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_afterUpsert`(vSelf INT)
+BEGIN
+/**
+ * Triggered actions when a buy is updated or inserted.
+ *
+ * @param vSelf The buy reference
+ */
+ DECLARE vEntryFk INT;
+ DECLARE vItemFk INT;
+ DECLARE vPackingOut DECIMAL(10,2);
+ DECLARE vWarehouse INT;
+ DECLARE vStandardFlowerBox INT;
+ DECLARE vWarehouseOut INT;
+ DECLARE vIsMerchandise BOOL;
+ DECLARE vIsFeedStock BOOL;
+
+ SELECT b.entryFk, b.itemFk, i.packingOut, ic.merchandise, vc.standardFlowerBox
+ INTO vEntryFk, vItemFk, vPackingOut, vIsMerchandise, vStandardFlowerBox
+ FROM buy b
+ LEFT JOIN item i ON i.id = b.itemFk
+ LEFT JOIN itemType it ON it.id = i.typeFk
+ LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.isBox
+ JOIN volumeConfig vc ON TRUE
+ WHERE b.id = vSelf;
+
+ SELECT t.warehouseInFk, t.warehouseOutFk
+ INTO vWarehouse, vWarehouseOut
+ FROM entry e
+ JOIN travel t ON t.id = e.travelFk
+ WHERE e.id = vEntryFk;
+
+ IF vIsMerchandise THEN
+
+ REPLACE itemCost SET
+ itemFk = vItemFk,
+ warehouseFk = vWarehouse,
+ cm3 = buy_getUnitVolume(vSelf),
+ cm3Delivery = IFNULL((vStandardFlowerBox * 1000) / vPackingOut, buy_getUnitVolume(vSelf));
+
+ UPDATE vn.itemCost ic
+ JOIN cache.last_buy lb ON lb.item_id = ic.itemFk AND lb.warehouse_id = ic.warehouseFk
+ JOIN vn.buy b ON b.id = lb.buy_id
+ SET ic.grams = b.weight * 1000 / b.packing
+ WHERE ic.itemFk = vItemFk AND
+ ic.warehouseFk = vWarehouse;
+
+ END IF;
+
+ SELECT isFeedStock INTO vIsFeedStock
+ FROM warehouse WHERE id = vWarehouseOut AND id <> 13;
+
+ IF vIsFeedStock THEN
+ INSERT IGNORE INTO producer(`name`)
+ SELECT es.company_name
+ FROM buy b
+ JOIN edi.ekt be ON be.id = b.ektFk
+ JOIN edi.supplier es ON es.supplier_id = be.pro
+ WHERE b.id = vSelf;
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -49243,11 +50562,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buy_checkGrouping`(vGrouping INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_checkGrouping`(vGrouping INT)
BEGIN
/**
* Checks the buy grouping, throws an error if it's invalid.
@@ -49270,11 +50589,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buy_getVolume`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_getVolume`()
BEGIN
/**
* Cálculo de volumen en líneas de compra
@@ -49304,11 +50623,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buy_getVolumeByAgency`(vDated DATE, vAgencyFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_getVolumeByAgency`(vDated DATE, vAgencyFk INT)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.buy;
@@ -49337,11 +50656,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buy_getVolumeByEntry`(vEntryFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_getVolumeByEntry`(vEntryFk INT)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.buy;
@@ -49366,13 +50685,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buy_notifyPassport__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_notifyPassport__`(
IN vBuyFk INT,
IN vItemFk INT,
IN vStickers SMALLINT,
@@ -49411,11 +50730,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buy_recalcPrices`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_recalcPrices`()
BEGIN
-- Preparar para que proveedores como el 4 no puedan ser recalculadas sus entradas
/**
@@ -49491,29 +50810,29 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buy_updateGrouping`(vWarehouseFk INT, vItemFk INT, vGrouping INT)
-BEGIN
-/**
- * Actualiza el grouping de las últimas compras de un artículo
- *
- * @param vWarehouseFk Id del almacén
- * @param vItemFk Id del Artículo
- * @param vGrouping Cantidad de grouping
- */
-
- CALL vn.buyUltimate(vWarehouseFk, CURDATE());
-
- UPDATE vn.buy b
- JOIN tmp.buyUltimate bu ON b.id = bu.buyFk
- SET b.`grouping` = vGrouping
- WHERE bu.warehouseFk = vWarehouseFk
- AND bu.itemFk = vItemFk;
-
- DROP TEMPORARY TABLE tmp.buyUltimate;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_updateGrouping`(vWarehouseFk INT, vItemFk INT, vGrouping INT)
+BEGIN
+/**
+ * Actualiza el grouping de las últimas compras de un artículo
+ *
+ * @param vWarehouseFk Id del almacén
+ * @param vItemFk Id del Artículo
+ * @param vGrouping Cantidad de grouping
+ */
+
+ CALL vn.buyUltimate(vWarehouseFk, CURDATE());
+
+ UPDATE vn.buy b
+ JOIN tmp.buyUltimate bu ON b.id = bu.buyFk
+ SET b.`grouping` = vGrouping
+ WHERE bu.warehouseFk = vWarehouseFk
+ AND bu.itemFk = vItemFk;
+
+ DROP TEMPORARY TABLE tmp.buyUltimate;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -49526,11 +50845,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buy_updatePacking`(vWarehouseFk INT, vItemFk INT, vPacking INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_updatePacking`(vWarehouseFk INT, vItemFk INT, vPacking INT)
BEGIN
/**
* Actualiza packing
@@ -49559,13 +50878,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `camaraFutureVolume__`(vWarehouseFk INT, vDateStart DATE, vDateEnd DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `camaraFutureVolume__`(vWarehouseFk INT, vDateStart DATE, vDateEnd DATE)
BEGIN
DECLARE vDated DATE;
@@ -49764,17 +51083,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `carrosOficialesANoOficiales` */;
+/*!50003 DROP PROCEDURE IF EXISTS `carrosOficialesANoOficiales__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `carrosOficialesANoOficiales`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `carrosOficialesANoOficiales__`()
BEGIN
DECLARE done BOOL DEFAULT FALSE;
@@ -49834,13 +51153,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_calcFromItem`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_calcFromItem`(
vLanded DATE,
vAddressFk INT,
vAgencyModeFk INT,
@@ -49879,7 +51198,355 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_calculate`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_calculate`(vLanded DATE, vAddressFk INT, vAgencyModeFk INT)
+BEGIN
+
+ /**
+ * Calcula los articulos disponibles y sus precios
+ *
+ * @table tmp.item(itemFk) Listado de artÃculos a calcular
+ * @param vLanded Fecha de recepcion de mercancia
+ * @param vAddressFk Id del consignatario
+ * @param vAgencyModeFk Id de la agencia
+ * @return tmp.ticketCalculateItem(itemFk, available, producer,
+ * item, size, stems, category, inkFk, image, origin, price)
+ * @return tmp.ticketLot(warehouseFk, itemFk, available, buyFk)
+ * @return tmp.ticketComponent
+ * @return tmp.ticketComponentPrice
+ */
+
+ DECLARE vAvailableCalc INT;
+ DECLARE vAvailableNoRaidsCalc INT;
+ DECLARE vShipped DATE;
+ DECLARE vWarehouseFk SMALLINT;
+ DECLARE vZoneFk INT;
+ DECLARE vDone BOOL;
+ DECLARE cTravelTree CURSOR FOR
+ SELECT zoneFk, warehouseFk, shipped FROM tmp.zoneGetShipped;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ CALL vn.zone_getShipped (vLanded, vAddressFk, vAgencyModeFk, FALSE);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+ CREATE TEMPORARY TABLE tmp.ticketLot(
+ `warehouseFk` smallint(5) unsigned NOT NULL,
+ `itemFk` int(11) NOT NULL,
+ `available` double DEFAULT NULL,
+ `buyFk` int(11) DEFAULT NULL,
+ `fix` tinyint(3) unsigned DEFAULT '0', -- este campo parece obsoleto
+ `zoneFk` int(11) NOT NULL,
+ KEY `itemFk` (`itemFk`),
+ KEY `item_warehouse` (`itemFk`,`warehouseFk`) USING HASH
+ ) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+
+ CALL catalog_componentPrepare();
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem;
+ CREATE TEMPORARY TABLE tmp.ticketCalculateItem(
+ itemFk INT(11) NOT NULL,
+ available INT(11),
+ producer VARCHAR(50),
+ item VARCHAR(50),
+ size INT(10) UNSIGNED,
+ stems INT(11),
+ category VARCHAR(3),
+ inkFk VARCHAR(3),
+ image VARCHAR(50),
+ origin VARCHAR(3),
+ price DECIMAL(10,2),
+ priceKg DECIMAL(10,2),
+ PRIMARY KEY `itemFk` (`itemFk`)
+ ) ENGINE = MEMORY DEFAULT CHARSET=utf8;
+
+ OPEN cTravelTree;
+
+ l: LOOP
+ SET vDone = FALSE;
+ FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped;
+
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+
+ CALL `cache`.available_refresh (vAvailableCalc, FALSE, vWarehouseFk, vShipped);
+ CALL `cache`.availableNoRaids_refresh (vAvailableNoRaidsCalc, FALSE, vWarehouseFk, vShipped);
+ CALL vn.buyUltimate(vWarehouseFk, vShipped);
+
+ INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
+ SELECT vWarehouseFk,
+ a.item_id,
+ IFNULL(a.available, 0),
+ bu.buyFk,
+ vZoneFk
+ FROM `cache`.available a
+ LEFT JOIN cache.availableNoRaids anr ON anr.item_id = a.item_id
+ AND anr.calc_id = vAvailableNoRaidsCalc
+ JOIN tmp.item i ON i.itemFk = a.item_id
+ JOIN vn.item it ON it.id = i.itemFk
+ LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id
+ LEFT JOIN edi.supplyOffer so ON so.srId = it.supplyResponseFk
+ LEFT JOIN (SELECT isVNHSupplier, isEarlyBird, TRUE AS itemAllowed
+ FROM vn.addressFilter af
+ JOIN (SELECT ad.provinceFk, p.countryFk, ad.isLogifloraAllowed
+ FROM vn.address ad
+ JOIN vn.province p ON p.id = ad.provinceFk
+ WHERE ad.id = vAddressFk
+ ) sub2 ON sub2.provinceFk <=> IFNULL(af.provinceFk, sub2.provinceFk)
+ AND sub2.countryFk <=> IFNULL(af.countryFk, sub2.countryFk)
+ AND sub2.isLogifloraAllowed <=> IFNULL(af.isLogifloraAllowed, sub2.isLogifloraAllowed)
+ WHERE vWarehouseFk = af.warehouseFk
+ ) sub ON sub.isVNHSupplier = so.isVNHSupplier
+ AND IFNULL(sub.isEarlyBird, so.isEarlyBird) = so.isEarlyBird
+ JOIN vn.agencyMode am ON am.id = vAgencyModeFk
+ JOIN vn.agency ag ON ag.id = am.agencyFk
+ JOIN vn.itemType itt ON itt.id = it.typeFk
+ WHERE a.calc_id = vAvailableCalc
+ AND a.available > 0
+ AND (sub.itemAllowed OR NOT it.isFloramondo OR anr.available > 0)
+ AND (ag.isAnyVolumeAllowed OR NOT itt.isUnconventionalSize);
+
+ DROP TEMPORARY TABLE tmp.buyUltimate;
+
+ CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+
+ INSERT INTO tmp.ticketCalculateItem (
+ itemFk,
+ available,
+ producer,
+ item,
+ size,
+ stems,
+ category,
+ inkFk,
+ image,
+ origin,
+ price,
+ priceKg)
+ SELECT
+ tl.itemFk,
+ SUM(tl.available) available,
+ p.name producer,
+ i.name item,
+ i.size size,
+ i.stems,
+ i.category,
+ i.inkFk,
+ i.image,
+ o.code origin,
+ bl.price,
+ bl.priceKg
+ FROM tmp.ticketLot tl
+ JOIN item i ON tl.itemFk = i.id
+ LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible
+ JOIN origin o ON o.id = i.originFk
+ JOIN (
+ SELECT *
+ FROM (SELECT price, itemFk, priceKg
+ FROM tmp.ticketComponentPrice
+ WHERE warehouseFk = vWarehouseFk
+ ORDER BY (rate = 2) DESC) sub
+ GROUP BY itemFk
+ ) bl ON bl.itemFk = tl.itemFk
+ WHERE tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk
+ GROUP BY tl.itemFk
+ ON DUPLICATE KEY UPDATE available = available + VALUES(available);
+
+ END LOOP;
+
+ CLOSE cTravelTree;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `catalog_calculate_beta` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_calculate_beta`(vLanded DATE, vAddressFk INT, vAgencyModeFk INT)
+BEGIN
+
+ /**
+ * Calcula los articulos disponibles y sus precios
+ *
+ * @table tmp.item(itemFk) Listado de artÃculos a calcular
+ * @param vLanded Fecha de recepcion de mercancia
+ * @param vAddressFk Id del consignatario
+ * @param vAgencyModeFk Id de la agencia
+ * @return tmp.ticketCalculateItem(itemFk, available, producer,
+ * item, size, stems, category, inkFk, image, origin, price)
+ * @return tmp.ticketLot(warehouseFk, itemFk, available, buyFk)
+ * @return tmp.ticketComponent
+ * @return tmp.ticketComponentPrice
+ */
+
+ DECLARE vAvailableCalc INT;
+ DECLARE vAvailableNoRaidsCalc INT;
+ DECLARE vShipped DATE;
+ DECLARE vWarehouseFk SMALLINT;
+ DECLARE vZoneFk INT;
+ DECLARE vDone BOOL;
+ DECLARE cTravelTree CURSOR FOR
+ SELECT zoneFk, warehouseFk, shipped FROM tmp.zoneGetShipped;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ CALL vn.zone_getShipped (vLanded, vAddressFk, vAgencyModeFk, FALSE);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+ CREATE TEMPORARY TABLE tmp.ticketLot(
+ `warehouseFk` smallint(5) unsigned NOT NULL,
+ `itemFk` int(11) NOT NULL,
+ `available` double DEFAULT NULL,
+ `buyFk` int(11) DEFAULT NULL,
+ `fix` tinyint(3) unsigned DEFAULT '0', -- este campo parece obsoleto
+ `zoneFk` int(11) NOT NULL,
+ KEY `itemFk` (`itemFk`),
+ KEY `item_warehouse` (`itemFk`,`warehouseFk`) USING HASH
+ ) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+
+ CALL catalog_componentPrepare();
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem;
+ CREATE TEMPORARY TABLE tmp.ticketCalculateItem(
+ itemFk INT(11) NOT NULL,
+ available INT(11),
+ producer VARCHAR(50),
+ item VARCHAR(50),
+ size INT(10) UNSIGNED,
+ stems INT(11),
+ category VARCHAR(3),
+ inkFk VARCHAR(3),
+ image VARCHAR(50),
+ origin VARCHAR(3),
+ price DECIMAL(10,2),
+ priceKg DECIMAL(10,2),
+ PRIMARY KEY `itemFk` (`itemFk`)
+ ) ENGINE = MEMORY DEFAULT CHARSET=utf8;
+
+ OPEN cTravelTree;
+
+ l: LOOP
+ SET vDone = FALSE;
+ FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped;
+
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+
+ CALL `cache`.available_refresh (vAvailableCalc, FALSE, vWarehouseFk, vShipped);
+ CALL `cache`.availableNoRaids_refresh (vAvailableNoRaidsCalc, FALSE, vWarehouseFk, vShipped);
+ CALL vn.buyUltimate(vWarehouseFk, vShipped);
+
+ INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
+ SELECT vWarehouseFk,
+ a.item_id,
+ IFNULL(a.available, 0),
+ bu.buyFk,
+ vZoneFk
+ FROM `cache`.available a
+ LEFT JOIN cache.availableNoRaids anr ON anr.item_id = a.item_id
+ AND anr.calc_id = vAvailableNoRaidsCalc
+ JOIN tmp.item i ON i.itemFk = a.item_id
+ JOIN vn.item it ON it.id = i.itemFk
+ LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id
+ LEFT JOIN edi.supplyOffer so ON so.srId = it.supplyResponseFk
+ LEFT JOIN (SELECT isVNHSupplier, isEarlyBird, TRUE AS itemAllowed
+ FROM vn.addressFilter af
+ JOIN (SELECT ad.provinceFk, p.countryFk, ad.isLogifloraAllowed
+ FROM vn.address ad
+ JOIN vn.province p ON p.id = ad.provinceFk
+ WHERE ad.id = vAddressFk
+ ) sub2 ON sub2.provinceFk <=> IFNULL(af.provinceFk, sub2.provinceFk)
+ AND sub2.countryFk <=> IFNULL(af.countryFk, sub2.countryFk)
+ AND sub2.isLogifloraAllowed <=> IFNULL(af.isLogifloraAllowed, sub2.isLogifloraAllowed)
+ WHERE vWarehouseFk = af.warehouseFk
+ ) sub ON sub.isVNHSupplier = so.isVNHSupplier
+ AND IFNULL(sub.isEarlyBird, so.isEarlyBird) = so.isEarlyBird
+ JOIN vn.agencyMode am ON am.id = vAgencyModeFk
+ JOIN vn.agency ag ON ag.id = am.agencyFk
+ JOIN vn.itemType itt ON itt.id = it.typeFk
+ WHERE a.calc_id = vAvailableCalc
+ AND a.available > 0
+ AND (sub.itemAllowed OR NOT it.isFloramondo OR anr.available > 0)
+ AND (ag.isAnyVolumeAllowed OR NOT itt.isUnconventionalSize);
+
+ DROP TEMPORARY TABLE tmp.buyUltimate;
+
+ CALL vn.catalog_componentCalculate_beta(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+
+ INSERT INTO tmp.ticketCalculateItem (
+ itemFk,
+ available,
+ producer,
+ item,
+ size,
+ stems,
+ category,
+ inkFk,
+ image,
+ origin,
+ price,
+ priceKg)
+ SELECT
+ tl.itemFk,
+ SUM(tl.available) available,
+ p.name producer,
+ i.name item,
+ i.size size,
+ i.stems,
+ i.category,
+ i.inkFk,
+ i.image,
+ o.code origin,
+ bl.price,
+ bl.priceKg
+ FROM tmp.ticketLot tl
+ JOIN item i ON tl.itemFk = i.id
+ LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible
+ JOIN origin o ON o.id = i.originFk
+ JOIN (
+ SELECT *
+ FROM (SELECT price, itemFk, priceKg
+ FROM tmp.ticketComponentPrice
+ WHERE warehouseFk = vWarehouseFk
+ ORDER BY (rate = 2) DESC) sub
+ GROUP BY itemFk
+ ) bl ON bl.itemFk = tl.itemFk
+ WHERE tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk
+ GROUP BY tl.itemFk
+ ON DUPLICATE KEY UPDATE available = available + VALUES(available);
+
+ END LOOP;
+
+ CLOSE cTravelTree;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `catalog_calculate__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_calculate__`(
vLanded DATE,
vAddressFk INT,
vAgencyModeFk INT)
@@ -49965,11 +51632,13 @@ proc: BEGIN
vZoneFk
FROM `cache`.available i
JOIN tmp.item br ON br.itemFk = i.item_id
- LEFT JOIN item it ON it.id = i.item_id
+ LEFT JOIN item it ON it.id = i.item_id -- esta linea sobra ?
LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.item_id
WHERE i.calc_id = vAvailableCalc
AND i.available > 0;
-
+
+ CALL util.debugAdd('ticketLot: ', (SELECT COUNT(*) FROM tmp.ticketLot));
+
DROP TEMPORARY TABLE tmp.buyUltimate;
CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
@@ -50020,174 +51689,6 @@ proc: BEGIN
CLOSE cTravelTree;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `catalog_calculate_beta` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_calculate_beta`(
- vLanded DATE,
- vAddressFk INT,
- vAgencyModeFk INT)
-proc: BEGIN
-/**
- * Calcula los articulos disponibles y sus precios
- *
- * @table tmp.item(itemFk) Listado de artÃculos a calcular
- * @param vLanded Fecha de recepcion de mercancia
- * @param vAddressFk Id del consignatario
- * @param vAgencyModeFk Id de la agencia
- * @return tmp.ticketCalculateItem(itemFk, available, producer,
- * item, size, stems, category, inkFk, image, origin, price)
- * @return tmp.ticketLot(warehouseFk, itemFk, available, buyFk)
- * @return tmp.ticketComponent
- * @return tmp.ticketComponentPrice
- * @return tmp.zoneGetShipped
- */
-
- DECLARE vAvailableCalc INT;
- DECLARE vShipped DATE;
- DECLARE vWarehouseFk SMALLINT;
- DECLARE vZoneFk INT;
- DECLARE vDone BOOL;
- DECLARE cTravelTree CURSOR FOR
- SELECT zoneFk, warehouseFk, shipped FROM tmp.zoneGetShipped;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
- -- Establece los almacenes y las fechas que van a entrar al disponible
- CALL vn.zone_getShipped (vLanded, vAddressFk, vAgencyModeFk, FALSE);
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
- CREATE TEMPORARY TABLE tmp.ticketLot(
- `warehouseFk` smallint(5) unsigned NOT NULL,
- `itemFk` int(11) NOT NULL,
- `available` double DEFAULT NULL,
- `buyFk` int(11) DEFAULT NULL,
- `fix` tinyint(3) unsigned DEFAULT '0', -- este campo parece obsoleto
- `zoneFk` int(11) NOT NULL,
- KEY `itemFk` (`itemFk`),
- KEY `item_warehouse` (`itemFk`,`warehouseFk`) USING HASH
- ) ENGINE=MEMORY DEFAULT CHARSET=utf8;
-
- CALL catalog_componentPrepare();
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem;
- CREATE TEMPORARY TABLE tmp.ticketCalculateItem(
- itemFk INT(11) NOT NULL,
- available INT(11),
- producer VARCHAR(50),
- item VARCHAR(50),
- size INT(10) UNSIGNED,
- stems INT(11),
- category VARCHAR(3),
- inkFk VARCHAR(3),
- image VARCHAR(50),
- origin VARCHAR(3),
- price DECIMAL(10,2),
- priceKg DECIMAL(10,2),
- PRIMARY KEY `itemFk` (`itemFk`)
- ) ENGINE = MEMORY DEFAULT CHARSET=utf8;
-
- OPEN cTravelTree;
-
- l: LOOP
- SET vDone = FALSE;
- FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped;
-
- IF vDone THEN
- LEAVE l;
- END IF;
-
- CALL `cache`.available_refresh (vAvailableCalc, FALSE, vWarehouseFk, vShipped);
- CALL vn.buyUltimate (vWarehouseFk, vShipped);
-
- INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
- SELECT vWarehouseFk,
- a.item_id,
- IFNULL(a.available, 0),
- bu.buyFk,
- vZoneFk
- FROM `cache`.available a
- JOIN vn.address a ON a.id = @addressFk
- JOIN vn.province p ON p.id = a.provinceFk
- JOIN vn.item i ON i.id = a.item_id
- JOIN vn.addressFilter af
- LEFT JOIN edi.supplyOffer so ON so.srId = i.supplyResponseFk
- LEFT JOIN edi.VMPSettings v ON v.VMPID = so.vmpID
- LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id
- WHERE a.calc_id = vAvailableCalc
- AND a.available > 0
- AND i.supplyResponseFk
- AND (IFNULL(af.isEarlyBird,so.isEarlyBird) = so.isEarlyBird OR ISNULL(so.isEarlyBird))
- AND (IFNULL(af.isVNHSupplier,so.isVNHSupplier ) = so.isVNHSupplier OR ISNULL(so.isVNHSupplier))
- AND af.warehouseFk = vWarehouseFk
- AND (ISNULL(af.provinceFk) OR af.provinceFk = a.provinceFk)
- AND (ISNULL(af.countryFk) OR af.countryFk = p.countryFk)
- AND (ISNULL(af.isLogifloraAllowed) OR af.isLogifloraAllowed = a.isLogifloraAllowed)
- ;
-
- DROP TEMPORARY TABLE tmp.buyUltimate;
-
- CALL vn.catalog_componentCalculate_beta(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
- INSERT INTO tmp.ticketCalculateItem (
- itemFk,
- available,
- producer,
- item,
- size,
- stems,
- category,
- inkFk,
- image,
- origin,
- price,
- priceKg)
- SELECT
- tl.itemFk,
- SUM(tl.available) available,
- p.name producer,
- i.name item,
- i.size size,
- i.stems,
- i.category,
- i.inkFk,
- i.image,
- o.code origin,
- bl.price,
- bl.priceKg
- FROM tmp.ticketLot tl
- JOIN item i ON tl.itemFk = i.id
- LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible
- JOIN origin o ON o.id = i.originFk
- JOIN (
- SELECT *
- FROM (SELECT price, itemFk, priceKg
- FROM tmp.ticketComponentPrice
- WHERE warehouseFk = vWarehouseFk
- ORDER BY (rate = 2) DESC) sub
- GROUP BY itemFk
- ) bl ON bl.itemFk = tl.itemFk
- WHERE tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk
- GROUP BY tl.itemFk
- ON DUPLICATE KEY UPDATE available = available + VALUES(available);
-
- END LOOP;
-
- CLOSE cTravelTree;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -50204,7 +51705,697 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_componentCalculate`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_componentCalculate`( vZoneFk INT,
+ vAddressFk INT,
+ vShipped DATE,
+ vWarehouseFk INT)
+BEGIN
+ /**
+ * Calcula los componentes de los articulos de tmp.ticketLot
+ *
+ * @param vZoneFk para calcular el transporte
+ * @param vAddressFk Consignatario
+ * @param vShipped dia de salida del pedido
+ * @param vWarehouseFk warehouse de salida del pedido
+ * @table tmp.ticketLot (warehouseFk, available, itemFk, buyFk, zoneFk)
+ * @table tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ *
+ * @return tmp.ticketComponentPrice (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+ */
+
+ DECLARE vClientFk INT;
+ DECLARE vIsFrenchVNHBuyer BOOLEAN DEFAULT FALSE;
+ DECLARE vVNHWarehouseFk INT DEFAULT 7;
+ DECLARE vFrenchDiscount DECIMAL(3,2) DEFAULT 0.12;
+
+ SELECT clientFk INTO vClientFK
+ FROM address
+ WHERE id = vAddressFk;
+
+ SELECT (c.country = 'FRANCIA' AND vWarehouseFk = vVNHWarehouseFk)
+ INTO vIsFrenchVNHBuyer
+ FROM vn.country c
+ JOIN vn.province p ON p.countryFk = c.id
+ JOIN vn.address a ON a.provinceFk = p.id
+ WHERE a.id = vAddressFk;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCalculate;
+
+ CREATE TEMPORARY TABLE tmp.ticketComponentCalculate
+ (PRIMARY KEY (itemFk, warehouseFk))
+ ENGINE = MEMORY
+ SELECT
+ tl.itemFk,
+ tl.warehouseFk,
+ tl.available,
+ -- IF((@rate2 := IFNULL(pf.rate2, b.price2)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate2) rate2,
+ IF(i.hasMinPrice, GREATEST(i.minPrice,IFNULL(pf.rate2, b.price2)),IFNULL(pf.rate2, b.price2)) rate2,
+ IF(i.hasMinPrice, GREATEST(i.minPrice,IFNULL(pf.rate3, b.price3)),IFNULL(pf.rate3, b.price3)) rate3,
+ -- @minPrice := IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) rate3,
+ -- TRUE AS minPrice,
+ IFNULL(pf.packing, GREATEST(b.grouping, b.packing)) packing,
+ IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
+ ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
+ tl.buyFk,
+ i.typeFk,
+ IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping
+ FROM tmp.ticketLot tl
+ JOIN buy b ON b.id = tl.buyFk
+ JOIN item i ON i.id = tl.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN specialPrice sp ON sp.itemFk = i.id
+ AND sp.clientFk = vClientFk
+ LEFT JOIN (
+ SELECT * FROM (
+ SELECT pf.itemFk,
+ pf.`grouping`,
+ pf.packing,
+ pf.box,
+ pf.rate2,
+ pf.rate3,
+ zw.warehouseFk
+ FROM priceFixed pf
+ JOIN zoneWarehouse zw ON zw.zoneFk = vZoneFk
+ AND zw.warehouseFk IN (pf.warehouseFk,0)
+ WHERE vShipped BETWEEN pf.started AND pf.ended
+ ORDER BY pf.itemFk, pf.warehouseFk DESC
+ ) tpf
+ GROUP BY tpf.itemFk, tpf.warehouseFk
+ ) pf ON pf.itemFk = tl.itemFk
+ AND pf.warehouseFk = tl.warehouseFk
+ WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01
+ AND ic.merchandise
+ AND tl.zoneFk = vZoneFk
+ AND tl.warehouseFk = vWarehouseFk;
+
+ -- Coste
+ INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+ SELECT
+ tcc.warehouseFk,
+ tcc.itemFk,
+ c2.id,
+ b.buyingValue + b.freightValue + b.packageValue + b.comissionValue
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN vn.component c2 ON c2.code = 'purchaseValue'
+ JOIN buy b ON b.id = tcc.buyFk;
+
+ -- Margen
+ INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+ SELECT
+ tcc.warehouseFk,
+ tcc.itemFk,
+ c2.id,
+ tcc.rate3 - b.buyingValue - b.freightValue - b.packageValue - b.comissionValue
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN vn.component c2 ON c2.code = 'margin'
+ JOIN buy b ON b.id = tcc.buyFk;
+
+ -- Promo Francia
+ IF vIsFrenchVNHBuyer THEN
+
+ INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+ SELECT
+ tcc.warehouseFk,
+ tcc.itemFk,
+ c2.id,
+ - vFrenchDiscount * (b.buyingValue + b.freightValue + b.packageValue + b.comissionValue) / ( 1 - vFrenchDiscount)
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN vn.component c2 ON c2.code = 'frenchOffer'
+ JOIN buy b ON b.id = tcc.buyFk;
+
+ END IF;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentBase;
+ CREATE TEMPORARY TABLE tmp.ticketComponentBase ENGINE = MEMORY
+ SELECT tc.itemFk, ROUND(SUM(tc.cost), 4) AS base, tc.warehouseFk
+ FROM tmp.ticketComponent tc
+ JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tc.itemFk AND tcc.warehouseFk = tc.warehouseFk
+ GROUP BY tc.itemFk, warehouseFk;
+
+ -- RECOBRO
+ INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ SELECT tcb.warehouseFk, tcb.itemFk, c2.id,
+ ROUND(tcb.base *
+ LEAST(
+ MAX(GREATEST(IFNULL(cr.priceIncreasing,0),
+ IFNULL(cr1.priceIncreasing,0),
+ IFNULL(cr2.priceIncreasing,0))
+ ),
+ 0.25),
+ 3)
+ FROM tmp.ticketComponentBase tcb
+ JOIN vn.component c2 ON c2.code = 'debtCollection'
+ JOIN claimRatio cr ON cr.clientFk = vClientFk
+ LEFT JOIN clientYoke cy1 ON cy1.leftOx = cr.clientFk
+ LEFT JOIN claimRatio cr1 ON cr1.clientFk = cy1.rightOx
+ LEFT JOIN clientYoke cy2 ON cy2.rightOx = cr.clientFk
+ LEFT JOIN claimRatio cr2 ON cr2.clientFk = cy2.leftOx
+ WHERE GREATEST(IFNULL(cr.priceIncreasing,0), IFNULL(cr1.priceIncreasing,0), IFNULL(cr2.priceIncreasing,0)) > 0.009
+ GROUP BY tcb.itemFk;
+
+ -- Mana auto
+ INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ SELECT tcb.warehouseFk, tcb.itemFk, c2.id, ROUND(base * (0.01 + wm.pricesModifierRate), 3) as manaAuto
+ FROM tmp.ticketComponentBase tcb
+ JOIN `client` c on c.id = vClientFk
+ JOIN workerMana wm ON c.salesPersonFk = wm.workerFk
+ JOIN vn.component c2 ON c2.code = 'autoMana'
+ WHERE wm.isPricesModifierActivated
+ HAVING manaAuto <> 0;
+
+ -- Precios especiales
+ INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ SELECT tcb.warehouseFk,
+ tcb.itemFk,
+ c2.id,
+ GREATEST(
+ IFNULL(ROUND(tcb.base * c2.tax, 4), 0),
+ IF(i.hasMinPrice, i.minPrice,0) - tcc.rate3
+ ) cost
+ FROM tmp.ticketComponentBase tcb
+ JOIN vn.component c2 ON c2.code = 'lastUnitsDiscount'
+ JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk
+ LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
+ JOIN vn.item i ON i.id = tcb.itemFk
+ WHERE sp.value IS NULL
+ AND i.supplyResponseFk IS NULL;
+
+ -- Venta por paquetes
+ INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ SELECT tcc.warehouseFk, tcc.itemFk, c2.id, tcc.rate2 - tcc.rate3
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN vn.component c2 ON c2.code = 'salePerPackage'
+ JOIN buy b ON b.id = tcc.buyFk
+ LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
+ WHERE sp.value IS NULL;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zone;
+ CREATE TEMPORARY TABLE IF NOT EXISTS tmp.zone (INDEX (id))
+ ENGINE = MEMORY
+ SELECT vZoneFk id;
+
+ CALL zone_getOptionsForShipment(vShipped, TRUE);
+
+ -- Reparto
+ INSERT INTO tmp.ticketComponent
+ SELECT tcc.warehouseFK,
+ tcc.itemFk,
+ c2.id,
+ z.inflation * ROUND(ic.cm3delivery * (IFNULL(zo.price,5000) - IFNULL(zo.bonus,0)) / (1000 * vc.standardFlowerBox) , 4) cost
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN item i ON i.id = tcc.itemFk
+ JOIN tmp.zoneOption zo ON zo.zoneFk = vZoneFk
+ JOIN zone z ON z.id = vZoneFk
+ JOIN agencyMode am ON am.id = z.agencyModeFk
+ JOIN vn.volumeConfig vc
+ JOIN vn.component c2 ON c2.code = 'delivery'
+ LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk
+ AND ic.itemFk = tcc.itemFk
+ HAVING cost <> 0;
+
+ DROP TEMPORARY TABLE tmp.zoneOption;
+ /*
+ -- Extra reparto
+ INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ SELECT tcc.warehouseFk, tcc.itemFk, c2.id, ap.packagingValue cost
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN vn.addressForPackaging ap
+ JOIN vn.component c2 ON c2.code = 'bagged'
+ WHERE ap.addressFk = vAddressFk;
+ */
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCopy;
+ CREATE TEMPORARY TABLE tmp.ticketComponentCopy ENGINE = MEMORY
+ SELECT * FROM tmp.ticketComponent;
+
+ -- Precio especial
+ INSERT INTO tmp.ticketComponent
+ SELECT tcc.warehouseFk,
+ tcc.itemFk,
+ c2.id,
+ sp.value - SUM(tcc.cost) sumCost
+ FROM tmp.ticketComponentCopy tcc
+ JOIN component c ON c.id = tcc.componentFk
+ JOIN specialPrice sp ON sp.clientFk = vClientFK AND sp.itemFk = tcc.itemFk
+ JOIN vn.component c2 ON c2.code = 'specialPrices'
+ WHERE c.classRate IS NULL
+ AND tcc.warehouseFk = vWarehouseFk
+ GROUP BY tcc.itemFk, tcc.warehouseFk
+ HAVING ABS(sumCost) > 0.001;
+
+ -- Rappel
+ INSERT INTO tmp.ticketComponent
+ SELECT tcc.warehouseFk,
+ tcc.itemFk,
+ IFNULL(c.componentFk ,c2.id),
+ SUM(tcc.cost) * ((1/(1-c.rappel/100)) -1) sumCost
+ FROM tmp.ticketComponentCopy tcc
+ JOIN vn.clientChain cc ON cc.clientFk = vClientFk
+ JOIN vn.`chain` c ON c.id = cc.chainFk
+ JOIN vn.component c2 ON c2.code = 'rappel'
+ WHERE tcc.warehouseFk = vWarehouseFk
+ GROUP BY tcc.itemFk, tcc.warehouseFk;
+
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentSum;
+ CREATE TEMPORARY TABLE tmp.ticketComponentSum
+ (INDEX (itemFk, warehouseFk))
+ ENGINE = MEMORY
+ SELECT SUM(cost) sumCost, tc.itemFk, tc.warehouseFk, c.classRate
+ FROM tmp.ticketComponent tc
+ JOIN component c ON c.id = tc.componentFk
+ GROUP BY tc.itemFk, tc.warehouseFk, c.classRate;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentRate;
+ CREATE TEMPORARY TABLE tmp.ticketComponentRate ENGINE = MEMORY
+ SELECT tcc.warehouseFk,
+ tcc.itemFk,
+ 1 rate,
+ IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`,
+ CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
+ CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
+ AND tcs.warehouseFk = tcc.warehouseFk
+ WHERE IFNULL(tcs.classRate, 1) = 1
+ AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
+ GROUP BY tcs.warehouseFk, tcs.itemFk;
+
+ INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+ SELECT
+ tcc.warehouseFk,
+ tcc.itemFk,
+ 2 rate,
+ tcc.packing `grouping`,
+ SUM(tcs.sumCost) price,
+ SUM(tcs.sumCost) / weightGrouping priceKg
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
+ AND tcs.warehouseFk = tcc.warehouseFk
+ WHERE tcc.available IS NULL OR (IFNULL(tcs.classRate, 2) = 2
+ AND tcc.packing > 0 AND tcc.available >= tcc.packing)
+ GROUP BY tcs.warehouseFk, tcs.itemFk;
+
+ INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+ SELECT
+ tcc.warehouseFk,
+ tcc.itemFk,
+ 3 rate,
+ tcc.available `grouping`,
+ SUM(tcs.sumCost) price,
+ SUM(tcs.sumCost) / weightGrouping priceKg
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
+ AND tcs.warehouseFk = tcc.warehouseFk
+ WHERE IFNULL(tcs.classRate, 3) = 3
+ GROUP BY tcs.warehouseFk, tcs.itemFk;
+
+ INSERT INTO tmp.ticketComponentPrice (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+ SELECT * FROM (
+ SELECT * FROM tmp.ticketComponentRate ORDER BY price
+ ) t
+ GROUP BY itemFk, warehouseFk, `grouping`;
+
+ DROP TEMPORARY TABLE
+ tmp.ticketComponentCalculate,
+ tmp.ticketComponentSum,
+ tmp.ticketComponentBase,
+ tmp.ticketComponentRate,
+ tmp.ticketComponentCopy;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `catalog_componentCalculate_beta` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_componentCalculate_beta`( vZoneFk INT,
+ vAddressFk INT,
+ vShipped DATE,
+ vWarehouseFk INT)
+BEGIN
+ /**
+ * Calcula los componentes de los articulos de tmp.ticketLot
+ *
+ * @param vZoneFk para calcular el transporte
+ * @param vAddressFk Consignatario
+ * @param vShipped dia de salida del pedido
+ * @param vWarehouseFk warehouse de salida del pedido
+ * @table tmp.ticketLot (warehouseFk, available, itemFk, buyFk, zoneFk)
+ * @table tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ *
+ * @return tmp.ticketComponentPrice (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+ */
+
+ DECLARE vClientFk INT;
+ DECLARE vIsFrenchVNHBuyer BOOLEAN DEFAULT FALSE;
+ DECLARE vVNHWarehouseFk INT DEFAULT 7;
+ DECLARE vFrenchDiscount DECIMAL(3,2) DEFAULT 0.12;
+ DECLARE visAnyVolumeAllowed BOOL;
+
+ SELECT clientFk INTO vClientFK
+ FROM address
+ WHERE id = vAddressFk;
+
+ SELECT (c.country = 'FRANCIA' AND vWarehouseFk = vVNHWarehouseFk)
+ INTO vIsFrenchVNHBuyer
+ FROM vn.country c
+ JOIN vn.province p ON p.countryFk = c.id
+ JOIN vn.address a ON a.provinceFk = p.id
+ WHERE a.id = vAddressFk;
+
+
+ -- Se eliminan los productos de tamaños no convencionales, salvo agencias que lo permitan
+ SELECT a.isAnyVolumeAllowed INTO visAnyVolumeAllowed
+ FROM vn.agency a
+ JOIN vn.agencyMode am ON am.agencyFk = a.id
+ JOIN vn.`zone`z ON z.agencyModeFk = am.id
+ WHERE z.id = vZoneFk;
+
+ IF NOT vIsAnyVolumeAllowed THEN
+
+ DELETE tl.*
+ FROM tmp.ticketLot tl
+ JOIN vn.item i ON i.id = tl.itemFk
+ JOIN vn.itemType it ON it.id = i.typeFk
+ WHERE it.isUnconventionalSize;
+
+ END IF;
+
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCalculate;
+
+ CREATE TEMPORARY TABLE tmp.ticketComponentCalculate
+ (PRIMARY KEY (itemFk, warehouseFk))
+ ENGINE = MEMORY
+ SELECT
+ tl.itemFk,
+ tl.warehouseFk,
+ tl.available,
+ -- IF((@rate2 := IFNULL(pf.rate2, b.price2)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate2) rate2,
+ IF(i.hasMinPrice, GREATEST(i.minPrice,IFNULL(pf.rate2, b.price2)),IFNULL(pf.rate2, b.price2)) rate2,
+ IF(i.hasMinPrice, GREATEST(i.minPrice,IFNULL(pf.rate3, b.price3)),IFNULL(pf.rate3, b.price3)) rate3,
+ -- @minPrice := IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) rate3,
+ -- TRUE AS minPrice,
+ IFNULL(pf.packing, GREATEST(b.grouping, b.packing)) packing,
+ IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
+ ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
+ tl.buyFk,
+ i.typeFk,
+ IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping
+ FROM tmp.ticketLot tl
+ JOIN buy b ON b.id = tl.buyFk
+ JOIN item i ON i.id = tl.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN specialPrice sp ON sp.itemFk = i.id
+ AND sp.clientFk = vClientFk
+ LEFT JOIN (
+ SELECT * FROM (
+ SELECT pf.itemFk,
+ pf.`grouping`,
+ pf.packing,
+ pf.box,
+ pf.rate2,
+ pf.rate3,
+ zw.warehouseFk
+ FROM priceFixed pf
+ JOIN zoneWarehouse zw ON zw.zoneFk = vZoneFk
+ AND zw.warehouseFk IN (pf.warehouseFk,0)
+ WHERE vShipped BETWEEN pf.started AND pf.ended
+ ORDER BY pf.itemFk, pf.warehouseFk DESC
+ ) tpf
+ GROUP BY tpf.itemFk, tpf.warehouseFk
+ ) pf ON pf.itemFk = tl.itemFk
+ AND pf.warehouseFk = tl.warehouseFk
+ WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01
+ AND ic.merchandise
+ AND tl.zoneFk = vZoneFk
+ AND tl.warehouseFk = vWarehouseFk;
+
+ -- Coste
+ INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+ SELECT
+ tcc.warehouseFk,
+ tcc.itemFk,
+ c2.id,
+ b.buyingValue + b.freightValue + b.packageValue + b.comissionValue
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN vn.component c2 ON c2.code = 'purchaseValue'
+ JOIN buy b ON b.id = tcc.buyFk;
+
+ -- Margen
+ INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+ SELECT
+ tcc.warehouseFk,
+ tcc.itemFk,
+ c2.id,
+ tcc.rate3 - b.buyingValue - b.freightValue - b.packageValue - b.comissionValue
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN vn.component c2 ON c2.code = 'margin'
+ JOIN buy b ON b.id = tcc.buyFk;
+
+ -- Promo Francia
+ IF vIsFrenchVNHBuyer THEN
+
+ INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+ SELECT
+ tcc.warehouseFk,
+ tcc.itemFk,
+ c2.id,
+ - vFrenchDiscount * (b.buyingValue + b.freightValue + b.packageValue + b.comissionValue) / ( 1 - vFrenchDiscount)
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN vn.component c2 ON c2.code = 'frenchOffer'
+ JOIN buy b ON b.id = tcc.buyFk;
+
+ END IF;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentBase;
+ CREATE TEMPORARY TABLE tmp.ticketComponentBase ENGINE = MEMORY
+ SELECT tc.itemFk, ROUND(SUM(tc.cost), 4) AS base, tc.warehouseFk
+ FROM tmp.ticketComponent tc
+ JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tc.itemFk AND tcc.warehouseFk = tc.warehouseFk
+ GROUP BY tc.itemFk, warehouseFk;
+
+ -- RECOBRO
+ INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ SELECT tcb.warehouseFk, tcb.itemFk, c2.id,
+ ROUND(tcb.base *
+ LEAST(
+ MAX(GREATEST(IFNULL(cr.priceIncreasing,0),
+ IFNULL(cr1.priceIncreasing,0),
+ IFNULL(cr2.priceIncreasing,0))
+ ),
+ 0.25),
+ 3)
+ FROM tmp.ticketComponentBase tcb
+ JOIN vn.component c2 ON c2.code = 'debtCollection'
+ JOIN claimRatio cr ON cr.clientFk = vClientFk
+ LEFT JOIN clientYoke cy1 ON cy1.leftOx = cr.clientFk
+ LEFT JOIN claimRatio cr1 ON cr1.clientFk = cy1.rightOx
+ LEFT JOIN clientYoke cy2 ON cy2.rightOx = cr.clientFk
+ LEFT JOIN claimRatio cr2 ON cr2.clientFk = cy2.leftOx
+ WHERE GREATEST(IFNULL(cr.priceIncreasing,0), IFNULL(cr1.priceIncreasing,0), IFNULL(cr2.priceIncreasing,0)) > 0.009
+ GROUP BY tcb.itemFk;
+
+ -- Mana auto
+ INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ SELECT tcb.warehouseFk, tcb.itemFk, c2.id, ROUND(base * (0.01 + wm.pricesModifierRate), 3) as manaAuto
+ FROM tmp.ticketComponentBase tcb
+ JOIN `client` c on c.id = vClientFk
+ JOIN workerMana wm ON c.salesPersonFk = wm.workerFk
+ JOIN vn.component c2 ON c2.code = 'autoMana'
+ WHERE wm.isPricesModifierActivated
+ HAVING manaAuto <> 0;
+
+ -- Precios especiales
+ INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ SELECT tcb.warehouseFk,
+ tcb.itemFk,
+ c2.id,
+ GREATEST(
+ IFNULL(ROUND(tcb.base * c2.tax, 4), 0),
+ IF(i.hasMinPrice, i.minPrice,0) - tcc.rate3
+ ) cost
+ FROM tmp.ticketComponentBase tcb
+ JOIN vn.component c2 ON c2.code = 'lastUnitsDiscount'
+ JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk
+ LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
+ JOIN vn.item i ON i.id = tcb.itemFk
+ WHERE sp.value IS NULL
+ AND i.supplyResponseFk IS NULL;
+
+ -- Venta por paquetes
+ INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ SELECT tcc.warehouseFk, tcc.itemFk, c2.id, tcc.rate2 - tcc.rate3
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN vn.component c2 ON c2.code = 'salePerPackage'
+ JOIN buy b ON b.id = tcc.buyFk
+ LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
+ WHERE sp.value IS NULL;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zone;
+ CREATE TEMPORARY TABLE IF NOT EXISTS tmp.zone (INDEX (id))
+ ENGINE = MEMORY
+ SELECT vZoneFk id;
+
+ CALL zone_getOptionsForShipment(vShipped, TRUE);
+
+ -- Reparto
+ INSERT INTO tmp.ticketComponent
+ SELECT tcc.warehouseFK,
+ tcc.itemFk,
+ c2.id,
+ z.inflation * ROUND(ic.cm3delivery * (IFNULL(zo.price,5000) - IFNULL(zo.bonus,0)) / (1000 * vc.standardFlowerBox) , 4) cost
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN item i ON i.id = tcc.itemFk
+ JOIN tmp.zoneOption zo ON zo.zoneFk = vZoneFk
+ JOIN zone z ON z.id = vZoneFk
+ JOIN agencyMode am ON am.id = z.agencyModeFk
+ JOIN vn.volumeConfig vc
+ JOIN vn.component c2 ON c2.code = 'delivery'
+ LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk
+ AND ic.itemFk = tcc.itemFk
+ HAVING cost <> 0;
+
+ DROP TEMPORARY TABLE tmp.zoneOption;
+ /*
+ -- Extra reparto
+ INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ SELECT tcc.warehouseFk, tcc.itemFk, c2.id, ap.packagingValue cost
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN vn.addressForPackaging ap
+ JOIN vn.component c2 ON c2.code = 'bagged'
+ WHERE ap.addressFk = vAddressFk;
+ */
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCopy;
+ CREATE TEMPORARY TABLE tmp.ticketComponentCopy ENGINE = MEMORY
+ SELECT * FROM tmp.ticketComponent;
+
+ -- Precio especial
+ INSERT INTO tmp.ticketComponent
+ SELECT tcc.warehouseFk,
+ tcc.itemFk,
+ c2.id,
+ sp.value - SUM(tcc.cost) sumCost
+ FROM tmp.ticketComponentCopy tcc
+ JOIN component c ON c.id = tcc.componentFk
+ JOIN specialPrice sp ON sp.clientFk = vClientFK AND sp.itemFk = tcc.itemFk
+ JOIN vn.component c2 ON c2.code = 'specialPrices'
+ WHERE c.classRate IS NULL
+ AND tcc.warehouseFk = vWarehouseFk
+ GROUP BY tcc.itemFk, tcc.warehouseFk
+ HAVING ABS(sumCost) > 0.001;
+
+ -- Rappel
+ INSERT INTO tmp.ticketComponent
+ SELECT tcc.warehouseFk,
+ tcc.itemFk,
+ IFNULL(c.componentFk ,c2.id),
+ SUM(tcc.cost) * ((1/(1-c.rappel/100)) -1) sumCost
+ FROM tmp.ticketComponentCopy tcc
+ JOIN vn.clientChain cc ON cc.clientFk = vClientFk
+ JOIN vn.`chain` c ON c.id = cc.chainFk
+ JOIN vn.component c2 ON c2.code = 'rappel'
+ WHERE tcc.warehouseFk = vWarehouseFk
+ GROUP BY tcc.itemFk, tcc.warehouseFk;
+
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentSum;
+ CREATE TEMPORARY TABLE tmp.ticketComponentSum
+ (INDEX (itemFk, warehouseFk))
+ ENGINE = MEMORY
+ SELECT SUM(cost) sumCost, tc.itemFk, tc.warehouseFk, c.classRate
+ FROM tmp.ticketComponent tc
+ JOIN component c ON c.id = tc.componentFk
+ GROUP BY tc.itemFk, tc.warehouseFk, c.classRate;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentRate;
+ CREATE TEMPORARY TABLE tmp.ticketComponentRate ENGINE = MEMORY
+ SELECT tcc.warehouseFk,
+ tcc.itemFk,
+ 1 rate,
+ IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`,
+ CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
+ CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
+ AND tcs.warehouseFk = tcc.warehouseFk
+ WHERE IFNULL(tcs.classRate, 1) = 1
+ AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
+ GROUP BY tcs.warehouseFk, tcs.itemFk;
+
+ INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+ SELECT
+ tcc.warehouseFk,
+ tcc.itemFk,
+ 2 rate,
+ tcc.packing `grouping`,
+ SUM(tcs.sumCost) price,
+ SUM(tcs.sumCost) / weightGrouping priceKg
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
+ AND tcs.warehouseFk = tcc.warehouseFk
+ WHERE tcc.available IS NULL OR (IFNULL(tcs.classRate, 2) = 2
+ AND tcc.packing > 0 AND tcc.available >= tcc.packing)
+ GROUP BY tcs.warehouseFk, tcs.itemFk;
+
+ INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+ SELECT
+ tcc.warehouseFk,
+ tcc.itemFk,
+ 3 rate,
+ tcc.available `grouping`,
+ SUM(tcs.sumCost) price,
+ SUM(tcs.sumCost) / weightGrouping priceKg
+ FROM tmp.ticketComponentCalculate tcc
+ JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
+ AND tcs.warehouseFk = tcc.warehouseFk
+ WHERE IFNULL(tcs.classRate, 3) = 3
+ GROUP BY tcs.warehouseFk, tcs.itemFk;
+
+ INSERT INTO tmp.ticketComponentPrice (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+ SELECT * FROM (
+ SELECT * FROM tmp.ticketComponentRate ORDER BY price
+ ) t
+ GROUP BY itemFk, warehouseFk, `grouping`;
+
+ DROP TEMPORARY TABLE
+ tmp.ticketComponentCalculate,
+ tmp.ticketComponentSum,
+ tmp.ticketComponentBase,
+ tmp.ticketComponentRate,
+ tmp.ticketComponentCopy;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `catalog_componentCalculate__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_componentCalculate__`(
vZoneFk INT,
vAddressFk INT,
vShipped DATE,
@@ -50644,451 +52835,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `catalog_componentCalculate_beta` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_componentCalculate_beta`(
- vZoneFk INT,
- vAddressFk INT,
- vShipped DATE,
- vWarehouseFk INT)
-proc: BEGIN
-/**
- * Calcula los componentes de los articulos de tmp.ticketLot
- *
- * @param vZoneFk para calcular el transporte
- * @param vAddressFk Consignatario
- * @param vShipped dia de salida del pedido
- * @param vWarehouseFk warehouse de salida del pedido
- * @table tmp.ticketLot (warehouseFk, available, itemFk, buyFk, zoneFk)
- * @table tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
- *
- * @return tmp.ticketComponentPrice (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
- */
- DECLARE vClientFk INT;
- DECLARE vIsFrenchVNHBuyer BOOLEAN DEFAULT FALSE;
- DECLARE vVNHWarehouseFk INT DEFAULT 7;
- DECLARE vIsLogifloraAllowed BOOLEAN DEFAULT 0;
- DECLARE vVisibleCache INT;
- DECLARE vIsZonePremium BOOL;
- DECLARE vFrenchDiscount DECIMAL(3,2) DEFAULT 0.12;
- DECLARE visAnyVolumeAllowed BOOL;
-
- SELECT * FROM tmp.ticketLot;
-
- SELECT (COUNT(*) > 0) INTO vIsZonePremium
- FROM vn.zoneFilter zf
- WHERE zf.zoneFk = vZoneFk;
-/*
- SELECT vc.standardFlowerBox * 1000 INTO vBoxVolume
- FROM vn.volumeConfig vc;
- */
- SELECT clientFk, isLogifloraAllowed INTO vClientFK, vIsLogifloraAllowed
- FROM address
- WHERE id = vAddressFk;
-
- SELECT (c.country = 'FRANCIA' AND vWarehouseFk = vVNHWarehouseFk)
- INTO vIsFrenchVNHBuyer
- FROM vn.country c
- JOIN vn.province p ON p.countryFk = c.id
- JOIN vn.address a ON a.provinceFk = p.id
- WHERE a.id = vAddressFk;
-
- /*
- -- Se eliminan los productos de tamaños no convencionales, salvo agencias que lo permitan
- SELECT a.isAnyVolumeAllowed INTO visAnyVolumeAllowed
- FROM vn.agency a
- JOIN vn.agencyMode am ON am.agencyFk = a.id
- JOIN vn.`zone`z ON z.agencyModeFk = am.id
- WHERE z.id = vZoneFk;
-
- IF NOT vIsAnyVolumeAllowed THEN
-
- DELETE tl.*
- FROM tmp.ticketLot tl
- JOIN vn.item i ON i.id = tl.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk
- WHERE it.isUnconventionalSize;
-
- END IF;
-
- -- Esto sirve para que los franceses compren sólo por las cuentas de VNH
- DELETE tl.*
- FROM tmp.ticketLot tl
- JOIN vn.item i ON i.id = tl.itemFk
- JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
- JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
- WHERE v.isVNHSupplier != vIsFrenchVNHBuyer;
-
- IF (NOT vIsLogifloraAllowed AND vVNHWarehouseFk != vWarehouseFk)
- OR NOT vn.isLogifloraDay(vShipped, vWarehouseFk)
-
- THEN
-
- CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
-
- DELETE tl FROM tmp.ticketLot tl
- JOIN item i ON i.id = tl.itemFk
- LEFT JOIN vn.buy b ON b.id = tl.buyFk
- LEFT JOIN vn.entry e ON e.id = b.entryFk
- LEFT JOIN vn.supplier s ON s.id = e.supplierFk
- LEFT JOIN cache.visible v ON v.calc_id = vVisibleCache AND v.item_id = i.id
- LEFT JOIN (SELECT DISTINCT s.itemFk
- FROM vn.sale s
- JOIN vn.ticket t ON t.id = s.ticketFk
- WHERE t.warehouseFk = vWarehouseFk
- AND t.addressFk = vAddressFk
- AND t.shipped = vShipped
- AND t.zoneFk = vZoneFk) sub ON sub.itemFk = i.id
- WHERE (i.supplyResponseFk
- AND (IFNULL(e.isRaid,TRUE) OR s.nickname = 'INVENTARIO')
- AND ISNULL(sub.itemFk)
- AND IFNULL(v.visible,0) = 0
- AND vWarehouseFk = tl.warehouseFk);
-
- END IF;
-
- -- Eliminem productes de la oferta que no deuen vore els francesos
- IF vIsFrenchVNHBuyer THEN
-
- CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
-
- DELETE tl FROM tmp.ticketLot tl
- JOIN item i ON i.id = tl.itemFk
- JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
- JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
- LEFT JOIN cache.visible v ON v.calc_id = vVisibleCache AND v.item_id = i.id
- LEFT JOIN (SELECT DISTINCT s.itemFk
- FROM vn.sale s
- JOIN vn.ticket t ON t.id = s.ticketFk
- WHERE t.warehouseFk = vWarehouseFk
- AND t.addressFk = vAddressFk
- AND t.shipped = vShipped
- AND t.zoneFk = vZoneFk) sub ON sub.itemFk = i.id
- WHERE (mp.isEarlyBird = FALSE
- AND IFNULL(sub.itemFk,0) = 0
- AND IFNULL(v.visible ,0) = 0);
-
- END IF;
-
- -- Eliminem productes de la oferta que no deuen vore les zones PREMIUM
- IF vIsZonePremium THEN
-
- DELETE tl.*
- FROM tmp.ticketLot tl
- JOIN item i ON i.id = tl.itemFk
- LEFT JOIN vn.zoneFilter zf ON zf.itemTypeFk = i.typeFk
- AND zf.zoneFk = vZoneFk
- AND i.`size` <= zf.sizeMax
- WHERE zf.id IS NULL ;
-
- END IF;
-
- -- Eliminem productes de la oferta que la zona no pot transportar
- DELETE tl.*
- FROM tmp.ticketLot tl
- JOIN item i ON i.id = tl.itemFk
- JOIN vn.zone z ON z.id = vZoneFk
- WHERE i.size > z.itemMaxSize;
- */
- SET @rate2 := 0;
- SET @rate3 := 0;
- SET @minPrice := 0;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCalculate;
- CREATE TEMPORARY TABLE tmp.ticketComponentCalculate
- (PRIMARY KEY (itemFk, warehouseFk))
- ENGINE = MEMORY
- SELECT
- tl.itemFk,
- tl.warehouseFk,
- tl.available,
- IF((@rate2 := IFNULL(pf.rate2, b.price2)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate2) * 1.0 rate2,
- @minPrice := IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3,
- IFNULL(@minPrice, 0) AS minPrice,
- IFNULL(pf.packing, GREATEST(b.grouping, b.packing)) packing,
- IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
- ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
- tl.buyFk,
- i.typeFk,
- IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping
- FROM tmp.ticketLot tl
- JOIN buy b ON b.id = tl.buyFk
- JOIN item i ON i.id = tl.itemFk
- JOIN itemType it ON it.id = i.typeFk
- LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN specialPrice sp ON sp.itemFk = i.id AND sp.clientFk = vClientFk
- LEFT JOIN (
- SELECT * FROM (
- SELECT pf.itemFk, pf.`grouping`, pf.packing, pf.box, pf.rate2, pf.rate3, zw.warehouseFk
- FROM priceFixed pf
- JOIN zoneWarehouse zw ON zw.zoneFk = vZoneFk AND (zw.warehouseFk = pf.warehouseFk OR pf.warehouseFk = 0)
- WHERE vShipped BETWEEN pf.started AND pf.ended ORDER BY pf.itemFk, pf.warehouseFk DESC
- ) tpf
- GROUP BY tpf.itemFk, tpf.warehouseFk
- ) pf ON pf.itemFk = tl.itemFk AND pf.warehouseFk = tl.warehouseFk
- WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01 AND ic.merchandise <> 0
- AND tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk;
-
- -- Coste
- INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
- SELECT
- tcc.warehouseFk,
- tcc.itemFk,
- c2.id,
- b.buyingValue + b.freightValue + b.packageValue + b.comissionValue
- FROM tmp.ticketComponentCalculate tcc
- JOIN vn.component c2 ON c2.code = 'purchaseValue'
- JOIN buy b ON b.id = tcc.buyFk;
-
- -- Margen
- INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
- SELECT
- tcc.warehouseFk,
- tcc.itemFk,
- c2.id,
- tcc.rate3 - b.buyingValue - b.freightValue - b.packageValue - b.comissionValue
- FROM tmp.ticketComponentCalculate tcc
- JOIN vn.component c2 ON c2.code = 'margin'
- JOIN buy b ON b.id = tcc.buyFk;
-
- -- Promo Francia
- IF vIsFrenchVNHBuyer THEN
-
- INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
- SELECT
- tcc.warehouseFk,
- tcc.itemFk,
- c2.id,
- - vFrenchDiscount * (b.buyingValue + b.freightValue + b.packageValue + b.comissionValue) / ( 1 - vFrenchDiscount)
- FROM tmp.ticketComponentCalculate tcc
- JOIN vn.component c2 ON c2.code = 'frenchOffer'
- JOIN buy b ON b.id = tcc.buyFk;
-
- END IF;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentBase;
- CREATE TEMPORARY TABLE tmp.ticketComponentBase ENGINE = MEMORY
- SELECT tc.itemFk, ROUND(SUM(tc.cost), 4) AS base, tc.warehouseFk
- FROM tmp.ticketComponent tc
- JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tc.itemFk AND tcc.warehouseFk = tc.warehouseFk
- GROUP BY tc.itemFk, warehouseFk;
-
- -- RECOBRO
- INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
- SELECT tcb.warehouseFk, tcb.itemFk, c2.id,
- ROUND(tcb.base * LEAST(MAX(GREATEST(IFNULL(cr.priceIncreasing,0), IFNULL(cr1.priceIncreasing,0), IFNULL(cr2.priceIncreasing,0))), 0.25), 3)
- FROM tmp.ticketComponentBase tcb
- JOIN vn.component c2 ON c2.code = 'debtCollection'
- JOIN claimRatio cr ON cr.clientFk = vClientFk
- LEFT JOIN clientYoke cy1 ON cy1.leftOx = cr.clientFk
- LEFT JOIN claimRatio cr1 ON cr1.clientFk = cy1.rightOx
- LEFT JOIN clientYoke cy2 ON cy2.rightOx = cr.clientFk
- LEFT JOIN claimRatio cr2 ON cr2.clientFk = cy2.leftOx
- WHERE GREATEST(IFNULL(cr.priceIncreasing,0), IFNULL(cr1.priceIncreasing,0), IFNULL(cr2.priceIncreasing,0)) > 0.009
- GROUP BY tcb.itemFk;
-
- -- Mana auto
- INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
- SELECT tcb.warehouseFk, tcb.itemFk, c2.id, ROUND(base * (0.01 + wm.pricesModifierRate), 3) as manaAuto
- FROM tmp.ticketComponentBase tcb
- JOIN `client` c on c.id = vClientFk
- JOIN workerMana wm ON c.salesPersonFk = wm.workerFk
- JOIN vn.component c2 ON c2.code = 'autoMana'
- WHERE wm.isPricesModifierActivated
- HAVING manaAuto <> 0;
-
- -- Precios especiales
- INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
- SELECT tcb.warehouseFk,
- tcb.itemFk,
- c2.id,
- GREATEST(IFNULL(ROUND(tcb.base * c2.tax, 4), 0), tcc.minPrice - tcc.rate3)
- FROM tmp.ticketComponentBase tcb
- JOIN vn.component c2 ON c2.code = 'lastUnitsDiscount'
- JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk
- LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
- JOIN vn.item i ON i.id = tcb.itemFk
- WHERE tcc.minPrice < tcc.rate3
- AND sp.value IS NULL
- AND i.supplyResponseFk IS NULL;
-
- -- Venta por paquetes
- INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
- SELECT tcc.warehouseFk, tcc.itemFk, c2.id, tcc.rate2 - tcc.rate3
- FROM tmp.ticketComponentCalculate tcc
- JOIN vn.component c2 ON c2.code = 'salePerPackage'
- JOIN buy b ON b.id = tcc.buyFk
- LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
- WHERE sp.value IS NULL;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.zone;
- CREATE TEMPORARY TABLE IF NOT EXISTS tmp.zone (INDEX (id))
- ENGINE = MEMORY
- SELECT vZoneFk id;
-
- CALL zone_getOptionsForShipment(vShipped, TRUE);
-
- -- Reparto
- INSERT INTO tmp.ticketComponent
- SELECT tcc.warehouseFK,
- tcc.itemFk,
- c2.id,
- z.inflation * ROUND(ic.cm3delivery * (IFNULL(zo.price,5000) - IFNULL(zo.bonus,0)) / (1000 * vc.standardFlowerBox) , 4) cost
- FROM tmp.ticketComponentCalculate tcc
- JOIN item i ON i.id = tcc.itemFk
- JOIN tmp.zoneOption zo ON zo.zoneFk = vZoneFk
- JOIN zone z ON z.id = vZoneFk
- JOIN agencyMode am ON am.id = z.agencyModeFk
- JOIN vn.volumeConfig vc
- JOIN vn.component c2 ON c2.code = 'delivery'
- LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk
- AND ic.itemFk = tcc.itemFk
- HAVING cost <> 0;
-
- DROP TEMPORARY TABLE tmp.zoneOption;
- /*
- -- Extra reparto
- INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
- SELECT tcc.warehouseFk, tcc.itemFk, c2.id, ap.packagingValue cost
- FROM tmp.ticketComponentCalculate tcc
- JOIN vn.addressForPackaging ap
- JOIN vn.component c2 ON c2.code = 'bagged'
- WHERE ap.addressFk = vAddressFk;
- */
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCopy;
- CREATE TEMPORARY TABLE tmp.ticketComponentCopy ENGINE = MEMORY
- SELECT * FROM tmp.ticketComponent;
-
- -- Precio especial
- INSERT INTO tmp.ticketComponent
- SELECT tcc.warehouseFk,
- tcc.itemFk,
- c2.id,
- sp.value - SUM(tcc.cost) sumCost
- FROM tmp.ticketComponentCopy tcc
- JOIN component c ON c.id = tcc.componentFk
- JOIN specialPrice sp ON sp.clientFk = vClientFK AND sp.itemFk = tcc.itemFk
- JOIN vn.component c2 ON c2.code = 'specialPrices'
- WHERE c.classRate IS NULL
- AND tcc.warehouseFk = vWarehouseFk
- GROUP BY tcc.itemFk, tcc.warehouseFk
- HAVING ABS(sumCost) > 0.001;
-
- -- Rappel
- INSERT INTO tmp.ticketComponent
- SELECT tcc.warehouseFk,
- tcc.itemFk,
- IFNULL(c.componentFk ,c2.id),
- SUM(tcc.cost) * ((1/(1-c.rappel/100)) -1) sumCost
- FROM tmp.ticketComponentCopy tcc
- JOIN vn.clientChain cc ON cc.clientFk = vClientFk
- JOIN vn.`chain` c ON c.id = cc.chainFk
- JOIN vn.component c2 ON c2.code = 'rappel'
- WHERE tcc.warehouseFk = vWarehouseFk
- GROUP BY tcc.itemFk, tcc.warehouseFk;
-
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentSum;
- CREATE TEMPORARY TABLE tmp.ticketComponentSum
- (INDEX (itemFk, warehouseFk))
- ENGINE = MEMORY
- SELECT SUM(cost) sumCost, tc.itemFk, tc.warehouseFk, c.classRate
- FROM tmp.ticketComponent tc
- JOIN component c ON c.id = tc.componentFk
- GROUP BY tc.itemFk, tc.warehouseFk, c.classRate;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentRate;
- CREATE TEMPORARY TABLE tmp.ticketComponentRate ENGINE = MEMORY
- SELECT tcc.warehouseFk,
- tcc.itemFk,
- 1 rate,
- IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`,
- CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
- CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg
- FROM tmp.ticketComponentCalculate tcc
- JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
- AND tcs.warehouseFk = tcc.warehouseFk
- WHERE IFNULL(tcs.classRate, 1) = 1
- AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
- GROUP BY tcs.warehouseFk, tcs.itemFk;
-
- INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
- SELECT
- tcc.warehouseFk,
- tcc.itemFk,
- 2 rate,
- tcc.packing `grouping`,
- SUM(tcs.sumCost) price,
- SUM(tcs.sumCost) / weightGrouping priceKg
- FROM tmp.ticketComponentCalculate tcc
- JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
- AND tcs.warehouseFk = tcc.warehouseFk
- WHERE tcc.available IS NULL OR (IFNULL(tcs.classRate, 2) = 2
- AND tcc.packing > 0 AND tcc.available >= tcc.packing)
- GROUP BY tcs.warehouseFk, tcs.itemFk;
-
- IF vIsZonePremium THEN
-
- DELETE
- FROM tmp.ticketComponentRate
- WHERE rate = 1;
-
- END IF;
-
- INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
- SELECT
- tcc.warehouseFk,
- tcc.itemFk,
- 3 rate,
- tcc.available `grouping`,
- SUM(tcs.sumCost) price,
- SUM(tcs.sumCost) / weightGrouping priceKg
- FROM tmp.ticketComponentCalculate tcc
- JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
- AND tcs.warehouseFk = tcc.warehouseFk
- WHERE IFNULL(tcs.classRate, 3) = 3
- GROUP BY tcs.warehouseFk, tcs.itemFk;
-
- INSERT INTO tmp.ticketComponentPrice (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
- SELECT * FROM (
- SELECT * FROM tmp.ticketComponentRate ORDER BY price
- ) t
- GROUP BY itemFk, warehouseFk, `grouping`;
-
- SELECT * FROM tmp.ticketComponentPrice;
-
- DROP TEMPORARY TABLE
- tmp.ticketComponentCalculate,
- tmp.ticketComponentSum,
- tmp.ticketComponentBase,
- tmp.ticketComponentRate,
- tmp.ticketComponentCopy;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `catalog_componentPrepare` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_componentPrepare`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_componentPrepare`()
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
@@ -51122,13 +52879,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_componentPurge`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_componentPurge`()
BEGIN
DROP TEMPORARY TABLE
tmp.ticketComponentPrice,
@@ -51146,11 +52903,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_test`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_test`()
proc: BEGIN
/**
* Calcula los articulos disponibles y sus precios
@@ -51313,7 +53070,7 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clean`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clean`()
BEGIN
DECLARE vDateShort DATETIME;
DECLARE vOneYearAgo DATE;
@@ -51340,9 +53097,6 @@ BEGIN
DELETE FROM itemShelving WHERE created < CURDATE() AND visible = 0;
DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,CURDATE());
DELETE FROM entryLog WHERE creationDate < vDateShort;
- DELETE g FROM glsExpedition g
- JOIN expedition e ON e.id = g.expeditionFk
- WHERE e.created < v26Month;
DELETE IGNORE FROM expedition WHERE created < v26Month;
DELETE FROM sms WHERE created < v18Month;
DELETE FROM saleTracking WHERE created < vDateShort;
@@ -51353,7 +53107,7 @@ BEGIN
DELETE FROM sharingClient where ended < vDateShort;
DELETE tw.* FROM ticketWeekly tw
LEFT JOIN sale s ON s.ticketFk = tw.ticketFk WHERE s.itemFk IS NULL;
- DELETE FROM claim WHERE ticketCreated < v18Month;
+ DELETE FROM claim WHERE ticketCreated < vFourYearsAgo;
DELETE FROM message WHERE sendDate < vDateShort;
-- Robert ubicacion anterior de trevelLog comentario para debug
DELETE sc FROM saleChecked sc
@@ -51477,9 +53231,7 @@ BEGIN
DELETE FROM travelLog WHERE creationDate < v3Month;
- CALL shelving_clean;
- CALL ticketPackagingRecovery;
-
+ CALL shelving_clean;
END ;;
DELIMITER ;
@@ -51491,94 +53243,94 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clean_logiflora`()
-BEGIN
- /* partir en 2 procedimientos, uno que borre compras y otro articulos
- * item_clean, buy_clean
- * */
-
- DECLARE vMaxDated DATE DEFAULT TIMESTAMPADD(DAY, - 7, CURDATE());
- DECLARE vDone INT DEFAULT FALSE;
- DECLARE vBuyFk INT;
- DECLARE cur1 CURSOR FOR SELECT id FROM tmp.buy;
- DECLARE cur2 CURSOR FOR SELECT id FROM tmp.item;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.buy;
-
- CREATE TEMPORARY TABLE tmp.buy
- ENGINE = MEMORY
- SELECT b.id
- FROM vn.buy b
- JOIN vn.entry e ON e.id = b.entryFk
- JOIN vn.travel tr ON tr.id = e.travelFk
- JOIN vn.agencyMode am ON am.id = tr.agencyFk
- WHERE b.quantity = 0
- AND am.name = 'LOGIFLORA'
- AND e.isRaid;
-
- OPEN cur1;
-
- read_loop: LOOP
-
- SET vDone = FALSE;
-
- FETCH cur1 INTO vBuyFk;
-
- IF vDone THEN
- LEAVE read_loop;
- END IF;
-
- DELETE FROM vn.buy WHERE id = vBuyFk;
-
- END LOOP;
-
- CLOSE cur1;
-
- DROP TEMPORARY TABLE tmp.buy;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.item;
-
- CREATE TEMPORARY TABLE tmp.item
- ENGINE = MEMORY
- SELECT DISTINCT i.id
- FROM vn.item i
- LEFT JOIN hedera.orderRow o ON o.itemFk = i.id
- LEFT JOIN vn.sale s ON s.itemFk = i.id
- LEFT JOIN vn.buy b ON b.itemFk = i.id
- WHERE i.supplyResponseFk
- AND o.id IS NULL
- AND b.id IS NULL
- AND s.id IS NULL
- AND i.created < vMaxDated;
-
- OPEN cur2;
-
- read_loop: LOOP
-
- SET vDone = FALSE;
-
- FETCH cur2 INTO vBuyFk;
-
- IF vDone THEN
- LEAVE read_loop;
- END IF;
-
- DELETE FROM vn.item WHERE id = vBuyFk;
-
- END LOOP;
-
- CLOSE cur2;
-
- DROP TEMPORARY TABLE tmp.item;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clean_logiflora`()
+BEGIN
+ /* partir en 2 procedimientos, uno que borre compras y otro articulos
+ * item_clean, buy_clean
+ * */
+
+ DECLARE vMaxDated DATE DEFAULT TIMESTAMPADD(DAY, - 7, CURDATE());
+ DECLARE vDone INT DEFAULT FALSE;
+ DECLARE vBuyFk INT;
+ DECLARE cur1 CURSOR FOR SELECT id FROM tmp.buy;
+ DECLARE cur2 CURSOR FOR SELECT id FROM tmp.item;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.buy;
+
+ CREATE TEMPORARY TABLE tmp.buy
+ ENGINE = MEMORY
+ SELECT b.id
+ FROM vn.buy b
+ JOIN vn.entry e ON e.id = b.entryFk
+ JOIN vn.travel tr ON tr.id = e.travelFk
+ JOIN vn.agencyMode am ON am.id = tr.agencyFk
+ WHERE b.quantity = 0
+ AND am.name = 'LOGIFLORA'
+ AND e.isRaid;
+
+ OPEN cur1;
+
+ read_loop: LOOP
+
+ SET vDone = FALSE;
+
+ FETCH cur1 INTO vBuyFk;
+
+ IF vDone THEN
+ LEAVE read_loop;
+ END IF;
+
+ DELETE FROM vn.buy WHERE id = vBuyFk;
+
+ END LOOP;
+
+ CLOSE cur1;
+
+ DROP TEMPORARY TABLE tmp.buy;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.item;
+
+ CREATE TEMPORARY TABLE tmp.item
+ ENGINE = MEMORY
+ SELECT DISTINCT i.id
+ FROM vn.item i
+ LEFT JOIN hedera.orderRow o ON o.itemFk = i.id
+ LEFT JOIN vn.sale s ON s.itemFk = i.id
+ LEFT JOIN vn.buy b ON b.itemFk = i.id
+ WHERE i.supplyResponseFk
+ AND o.id IS NULL
+ AND b.id IS NULL
+ AND s.id IS NULL
+ AND i.created < vMaxDated;
+
+ OPEN cur2;
+
+ read_loop: LOOP
+
+ SET vDone = FALSE;
+
+ FETCH cur2 INTO vBuyFk;
+
+ IF vDone THEN
+ LEAVE read_loop;
+ END IF;
+
+ DELETE FROM vn.item WHERE id = vBuyFk;
+
+ END LOOP;
+
+ CLOSE cur2;
+
+ DROP TEMPORARY TABLE tmp.item;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -51589,13 +53341,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clearShelvingList`(vShelvingFk VARCHAR(8))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clearShelvingList`(vShelvingFk VARCHAR(8))
BEGIN
UPDATE vn.itemShelving
@@ -51614,80 +53366,80 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientCreate`(
- vFirstname VARCHAR(50),
- vSurnames VARCHAR(50),
- vFi VARCHAR(9),
- vAddress TEXT,
- vPostcode CHAR(5),
- vCity VARCHAR(25),
- vProvinceFk SMALLINT(5),
- vCompanyFk SMALLINT(5),
- vPhone VARCHAR(11),
- vEmail VARCHAR(255),
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientCreate`(
+ vFirstname VARCHAR(50),
+ vSurnames VARCHAR(50),
+ vFi VARCHAR(9),
+ vAddress TEXT,
+ vPostcode CHAR(5),
+ vCity VARCHAR(25),
+ vProvinceFk SMALLINT(5),
+ vCompanyFk SMALLINT(5),
+ vPhone VARCHAR(11),
+ vEmail VARCHAR(255),
vUserFk INT)
-BEGIN
-/**
- * Create new client
- *
- */
- DECLARE vPayMethodFk INT DEFAULT 4;
- DECLARE vDueDay INT DEFAULT 5;
- DECLARE vDefaultCredit DECIMAL(10, 2) DEFAULT 300.00;
- DECLARE vIsTaxDataChecked TINYINT(1) DEFAULT 1;
- DECLARE vHasCoreVnl BOOLEAN DEFAULT TRUE;
- DECLARE vMandateTypeFk INT DEFAULT 2;
-
- INSERT INTO `client` (
- id,
- name,
- street,
- fi,
- phone,
- email,
- provinceFk,
- city,
- postcode,
- socialName,
- payMethodFk,
- dueDay,
- credit,
- isTaxDataChecked,
- hasCoreVnl,
- isEqualizated)
- VALUES (
- vUserFk,
- CONCAT('TR ', vFirstname, ' ', vSurnames),
- vAddress,
- TRIM(vFi),
- vPhone,
- vEmail,
- vProvinceFk,
- vCity,
- vPostcode,
- CONCAT(vSurnames, ' ', vFirstname),
- vPayMethodFk,
- vDueDay,
- vDefaultCredit,
- vIsTaxDataChecked,
- vHasCoreVnl,
- FALSE
- ) ON duplicate key update
- payMethodFk = vPayMethodFk,
- dueDay = vDueDay,
- credit = vDefaultCredit,
- isTaxDataChecked = vIsTaxDataChecked,
- hasCoreVnl = vHasCoreVnl,
- isActive = TRUE;
-
- IF (SELECT COUNT(*) FROM mandate WHERE clientFk = vUserFk AND companyFk = vCompanyFk AND mandateTypeFk = vMandateTypeFk) = 0 THEN
- INSERT INTO mandate (clientFk, companyFk, mandateTypeFk)
- VALUES (vUserFk, vCompanyFk, vMandateTypeFk);
- END IF;
+BEGIN
+/**
+ * Create new client
+ *
+ */
+ DECLARE vPayMethodFk INT DEFAULT 4;
+ DECLARE vDueDay INT DEFAULT 5;
+ DECLARE vDefaultCredit DECIMAL(10, 2) DEFAULT 300.00;
+ DECLARE vIsTaxDataChecked TINYINT(1) DEFAULT 1;
+ DECLARE vHasCoreVnl BOOLEAN DEFAULT TRUE;
+ DECLARE vMandateTypeFk INT DEFAULT 2;
+
+ INSERT INTO `client` (
+ id,
+ name,
+ street,
+ fi,
+ phone,
+ email,
+ provinceFk,
+ city,
+ postcode,
+ socialName,
+ payMethodFk,
+ dueDay,
+ credit,
+ isTaxDataChecked,
+ hasCoreVnl,
+ isEqualizated)
+ VALUES (
+ vUserFk,
+ CONCAT('TR ', vFirstname, ' ', vSurnames),
+ vAddress,
+ TRIM(vFi),
+ vPhone,
+ vEmail,
+ vProvinceFk,
+ vCity,
+ vPostcode,
+ CONCAT(vSurnames, ' ', vFirstname),
+ vPayMethodFk,
+ vDueDay,
+ vDefaultCredit,
+ vIsTaxDataChecked,
+ vHasCoreVnl,
+ FALSE
+ ) ON duplicate key update
+ payMethodFk = vPayMethodFk,
+ dueDay = vDueDay,
+ credit = vDefaultCredit,
+ isTaxDataChecked = vIsTaxDataChecked,
+ hasCoreVnl = vHasCoreVnl,
+ isActive = TRUE;
+
+ IF (SELECT COUNT(*) FROM mandate WHERE clientFk = vUserFk AND companyFk = vCompanyFk AND mandateTypeFk = vMandateTypeFk) = 0 THEN
+ INSERT INTO mandate (clientFk, companyFk, mandateTypeFk)
+ VALUES (vUserFk, vCompanyFk, vMandateTypeFk);
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -51698,13 +53450,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientDebtSpray`(vClientFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientDebtSpray`(vClientFk INT)
BEGIN
/* Reparte el saldo de un cliente en greuge en la cartera que corresponde, y desasigna el comercial
@@ -51747,50 +53499,50 @@ DELIMITER ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `clientFreeze`()
-BEGIN
-/**
- * Congela diariamente aquellos clientes que son morosos sin recobro,
- * pero que no sean trabajadores,
- * y que el riesgo no sea menor que cero
- * hasta que no se gire la remesa no se congelan a los clientes de giro
- */
-
- DECLARE vIsRemittanced BOOLEAN;
-
- SELECT id into vIsRemittanced
- FROM receipt
- WHERE invoiceFk LIKE 'REMESA%'
- AND payed > util.firstDayOfMonth(CURDATE())
- limit 1;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
- CREATE TEMPORARY TABLE tmp.clientGetDebt
- SELECT clientFk
- FROM bs.defaulter
- WHERE created = CURDATE()
- AND amount;
-
- CALL clientGetDebt(CURDATE());
-
- UPDATE client c
- JOIN bi.defaulters d ON d.client = c.id AND d.date = CURDATE()
- JOIN config ON TRUE
- LEFT JOIN account.`user` u ON u.id = c.id AND u.active
- LEFT JOIN worker w ON w.id = u.id
- LEFT JOIN recovery r ON r.clientFk = c.id AND r.finished IS NULL
- LEFT JOIN payMethod pm ON pm.id = c.payMethodFk
- LEFT JOIN tmp.risk rk ON rk.clientFk = c.id
- SET c.isFreezed = TRUE,
- d.frozened = CURDATE(),
- u.active = FALSE
- WHERE (d.amount > config.defaultersMaxAmount
- AND rk.risk > 0)
- AND c.typeFk = 'normal'
- AND r.id IS NULL
- AND w.id IS NULL
- AND (vIsRemittanced OR pm.code <> 'bankDraft');
-
- DROP TEMPORARY TABLE tmp.clientGetDebt;
+BEGIN
+/**
+ * Congela diariamente aquellos clientes que son morosos sin recobro,
+ * pero que no sean trabajadores,
+ * y que el riesgo no sea menor que cero
+ * hasta que no se gire la remesa no se congelan a los clientes de giro
+ */
+
+ DECLARE vIsRemittanced BOOLEAN;
+
+ SELECT id into vIsRemittanced
+ FROM receipt
+ WHERE invoiceFk LIKE 'REMESA%'
+ AND payed > util.firstDayOfMonth(CURDATE())
+ limit 1;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
+ CREATE TEMPORARY TABLE tmp.clientGetDebt
+ SELECT clientFk
+ FROM bs.defaulter
+ WHERE created = CURDATE()
+ AND amount;
+
+ CALL clientGetDebt(CURDATE());
+
+ UPDATE client c
+ JOIN bi.defaulters d ON d.client = c.id AND d.date = CURDATE()
+ JOIN config ON TRUE
+ LEFT JOIN account.`user` u ON u.id = c.id AND u.active
+ LEFT JOIN worker w ON w.id = u.id
+ LEFT JOIN recovery r ON r.clientFk = c.id AND r.finished IS NULL
+ LEFT JOIN payMethod pm ON pm.id = c.payMethodFk
+ LEFT JOIN tmp.risk rk ON rk.clientFk = c.id
+ SET c.isFreezed = TRUE,
+ d.frozened = CURDATE(),
+ u.active = FALSE
+ WHERE (d.amount > config.defaultersMaxAmount
+ AND rk.risk > 0)
+ AND c.typeFk = 'normal'
+ AND r.id IS NULL
+ AND w.id IS NULL
+ AND (vIsRemittanced OR pm.code <> 'bankDraft');
+
+ DROP TEMPORARY TABLE tmp.clientGetDebt;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -51808,59 +53560,59 @@ DELIMITER ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `clientGetDebt`(vDate DATE)
-BEGIN
-/**
- * Calcula el riesgo para los clientes activos
- *
- * @table tmp.clientGetDebt(clientFk)
- * @param vDate Fecha maxima de los registros
- * @return tmp.risk
- */
- DECLARE vStarted DATETIME DEFAULT TIMESTAMPADD(DAY, -35, CURDATE());
- DECLARE vEnded DATETIME;
-
- SET vEnded = TIMESTAMP(IFNULL(vDate, CURDATE()), '23:59:59');
-
- DROP TEMPORARY TABLE IF EXISTS tClientRisk;
- CREATE TEMPORARY TABLE tClientRisk
- ENGINE = MEMORY
- SELECT cr.clientFk, SUM(cr.amount) amount
- FROM clientRisk cr
- JOIN tmp.clientGetDebt c ON c.clientFk = cr.clientFk
- GROUP BY cr.clientFk;
-
- INSERT INTO tClientRisk
- SELECT c.clientFk, SUM(r.amountPaid)
- FROM receipt r
- JOIN tmp.clientGetDebt c ON c.clientFk = r.clientFk
- WHERE r.payed > vEnded
- GROUP BY c.clientFk;
-
- INSERT INTO tClientRisk
- SELECT t.clientFk, CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2))
- FROM hedera.tpvTransaction t
- JOIN tmp.clientGetDebt c ON c.clientFk = t.clientFk
- WHERE t.receiptFk IS NULL
- AND t.status = 'ok'
- GROUP BY t.clientFk;
-
- INSERT INTO tClientRisk
- SELECT t.clientFk, totalWithVat
- FROM ticket t
- JOIN tmp.clientGetDebt c ON c.clientFk = t.clientFk
- WHERE refFk IS NULL
- AND shipped BETWEEN vStarted AND vEnded;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.risk;
- CREATE TEMPORARY TABLE tmp.risk
- (PRIMARY KEY (clientFk))
- ENGINE = MEMORY
- SELECT clientFk, SUM(amount) risk
- FROM client c
- JOIN tClientRisk cr ON cr.clientFk = c.id
- GROUP BY c.id;
-
- DROP TEMPORARY TABLE tClientRisk;
+BEGIN
+/**
+ * Calcula el riesgo para los clientes activos
+ *
+ * @table tmp.clientGetDebt(clientFk)
+ * @param vDate Fecha maxima de los registros
+ * @return tmp.risk
+ */
+ DECLARE vStarted DATETIME DEFAULT TIMESTAMPADD(DAY, -35, CURDATE());
+ DECLARE vEnded DATETIME;
+
+ SET vEnded = TIMESTAMP(IFNULL(vDate, CURDATE()), '23:59:59');
+
+ DROP TEMPORARY TABLE IF EXISTS tClientRisk;
+ CREATE TEMPORARY TABLE tClientRisk
+ ENGINE = MEMORY
+ SELECT cr.clientFk, SUM(cr.amount) amount
+ FROM clientRisk cr
+ JOIN tmp.clientGetDebt c ON c.clientFk = cr.clientFk
+ GROUP BY cr.clientFk;
+
+ INSERT INTO tClientRisk
+ SELECT c.clientFk, SUM(r.amountPaid)
+ FROM receipt r
+ JOIN tmp.clientGetDebt c ON c.clientFk = r.clientFk
+ WHERE r.payed > vEnded
+ GROUP BY c.clientFk;
+
+ INSERT INTO tClientRisk
+ SELECT t.clientFk, CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2))
+ FROM hedera.tpvTransaction t
+ JOIN tmp.clientGetDebt c ON c.clientFk = t.clientFk
+ WHERE t.receiptFk IS NULL
+ AND t.status = 'ok'
+ GROUP BY t.clientFk;
+
+ INSERT INTO tClientRisk
+ SELECT t.clientFk, totalWithVat
+ FROM ticket t
+ JOIN tmp.clientGetDebt c ON c.clientFk = t.clientFk
+ WHERE refFk IS NULL
+ AND shipped BETWEEN vStarted AND vEnded;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.risk;
+ CREATE TEMPORARY TABLE tmp.risk
+ (PRIMARY KEY (clientFk))
+ ENGINE = MEMORY
+ SELECT clientFk, SUM(amount) risk
+ FROM client c
+ JOIN tClientRisk cr ON cr.clientFk = c.id
+ GROUP BY c.id;
+
+ DROP TEMPORARY TABLE tClientRisk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -51871,13 +53623,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientGetDebtDiary`(vClientFK INT, vCompanyFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientGetDebtDiary`(vClientFK INT, vCompanyFk INT)
BEGIN
/**
* Devuelve el registro de deuda
@@ -52001,13 +53753,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientGreugeSpray`(IN vClientFk INT, IN onlyForHisOwner BOOL, IN vWorkerCode VARCHAR(3), IN vWithMana BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientGreugeSpray`(IN vClientFk INT, IN onlyForHisOwner BOOL, IN vWorkerCode VARCHAR(3), IN vWithMana BOOLEAN)
BEGIN
DECLARE vGreuge DECIMAL(10,2);
@@ -52083,106 +53835,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `clientNewBorn_recalc__` */;
+/*!50003 DROP PROCEDURE IF EXISTS `clientPackagingOverstock` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientNewBorn_recalc__`()
-BLOCK1: BEGIN
-
- DECLARE vClientFk INT;
- DECLARE vShipped DATE;
- DECLARE vPreviousShipped DATE;
- DECLARE vDone boolean;
- DECLARE cur cursor for
- SELECT clientFk, firstShipped
- FROM bs.clientNewBorn;
- DECLARE continue HANDLER FOR NOT FOUND SET vDone = TRUE;
- SET vDone := FALSE;
- TRUNCATE bs.clientNewBorn;
- INSERT INTO bs.clientNewBorn
- SELECT c.id, MAX(t.shipped), MAX(t.shipped)
- FROM vn.client c
- JOIN vn.ticket t on t.clientFk = c.id
- WHERE t.shipped BETWEEN TIMESTAMPADD(YEAR, -1, CURDATE()) AND CURDATE()
- GROUP BY c.id;
- OPEN cur;
-
- LOOP1: LOOP
- SET vDone := FALSE;
- FETCH cur INTO vClientFk, vShipped;
-
- IF vDone THEN
- CLOSE cur;
- LEAVE LOOP1;
- END IF;
-
- BLOCK2: BEGIN
- DECLARE vCurrentShipped DATE;
- DECLARE vDone2 boolean;
- DECLARE cur2 CURSOR FOR
- SELECT shipped
- FROM vn.ticket
- WHERE clientFk = vClientFk AND shipped <= CURDATE()
- ORDER BY shipped DESC;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone2 = TRUE;
- SET vDone2 := FALSE;
- OPEN cur2;
-
- SET vPreviousShipped := vShipped;
- LOOP2: LOOP
- SET vDone2 := FALSE;
- FETCH cur2 INTO vCurrentShipped;
-
-
- IF DATEDIFF(vPreviousShipped,vCurrentShipped) > 365 THEN
-
- UPDATE bs.clientNewBorn
- SET firstShipped = vPreviousShipped
- WHERE clientFk= vClientFk;
-
- CLOSE cur2;
- LEAVE LOOP2;
- END IF;
- SET vPreviousShipped := vCurrentShipped;
-
- IF vDone2 THEN
-
- UPDATE bs.clientNewBorn
- SET firstShipped = vCurrentShipped
- WHERE clientFk= vClientFk;
- CLOSE cur2;
- LEAVE LOOP2;
- END IF;
-
- END LOOP LOOP2;
-
- END BLOCK2;
- END LOOP LOOP1;
-END BLOCK1 ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `clientPackagingOverstock` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientPackagingOverstock`(vClientFk INT, vGraceDays INT )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientPackagingOverstock`(vClientFk INT, vGraceDays INT )
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.clientPackagingOverstock;
CREATE TEMPORARY TABLE tmp.clientPackagingOverstock
@@ -52283,11 +53946,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientPackagingOverstockReturn`(vClientFk INT, vGraceDays INT )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientPackagingOverstockReturn`(vClientFk INT, vGraceDays INT )
BEGIN
DECLARE vNewTicket INT DEFAULT 0;
@@ -52333,17 +53996,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `clientRandomSelection` */;
+/*!50003 DROP PROCEDURE IF EXISTS `clientRandomSelection__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientRandomSelection`(vNumero INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientRandomSelection__`(vNumero INT)
BEGIN
DECLARE vClient INT;
@@ -52395,11 +54058,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientRemoveWorker`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientRemoveWorker`()
BEGIN
DECLARE vDone BOOL DEFAULT FALSE;
DECLARE vClientFk INT;
@@ -52442,81 +54105,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `clientRemoveWorker__` */;
+/*!50003 DROP PROCEDURE IF EXISTS `clientRisk_update` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientRemoveWorker__`()
-BEGIN
- DECLARE done BOOL DEFAULT FALSE;
- DECLARE vClientFk INT;
-
- DECLARE rs CURSOR FOR
- SELECT c.clientFk
- FROM tmp.clientGetDebt c
- LEFT JOIN clientRisk r ON r.clientFk = c.clientFk
- GROUP BY r.clientFk
- HAVING SUM(IFNULL(r.amount,0)) = 0;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
- CREATE TEMPORARY TABLE tmp.clientGetDebt
- SELECT cd.id as clientFk
- FROM bs.clientDied cd
- LEFT JOIN vn.clientProtected cp ON cp.clientFk = cd.id
- JOIN vn.client c ON c.id = cd.id
- JOIN vn.province p ON p.id = c.provinceFk
- JOIN vn.country co ON co.id = p.countryFk
- WHERE cd.Aviso = 'TERCER AVISO'
- AND cp.clientFk IS NULL
- AND co.country NOT IN ('Portugal','Francia','España exento')
- AND c.salesPersonFk IS NOT NULL;
-
- OPEN rs;
-
- FETCH rs INTO vClientFk;
-
- WHILE NOT done DO
-
- CALL vn.clientGreugeSpray(vClientFk, TRUE, '',TRUE);
- UPDATE vn.client SET salesPersonFk = NULL WHERE id = vClientFk;
-
- INSERT INTO vn.clientLog (originFk, userFk, `action`, description)
- VALUES (vClientFk, account.userGetId(), 'update', CONCAT('Se ha desasignado el cliente por que no ha comprado en 3 meses'));
-
- REPLACE bs.clientNewBorn(clientFk, shipped)
- VALUES(vClientFk, CURDATE());
-
- FETCH rs INTO vClientFk;
-
- END WHILE;
-
- CLOSE rs;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `clientRisk_update` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clientRisk_update`(vClientId INT, vCompanyId INT, vAmount DECIMAL(10,2))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clientRisk_update`(vClientId INT, vCompanyId INT, vAmount DECIMAL(10,2))
BEGIN
IF vAmount IS NOT NULL
THEN
@@ -52540,11 +54139,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `client_checkBalance`(IN vDateTo DATETIME, IN vIsConciliated BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `client_checkBalance`(IN vDateTo DATETIME, IN vIsConciliated BOOL)
BEGIN
DECLARE vDateFrom DATE;
@@ -52588,13 +54187,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `client_RandomList`(vNumber INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `client_RandomList`(vNumber INT)
BEGIN
DECLARE i INT DEFAULT 0;
@@ -52660,13 +54259,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `clonTravelComplete__`(IN `vTravelFk` INT, IN `vDateStart` DATE, IN `vDateEnd` DATE, IN `vRef` VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `clonTravelComplete__`(IN `vTravelFk` INT, IN `vDateStart` DATE, IN `vDateEnd` DATE, IN `vRef` VARCHAR(255))
BEGIN
-- DEPRECATED usar travel_cloneWithEntries. jgallego
/*
@@ -52806,13 +54405,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cmr_getByTicket`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `cmr_getByTicket`(vTicketFk INT)
BEGIN
IF vTicketFk THEN
@@ -52855,11 +54454,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cmr_new__`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `cmr_new__`(vTicketFk INT)
BEGIN
IF vTicketFk THEN
@@ -52904,11 +54503,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cmr_sendOverview`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `cmr_sendOverview`()
BEGIN
/**
* Insert the monthly CMR summary in vn.mail on the 5th of each month.
@@ -52979,34 +54578,34 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collectionOrTicket_printSticker`(vParam INT, vSectorFk INT)
-BEGIN
-
- /*Imprime una etiqueta amarilla a partir de una colección o ticket
- *
- * @param vParam colección o ticket a imprimir
- * @param vSectorFk id del sector
- */
-
- DECLARE vLabelReport INT;
-
- SELECT labelReportFk INTO vLabelReport
- FROM sector
- WHERE id = vSectorFk;
-
- IF vLabelReport THEN
-
- INSERT INTO ticketTrolley(ticket, labelCount)
- SELECT ticketFk, 1
- FROM ticketCollection
- WHERE collectionFk = vParam OR ticketFK = vParam
- ON DUPLICATE KEY UPDATE labelCount = labelCount + 1;
-
- INSERT INTO printServerQueue(labelReportFk, param1, workerFk)
- SELECT vLabelReport, vParam, getUser();
-
- END IF;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collectionOrTicket_printSticker`(vParam INT, vSectorFk INT)
+BEGIN
+
+ /*Imprime una etiqueta amarilla a partir de una colección o ticket
+ *
+ * @param vParam colección o ticket a imprimir
+ * @param vSectorFk id del sector
+ */
+
+ DECLARE vLabelReport INT;
+
+ SELECT labelReportFk INTO vLabelReport
+ FROM sector
+ WHERE id = vSectorFk;
+
+ IF vLabelReport THEN
+
+ INSERT INTO ticketTrolley(ticket, labelCount)
+ SELECT ticketFk, 1
+ FROM ticketCollection
+ WHERE collectionFk = vParam OR ticketFK = vParam
+ ON DUPLICATE KEY UPDATE labelCount = labelCount + 1;
+
+ INSERT INTO printServerQueue(labelReportFk, param1, workerFk)
+ SELECT vLabelReport, vParam, getUser();
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53017,13 +54616,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collectionPlacement_get`(vParamFk INT(11), vIsPicker bool)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collectionPlacement_get`(vParamFk INT(11), vIsPicker bool)
BEGIN
/* Devuelve el listado de ubicaciones a las que hay que ir para preparar una colección o ticket
@@ -53179,8 +54778,8 @@ BEGIN
ORDER BY saleOrder,
IF(isPreviousPrepared,2,1),
IF(itemShelvingSaleFk,1,2),
- shelvingPriority DESC, -- PAK 05/11/2021
IF(vIsPicker, visible = 0, TRUE),
+ shelvingPriority DESC, -- PAK 05/11/2021
priority;
DROP TEMPORARY TABLE
@@ -53191,147 +54790,6 @@ BEGIN
tmp.salePlacementList_2,
tmp.salePlacementList_3;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collectionSale_get__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collectionSale_get__`(vParam INT)
-BEGIN
-
-
- /*@deprecated: utilizar sale_getFromTicketOrCollection*/
-
- DECLARE vItemPackingTypeFk VARCHAR(1);
- DECLARE vCollectionFk INT;
- DECLARE vTicketFk INT;
-
- IF (SELECT COUNT(*) FROM vn.ticket WHERE id = vParam AND id > 2000000) THEN
-
- SET vTicketFk = vParam;
-
- SELECT itemPackingTypeFk INTO vItemPackingTypeFk
- FROM tmp.workerPackingType wpt
- WHERE wpt.workerFk = account.myUser_getId();
-
- SELECT c.id INTO vCollectionFk
- FROM vn.collection c
- JOIN vn.ticketCollection tc ON tc.collectionFk = c.id
- WHERE tc.ticketFk = vTicketFk
- ORDER BY c.itemPackingTypeFk = vItemPackingTypeFk DESC
- LIMIT 1;
-
- IF IFNULL(vCollectionFk,0) = 0 THEN
-CALL util.debugAdd("vCollectionFk",vn.getUser());
- INSERT INTO vn.collection(workerFk, itemPackingTypeFk)
- VALUES(vn.getUser(), vItemPackingTypeFk);
-
- SET vCollectionFk = LAST_INSERT_ID();
-
- INSERT INTO vn.ticketCollection (collectionFk, ticketFk)
- VALUES (vCollectionFk, vParam);
-
- END IF;
-
- ELSE
-
- SET vCollectionFk = vParam;
-
- END IF;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT tc.ticketFk id, clientFk, tc.ticketFk as showTicketFk
- FROM vn.ticketCollection tc
- JOIN vn.ticket t ON t.id = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND IFNULL(vTicketFk, t.id) = t.id;
-
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket3;
- CREATE TEMPORARY TABLE tmp.ticket3
- SELECT * FROM tmp.ticket;
-
- SELECT showTicketFk ticketFk,
- s.id as saleFk,
- s.itemFk,
- s.quantity,
- i.longName,
- i.size,
- s.reserved,
- MAX(IF(st.semaphore <=> 1, TRUE, FALSE)) as isPreviousPrepared,
- MAX(IF(st.semaphore <=> 2, TRUE, FALSE)) as isPrepared,
- MAX(IF(st.semaphore <=> 3, TRUE, FALSE)) as isControlled,
- ic.color,
- ip.productor,
- s.discount,
- s.price,
- i.stems,
- i.category,
- o.code AS origin,
- t.clientFk,
- s.originalQuantity,
- TRIM(CONCAT(
- LPAD(s.concept,30,' '), ' ',
- RPAD(IFNULL(i.size,''),5,' ')
- )
- ) as line1,
- '' cel1,
- TRIM(CONCAT(LPAD(IFNULL(ip.productor,''),30,' '), ' ',LPAD(IFNULL(o.code,''),4,' '))) as line2,
- IF(s.quantity MOD b.packing,
- CONCAT(CAST(s.quantity/b.`grouping` AS decimal(10,0)),' x ',b.`grouping`),
- CONCAT(CAST(s.quantity / b.packing AS DECIMAL(10,0)),' pack de ',b.packing)) cel2,
- TRIM(CONCAT(ic.color, IF(MAX(IF(st.semaphore <=> 1, TRUE, FALSE)) AND t.id != t.showTicketFk, CONCAT(' [ TICKET ',t.id,' ] '),''), IFNULL(LPAD(st.parkingCode,40,' '),''))) as line3,
- '' cel3,
- s.isAdded,
- str.originalQuantity as startQuantity, -- eliminar cuando tengamos la nueva apk
- c.workerFk,
- IFNULL(SUM(iss.quantity),0) as pickedQuantity
- FROM vn.sale s
- JOIN tmp.ticket t ON t.id = s.ticketFk
- JOIN vn.ticket tt ON tt.id = t.id
- JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = tt.warehouseFk
- JOIN vn.buy b ON b.id = lb.buy_id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
- JOIN vn.collection c ON c.id = tc.collectionFk
- LEFT JOIN vn.saleTracking str ON str.saleFk = s.id AND str.isChecked = 1
- LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
- LEFT JOIN vn.state st ON st.id = str.stateFk
- LEFT JOIN vn.itemColor ic ON ic.itemFk = s.itemFk
- LEFT JOIN vn.itemProductor ip ON ip.itemFk = s.itemFk
- LEFT JOIN vn.origin o ON o.id = i.originFk
- LEFT JOIN (SELECT st.saleFk, p.`code` as parkingCode
- FROM vn.saleTracking st
- JOIN vn.state s ON s.id = st.stateFk
- JOIN vn.sale sa ON sa.id = st.saleFk
- JOIN tmp.ticket3 t ON t.id = sa.ticketFk
- JOIN vn.ticketParking tp ON tp.ticketFk = sa.ticketFk
- JOIN vn.parking p ON p.id = tp.parkingFk
- WHERE st.isChecked
- AND s.semaphore = 1
- GROUP BY st.saleFk) st ON st.saleFk = s.id
- WHERE (i.itemPackingTypeFk = c.itemPackingTypeFk OR ISNULL(c.itemPackingTypeFk))
- AND tc.collectionFk = vCollectionFk
- GROUP BY s.id
-
- ;
-
- DROP TEMPORARY TABLE tmp.ticket;
- DROP TEMPORARY TABLE tmp.ticket3;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53344,11 +54802,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collectionSticker_print`(vCollectionFk INT, vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collectionSticker_print`(vCollectionFk INT, vSectorFk INT)
BEGIN
/*@deprecated :utilizar collectionOrTicket_printSticker*/
@@ -53357,221 +54815,21 @@ BEGIN
SELECT labelReportFk INTO vLabelReport
FROM vn.sector
- WHERE id = vSectorFk;
+ WHERE id = vSectorFk;
- IF vLabelReport THEN
-
+ IF vLabelReport THEN
+
INSERT INTO vn.ticketTrolley(ticket, labelCount)
SELECT ticketFk, 1
FROM vn.ticketCollection
WHERE collectionFk = vCollectionFk
- ON DUPLICATE KEY UPDATE labelCount = labelCount + 1;
+ ON DUPLICATE KEY UPDATE labelCount = labelCount + 1;
- INSERT INTO vn.printServerQueue(labelReportFk, param1, workerFk)
+ INSERT INTO vn.printServerQueue(labelReportFk, param1, workerFk)
SELECT vLabelReport, vCollectionFk, getUser();
-
- END IF;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collectionSticker_print__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collectionSticker_print__`(vCollectionFk INT, vSectorFk INT)
-BEGIN
-
- DECLARE vLabelReport INT;
-
- UPDATE vn.ticket t
- JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
- SET t.notes = CONCAT('COL ',vCollectionFk,'-',tc.`level`)
- WHERE tc.collectionFk = vCollectionFk;
-
- SELECT labelReport INTO vLabelReport
- FROM vn.sector
- WHERE id = vSectorFk;
-
- IF vLabelReport THEN
-
- INSERT INTO vn.ticketTrolley(ticket, labelCount)
- SELECT ticketFk, 1
- FROM vn.ticketCollection
- WHERE collectionFk = vCollectionFk
- ON DUPLICATE KEY UPDATE labelCount = labelCount + 1;
- /*
- INSERT INTO vn.printServerQueue(reportFk, param1, workerFk,param2)
- SELECT vLabelReport, tc.ticketFk, getUser(), tt.labelCount
- FROM vn.ticketCollection tc
- LEFT JOIN vn.ticketTrolley tt ON tt.ticket = tc.ticketFk
- WHERE collectionFk = vCollectionFk;
- */
- INSERT INTO vn.printServerQueue(reportFk, param1, workerFk)
- SELECT vLabelReport, vCollectionFk, getUser();
-
- END IF;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collectionTicket_get` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collectionTicket_get`(vParamFk INT)
-BEGIN
-
- DECLARE vCollectionFk INT;
- DECLARE vTicketFk INT;
- DECLARE vAlertLevel INT;
- DECLARE vItemPackingTypeFk VARCHAR(1);
-
- -- Si los sacadores son los de pruebas, pinta los colores
- SELECT id, itemPackingTypeFk
- INTO vCollectionFk, vItemPackingTypeFk
- FROM vn.collection
- WHERE id = vParamFk;
-
- -- Sergio debug insertado el 13-10-2021
- CALL util.debugAdd("collectionTicket_get",vn.getUser());
-
- IF !(vItemPackingTypeFk <=> 'V') THEN
-
- IF vCollectionFk THEN
-
- SELECT t.id ticketFk,
- cc.code `level`,
- am.name as agencyName,
- t.warehouseFk ,
- w.id as salesPersonFk,
- IFNULL(tob.description,'')as observaciones
- FROM vn.ticket t
- JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
- LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk -- PAK 23/12/21
- LEFT JOIN vn.collectionColors cc
- ON cc.wagon = tc.wagon
- AND cc.shelve = tc.`level`
- AND cc.trainFk = c2.trainFk -- PAK 23/12/21
- LEFT JOIN vn.zone z ON z.id = t.zoneFk
- LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
- LEFT JOIN vn.client c ON c.id = t.clientFk
- LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
- LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 1
- WHERE tc.collectionFk = vCollectionFk;
-
- ELSE
-
- SET vTicketFk = vParamFk;
-
- SELECT t.id ticketFk,
- cc.code `level`,
- am.name as agencyName,
- t.warehouseFk ,
- w.id as salesPersonFk,
- IFNULL(tob.description,'')as observaciones
- FROM vn.ticket t
- JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
- JOIN vn.collection c2 ON c2.id = tc.collectionFk -- PAK 23/12/21
- LEFT JOIN vn.collectionColors cc
- ON cc.wagon = tc.wagon
- AND cc.shelve = tc.`level`
- AND cc.trainFk = c2.trainFk -- PAK 23/12/21
- LEFT JOIN vn.zone z ON z.id = t.zoneFk
- LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
- LEFT JOIN vn.client c ON c.id = t.clientFk
- LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
- LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 1
- WHERE t.id = vTicketFk
- LIMIT 1;
-
- SELECT s.alertLevel INTO vAlertLevel
- FROM vn.state s
- JOIN vn.ticketStateToday tst ON tst.state = s.id
- WHERE tst.ticket = vTicketFk
- LIMIT 1;
-
- IF vAlertLevel < 2 THEN
-
- CALL vn.ticketStateUpdate(vTicketFk, 'ON_CHECKING');
-
- END IF;
-
- END IF;
-
- ELSE
-
- IF vCollectionFk THEN
-
- SELECT t.id ticketFk,
- CONCAT(SUBSTRING('ABCDEFGH',tc.wagon, 1),'-',tc.`level` ) `level`,
- am.name as agencyName,
- t.warehouseFk ,
- w.id as salesPersonFk,
- IFNULL(tob.description,'')as observaciones
- FROM vn.ticket t
- JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
- LEFT JOIN vn.zone z ON z.id = t.zoneFk
- LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
- LEFT JOIN vn.client c ON c.id = t.clientFk
- LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
- LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 1
- WHERE tc.collectionFk = vCollectionFk;
-
- ELSE
-
- SET vTicketFk = vParamFk;
-
- SELECT t.id ticketFk,
- CONCAT(SUBSTRING('ABCDEFGH',tc.wagon, 1),'-',tc.`level` ) `level`,
- am.name as agencyName,
- t.warehouseFk ,
- w.id as salesPersonFk,
- IFNULL(tob.description,'')as observaciones
- FROM vn.ticket t
- JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
- LEFT JOIN vn.zone z ON z.id = t.zoneFk
- LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
- LEFT JOIN vn.client c ON c.id = t.clientFk
- LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
- LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 1
- WHERE t.id = vTicketFk
- LIMIT 1;
-
- SELECT s.alertLevel INTO vAlertLevel
- FROM vn.state s
- JOIN vn.ticketStateToday tst ON tst.state = s.id
- WHERE tst.ticket = vTicketFk
- LIMIT 1;
-
- IF vAlertLevel < 2 THEN
-
- CALL vn.ticketStateUpdate(vTicketFk, 'ON_CHECKING');
-
- END IF;
-
- END IF;
END IF;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53582,13 +54840,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_addItem`(vItemFk INT, vQuantity INT, vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_addItem`(vItemFk INT, vQuantity INT, vTicketFk INT)
BEGIN
DECLARE vConcept VARCHAR(50);
DECLARE itemFk INT;
@@ -53620,61 +54878,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_checkFullyControlled` */;
+/*!50003 DROP PROCEDURE IF EXISTS `collection_faults` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_checkFullyControlled`(vWorkerFk INT, vCollectionFk INT )
-BEGIN
-/**
- * Comprueba que no hay ningún ticket pendiente de revisar de alguna colección del trabajador haya revisado ya
- * @param vWorkerFk id del user
- * @param vCollectionFk número de colección escaneada
- *
- */
-
- SELECT tc.collectionFk
- FROM ticket t
- JOIN sale s ON s.ticketFk = t.id
- JOIN ticketCollection tc ON tc.ticketFk = t.id
- JOIN (SELECT tc.collectionFk
- FROM ticketState ts
- JOIN ticketCollection tc ON tc.ticketFk = ts.ticketFk
- WHERE ts.workerFk = vWorkerFk
- AND tc.collectionFk <> vCollectionFk
- AND tc.created >= CURDATE()
- GROUP BY tc.collectionFk
- )sub ON sub.collectionFk = tc.collectionFk
- JOIN ticketState ts ON ts.ticketFk = t.id
- WHERE t.shipped >= CURDATE()
- AND ts.code IN ('ON_PREPARATION', 'PREPARED', 'PREVIOUS_PREPARATION', 'OK PREVIOUS')
- AND s.quantity <>0
-
- LIMIT 1;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_faults` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_faults`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_faults`(
vShelvingFk VARCHAR(10),
vQuantity INT,
vItemFk INT)
@@ -53722,15 +54936,26 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_get`(vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_get`(vWorkerFk INT)
BEGIN
+
+ /* Obtiene colección del sacador si tiene líneas pendientes
+ *
+ * @param vWorkerFk id del worker
+ */
- SELECT c.id AS collectionFk, date(c.created) AS created
+ SELECT c.id AS collectionFk, date(c.created) AS created, count(DISTINCT s.id) totalRow, count(DISTINCT st.id) pickedRow
FROM vn.collection c
- LEFT JOIN vn.state s ON c.stateFk = s.id
- WHERE c.workerFk = vWorkerFk AND s.code = 'ON_PREPARATION'
- AND created >= TIMESTAMPADD(HOUR , -6,NOW());
-
+ JOIN vn.ticketCollection tc on tc.collectionFk = c.id
+ JOIN vn.sale s on s.ticketFk = tc.ticketFk
+ JOIN vn.state ss on ss.code = 'PREPARED'
+ LEFT JOIN vn.saleTracking st on st.saleFk = s.id AND st.stateFk = ss.id
+ WHERE c.workerFk = vWorkerFk
+ AND c.created >= TIMESTAMPADD(HOUR , -6,NOW())
+ AND s.quantity != 0
+ GROUP BY c.id
+ HAVING totalRow > pickedRow;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53741,13 +54966,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_getTickets`(vParamFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_getTickets`(vParamFk INT)
BEGIN
/**
* Selecciona los tickets de una colección/ticket
@@ -53810,79 +55035,31 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_getTickets__` */;
+/*!50003 DROP PROCEDURE IF EXISTS `collection_get_` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_getTickets__`(vParamFk INT)
-BEGIN
-
- DECLARE vAlertLevel INT;
- DECLARE vItemPackingTypeFk VARCHAR(1);
-
- -- Si los sacadores son los de pruebas, pinta los colores
- SELECT itemPackingTypeFk INTO vItemPackingTypeFk
- FROM vn.collection
- WHERE id = vParamFk;
-
- SELECT t.id ticketFk,
- IF (!(vItemPackingTypeFk <=> 'V'), cc.code,CONCAT(SUBSTRING('ABCDEFGH',tc.wagon, 1),'-',tc.`level` )) `level`,
- am.name as agencyName,
- t.warehouseFk ,
- w.id as salesPersonFk,
- IFNULL(tob.description,'')as observaciones
- FROM vn.ticket t
- LEFT JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
- LEFT JOIN vn.collectionColors cc ON cc.wagon = tc.wagon AND cc.shelve = tc.`level`
- LEFT JOIN vn.zone z ON z.id = t.zoneFk
- LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
- LEFT JOIN vn.client c ON c.id = t.clientFk
- LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
- LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 1
- WHERE tc.collectionFk = vParamFk OR (t.id = vParamFk AND t.id>2000000);
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_increaseQuantity` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_increaseQuantity`(
- vSaleFk INT,
- vQuantity INT)
-BEGIN
-
- DECLARE vDescription VARCHAR(100);
- DECLARE vOriginalQuantity INT;
- DECLARE vConcept VARCHAR(100);
- DECLARE vOrigin INT;
-
- SELECT concept INTO vConcept FROM sale WHERE id = vSaleFk;
- SELECT ticketFk INTO vOrigin FROM sale WHERE id = vSaleFk;
- SELECT quantity INTO vOriginalQuantity FROM sale WHERE id = vSaleFk;
- SELECT CONCAT("Cambio cantidad ",vConcept," de ", vOriginalQuantity," a ", vQuantity) INTO vDescription;
-
- INSERT INTO ticketLog (originFk, userFk, action , description)
- VALUES(vOrigin, getUser(), 'update', vDescription);
-
- UPDATE `vn`.`sale` SET `quantity` = vQuantity,`originalQuantity` = vOriginalQuantity WHERE (`id` = vSaleFk);
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_get_`(vWorkerFk INT)
+BEGIN
+
+ /* Obtiene colección del sacador si tiene líneas pendientes
+ *
+ * @param vWorkerFk id del worker
+ */
+
+ SELECT c.id AS collectionFk, date(c.created) AS created
+ FROM vn.collection c
+ LEFT JOIN vn.state s ON c.stateFk = s.id
+ WHERE c.workerFk = vWorkerFk AND s.code = 'ON_PREPARATION'
+ AND created >= TIMESTAMPADD(HOUR , -6,NOW());
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53893,28 +55070,28 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_kill`(vSelf INT)
-BEGIN
-
- /* Elimina una coleccion y coloca sus tickets en OK
- *
- */
-
- INSERT INTO vncontrol.inter(state_id, Id_Ticket)
- SELECT s.id, ticketFk
- FROM vn.ticketCollection tc
- JOIN vn.state s ON s.code = 'OK'
- WHERE tc.collectionFk = vSelf;
-
- DELETE FROM vn.collection
- WHERE id = vSelf;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_kill`(vSelf INT)
+BEGIN
+
+ /* Elimina una coleccion y coloca sus tickets en OK
+ *
+ */
+
+ INSERT INTO vncontrol.inter(state_id, Id_Ticket)
+ SELECT s.id, ticketFk
+ FROM vn.ticketCollection tc
+ JOIN vn.state s ON s.code = 'OK'
+ WHERE tc.collectionFk = vSelf;
+
+ DELETE FROM vn.collection
+ WHERE id = vSelf;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -53927,11 +55104,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_missingTrash`(vSaleFk BIGINT, vQuantity INT, vIsTrash BOOLEAN, vWarehouseFk INT, vNewQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_missingTrash`(vSaleFk BIGINT, vQuantity INT, vIsTrash BOOLEAN, vWarehouseFk INT, vNewQuantity INT)
BEGIN
DECLARE vTicketFk INT;
DECLARE vClientFk INT DEFAULT 400;
@@ -53987,11 +55164,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_newSmartTag`(vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_newSmartTag`(vSectorFk INT)
proc:BEGIN
DECLARE vIsPreviousPrepared BOOLEAN;
@@ -54515,7 +55692,7 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_newWithWagon`(vSectorFk INT, vWagons INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_newWithWagon`(vSectorFk INT, vWagons INT)
proc:BEGIN
DECLARE vIsPreviousPrepared BOOLEAN;
@@ -54546,18 +55723,15 @@ proc:BEGIN
END IF;*/
- CALL util.debugAdd('vn.collection_newWithWagon',CONCAT('sector: ',vSectorFk,' wagons:',vWagons));
-
-
SELECT w.code INTO vWorkerCode
FROM vn.worker w
WHERE w.id = vn.getUser();
- -- Establecemos el almacén y si es un sector de preparación previa, así como el estado para los tickets que se vayan preparando
- SELECT isPreviousPrepared, warehouseFk, itemPackingTypeFk
+ -- Establecemos el almacén y si es un sector de preparación previa, así como el estado para los tickets que se vayan preparando
+ SELECT isPreviousPrepared, warehouseFk, itemPackingTypeFk
INTO vIsPreviousPrepared, vWarehouseFk, vItemPackingTypeFk
FROM vn.sector
- WHERE id = vSectorFk;
+ WHERE id = vSectorFk;
-- Si está habilitado el modo cazador para las motos, y el usuario no está registrado, se sale.
@@ -54581,40 +55755,45 @@ proc:BEGIN
LEAVE proc;
END IF;
-
- SET vMaxTicketPrinted = 8 * vWagons;
- SET vMaxTickets = 4 * vWagons;
-
+
+ -- SET vMaxTicketPrinted = 8 * vWagons;
+ -- SET vMaxTickets = 4 * vWagons;
+ SELECT ticketPrintedMax * vWagons, ticketTrolleyMax * vWagons
+ INTO vMaxTicketPrinted, vMaxTickets
+ FROM vn.productionConfig pc;
+
+ CALL util.debugAdd('cnww:',CONCAT(vMaxTicketPrinted, vMaxTickets));
+
IF vIsPreviousPrepared THEN
-
+
LEAVE proc; -- Hasta que tengamos el altillo, vamos a cancelar esta opcion
SELECT id INTO vStateFk
FROM vn.state
- WHERE `code` = 'PREVIOUS_PREPARATION';
- ELSE
-
+ WHERE `code` = 'PREVIOUS_PREPARATION';
+ ELSE
+
SELECT id INTO vStateFk
FROM vn.state
- WHERE `code` = 'ON_PREPARATION';
-
- END IF;
-
- CALL vn.productionControl(vWarehouseFk, 0);
-
+ WHERE `code` = 'ON_PREPARATION';
+
+ END IF;
+
+ CALL vn.productionControl(vWarehouseFk, 0);
+
-- Esto hay que corregirlo añadiendo un nuevo parámetro al proc. PAK 23/12/21
- IF vSectorFk = 65 THEN
+ IF vSectorFk = 65 THEN -- Pedidos pequeños
SET vTrainFk = 2;
DELETE pb.*
- FROM tmp.productionBuffer pb
- JOIN vn.volumeConfig vc
- WHERE pb.m3 * 1000 > vc.minTicketVolume;
-
+ FROM tmp.productionBuffer pb
+ JOIN vn.volumeConfig vc
+ WHERE pb.m3 * 1000 > vc.minTicketVolume;
+
END IF;
-
- -- Se obtiene nº de colección y el buffer con los pedidos preparables
+
+ -- Se obtiene nº de colección y el buffer con los pedidos preparables
INSERT INTO vn.collection
SET workerFk = account.myUser_getId(),
itemPackingTypeFk = vItemPackingTypeFk,
@@ -54622,23 +55801,26 @@ proc:BEGIN
SELECT LAST_INSERT_ID() INTO vCollectionFk;
-
- -- 05/08/2021 PAK Jose Frau pide que los tickets de recogida en Algemesí sólo se saquen si están asignados.
- DELETE pb.*
+
+ -- 05/08/2021 PAK Jose Frau pide que los tickets de recogida en Algemesí sólo se saquen si están asignados.
+ DELETE pb.*
FROM tmp.productionBuffer pb
JOIN vn.state s ON s.id = pb.state
WHERE pb.agency = 'REC_ALGEMESI'
AND s.code != 'PICKER_DESIGNED';
-
+
+ -- 2/3/2022 PAK Se acuerda con Pepe que los pedidos con riesgo no se sacan aunque se asignen.
+ DELETE pb.*
+ FROM tmp.productionBuffer pb
+ WHERE pb.problem LIKE '%RIESGO%';
+
-- Comprobamos si hay tickets asignados. En ese caso, nos centramos exclusivamente en esos tickets
-- y los sacamos independientemente de problemas o tamaños
SELECT COUNT(*) INTO hasAssignedTickets
FROM tmp.productionBuffer pb
JOIN vn.state s ON s.id = pb.state
- WHERE s.code = 'PICKER_DESIGNED'
- AND pb.workerCode = vWorkerCode
- -- AND LENGTH(pb.problem) = 0
- ;
+ WHERE s.code = 'PICKER_DESIGNED'
+ AND pb.workerCode = vWorkerCode;
IF hasAssignedTickets THEN
@@ -54651,7 +55833,7 @@ proc:BEGIN
SELECT pb.ticketFk
FROM tmp.productionBuffer pb
JOIN vn.state s ON s.id = pb.state
- WHERE s.code = 'PICKER_DESIGNED'
+ WHERE s.code = 'PICKER_DESIGNED'
AND pb.workerCode = vWorkerCode
ORDER BY HH,
mm,
@@ -54685,44 +55867,48 @@ proc:BEGIN
FROM tmp.productionBuffer pb
JOIN vn.state s ON s.id = pb.state
JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
+ JOIN vn.agency a ON a.id = am.agencyFk
+ JOIN vn.productionConfig pc
WHERE pb.shipped = CURDATE()
AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
AND s.isPreparable
AND (pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.N > 0 AND ISNULL(pb.collectionH));
+ OR pb.N > 0 AND ISNULL(pb.collectionH))
+ AND (pc.isPreviousPreparationRequired = FALSE OR pb.previousWithoutParking = FALSE);
SET vMaxTicketPrinted = vMaxTicketPrinted - vPrintedTickets;
-- AutoPRINT
- IF vMaxTicketPrinted > 0 THEN
-
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT s2.id, pb.ticketFk, vn.getUser()
- FROM tmp.productionBuffer pb
- JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
- JOIN vn.state s ON s.id = pb.state
- JOIN vn.state s2 ON s2.code = 'PRINTED_AUTO'
- JOIN vn.ticket t ON t.id = pb.ticketFk
- JOIN vn.ticketConfig tc
- WHERE pb.shipped = CURDATE()
- AND (LENGTH(pb.problem) = 0 OR (pb.problem = 'PEQUEÑO' AND vTrainFk = 2))
- AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
- AND s.isPrintable
- AND s.isOK
- AND (pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
- OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.N > 0 AND ISNULL(pb.collectionH))
- AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , NOW())
- ORDER BY HH,
- mm,
- s.`order` DESC,
- pb.m3 DESC
- LIMIT vMaxTicketPrinted;
-
- END IF;
+ -- IF vMaxTicketPrinted > 0 THEN
+
+ INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
+ SELECT s2.id, pb.ticketFk, vn.getUser()
+ FROM tmp.productionBuffer pb
+ JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
+ JOIN vn.agency a ON a.id = am.agencyFk
+ JOIN vn.state s ON s.id = pb.state
+ JOIN vn.state s2 ON s2.code = 'PRINTED_AUTO'
+ JOIN vn.ticket t ON t.id = pb.ticketFk
+ JOIN vn.ticketConfig tc
+ JOIN vn.productionConfig pc
+ WHERE pb.shipped = CURDATE()
+ AND (LENGTH(pb.problem) = 0 OR (pb.problem = 'PEQUEÑO' AND vTrainFk = 2))
+ AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
+ AND s.isPrintable
+ AND s.isOK
+ AND (pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
+ OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
+ OR pb.N > 0 AND ISNULL(pb.collectionH))
+ AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , NOW())
+ AND (pc.isPreviousPreparationRequired = FALSE OR pb.previousWithoutParking = FALSE)
+ ORDER BY HH,
+ mm,
+ s.`order` DESC,
+ pb.m3 DESC
+ LIMIT vMaxTicketPrinted;
+
+ -- END IF;
-- Se seleccionan los primeros tickets, asignando colección para dejarlos bloqueados a otros sacadores.
-- Se splitan los tickets preparables, para que solo tengan un tipo de empaquetado
@@ -54735,11 +55921,13 @@ proc:BEGIN
JOIN vn.agency a ON a.id = am.agencyFk
JOIN vn.ticketStateToday tst ON tst.ticket = pb.ticketFk
JOIN vn.state s ON s.id = tst.state
+ JOIN vn.productionConfig pc
WHERE ( pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV))
AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
AND LENGTH(pb.problem) = 0
AND s.isPreparable
+ AND (pc.isPreviousPreparationRequired = FALSE OR pb.previousWithoutParking = FALSE)
ORDER BY pb.HH, pb.mm, s.`order` DESC
LIMIT vMaxTickets;
@@ -55058,1627 +56246,6 @@ proc:BEGIN
DROP TEMPORARY TABLE tmp.wagonsVolumetry;
DROP TEMPORARY TABLE tmp.ticketShelve;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_newWithWagon_beta` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_newWithWagon_beta`(vSectorFk INT, vWagons INT)
-proc:BEGIN
-
- DECLARE vIsPreviousPrepared BOOLEAN;
- DECLARE vCollectionFk INT;
- DECLARE vWarehouseFk INT;
- DECLARE vMaxTickets INT;
- DECLARE vStateFk INT;
- DECLARE vFirstTicketFk INT;
- DECLARE vHour INT;
- DECLARE vMinute INT;
- DECLARE vWorkerCode VARCHAR(3);
- DECLARE vWagon INT;
- DECLARE vWagonCounter INT;
- DECLARE vShelve INT;
- DECLARE vTicket INT;
- DECLARE vTicketToSplit INT;
- DECLARE vPrintedTickets INT;
- DECLARE vMaxTicketPrinted INT;
- DECLARE vItemPackingTypeFk VARCHAR(1);
- DECLARE hasAssignedTickets BOOLEAN;
- DECLARE vMaxNotReadyCollections INT DEFAULT 0;
- DECLARE vNotReadyCollections INT;
- DECLARE vTrainFk INT DEFAULT 1;
-
- /*IF NOT vn.deviceProductionUser_Exists(vn.getUser()) THEN
-
- LEAVE proc;
-
- END IF;*/
-
- CALL util.debugAdd('vn.collection_newWithWagon',CONCAT('sector: ',vSectorFk,' wagons:',vWagons));
-
-
- SELECT w.code INTO vWorkerCode
- FROM vn.worker w
- WHERE w.id = vn.getUser();
-
- -- Establecemos el almacén y si es un sector de preparación previa, así como el estado para los tickets que se vayan preparando
- SELECT isPreviousPrepared, warehouseFk, itemPackingTypeFk
- INTO vIsPreviousPrepared, vWarehouseFk, vItemPackingTypeFk
- FROM vn.sector
- WHERE id = vSectorFk;
-
--- Si está habilitado el modo cazador para las motos, y el usuario no está registrado, se sale.
-
- IF (SELECT isTractorHuntingMode FROM vn.deviceProductionConfig dpc) AND vItemPackingTypeFk = 'H' THEN
- IF (SELECT COUNT(*) FROM vn.workerWithoutTractor wwt WHERE wwt.workerFk = account.userGetId()) THEN
- INSERT INTO tmp.kk(userFk) VALUES(vn.getUser());
- LEAVE proc;
- END IF;
- END IF;
-
-
--- Si hay colecciones sin terminar, sale del proceso
- SELECT count(*) INTO vNotReadyCollections
- FROM vn.collection c
- WHERE c.workerFk = vn.getUser()
- AND c.saleTotalCount > c.salePickedCount + 1
- AND c.created > TIMESTAMPADD(HOUR , -5,NOW());
-
- IF vMaxNotReadyCollections < vNotReadyCollections THEN
-
- LEAVE proc;
-
- END IF;
-
- SET vMaxTicketPrinted = 8 * vWagons;
- SET vMaxTickets = 4 * vWagons;
-
- IF vIsPreviousPrepared THEN
-
- LEAVE proc; -- Hasta que tengamos el altillo, vamos a cancelar esta opcion
-
- SELECT id INTO vStateFk
- FROM vn.state
- WHERE `code` = 'PREVIOUS_PREPARATION';
- ELSE
-
- SELECT id INTO vStateFk
- FROM vn.state
- WHERE `code` = 'ON_PREPARATION';
-
- END IF;
-
- CALL vn.productionControl(vWarehouseFk, 0);
-
- -- Esto hay que corregirlo añadiendo un nuevo parámetro al proc. PAK 23/12/21
- IF vSectorFk = 65 THEN
-
- SET vTrainFk = 2;
-
- DELETE pb.*
- FROM tmp.productionBuffer pb
- JOIN vn.volumeConfig vc
- WHERE pb.m3 * 1000 > vc.minTicketVolume;
-
- END IF;
-
- -- Se obtiene nº de colección y el buffer con los pedidos preparables
- INSERT INTO vn.collection
- SET workerFk = account.myUser_getId(),
- itemPackingTypeFk = vItemPackingTypeFk,
- trainFk = vTrainFk;
-
- SELECT LAST_INSERT_ID() INTO vCollectionFk;
-
-
- -- 05/08/2021 PAK Jose Frau pide que los tickets de recogida en Algemesí sólo se saquen si están asignados.
- DELETE pb.*
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- WHERE pb.agency = 'REC_ALGEMESI'
- AND s.code != 'PICKER_DESIGNED';
-
- -- Comprobamos si hay tickets asignados. En ese caso, nos centramos exclusivamente en esos tickets
- -- y los sacamos independientemente de problemas o tamaños
- SELECT COUNT(*) INTO hasAssignedTickets
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- WHERE s.code = 'PICKER_DESIGNED'
- AND pb.workerCode = vWorkerCode
- -- AND LENGTH(pb.problem) = 0
- ;
-
- IF hasAssignedTickets THEN
-
- UPDATE vn.collection
- SET itemPackingTypeFk = NULL
- WHERE id = vCollectionFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketToSplit;
- CREATE TEMPORARY TABLE tmp.ticketToSplit
- SELECT pb.ticketFk
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- WHERE s.code = 'PICKER_DESIGNED'
- AND pb.workerCode = vWorkerCode
- ORDER BY HH,
- mm,
- s.`order` DESC,
- pb.m3 DESC;
-
- WHILE (SELECT COUNT(*) FROM tmp.ticketToSplit) DO
-
- SELECT MIN(ticketFk) INTO vTicketToSplit
- FROM tmp.ticketToSplit;
-
- CALL vn.ticket_splitItemPackingType(vTicketToSplit);
-
- INSERT INTO vn.ticketCollection(ticketFk, collectionFk)
- SELECT ticketFk, vCollectionFk
- FROM tmp.ticketIPT
- WHERE (itemPackingTypeFk = vItemPackingTypeFk) ;
-
- DELETE FROM tmp.ticketToSplit
- WHERE ticketFk = vTicketToSplit;
-
- DROP TEMPORARY TABLE tmp.ticketIPT;
-
- END WHILE;
-
- CALL vn.productionControl(vWarehouseFk, 0);
-
- ELSE
-
- SELECT COUNT(*) INTO vPrintedTickets
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
- WHERE pb.shipped = CURDATE()
- AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
- AND s.isPreparable
- AND (pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
- OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.F > 0 AND vItemPackingTypeFk = 'F' AND ISNULL(pb.collectionF)
- OR pb.P > 0 AND vItemPackingTypeFk = 'P' AND ISNULL(pb.collectionP));
-
- SET vMaxTicketPrinted = vMaxTicketPrinted - vPrintedTickets;
- -- AutoPRINT
-
- IF vMaxTicketPrinted > 0 THEN
-
- CALL util.debugAdd('PAK vMaxTicketPrinted',vMaxTicketPrinted);
-
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT s2.id, pb.ticketFk, vn.getUser()
- FROM tmp.productionBuffer pb
- JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
- JOIN vn.state s ON s.id = pb.state
- JOIN vn.state s2 ON s2.code = 'PRINTED_AUTO'
- JOIN vn.ticket t ON t.id = pb.ticketFk
- JOIN vn.ticketConfig tc
- WHERE pb.shipped = CURDATE()
- AND (LENGTH(pb.problem) = 0 OR (pb.problem = 'PEQUEÑO' AND vTrainFk = 2))
- AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
- AND s.isPrintable
- AND s.isOK
- AND (pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
- OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.F > 0 AND vItemPackingTypeFk = 'F' AND ISNULL(pb.collectionF)
- OR pb.P > 0 AND vItemPackingTypeFk = 'P' AND ISNULL(pb.collectionP))
- AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , NOW())
- ORDER BY HH,
- mm,
- s.`order` DESC,
- pb.m3 DESC
- LIMIT vMaxTicketPrinted;
-
- END IF;
-
- -- Se seleccionan los primeros tickets, asignando colección para dejarlos bloqueados a otros sacadores.
- -- Se splitan los tickets preparables, para que solo tengan un tipo de empaquetado
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketToSplit;
- CREATE TEMPORARY TABLE tmp.ticketToSplit
- SELECT pb.ticketFk
- FROM tmp.productionBuffer pb
- JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
- JOIN vn.ticketStateToday tst ON tst.ticket = pb.ticketFk
- JOIN vn.state s ON s.id = tst.state
- WHERE ( pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
- OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.P > 0 AND vItemPackingTypeFk = 'P' AND ISNULL(pb.collectionP))
- AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
- AND (LENGTH(pb.problem) = 0 OR (pb.problem = 'PEQUEÑO' AND vTrainFk = 2))
- AND s.isPreparable
- ORDER BY pb.HH, pb.mm, s.`order` DESC
- LIMIT vMaxTickets;
-
- WHILE (SELECT COUNT(*) FROM tmp.ticketToSplit) DO
-
- SELECT MIN(ticketFk) INTO vTicketToSplit
- FROM tmp.ticketToSplit;
-
- CALL vn.ticket_splitItemPackingType(vTicketToSplit);
-
- INSERT INTO vn.ticketCollection(ticketFk, collectionFk)
- SELECT ticketFk, vCollectionFk
- FROM tmp.ticketIPT
- WHERE itemPackingTypeFk = vItemPackingTypeFk;
-
- DELETE FROM tmp.ticketToSplit
- WHERE ticketFk = vTicketToSplit;
-
- DROP TEMPORARY TABLE tmp.ticketIPT;
-
- END WHILE;
-
- END IF;
-
- -- Creamos una tabla temporal con los datos que necesitamos para depurar la colección
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT pb.ticketFk,
- pb.`lines`,
- pb.m3 * 1000 liters,
- 0 as height,
- 0 as shelve,
- 0 as wagon,
- 0 AS shelveLiters,
- pb.productionOrder,
- pb.HH,
- pb.mm
- FROM tmp.productionBuffer pb
- JOIN vn.ticketCollection tc ON tc.ticketFk = pb.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- LIMIT vMaxTickets;
-
-
- -- Voumen de las lineas de los pedidos, de acuerdo con el packingShelve establecido por los controladores
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketShelveLiters;
- CREATE TEMPORARY TABLE tmp.ticketShelveLiters
- SELECT t.ticketFk, SUM(s.quantity * vc.shelveVolume / i.packingShelve) shelveLiters
- FROM tmp.ticket t
- JOIN vn.sale s ON s.ticketFk = t.ticketFk
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.volumeConfig vc
- WHERE i.packingShelve
- GROUP BY t.ticketFk;
-
- UPDATE tmp.ticket t
- JOIN tmp.ticketShelveLiters tsl ON tsl.ticketFk = t.ticketFk
- SET t.shelveLiters = tsl.shelveLiters;
-
- -- Es importante que el primer ticket se coja en todos los casos
- SET vFirstTicketFk = 0;
-
- SELECT ticketFk, HH, mm
- INTO vFirstTicketFk, vHour, vMinute
- FROM tmp.ticket
- ORDER BY productionOrder DESC, HH, mm
- LIMIT 1;
-
- -- Hay que excluir aquellos que no tengan la misma hora de preparación
- DELETE
- FROM tmp.ticket
- WHERE HH != vHour
- OR mm != vMinute;
-
- -- En el caso de pedidos de más volumen de un carro, la colección será monoticket. Pero si el primer pedido
- -- no es monoticket, excluimos a los de más de un carro
- IF (SELECT (t.shelveLiters > vc.trolleyM3 * 1000)
- FROM tmp.ticket t
- JOIN vn.volumeConfig vc
- WHERE t.ticketFk = vFirstTicketFk) THEN
-
- DELETE
- FROM tmp.ticket
- WHERE ticketFk != vFirstTicketFk;
-
- ELSE
-
- DELETE t.*
- FROM tmp.ticket t
- JOIN vn.volumeConfig vc
- WHERE t.shelveLiters > vc.trolleyM3 * 1000;
-
- END IF;
-
- -- Elimina los tickets bloqueados que no se van a preparar
- DELETE tc.*
- FROM vn.ticketCollection tc
- LEFT JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND t.ticketFk IS NULL;
-
-
- /*
- *
- * Construccion del tren
- *
- */
-
- -- Establece altura máxima por pedido, porque las plantas no se pueden recostar.
- UPDATE tmp.ticket t
- JOIN
- ( SELECT MAX(i.size) maxHeigth,
- tc.ticketFk
- FROM vn.ticketCollection tc
- JOIN vn.collection c ON c.id = tc.collectionFk
- JOIN vn.sale s ON s.ticketFk = tc.ticketFk
- JOIN vn.item i ON i.id = s.itemFk
- WHERE i.itemPackingTypeFk = 'V'
- AND tc.collectionFk = vCollectionFk
- AND c.trainFk = vTrainFk
- GROUP BY tc.ticketFk) sub ON sub.ticketFk = t.ticketFk
- SET t.height = IFNULL(sub.maxHeigth,0);
-
- -- Vamos a generar una tabla con todas las posibilidades de asignacion de pedido
- DROP TEMPORARY TABLE IF EXISTS tmp.wagonsVolumetry;
- CREATE TEMPORARY TABLE tmp.wagonsVolumetry
- SELECT cv.`level` as shelve,
- 1 as wagon,
- cv.`lines`,
- cv.liters,
- cv.height
- FROM vn.collectionVolumetry cv
- WHERE cv.itemPackingTypeFk = IFNULL(vItemPackingTypeFk, 'H')
- AND cv.trainFk = vTrainFk;
-
- SET vWagonCounter = 1;
-
- WHILE vWagonCounter < vWagons DO
-
- SET vWagonCounter = vWagonCounter + 1;
-
- INSERT INTO tmp.wagonsVolumetry(shelve, wagon, `lines`, liters, height)
- SELECT cv.`level` as shelve,
- vWagonCounter as wagon,
- cv.`lines`,
- cv.liters,
- cv.height
- FROM vn.collectionVolumetry cv
- WHERE cv.itemPackingTypeFk = IFNULL(vItemPackingTypeFk, 'H')
- AND cv.trainFk = vTrainFk;
-
- END WHILE;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketShelve;
- CREATE TEMPORARY TABLE tmp.ticketShelve
- SELECT ticketFk, shelve, wagon, linesDif, LitersDif, heightDif
- FROM (
- SELECT t.ticketFk,
- wv.shelve,
- wv.wagon,
- t.productionOrder,
- CAST(wv.`lines` AS SIGNED) - t.`lines` as linesDif,
- CAST(wv.liters AS SIGNED) - t.shelveLiters as litersDif,
- CAST(wv.height AS SIGNED) - t.height as heightDif
- FROM tmp.wagonsVolumetry wv
- JOIN tmp.ticket t
- ) sub
- WHERE linesDif >= 0
- AND litersDif >= 0
- AND heightDif >= 0
- ORDER BY productionOrder DESC, linesDif, LitersDif, heightDif ;
-
- -- Insertamos una opcion virtual para carro completo. Todo ticket tiene que poder entrar en un carro completo....
- INSERT INTO tmp.ticketShelve(ticketFk, shelve, wagon, linesDif, LitersDif, heightDif)
- SELECT t.ticketFk, 0, wv.wagon, 999, 999,999
- FROM tmp.ticket t
- JOIN tmp.wagonsVolumetry wv
- GROUP BY t.ticketFk, wv.wagon;
-
- SET vWagonCounter = 0;
-
- WHILE vWagonCounter < vWagons DO
-
- SET vWagonCounter = vWagonCounter + 1;
-
- -- Asignamos la primera balda util al primer pedido
- IF vWagonCounter = 1 THEN
-
- SELECT shelve INTO vShelve
- FROM tmp.ticketShelve
- WHERE ticketFk = vFirstTicketFk
- AND wagon = vWagonCounter
- ORDER BY heightDif, litersDif, linesDif
- LIMIT 1;
-
- ELSE
-
- SELECT shelve, ticketFk INTO vShelve, vFirstTicketFk
- FROM tmp.ticketShelve
- WHERE wagon = vWagonCounter
- ORDER BY heightDif, litersDif, linesDif
- LIMIT 1;
-
- END IF;
-
- IF vShelve > 0 THEN
-
- UPDATE tmp.ticket
- SET shelve = vShelve,
- wagon = vWagonCounter
- WHERE ticketFk = vFirstTicketFk;
-
- DELETE FROM tmp.ticketShelve
- WHERE ticketFk = vFirstTicketFk
- OR (shelve = vShelve AND wagon = vWagonCounter);
-
- WHILE (SELECT COUNT(*) FROM tmp.ticketShelve WHERE wagon = vWagonCounter) DO
-
- SELECT ticketFk, shelve
- INTO vTicket, vShelve
- FROM tmp.ticketShelve
- WHERE wagon = vWagonCounter
- LIMIT 1;
-
- UPDATE tmp.ticket
- SET shelve = vShelve,
- wagon = vWagonCounter
- WHERE ticketFk = vTicket;
-
- DELETE FROM tmp.ticketShelve
- WHERE ticketFk = vTicket
- OR (shelve = vShelve AND wagon = vWagonCounter);
-
- END WHILE;
-
- ELSE
-
- UPDATE tmp.ticket
- SET shelve = 1, wagon = vWagonCounter
- WHERE ticketFk = vFirstTicketFk;
-
- DELETE FROM tmp.ticketShelve
- WHERE ticketFk = vFirstTicketFk
- AND wagon != vWagonCounter;
-
- END IF;
-
- END WHILE;
-
- -- Eliminamos los que se han quedado sin balda
- DELETE FROM tmp.ticket WHERE shelve = 0;
-
- -- Elimina los tickets bloqueados que no se van a preparar
- DELETE tc.*
- FROM vn.ticketCollection tc
- LEFT JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND t.ticketFk IS NULL;
-
- -- Elimina los tickets que ya estan en otra coleccion
- DELETE tc.*
- FROM vn.ticketCollection tc
- JOIN vn.ticketCollection tc2 ON tc2.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND tc2.collectionFk != vCollectionFk;
-
- -- Actualiza el estado de la colección
- UPDATE vn.collection c
- JOIN vn.state st ON st.code = 'ON_PREPARATION'
- SET c.stateFk = st.id
- WHERE c.id = vCollectionFk;
-
- -- Asigna las bandejas
- UPDATE vn.ticketCollection tc
- JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
- SET tc.level = t.shelve,
- tc.wagon = t.wagon,
- tc.itemCount = t.`lines`,
- tc.liters = t.shelveLiters;
-
- -- Actualiza el estado de los tickets
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT vStateFk, ticketFk, account.myUser_getId()
- FROM vn.ticketCollection tc
- WHERE tc.collectionFk = vCollectionFk;
-
- -- Aviso para la preparacion previa
- INSERT INTO vn.ticketDown(ticketFk, collectionFk)
- SELECT tc.ticketFk, tc.collectionFk
- FROM vn.ticketCollection tc
- WHERE tc.collectionFk = vCollectionFk;
-
- IF (SELECT count(*) FROM vn.ticketCollection WHERE collectionFk = vCollectionFk) THEN
-
- CALL vn.salesMerge_byCollection(vCollectionFk);
-
- UPDATE vn.collection c
- JOIN (SELECT count(*) saleTotalCount ,
- sum(s.isPicked != 0) salePickedCount
- FROM vn.ticketCollection tc
- JOIN vn.sale s ON s.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND s.quantity > 0
- ) sub
- SET c.saleTotalCount = sub.saleTotalCount,
- c.salePickedCount = sub.salePickedCount
- WHERE c.id = vCollectionFk;
-
- SELECT vCollectionFk;
-
- ELSE
-
- DELETE FROM vn.collection WHERE id = vCollectionFk;
- -- SELECT NULL;
-
- END IF;
-
- DROP TEMPORARY TABLE tmp.ticketToSplit;
- DROP TEMPORARY TABLE tmp.ticketShelveLiters;
- DROP TEMPORARY TABLE tmp.ticket;
- DROP TEMPORARY TABLE tmp.wagonsVolumetry;
- DROP TEMPORARY TABLE tmp.ticketShelve;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_newWithWagon__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_newWithWagon__`(vSectorFk INT, vWagons INT)
-proc:BEGIN
-
- DECLARE vIsPreviousPrepared BOOLEAN;
- DECLARE vCollectionFk INT;
- DECLARE vWarehouseFk INT;
- DECLARE vMaxTickets INT;
- DECLARE vStateFk INT;
- DECLARE vFirstTicketFk INT;
- DECLARE vHour INT;
- DECLARE vMinute INT;
- DECLARE vWorkerCode VARCHAR(3);
- DECLARE vWagon INT;
- DECLARE vWagonCounter INT;
- DECLARE vShelve INT;
- DECLARE vTicket INT;
- DECLARE vTicketToSplit INT;
- DECLARE vPrintedTickets INT;
- DECLARE vMaxTicketPrinted INT;
- DECLARE vItemPackingTypeFk VARCHAR(1);
- DECLARE hasAssignedTickets BOOLEAN;
- DECLARE vMaxNotReadyCollections INT DEFAULT 0;
- DECLARE vNotReadyCollections INT;
-
- /*IF NOT vn.deviceProductionUser_Exists(vn.getUser()) THEN
-
- LEAVE proc;
-
- END IF;*/
-
- CALL util.debugAdd('vn.collection_newWithWagon',CONCAT('sector: ',vSectorFk,' wagons:',vWagons));
-
-
- SELECT w.code INTO vWorkerCode
- FROM vn.worker w
- WHERE w.id = vn.getUser();
-
- -- Establecemos el almacén y si es un sector de preparación previa, así como el estado para los tickets que se vayan preparando
- SELECT isPreviousPrepared, warehouseFk, itemPackingTypeFk
- INTO vIsPreviousPrepared, vWarehouseFk, vItemPackingTypeFk
- FROM vn.sector
- WHERE id = vSectorFk;
-
--- Si está habilitado el modo cazador para las motos, y el usuario no está registrado, se sale.
-
- IF (SELECT isTractorHuntingMode FROM vn.deviceProductionConfig dpc) AND vItemPackingTypeFk = 'H' THEN
- IF (SELECT COUNT(*) FROM vn.workerWithoutTractor wwt WHERE wwt.workerFk = account.userGetId()) THEN
- INSERT INTO tmp.kk(userFk) VALUES(vn.getUser());
- LEAVE proc;
- END IF;
- END IF;
-
--- Si hay colecciones sin terminar, sale del proceso
- SELECT count(*) INTO vNotReadyCollections
- FROM vn.collection c
- WHERE c.workerFk = vn.getUser()
- AND c.saleTotalCount > c.salePickedCount + 1
- AND c.created > TIMESTAMPADD(HOUR , -5,NOW());
-
- IF vMaxNotReadyCollections < vNotReadyCollections THEN
-
- LEAVE proc;
-
- END IF;
-
- SET vMaxTicketPrinted = 8 * vWagons;
- SET vMaxTickets = 4 * vWagons;
-
- IF vIsPreviousPrepared THEN
-
- LEAVE proc; -- Hasta que tengamos el altillo, vamos a cancelar esta opcion
-
- SELECT id INTO vStateFk
- FROM vn.state
- WHERE `code` = 'PREVIOUS_PREPARATION';
- ELSE
-
- SELECT id INTO vStateFk
- FROM vn.state
- WHERE `code` = 'ON_PREPARATION';
-
- END IF;
-
- -- Se obtiene nº de colección y el buffer con los pedidos preparables
- INSERT INTO vn.collection
- SET workerFk = account.myUser_getId(),
- itemPackingTypeFk = vItemPackingTypeFk;
-
- SELECT LAST_INSERT_ID() INTO vCollectionFk;
-
- CALL vn.productionControl(vWarehouseFk, 0);
-
- -- 05/08/2021 PAK Jose Frau pide que los tickets de recogida en Algemesí sólo se saquen si están asignados.
- DELETE pb.*
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- WHERE pb.agency = 'REC_ALGEMESI'
- AND s.code != 'PICKER_DESIGNED';
-
- -- Comprobamos si hay tickets asignados. En ese caso, nos centramos exclusivamente en esos tickets
- -- y los sacamos independientemente de problemas o tamaños
- SELECT COUNT(*) INTO hasAssignedTickets
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- WHERE s.code = 'PICKER_DESIGNED'
- AND pb.workerCode = vWorkerCode
- -- AND LENGTH(pb.problem) = 0
- ;
-
- IF hasAssignedTickets THEN
-
- UPDATE vn.collection
- SET itemPackingTypeFk = NULL
- WHERE id = vCollectionFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketToSplit;
- CREATE TEMPORARY TABLE tmp.ticketToSplit
- SELECT pb.ticketFk
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- WHERE s.code = 'PICKER_DESIGNED'
- AND pb.workerCode = vWorkerCode
- ORDER BY HH,
- mm,
- s.`order` DESC,
- pb.m3 DESC;
-
- WHILE (SELECT COUNT(*) FROM tmp.ticketToSplit) DO
-
- SELECT MIN(ticketFk) INTO vTicketToSplit
- FROM tmp.ticketToSplit;
-
- CALL vn.ticket_splitItemPackingType(vTicketToSplit);
-
- INSERT INTO vn.ticketCollection(ticketFk, collectionFk)
- SELECT ticketFk, vCollectionFk
- FROM tmp.ticketIPT
- WHERE (itemPackingTypeFk = vItemPackingTypeFk) ;
-
- DELETE FROM tmp.ticketToSplit
- WHERE ticketFk = vTicketToSplit;
-
- DROP TEMPORARY TABLE tmp.ticketIPT;
-
- END WHILE;
-
- CALL vn.productionControl(vWarehouseFk, 0);
-
- ELSE
-
- SELECT COUNT(*) INTO vPrintedTickets
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
- WHERE pb.shipped = CURDATE()
- AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
- AND s.isPreparable
- AND (pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
- OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.F > 0 AND vItemPackingTypeFk = 'F' AND ISNULL(pb.collectionF)
- OR pb.P > 0 AND vItemPackingTypeFk = 'P' AND ISNULL(pb.collectionP));
-
- SET vMaxTicketPrinted = vMaxTicketPrinted - vPrintedTickets;
- -- AutoPRINT
-
- IF vMaxTicketPrinted > 0 THEN
-
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT s2.id, pb.ticketFk, vn.getUser()
- FROM tmp.productionBuffer pb
- JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
- JOIN vn.state s ON s.id = pb.state
- JOIN vn.state s2 ON s2.code = 'PRINTED_AUTO'
- JOIN vn.ticket t ON t.id = pb.ticketFk
- JOIN vn.ticketConfig tc
- WHERE pb.shipped = CURDATE()
- AND LENGTH(pb.problem) = 0
- AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
- AND s.isPrintable
- AND s.isOK
- AND (pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
- OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.F > 0 AND vItemPackingTypeFk = 'F' AND ISNULL(pb.collectionF)
- OR pb.P > 0 AND vItemPackingTypeFk = 'P' AND ISNULL(pb.collectionP))
- AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , NOW())
- ORDER BY HH,
- mm,
- s.`order` DESC,
- pb.m3 DESC
- LIMIT vMaxTicketPrinted;
-
- END IF;
-
- -- Se seleccionan los primeros tickets, asignando colección para dejarlos bloqueados a otros sacadores.
- -- Se splitan los tickets preparables, para que solo tengan un tipo de empaquetado
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketToSplit;
- CREATE TEMPORARY TABLE tmp.ticketToSplit
- SELECT pb.ticketFk
- FROM tmp.productionBuffer pb
- JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
- JOIN vn.ticketStateToday tst ON tst.ticket = pb.ticketFk
- JOIN vn.state s ON s.id = tst.state
- WHERE ( pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
- OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.P > 0 AND vItemPackingTypeFk = 'P' AND ISNULL(pb.collectionP))
- AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
- AND LENGTH(pb.problem) = 0
- AND s.isPreparable
- ORDER BY pb.HH, pb.mm, s.`order` DESC
- LIMIT vMaxTickets;
-
- WHILE (SELECT COUNT(*) FROM tmp.ticketToSplit) DO
-
- SELECT MIN(ticketFk) INTO vTicketToSplit
- FROM tmp.ticketToSplit;
-
- CALL vn.ticket_splitItemPackingType(vTicketToSplit);
-
- INSERT INTO vn.ticketCollection(ticketFk, collectionFk)
- SELECT ticketFk, vCollectionFk
- FROM tmp.ticketIPT
- WHERE itemPackingTypeFk = vItemPackingTypeFk;
-
- DELETE FROM tmp.ticketToSplit
- WHERE ticketFk = vTicketToSplit;
-
- DROP TEMPORARY TABLE tmp.ticketIPT;
-
- END WHILE;
-
- END IF;
-
- -- Creamos una tabla temporal con los datos que necesitamos para depurar la colección
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT pb.ticketFk,
- pb.`lines`,
- pb.m3 * 1000 liters,
- 0 as height,
- 0 as shelve,
- 0 as wagon,
- 0 AS shelveLiters,
- pb.productionOrder,
- pb.HH,
- pb.mm
- FROM tmp.productionBuffer pb
- JOIN vn.ticketCollection tc ON tc.ticketFk = pb.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- LIMIT vMaxTickets;
-
- -- Voumen de las lineas de los pedidos, de acuerdo con el packingShelve establecido por los controladores
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketShelveLiters;
- CREATE TEMPORARY TABLE tmp.ticketShelveLiters
- SELECT t.ticketFk, SUM(s.quantity * vc.shelveVolume / i.packingShelve) shelveLiters
- FROM tmp.ticket t
- JOIN vn.sale s ON s.ticketFk = t.ticketFk
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.volumeConfig vc
- WHERE i.packingShelve
- GROUP BY t.ticketFk;
-
- UPDATE tmp.ticket t
- JOIN tmp.ticketShelveLiters tsl ON tsl.ticketFk = t.ticketFk
- SET t.shelveLiters = tsl.shelveLiters;
-
- -- Es importante que el primer ticket se coja en todos los casos
- SET vFirstTicketFk = 0;
-
- SELECT ticketFk, HH, mm
- INTO vFirstTicketFk, vHour, vMinute
- FROM tmp.ticket
- ORDER BY productionOrder DESC, HH, mm
- LIMIT 1;
-
- -- Hay que excluir aquellos que no tengan la misma hora de preparación
- DELETE
- FROM tmp.ticket
- WHERE HH != vHour
- OR mm != vMinute;
-
- -- En el caso de pedidos de más volumen de un carro, la colección será monoticket. Pero si el primer pedido
- -- no es monoticket, excluimos a los de más de un carro
- IF (SELECT (t.shelveLiters > vc.trolleyM3 * 1000)
- FROM tmp.ticket t
- JOIN vn.volumeConfig vc
- WHERE t.ticketFk = vFirstTicketFk) THEN
-
- DELETE
- FROM tmp.ticket
- WHERE ticketFk != vFirstTicketFk;
-
- ELSE
-
- DELETE t.*
- FROM tmp.ticket t
- JOIN vn.volumeConfig vc
- WHERE t.shelveLiters > vc.trolleyM3 * 1000;
-
- END IF;
-
- -- Elimina los tickets bloqueados que no se van a preparar
- DELETE tc.*
- FROM vn.ticketCollection tc
- LEFT JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND t.ticketFk IS NULL;
-
- /*
- *
- * Construccion del tren
- *
- */
-
- -- Establece altura máxima por pedido, porque las plantas no se pueden recostar.
- UPDATE tmp.ticket t
- JOIN
- ( SELECT MAX(i.size) maxHeigth,
- tc.ticketFk
- FROM vn.ticketCollection tc
- JOIN vn.sale s ON s.ticketFk = tc.ticketFk
- JOIN vn.item i ON i.id = s.itemFk
- WHERE i.itemPackingTypeFk = 'V'
- AND tc.collectionFk = vCollectionFk
- GROUP BY tc.ticketFk) sub ON sub.ticketFk = t.ticketFk
- SET t.height = IFNULL(sub.maxHeigth,0);
-
- -- Vamos a generar una tabla con todas las posibilidades de asignacion de pedido
- DROP TEMPORARY TABLE IF EXISTS tmp.wagonsVolumetry;
- CREATE TEMPORARY TABLE tmp.wagonsVolumetry
- SELECT cv.`level` as shelve,
- 1 as wagon,
- cv.`lines`,
- cv.liters,
- cv.height
- FROM vn.collectionVolumetry cv
- WHERE cv.itemPackingTypeFk = IFNULL(vItemPackingTypeFk, 'H');
-
- SET vWagonCounter = 1;
-
- WHILE vWagonCounter < vWagons DO
-
- SET vWagonCounter = vWagonCounter + 1;
-
- INSERT INTO tmp.wagonsVolumetry(shelve, wagon, `lines`, liters, height)
- SELECT cv.`level` as shelve,
- vWagonCounter as wagon,
- cv.`lines`,
- cv.liters,
- cv.height
- FROM vn.collectionVolumetry cv
- WHERE cv.itemPackingTypeFk = IFNULL(vItemPackingTypeFk, 'H');
-
- END WHILE;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketShelve;
- CREATE TEMPORARY TABLE tmp.ticketShelve
- SELECT ticketFk, shelve, wagon, linesDif, LitersDif, heightDif
- FROM (
- SELECT t.ticketFk,
- wv.shelve,
- wv.wagon,
- t.productionOrder,
- CAST(wv.`lines` AS SIGNED) - t.`lines` as linesDif,
- CAST(wv.liters AS SIGNED) - t.shelveLiters as litersDif,
- CAST(wv.height AS SIGNED) - t.height as heightDif
- FROM tmp.wagonsVolumetry wv
- JOIN tmp.ticket t
- ) sub
- WHERE linesDif >= 0
- AND litersDif >= 0
- AND heightDif >= 0
- ORDER BY productionOrder DESC, linesDif, LitersDif, heightDif ;
-
- -- Insertamos una opcion virtual para carro completo. Todo ticket tiene que poder entrar en un carro completo....
- INSERT INTO tmp.ticketShelve(ticketFk, shelve, wagon, linesDif, LitersDif, heightDif)
- SELECT t.ticketFk, 0, wv.wagon, 999, 999,999
- FROM tmp.ticket t
- JOIN tmp.wagonsVolumetry wv
- GROUP BY t.ticketFk, wv.wagon;
-
- SET vWagonCounter = 0;
-
- WHILE vWagonCounter < vWagons DO
-
- SET vWagonCounter = vWagonCounter + 1;
-
- -- Asignamos la primera balda util al primer pedido
- IF vWagonCounter = 1 THEN
-
- SELECT shelve INTO vShelve
- FROM tmp.ticketShelve
- WHERE ticketFk = vFirstTicketFk
- AND wagon = vWagonCounter
- ORDER BY heightDif, litersDif, linesDif
- LIMIT 1;
-
- ELSE
-
- SELECT shelve, ticketFk INTO vShelve, vFirstTicketFk
- FROM tmp.ticketShelve
- WHERE wagon = vWagonCounter
- ORDER BY heightDif, litersDif, linesDif
- LIMIT 1;
-
- END IF;
-
- IF vShelve > 0 THEN
-
- UPDATE tmp.ticket
- SET shelve = vShelve,
- wagon = vWagonCounter
- WHERE ticketFk = vFirstTicketFk;
-
- DELETE FROM tmp.ticketShelve
- WHERE ticketFk = vFirstTicketFk
- OR (shelve = vShelve AND wagon = vWagonCounter);
-
- WHILE (SELECT COUNT(*) FROM tmp.ticketShelve WHERE wagon = vWagonCounter) DO
-
- SELECT ticketFk, shelve
- INTO vTicket, vShelve
- FROM tmp.ticketShelve
- WHERE wagon = vWagonCounter
- LIMIT 1;
-
- UPDATE tmp.ticket
- SET shelve = vShelve,
- wagon = vWagonCounter
- WHERE ticketFk = vTicket;
-
- DELETE FROM tmp.ticketShelve
- WHERE ticketFk = vTicket
- OR (shelve = vShelve AND wagon = vWagonCounter);
-
- END WHILE;
-
- ELSE
-
- UPDATE tmp.ticket
- SET shelve = 1, wagon = vWagonCounter
- WHERE ticketFk = vFirstTicketFk;
-
- DELETE FROM tmp.ticketShelve
- WHERE ticketFk = vFirstTicketFk
- AND wagon != vWagonCounter;
-
- END IF;
-
- END WHILE;
-
- -- Eliminamos los que se han quedado sin balda
- DELETE FROM tmp.ticket WHERE shelve = 0;
-
- -- Elimina los tickets bloqueados que no se van a preparar
- DELETE tc.*
- FROM vn.ticketCollection tc
- LEFT JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND t.ticketFk IS NULL;
-
- -- Elimina los tickets que ya estan en otra coleccion
- DELETE tc.*
- FROM vn.ticketCollection tc
- JOIN vn.ticketCollection tc2 ON tc2.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND tc2.collectionFk != vCollectionFk;
-
- -- Actualiza el estado de la colección
- UPDATE vn.collection c
- JOIN vn.state st ON st.code = 'ON_PREPARATION'
- SET c.stateFk = st.id
- WHERE c.id = vCollectionFk;
-
- -- Asigna las bandejas
- UPDATE vn.ticketCollection tc
- JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
- SET tc.level = t.shelve,
- tc.wagon = t.wagon,
- tc.itemCount = t.`lines`,
- tc.liters = t.shelveLiters;
-
- -- Actualiza el estado de los tickets
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT vStateFk, ticketFk, account.myUser_getId()
- FROM vn.ticketCollection tc
- WHERE tc.collectionFk = vCollectionFk;
-
- -- Aviso para la preparacion previa
- INSERT INTO vn.ticketDown(ticketFk, collectionFk)
- SELECT tc.ticketFk, tc.collectionFk
- FROM vn.ticketCollection tc
- WHERE tc.collectionFk = vCollectionFk;
-
- IF (SELECT count(*) FROM vn.ticketCollection WHERE collectionFk = vCollectionFk) THEN
-
- CALL vn.salesMerge_byCollection(vCollectionFk);
-
- UPDATE vn.collection c
- JOIN (SELECT count(*) saleTotalCount ,
- sum(s.isPicked != 0) salePickedCount
- FROM vn.ticketCollection tc
- JOIN vn.sale s ON s.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND s.quantity > 0
- ) sub
- SET c.saleTotalCount = sub.saleTotalCount,
- c.salePickedCount = sub.salePickedCount
- WHERE c.id = vCollectionFk;
-
- SELECT vCollectionFk;
-
- ELSE
-
- DELETE FROM vn.collection WHERE id = vCollectionFk;
- -- SELECT NULL;
-
- END IF;
-
- DROP TEMPORARY TABLE tmp.ticketToSplit;
- DROP TEMPORARY TABLE tmp.ticketShelveLiters;
- DROP TEMPORARY TABLE tmp.ticket;
- DROP TEMPORARY TABLE tmp.wagonsVolumetry;
- DROP TEMPORARY TABLE tmp.ticketShelve;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_new__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_new__`(vSectorFk INT)
-proc:BEGIN
-
- DECLARE vIsPreviousPrepared BOOLEAN;
- DECLARE vCollectionFk INT;
- DECLARE vWarehouseFk INT;
- DECLARE vMaxTickets INT;
- DECLARE vStateFk INT;
- DECLARE vFirstTicketFk INT;
- DECLARE vHour INT;
- DECLARE vMinute INT;
- DECLARE vWorkerCode VARCHAR(3);
- DECLARE vWagon INT;
- DECLARE vWagonCounter INT;
- DECLARE vShelve INT;
- DECLARE vTicket INT;
- DECLARE vTicketToSplit INT;
- DECLARE myUserIsSalesPersonRole BOOLEAN;
- DECLARE vPrintedTickets INT;
- DECLARE vMaxTicketPrinted INT;
- DECLARE vItemPackingTypeFk VARCHAR(1);
- DECLARE vWagons INT DEFAULT 2;
- DECLARE hasAssignedTickets BOOLEAN;
- DECLARE vMaxNotReadyCollections INT DEFAULT 0;
- DECLARE vNotReadyCollections INT;
- DECLARE vSectorCode VARCHAR(20);
-
- SELECT w.code INTO vWorkerCode
- FROM vn.worker w
- WHERE w.id = vn.getUser();
-
--- Si hay colecciones sin terminar, sale del proceso
- SELECT count(*) INTO vNotReadyCollections
- FROM vn.collection c
- WHERE c.workerFk = vn.getUser()
- AND c.saleTotalCount > c.salePickedCount + 1
- AND c.created > TIMESTAMPADD(HOUR , -5,NOW());
-
- IF vMaxNotReadyCollections < vNotReadyCollections THEN
-
- LEAVE proc;
-
- END IF;
-
- -- Establecemos el almacén y si es un sector de preparación previa, así como el estado para los tickets que se vayan preparando
- SELECT isPreviousPrepared, warehouseFk, itemPackingTypeFk, code
- INTO vIsPreviousPrepared, vWarehouseFk, vItemPackingTypeFk, vSectorCode
- FROM vn.sector
- WHERE id = vSectorFk;
-
- IF LENGTH(vSectorCode) = 2 THEN
-
- SELECT CAST(SUBSTRING(vSectorCode,2,1) AS UNSIGNED) INTO vWagons;
-
- END IF;
-
- SET vMaxTicketPrinted = 8 * vWagons;
- SET vMaxTickets = 4 * vWagons;
-
-
- IF vIsPreviousPrepared THEN
-
- LEAVE proc; -- Hasta que tengamos el altillo, vamos a cancelar esta opcion
-
- SELECT id INTO vStateFk
- FROM vn.state
- WHERE `code` = 'PREVIOUS_PREPARATION';
- ELSE
-
- SELECT id INTO vStateFk
- FROM vn.state
- WHERE `code` = 'ON_PREPARATION';
-
- END IF;
-
- -- Averiguamos si es comercial el usuario
- SELECT FALSE -- (r.name = 'salesPerson')
- INTO myUserIsSalesPersonRole
- FROM account.user u
- JOIN account.role r ON r.id = u.role
- WHERE u.id = vn.getUser();
-
- -- Se obtiene nº de colección y el buffer con los pedidos preparables
- INSERT INTO vn.collection
- SET workerFk = account.myUser_getId(),
- itemPackingTypeFk = vItemPackingTypeFk;
-
- SELECT LAST_INSERT_ID() INTO vCollectionFk;
-
- CALL vn.productionControl(vWarehouseFk, 0);
-
- -- Comprobamos si hay tickets asignados. En ese caso, nos centramos exclusivamente en esos tickets
- -- y los sacamos independientemente de problemas o tamaños
- SELECT COUNT(*) INTO hasAssignedTickets
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- WHERE s.code = 'PICKER_DESIGNED'
- AND pb.workerCode = vWorkerCode
- AND LENGTH(pb.problem) = 0;
-
- IF hasAssignedTickets THEN
-
- UPDATE vn.collection
- SET itemPackingTypeFk = NULL
- WHERE id = vCollectionFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketToSplit;
- CREATE TEMPORARY TABLE tmp.ticketToSplit
- SELECT pb.ticketFk
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- WHERE s.code = 'PICKER_DESIGNED'
- AND pb.workerCode = vWorkerCode
- AND LENGTH(pb.problem) = 0
- ORDER BY HH,
- mm,
- s.`order` DESC,
- pb.m3 DESC;
-
- WHILE (SELECT COUNT(*) FROM tmp.ticketToSplit) DO
-
- SELECT MIN(ticketFk) INTO vTicketToSplit
- FROM tmp.ticketToSplit;
-
- CALL vn.ticket_splitItemPackingType(vTicketToSplit);
-
- INSERT INTO vn.ticketCollection(ticketFk, collectionFk)
- SELECT ticketFk, vCollectionFk
- FROM tmp.ticketIPT;
-
- DELETE FROM tmp.ticketToSplit
- WHERE ticketFk = vTicketToSplit;
-
- END WHILE;
-
- CALL vn.productionControl(vWarehouseFk, 0);
-
- ELSE
-
- SELECT COUNT(*) INTO vPrintedTickets
- FROM tmp.productionBuffer pb
- JOIN vn.state s ON s.id = pb.state
- JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
- WHERE pb.shipped = CURDATE()
- AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
- AND s.isPreparable
- AND (pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
- OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.F > 0 AND vItemPackingTypeFk = 'F' AND ISNULL(pb.collectionF)
- OR pb.P > 0 AND vItemPackingTypeFk = 'P' AND ISNULL(pb.collectionP));
-
- SET vMaxTicketPrinted = vMaxTicketPrinted - vPrintedTickets;
- -- AutoPRINT
-
- IF vMaxTicketPrinted > 0 THEN
-
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT s2.id, pb.ticketFk, vn.getUser()
- FROM tmp.productionBuffer pb
- JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
- JOIN vn.state s ON s.id = pb.state
- JOIN vn.state s2 ON s2.code = 'PRINTED_AUTO'
- JOIN vn.ticket t ON t.id = pb.ticketFk
- WHERE pb.shipped = CURDATE()
- AND LENGTH(pb.problem) = 0
- AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
- AND s.isPrintable
- AND (pb.m3 > 0.05 OR s.isOK)
- AND (pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
- OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.F > 0 AND vItemPackingTypeFk = 'F' AND ISNULL(pb.collectionF)
- OR pb.P > 0 AND vItemPackingTypeFk = 'P' AND ISNULL(pb.collectionP))
- AND t.created < TIMESTAMPADD(MINUTE, -10, NOW())
- ORDER BY HH,
- mm,
- s.`order` DESC,
- pb.m3 DESC
- LIMIT vMaxTicketPrinted;
-
- END IF;
-
- -- Se seleccionan los primeros tickets, asignando colección para dejarlos bloqueados a otros sacadores.
- -- Se splitan los tickets preparables, para que solo tengan un tipo de empaquetado
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketToSplit;
- CREATE TEMPORARY TABLE tmp.ticketToSplit
- SELECT pb.ticketFk
- FROM tmp.productionBuffer pb
- JOIN vn.agencyMode am ON am.id = pb.agencyModeFk
- JOIN vn.agency a ON a.id = am.agencyFk
- JOIN vn.ticketStateToday tst ON tst.ticket = pb.ticketFk
- JOIN vn.state s ON s.id = tst.state
- WHERE ( pb.H > 0 AND vItemPackingTypeFk = 'H' AND ISNULL(pb.collectionH)
- OR pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)
- OR pb.F > 0 AND vItemPackingTypeFk = 'F' AND ISNULL(pb.collectionF)
- OR pb.P > 0 AND vItemPackingTypeFk = 'P' AND ISNULL(pb.collectionP))
- AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE )
- AND LENGTH(pb.problem) = 0
- AND s.isPreparable
- AND NOT myUserIsSalesPersonRole
- ORDER BY pb.HH, pb.mm, s.`order` DESC
- LIMIT vMaxTickets;
-
- WHILE (SELECT COUNT(*) FROM tmp.ticketToSplit) DO
-
- SELECT MIN(ticketFk) INTO vTicketToSplit
- FROM tmp.ticketToSplit;
-
- CALL vn.ticket_splitItemPackingType(vTicketToSplit);
-
- INSERT INTO vn.ticketCollection(ticketFk, collectionFk)
- SELECT ticketFk, vCollectionFk
- FROM tmp.ticketIPT
- WHERE itemPackingTypeFk = vItemPackingTypeFk;
-
- DELETE FROM tmp.ticketToSplit
- WHERE ticketFk = vTicketToSplit;
-
- END WHILE;
-
- END IF;
-
- -- Creamos una tabla temporal con los datos que necesitamos para depurar la colección
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT pb.ticketFk,
- pb.`lines`,
- pb.m3 * 1000 liters,
- 0 as height,
- 0 as shelve,
- 0 as wagon,
- pb.productionOrder,
- pb.HH,
- pb.mm
- FROM tmp.productionBuffer pb
- JOIN vn.ticketCollection tc ON tc.ticketFk = pb.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- LIMIT vMaxTickets;
-
- -- Es importante que el primer ticket se coja en todos los casos
- SET vFirstTicketFk = 0;
-
- SELECT ticketFk, HH, mm
- INTO vFirstTicketFk, vHour, vMinute
- FROM tmp.ticket
- ORDER BY productionOrder DESC, HH, mm
- LIMIT 1;
-
- -- Hay que excluir aquellos que no tengan la misma hora de preparación
- DELETE
- FROM tmp.ticket
- WHERE HH != vHour
- OR mm != vMinute;
-
- -- En el caso de pedidos de más volumen de un carro, la colección será monoticket. Pero si el primer pedido
- -- no es monoticket, excluimos a los de más de un carro
- IF (SELECT (t.liters > vc.carro * 1000)
- FROM tmp.ticket t
- JOIN vn.volumeConfig vc
- WHERE t.ticketFk = vFirstTicketFk) THEN
-
- DELETE
- FROM tmp.ticket
- WHERE ticketFk != vFirstTicketFk;
-
- ELSE
-
- DELETE t.*
- FROM tmp.ticket t
- JOIN vn.volumeConfig vc
- WHERE t.liters > vc.carro * 1000;
-
- END IF;
-
- -- Elimina los tickets bloqueados que no se van a preparar
- DELETE tc.*
- FROM vn.ticketCollection tc
- LEFT JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND t.ticketFk IS NULL;
-
- /*
- *
- * Construccion del tren
- *
- */
-
- -- Establece altura máxima por pedido, porque las plantas no se pueden recostar.
- UPDATE tmp.ticket t
- JOIN
- ( SELECT MAX(i.size) maxHeigth,
- tc.ticketFk
- FROM vn.ticketCollection tc
- JOIN vn.sale s ON s.ticketFk = tc.ticketFk
- JOIN vn.item i ON i.id = s.itemFk
- WHERE i.itemPackingTypeFk = 'V'
- AND tc.collectionFk = vCollectionFk
- GROUP BY tc.ticketFk) sub ON sub.ticketFk = t.ticketFk
- SET t.height = IFNULL(sub.maxHeigth,0);
-
- -- Vamos a generar una tabla con todas las posibilidades de asignacion de pedido
- DROP TEMPORARY TABLE IF EXISTS tmp.wagonsVolumetry;
- CREATE TEMPORARY TABLE tmp.wagonsVolumetry
- SELECT cv.`level` as shelve,
- 1 as wagon,
- cv.`lines`,
- cv.liters,
- cv.height
- FROM vn.collectionVolumetry cv;
-
- SET vWagonCounter = 1;
-
- WHILE vWagonCounter < vWagons DO
-
- SET vWagonCounter = vWagonCounter + 1;
-
- INSERT INTO tmp.wagonsVolumetry(shelve, wagon, `lines`, liters, height)
- SELECT cv.`level` as shelve,
- vWagonCounter as wagon,
- cv.`lines`,
- cv.liters,
- cv.height
- FROM vn.collectionVolumetry cv
- WHERE cv.itemPackingTypeFk = IFNULL(vItemPackingTypeFk, 'H');
-
- END WHILE;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketShelve;
- CREATE TEMPORARY TABLE tmp.ticketShelve
- SELECT ticketFk, shelve, wagon, linesDif, LitersDif, heightDif
- FROM (
- SELECT t.ticketFk,
- wv.shelve,
- wv.wagon,
- t.productionOrder,
- CAST(wv.`lines` AS SIGNED) - t.`lines` as linesDif,
- CAST(wv.liters AS SIGNED) - t.liters as litersDif,
- CAST(wv.height AS SIGNED) - t.height as heightDif
- FROM tmp.wagonsVolumetry wv
- JOIN tmp.ticket t
- ) sub
- WHERE linesDif >= 0
- AND litersDif >= 0
- AND heightDif >= 0
- ORDER BY productionOrder DESC, linesDif, LitersDif, heightDif ;
-
- -- Insertamos una opcion virtual para carro completo. Todo ticket tiene que poder entrar en un carro completo....
- INSERT INTO tmp.ticketShelve(ticketFk, shelve, wagon, linesDif, LitersDif, heightDif)
- SELECT t.ticketFk, 0, wv.wagon, 999, 999,999
- FROM tmp.ticket t
- JOIN tmp.wagonsVolumetry wv
- GROUP BY t.ticketFk, wv.wagon;
-
- SET vWagonCounter = 0;
-
- WHILE vWagonCounter < vWagons DO
-
- SET vWagonCounter = vWagonCounter + 1;
-
- -- Asignamos la primera balda util al primer pedido
- IF vWagonCounter = 1 THEN
-
- SELECT shelve INTO vShelve
- FROM tmp.ticketShelve
- WHERE ticketFk = vFirstTicketFk
- AND wagon = vWagonCounter
- ORDER BY heightDif, litersDif, linesDif
- LIMIT 1;
-
- ELSE
-
- SELECT shelve, ticketFk INTO vShelve, vFirstTicketFk
- FROM tmp.ticketShelve
- WHERE wagon = vWagonCounter
- ORDER BY heightDif, litersDif, linesDif
- LIMIT 1;
-
- END IF;
-
- IF vShelve > 0 THEN
-
- UPDATE tmp.ticket
- SET shelve = vShelve,
- wagon = vWagonCounter
- WHERE ticketFk = vFirstTicketFk;
-
- DELETE FROM tmp.ticketShelve
- WHERE ticketFk = vFirstTicketFk
- OR (shelve = vShelve AND wagon = vWagonCounter);
-
- WHILE (SELECT COUNT(*) FROM tmp.ticketShelve WHERE wagon = vWagonCounter) DO
-
- SELECT ticketFk, shelve
- INTO vTicket, vShelve
- FROM tmp.ticketShelve
- WHERE wagon = vWagonCounter
- LIMIT 1;
-
- UPDATE tmp.ticket
- SET shelve = vShelve,
- wagon = vWagonCounter
- WHERE ticketFk = vTicket;
-
- DELETE FROM tmp.ticketShelve
- WHERE ticketFk = vTicket
- OR (shelve = vShelve AND wagon = vWagonCounter);
-
- END WHILE;
-
- ELSE
-
- UPDATE tmp.ticket
- SET shelve = 1, wagon = vWagonCounter
- WHERE ticketFk = vFirstTicketFk;
-
- DELETE FROM tmp.ticketShelve
- WHERE ticketFk = vFirstTicketFk
- AND wagon != vWagonCounter;
-
- END IF;
-
- END WHILE;
-
- -- Eliminamos los que se han quedado sin balda
- DELETE FROM tmp.ticket WHERE shelve = 0;
-
- -- Elimina los tickets bloqueados que no se van a preparar
- DELETE tc.*
- FROM vn.ticketCollection tc
- LEFT JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND t.ticketFk IS NULL;
-
- -- Elimina los tickets que ya estan en otra coleccion
- DELETE tc.*
- FROM vn.ticketCollection tc
- JOIN vn.ticketCollection tc2 ON tc2.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND tc2.collectionFk != vCollectionFk;
-
- -- Actualiza el estado de la colección
- UPDATE vn.collection c
- JOIN vn.state st ON st.code = 'ON_PREPARATION'
- SET c.stateFk = st.id
- WHERE c.id = vCollectionFk;
-
- -- Asigna las bandejas
- UPDATE vn.ticketCollection tc
- JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
- SET tc.level = t.shelve, tc.wagon = t.wagon;
-
- -- Actualiza el estado de los tickets
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT vStateFk, ticketFk, account.myUser_getId()
- FROM vn.ticketCollection tc
- WHERE tc.collectionFk = vCollectionFk;
-
- -- Aviso para la preparacion previa
- INSERT INTO vn.ticketDown(ticketFk, collectionFk)
- SELECT tc.ticketFk, tc.collectionFk
- FROM vn.ticketCollection tc
- WHERE tc.collectionFk = vCollectionFk;
-
- IF (SELECT count(*) FROM vn.ticketCollection WHERE collectionFk = vCollectionFk) THEN
-
- CALL vn.salesMerge_byCollection(vCollectionFk);
-
- UPDATE vn.collection c
- JOIN (SELECT count(*) saleTotalCount ,
- sum(s.isPicked != 0) salePickedCount
- FROM vn.ticketCollection tc
- JOIN vn.sale s ON s.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND s.quantity > 0
- ) sub
- SET c.saleTotalCount = sub.saleTotalCount,
- c.salePickedCount = sub.salePickedCount
- WHERE c.id = vCollectionFk;
-
- SELECT vCollectionFk;
-
- ELSE
-
- DELETE FROM vn.collection WHERE id = vCollectionFk;
- -- SELECT NULL;
-
- END IF;
-
- DROP TEMPORARY TABLE tmp.ticketIPT;
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketToSplit;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -56691,11 +56258,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_reject`(vSale INT, vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_reject`(vSale INT, vQuantity INT)
BEGIN
DECLARE vDescription VARCHAR(100);
@@ -56724,13 +56291,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_updateSale`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_updateSale`(
vSaleFk INT,
vOriginalQuantity INT,
vWorkerFk INT,
@@ -56765,93 +56332,6 @@ BEGIN
END IF;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_updateState__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_updateState__`(vTicketFk INT, vState VARCHAR(50))
-BEGIN
-
-DECLARE vCollectionFk INT;
-DECLARE vStateFk INT;
-DECLARE vLastState VARCHAR(50);
-
-SELECT name INTO vLastState FROM vn.ticketLastState WHERE ticketFk = vTicketFk;
-
-IF vLastState <> 'Encajado' THEN
-
- SELECT collectionFk INTO vCollectionFk FROM vn.ticketCollection WHERE ticketFk = vTicketFk;
-
- SELECT id INTO vStateFk
- FROM vn.state
- WHERE `code` = vState COLLATE utf8_unicode_ci;
-
- -- Actualiza el estado del ticket
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT vStateFk, ticketFk, account.myUser_getId()
- FROM vn.ticketCollection tc
- WHERE tc.ticketFk = vTicketFk
- UNION ALL
- SELECT vStateFk, sw.id, account.myUser_getId()
- FROM vn.stowaway sw
- JOIN vn.ticketCollection tc ON tc.ticketFk = sw.shipFk
- WHERE tc.ticketFk = vTicketFk;
-
- -- Actualiza la colección
- CALL vn.collection_update__(vTicketFk);
-
-END IF;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_update__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_update__`(vTicketFk INT)
-BEGIN
-
- DECLARE vNumChecked INT;
- DECLARE vCollectionFk INT;
-
- /*SI TODAS LOS TICKETS DE UNA COLECCIÓN ESTAN REVISADOS CAMBIADOS ESTADO COLECCIÓN*/
- SELECT collectionFk
- INTO vCollectionFk
- FROM vn.ticketCollection
- WHERE ticketFk = vTicketFk;
-
- IF (SELECT COUNT(*)
- FROM vn.ticketCollection tc
- JOIN vn.ticketLastState tls ON tls.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vCollectionFk
- AND (name = 'Preparación' OR name = 'En Revisión' OR name = 'Impreso' OR name = 'Preparado') ) = 0 THEN
-
- UPDATE vn.collection
- SET stateFk = (SELECT id FROM vn.state WHERE code = 'PREPARED')
- WHERE id = vCollectionFk;
- END IF;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -56864,32 +56344,32 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `company_getFiscaldata`(workerFk INT)
-BEGIN
-
-DECLARE vCompanyFk INT;
-
- SELECT IFNULL(uc.companyFk, rc.defaultCompanyFk)
- INTO vCompanyFk
- FROM vn.routeConfig rc
- LEFT JOIN userConfig uc ON uc.userFk = workerFk;
-
-
- SELECT
- s.name AS name ,
- s.NIF AS nif ,
- s.street AS street ,
- s.city AS city ,
- s.postCode AS postCode
-
- FROM vn.company c
- JOIN vn.worker w ON w.id = c.workerManagerFk
- JOIN vn.supplier s ON s.id = c.id
- WHERE c.id = vCompanyFk;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `company_getFiscaldata`(workerFk INT)
+BEGIN
+
+DECLARE vCompanyFk INT;
+
+ SELECT IFNULL(uc.companyFk, rc.defaultCompanyFk)
+ INTO vCompanyFk
+ FROM vn.routeConfig rc
+ LEFT JOIN userConfig uc ON uc.userFk = workerFk;
+
+
+ SELECT
+ s.name AS name ,
+ s.NIF AS nif ,
+ s.street AS street ,
+ s.city AS city ,
+ s.postCode AS postCode
+
+ FROM vn.company c
+ JOIN vn.worker w ON w.id = c.workerManagerFk
+ JOIN vn.supplier s ON s.id = c.id
+ WHERE c.id = vCompanyFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -56900,13 +56380,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `conveyorExpedition_Add`(vStarted DATETIME, vEnded DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `conveyorExpedition_Add`(vStarted DATETIME, vEnded DATETIME)
BEGIN
@@ -56965,13 +56445,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `copyComponentsFromSaleList`(vTargetTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `copyComponentsFromSaleList`(vTargetTicketFk INT)
BEGIN
/* Copy sales and components to the target ticket
@@ -57012,13 +56492,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `createPedidoInterno`(vItemFk INT,vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `createPedidoInterno`(vItemFk INT,vQuantity INT)
BEGIN
@@ -57034,13 +56514,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cristalBall__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `cristalBall__`()
BEGIN
/*
*se utiliza en campaña
@@ -57143,13 +56623,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `crypt`(vText VARCHAR(255), vKey VARCHAR(255), OUT vResult VARCHAR(255) )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `crypt`(vText VARCHAR(255), vKey VARCHAR(255), OUT vResult VARCHAR(255) )
BEGIN
DECLARE vEncryptedText VARCHAR(255) DEFAULT '';
@@ -57213,13 +56693,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cryptOff`(vText VARCHAR(255), vKey VARCHAR(255), OUT vResult VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `cryptOff`(vText VARCHAR(255), vKey VARCHAR(255), OUT vResult VARCHAR(255))
BEGIN
DECLARE vUncryptedText VARCHAR(255) DEFAULT '';
@@ -57282,11 +56762,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `dayMinuteWorker`(vDateFrom DATETIME, vDateTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `dayMinuteWorker`(vDateFrom DATETIME, vDateTo DATETIME)
BEGIN
DECLARE vDateStart DATE DEFAULT vDateFrom;
@@ -57367,13 +56847,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `department_calcTree`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `department_calcTree`()
BEGIN
/**
* Calculates the #path, #lft, #rgt, #sons and #depth columns of
@@ -57411,13 +56891,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `department_calcTreeRec`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `department_calcTreeRec`(
vSelf INT,
vPath VARCHAR(255),
vDepth INT,
@@ -57493,13 +56973,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `department_doCalc`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `department_doCalc`()
proc: BEGIN
/**
* Recalculates the department tree.
@@ -57525,6 +57005,35 @@ proc: BEGIN
END IF;
DO RELEASE_LOCK('vn.department_doCalc');
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `department_getHasMistake` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `department_getHasMistake`()
+BEGIN
+
+/**
+ * Obtiene los sectores a los cuales les ponemos errores
+ *
+ */
+
+ SELECT id, name
+ FROM department
+ WHERE hasToMistake <> FALSE;
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -57535,13 +57044,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `department_getLeaves`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `department_getLeaves`(
vParentFk INT,
vSearch VARCHAR(255)
)
@@ -57628,23 +57137,23 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `deviceLog_add`(vWorkerFk INT, vAppName VARCHAR(45), vAppVersion VARCHAR(45), vAndroid_id VARCHAR(100))
-BEGIN
-/*
- * Inserta registro en tabla devicelog el log del usuario conectado
- * @param vAppName es el nombre de la app
- * @param vAppVersion es la versión de la app
- * @param vAndroid_id es el android_id del dispositivo que se ha logueado
- */
-
- INSERT INTO deviceLog (userFK, nameApp, versionApp, android_id)
- VALUES(vWorkerFk, vAppName, vAppVersion, vAndroid_id);
-
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `deviceLog_add`(vWorkerFk INT, vAppName VARCHAR(45), vAppVersion VARCHAR(45), vAndroid_id VARCHAR(100))
+BEGIN
+/*
+ * Inserta registro en tabla devicelog el log del usuario conectado
+ * @param vAppName es el nombre de la app
+ * @param vAppVersion es la versión de la app
+ * @param vAndroid_id es el android_id del dispositivo que se ha logueado
+ */
+
+ INSERT INTO deviceLog (userFK, nameApp, versionApp, android_id)
+ VALUES(vWorkerFk, vAppName, vAppVersion, vAndroid_id);
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -57657,11 +57166,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `deviceProductionUser_exists`(vUserFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `deviceProductionUser_exists`(vUserFk INT)
BEGIN
/* SELECT COUNT(*) AS UserExists
@@ -57681,24 +57190,24 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `deviceProductionUser_getWorker`(vAndroid_id VARCHAR(50))
-BEGIN
-/**
- * Selecciona si hay registrado un device con un android_id
- *
- * @param vAndroid_id el número android_id del dispositivo
- *
- */
- SELECT 103;
-/* SELECT account.user_getNameFromId(dpu.userFk)
- FROM deviceProductionUser dpu
- JOIN deviceProduction dp ON dpu.deviceProductionFk = dp.id
- WHERE dp.android_id = vAndroid_id;*/
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `deviceProductionUser_getWorker`(vAndroid_id VARCHAR(50))
+BEGIN
+/**
+ * Selecciona si hay registrado un device con un android_id
+ *
+ * @param vAndroid_id el número android_id del dispositivo
+ *
+ */
+ SELECT 103;
+/* SELECT account.user_getNameFromId(dpu.userFk)
+ FROM deviceProductionUser dpu
+ JOIN deviceProduction dp ON dpu.deviceProductionFk = dp.id
+ WHERE dp.android_id = vAndroid_id;*/
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -57711,23 +57220,23 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `deviceProduction_getnameDevice`(vAndroid_id VARCHAR(50))
-BEGIN
-/**
- * Selecciona el id del dispositivo que corresponde al vAndroid_id
- *
- * @param vAndroid_id el número android_id del dispositivo
- *
- */
-
- SELECT dp.id
- FROM deviceProduction dp
- WHERE dp.android_id = vAndroid_id;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `deviceProduction_getnameDevice`(vAndroid_id VARCHAR(50))
+BEGIN
+/**
+ * Selecciona el id del dispositivo que corresponde al vAndroid_id
+ *
+ * @param vAndroid_id el número android_id del dispositivo
+ *
+ */
+
+ SELECT dp.id
+ FROM deviceProduction dp
+ WHERE dp.android_id = vAndroid_id;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -57740,11 +57249,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `device_checkLogin`(vUserFk INT, vAndroidID VARCHAR(50))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `device_checkLogin`(vUserFk INT, vAndroidID VARCHAR(50))
BEGIN
/*
@@ -57796,11 +57305,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `device_checkLogin__`(vUserFk INT, vAndroidID VARCHAR(50))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `device_checkLogin__`(vUserFk INT, vAndroidID VARCHAR(50))
BEGIN
/*
@@ -57849,13 +57358,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `duaEntryValueUpdate`(vDuaFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `duaEntryValueUpdate`(vDuaFk INT)
BEGIN
UPDATE duaEntry de
@@ -57890,13 +57399,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `duaInvoiceInBooking`(vDuaFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `duaInvoiceInBooking`(vDuaFk INT)
BEGIN
DECLARE done BOOL DEFAULT FALSE;
@@ -57973,13 +57482,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `duaInvoiceInBooking__`(vDuaFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `duaInvoiceInBooking__`(vDuaFk INT)
BEGIN
DECLARE done BOOL DEFAULT FALSE;
DECLARE vInvoiceFk INT;
@@ -58055,13 +57564,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `duaParcialMake`(vDuaFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `duaParcialMake`(vDuaFk INT)
BEGIN
DECLARE vNewDuaFk INT;
@@ -58091,11 +57600,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `duaTaxBooking`(vDuaFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `duaTaxBooking`(vDuaFk INT)
BEGIN
DECLARE vBookNumber INT;
DECLARE vBookDated DATE;
@@ -58238,11 +57747,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `duaTaxBooking__`(vDuaFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `duaTaxBooking__`(vDuaFk INT)
BEGIN
DECLARE vBookNumber INT;
DECLARE vBookDated DATE;
@@ -58395,11 +57904,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `duaTaxUpdate__`(vDuaFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `duaTaxUpdate__`(vDuaFk INT)
BEGIN
DECLARE vSPAIN INT DEFAULT 1;
@@ -58482,11 +57991,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `duaTax_doRecalc`(vDuaFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `duaTax_doRecalc`(vDuaFk INT)
BEGIN
/**
* Borra los valores de duaTax y los vuelve a crear en base a la tabla duaEntry
@@ -58542,22 +58051,22 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ediTables_Update`()
-BEGIN
-
- INSERT IGNORE INTO vn.genus(name)
- SELECT latin_genus_name
- FROM edi.genus ;
-
- INSERT IGNORE INTO vn.specie(name)
- SELECT LCASE(latin_species_name)
- FROM edi.specie ;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ediTables_Update`()
+BEGIN
+
+ INSERT IGNORE INTO vn.genus(name)
+ SELECT latin_genus_name
+ FROM edi.genus ;
+
+ INSERT IGNORE INTO vn.specie(name)
+ SELECT LCASE(latin_species_name)
+ FROM edi.specie ;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -58568,13 +58077,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ektEntryAssign_setEntry`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ektEntryAssign_setEntry`()
BEGIN
DECLARE done INT DEFAULT FALSE;
@@ -58689,76 +58198,76 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ekt_add` */;
+/*!50003 DROP PROCEDURE IF EXISTS `ekt_add__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ekt_add`(vPutOrderFk INT)
-BEGIN
-
-/**
- * Añade ekt para las ordenes de compra de proveedores que no envian el ekt por email
- *
- * @param vPutOrderFk PutOrderId de donde coger los datos
- **/
-
- INSERT INTO edi.ekt(entryYear,
- deliveryNumber,
- fec,
- hor,
- item,
- pac,
- qty,
- ori,
- cat,
- pro,
- pri,
- package,
- s1,
- s2,
- s3,
- s4,
- s5,
- s6,
- putOrderFk,
- `ref`,
- kop)
- SELECT year(curdate()) entryYear,
- p.id deliveryNumber ,
- CURDATE() fec,
- CURTIME() hor,
- i.longName item,
- sr.NumberOfItemsPerCask pac,
- p.quantity qty,
- o.code ori,
- i.category cat,
- mp.supplierFk pro,
- sr.Price pri,
- sr.EmbalageCode package,
- i.value5 s1,
- i.value6 s2,
- i.value7 s3,
- i.value8 s4,
- i.value9 s5,
- i.value10 s6,
- p.id putOrderFk,
- sr.Item_ArticleCode,
- sr.vmpID
- FROM edi.putOrder p
- JOIN edi.supplyResponse sr ON sr.ID = p.supplyResponseID
- JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
- JOIN vn.item i ON i.supplyResponseFk = sr.ID
- JOIN vn.origin o ON o.id = i.originFk
- WHERE p.id = vPutOrderFk;
-
- CALL edi.ekt_load(LAST_INSERT_ID());
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ekt_add__`(vPutOrderFk INT)
+BEGIN
+
+/**
+ * Añade ekt para las ordenes de compra de proveedores que no envian el ekt por email
+ *
+ * @param vPutOrderFk PutOrderId de donde coger los datos
+ **/
+
+ INSERT INTO edi.ekt(entryYear,
+ deliveryNumber,
+ fec,
+ hor,
+ item,
+ pac,
+ qty,
+ ori,
+ cat,
+ pro,
+ pri,
+ package,
+ s1,
+ s2,
+ s3,
+ s4,
+ s5,
+ s6,
+ putOrderFk,
+ `ref`,
+ kop)
+ SELECT year(curdate()) entryYear,
+ p.id deliveryNumber ,
+ CURDATE() fec,
+ CURTIME() hor,
+ i.longName item,
+ sr.NumberOfItemsPerCask pac,
+ p.quantity qty,
+ o.code ori,
+ i.category cat,
+ mp.supplierFk pro,
+ sr.Price pri,
+ sr.EmbalageCode package,
+ i.value5 s1,
+ i.value6 s2,
+ i.value7 s3,
+ i.value8 s4,
+ i.value9 s5,
+ i.value10 s6,
+ p.id putOrderFk,
+ sr.Item_ArticleCode,
+ sr.vmpID
+ FROM edi.putOrder p
+ JOIN edi.supplyResponse sr ON sr.ID = p.supplyResponseID
+ JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
+ JOIN vn.item i ON i.supplyResponseFk = sr.ID
+ JOIN vn.origin o ON o.id = i.originFk
+ WHERE p.id = vPutOrderFk;
+
+ CALL edi.ekt_load(LAST_INSERT_ID());
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -58771,11 +58280,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `energyMeter_record`(vInput INT, vActiveTime INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `energyMeter_record`(vInput INT, vActiveTime INT)
BEGIN
DECLARE vConsumption INT;
@@ -58798,7 +58307,7 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `entryConverter` */;
+/*!50003 DROP PROCEDURE IF EXISTS `entryConverter__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -58806,219 +58315,219 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entryConverter`(IN `vEntry` INT)
-BEGIN
-
- DECLARE vWarehouseIn INT;
- DECLARE vWarehouseOut INT;
- DECLARE vTravel INT;
-
- DECLARE done BOOL DEFAULT FALSE;
-
- DECLARE vId_Entrada INT;
- DECLARE vId_Article INT;
- DECLARE vEtiquetas INT;
- DECLARE vId_Cubo VARCHAR(10);
- DECLARE vPacking INT;
- DECLARE vGrouping INT;
- DECLARE vCantidad INT;
- DECLARE vCostefijo DECIMAL(10,3);
- DECLARE vPortefijo DECIMAL(10,3);
- DECLARE vEmbalajefijo DECIMAL(10);
- DECLARE vComisionfija DECIMAL(10,3);
- DECLARE vCaja INT;
- DECLARE vNicho VARCHAR(5);
- DECLARE vTarifa1 DECIMAL(10,2);
- DECLARE vTarifa2 DECIMAL(10,2);
- DECLARE vTarifa3 DECIMAL(10,2);
- DECLARE vPVP DECIMAL(10,2);
- DECLARE vCompra INT;
-
- DECLARE rs CURSOR FOR
- SELECT
- b.Id_Entrada,
- b.Id_Article,
- b.Etiquetas,
- b.Id_Cubo,
- b.Packing,
- b.`grouping`,
- b.Cantidad,
- b.Costefijo,
- b.Portefijo,
- b.Embalajefijo,
- b.Comisionfija,
- b.caja,
- b.Nicho,
- b.Tarifa1,
- b.Tarifa2,
- b.Tarifa3,
- b.PVP
- FROM vn2008.Compres b
- JOIN vn.itemConversor ic ON ic.espItemFk = b.Id_Article
- WHERE Id_Entrada = vEntry;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-
- SELECT warehouseInFk, warehouseOutFk, tr.id
- INTO vWarehouseIn, vWarehouseOut, vTravel
- FROM travel tr
- JOIN entry e ON e.travelFk = tr.id
- WHERE e.id = vEntry;
-
- UPDATE travel
- SET warehouseInFk = vWarehouseOut,
- warehouseOutFk = vWarehouseIn
- WHERE id = vTravel;
-
- UPDATE vn2008.Compres c
- LEFT JOIN vn.itemConversor ic ON ic.espItemFk = c.Id_Article
- SET Etiquetas = 0, Cantidad = 0
- WHERE c.Id_Entrada = vEntry
- AND ic.espItemFk IS NULL;
-
- OPEN rs;
-
- DELETE FROM vn2008.Compres WHERE Id_Entrada = vEntry;
-
- FETCH rs INTO
- vId_Entrada,
- vId_Article,
- vEtiquetas,
- vId_Cubo,
- vPacking,
- vGrouping,
- vCantidad,
- vCostefijo,
- vPortefijo,
- vEmbalajefijo,
- vComisionfija,
- vCaja,
- vNicho,
- vTarifa1,
- vTarifa2,
- vTarifa3,
- vPVP;
-
- WHILE NOT done DO
-
- -- Primero la linea original con las cantidades invertidas
- INSERT INTO vn2008.Compres
- (
- Id_Entrada,
- Id_Article,
- Etiquetas,
- Id_Cubo,
- Packing,
- `grouping`,
- Cantidad,
- Costefijo,
- Portefijo,
- Embalajefijo,
- Comisionfija,
- caja,
- Nicho,
- Tarifa1,
- Tarifa2,
- Tarifa3,
- PVP
- )
- VALUES
- (
- vId_Entrada,
- vId_Article,
- - vEtiquetas,
- vId_Cubo,
- vPacking,
- vGrouping,
- - vCantidad,
- vCostefijo,
- vPortefijo,
- vEmbalajefijo,
- vComisionfija,
- vCaja,
- vNicho,
- vTarifa1,
- vTarifa2,
- vTarifa3,
- vPVP);
-
- -- Ahora la linea nueva, con el item genérico
- INSERT INTO vn2008.Compres
- (
- Id_Entrada,
- Id_Article,
- Etiquetas,
- Id_Cubo,
- Packing,
- `grouping`,
- Cantidad,
- Costefijo,
- Portefijo,
- Embalajefijo,
- Comisionfija,
- caja,
- Nicho,
- Tarifa1,
- Tarifa2,
- Tarifa3,
- PVP
- )
- SELECT
- vId_Entrada,
- genItemFk as Id_Article,
- vEtiquetas,
- vId_Cubo,
- vPacking,
- vGrouping,
- vCantidad,
- vCostefijo,
- vPortefijo,
- vEmbalajefijo,
- vComisionfija,
- vCaja,
- vNicho,
- vTarifa1,
- vTarifa2,
- vTarifa3,
- vPVP
- FROM itemConversor
- WHERE espItemFk = vId_Article;
-
- SELECT LAST_INSERT_ID()
- INTO vCompra;
-
- REPLACE vn2008.Compres_mark(Id_Compra,`comment`)
- SELECT vCompra, vId_Article;
-
-
- FETCH rs INTO
- vId_Entrada,
- vId_Article,
- vEtiquetas,
- vId_Cubo,
- vPacking,
- vGrouping,
- vCantidad,
- vCostefijo,
- vPortefijo,
- vEmbalajefijo,
- vComisionfija,
- vCaja,
- vNicho,
- vTarifa1,
- vTarifa2,
- vTarifa3,
- vPVP;
-
- END WHILE;
-
-
- CLOSE rs;
-
-
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entryConverter__`(IN `vEntry` INT)
+BEGIN
+
+ DECLARE vWarehouseIn INT;
+ DECLARE vWarehouseOut INT;
+ DECLARE vTravel INT;
+
+ DECLARE done BOOL DEFAULT FALSE;
+
+ DECLARE vId_Entrada INT;
+ DECLARE vId_Article INT;
+ DECLARE vEtiquetas INT;
+ DECLARE vId_Cubo VARCHAR(10);
+ DECLARE vPacking INT;
+ DECLARE vGrouping INT;
+ DECLARE vCantidad INT;
+ DECLARE vCostefijo DECIMAL(10,3);
+ DECLARE vPortefijo DECIMAL(10,3);
+ DECLARE vEmbalajefijo DECIMAL(10);
+ DECLARE vComisionfija DECIMAL(10,3);
+ DECLARE vCaja INT;
+ DECLARE vNicho VARCHAR(5);
+ DECLARE vTarifa1 DECIMAL(10,2);
+ DECLARE vTarifa2 DECIMAL(10,2);
+ DECLARE vTarifa3 DECIMAL(10,2);
+ DECLARE vPVP DECIMAL(10,2);
+ DECLARE vCompra INT;
+
+ DECLARE rs CURSOR FOR
+ SELECT
+ b.Id_Entrada,
+ b.Id_Article,
+ b.Etiquetas,
+ b.Id_Cubo,
+ b.Packing,
+ b.`grouping`,
+ b.Cantidad,
+ b.Costefijo,
+ b.Portefijo,
+ b.Embalajefijo,
+ b.Comisionfija,
+ b.caja,
+ b.Nicho,
+ b.Tarifa1,
+ b.Tarifa2,
+ b.Tarifa3,
+ b.PVP
+ FROM vn2008.Compres b
+ JOIN vn.itemConversor ic ON ic.espItemFk = b.Id_Article
+ WHERE Id_Entrada = vEntry;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+ SELECT warehouseInFk, warehouseOutFk, tr.id
+ INTO vWarehouseIn, vWarehouseOut, vTravel
+ FROM travel tr
+ JOIN entry e ON e.travelFk = tr.id
+ WHERE e.id = vEntry;
+
+ UPDATE travel
+ SET warehouseInFk = vWarehouseOut,
+ warehouseOutFk = vWarehouseIn
+ WHERE id = vTravel;
+
+ UPDATE vn2008.Compres c
+ LEFT JOIN vn.itemConversor ic ON ic.espItemFk = c.Id_Article
+ SET Etiquetas = 0, Cantidad = 0
+ WHERE c.Id_Entrada = vEntry
+ AND ic.espItemFk IS NULL;
+
+ OPEN rs;
+
+ DELETE FROM vn2008.Compres WHERE Id_Entrada = vEntry;
+
+ FETCH rs INTO
+ vId_Entrada,
+ vId_Article,
+ vEtiquetas,
+ vId_Cubo,
+ vPacking,
+ vGrouping,
+ vCantidad,
+ vCostefijo,
+ vPortefijo,
+ vEmbalajefijo,
+ vComisionfija,
+ vCaja,
+ vNicho,
+ vTarifa1,
+ vTarifa2,
+ vTarifa3,
+ vPVP;
+
+ WHILE NOT done DO
+
+ -- Primero la linea original con las cantidades invertidas
+ INSERT INTO vn2008.Compres
+ (
+ Id_Entrada,
+ Id_Article,
+ Etiquetas,
+ Id_Cubo,
+ Packing,
+ `grouping`,
+ Cantidad,
+ Costefijo,
+ Portefijo,
+ Embalajefijo,
+ Comisionfija,
+ caja,
+ Nicho,
+ Tarifa1,
+ Tarifa2,
+ Tarifa3,
+ PVP
+ )
+ VALUES
+ (
+ vId_Entrada,
+ vId_Article,
+ - vEtiquetas,
+ vId_Cubo,
+ vPacking,
+ vGrouping,
+ - vCantidad,
+ vCostefijo,
+ vPortefijo,
+ vEmbalajefijo,
+ vComisionfija,
+ vCaja,
+ vNicho,
+ vTarifa1,
+ vTarifa2,
+ vTarifa3,
+ vPVP);
+
+ -- Ahora la linea nueva, con el item genérico
+ INSERT INTO vn2008.Compres
+ (
+ Id_Entrada,
+ Id_Article,
+ Etiquetas,
+ Id_Cubo,
+ Packing,
+ `grouping`,
+ Cantidad,
+ Costefijo,
+ Portefijo,
+ Embalajefijo,
+ Comisionfija,
+ caja,
+ Nicho,
+ Tarifa1,
+ Tarifa2,
+ Tarifa3,
+ PVP
+ )
+ SELECT
+ vId_Entrada,
+ genItemFk as Id_Article,
+ vEtiquetas,
+ vId_Cubo,
+ vPacking,
+ vGrouping,
+ vCantidad,
+ vCostefijo,
+ vPortefijo,
+ vEmbalajefijo,
+ vComisionfija,
+ vCaja,
+ vNicho,
+ vTarifa1,
+ vTarifa2,
+ vTarifa3,
+ vPVP
+ FROM itemConversor
+ WHERE espItemFk = vId_Article;
+
+ SELECT LAST_INSERT_ID()
+ INTO vCompra;
+
+ REPLACE vn2008.Compres_mark(Id_Compra,`comment`)
+ SELECT vCompra, vId_Article;
+
+
+ FETCH rs INTO
+ vId_Entrada,
+ vId_Article,
+ vEtiquetas,
+ vId_Cubo,
+ vPacking,
+ vGrouping,
+ vCantidad,
+ vCostefijo,
+ vPortefijo,
+ vEmbalajefijo,
+ vComisionfija,
+ vCaja,
+ vNicho,
+ vTarifa1,
+ vTarifa2,
+ vTarifa3,
+ vPVP;
+
+ END WHILE;
+
+
+ CLOSE rs;
+
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59029,13 +58538,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entryDelivered`(vDated DATE, vEntryFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entryDelivered`(vDated DATE, vEntryFk INT)
BEGIN
DECLARE vTravelFk INT;
@@ -59073,69 +58582,69 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entryPrepare__`(IN `idE` BIGINT)
-BEGIN
- SELECT
- b.quantity / b.packing AS Paquetes,
- b.packing AS `Grouping`,
- barcode,
- 'ASEGURADO' AS asegurado,
- ic.name,
- ic.order,
- s.name AS Consignatario,
- e.supplierFk AS Id_Cliente,
- e.isOrdered,
- e.isConfirmed,
- 10 AS Calidad,
- LPAD(IFNULL(cpd.id, ip.code),
- 5,
- '0') AS path,
- b.entryFk AS Id_Ticket,
- t.landed AS Fecha,
- b.itemFk,
- b.quantity,
- i.name AS Concepte,
- i.size,
- i.inkFk,
- i.category,
- o.code AS Origen,
- 0 AS Bultos,
- wIn.`name` AS Tipo,
- 0 AS OK,
- 0 AS Reservado,
- i.stems,
- b.id AS Id_Movimiento,
- ip.code,
- 'PEDIDO ASEGURADO' AS MSG,
- 0 AS Seguro,
- i.image,
- pr.name AS producer
- FROM vn.buy b
- JOIN vn.entry e ON b.entryFk = e.id
- JOIN vn.travel t ON t.id = e.travelFk
- JOIN vn.warehouse wIn ON wIn.id = t.warehouseInFk
- JOIN vn.warehouse wOut ON wOut.id = t.warehouseOutFk
- JOIN vn.item i ON i.id = b.itemFk
- JOIN vn.itemType it ON it.id =i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- JOIN vn.packaging pkg ON pkg.id = b.packageFk
- LEFT JOIN vn.itemPlacement ip ON i.id = ip.itemFk AND ip.warehouseFk = wIn.id AND ip.warehouseFk = t.warehouseOutFk
- LEFT JOIN (SELECT itemFk, code AS barcode FROM vn.itemBarcode GROUP BY itemFk) ib ON ib.itemFk = b.itemFk
- LEFT JOIN vn.origin o ON o.id = i.originFk
- LEFT JOIN vn.supplier s ON s.id = e.supplierFk
- LEFT JOIN vn.producer pr on pr.id = i.producerFk
- LEFT JOIN vn.coolerPathDetail cpd ON LEFT(ip.code, 3) = cpd.hallway
- WHERE
- NOT wIn.isFeedStock AND NOT e.isInventory AND NOT e.isRaid
- AND e.id = 158772
- AND i.typeFk IS NOT NULL
- AND ic.display IS NOT FALSE;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entryPrepare__`(IN `idE` BIGINT)
+BEGIN
+ SELECT
+ b.quantity / b.packing AS Paquetes,
+ b.packing AS `Grouping`,
+ barcode,
+ 'ASEGURADO' AS asegurado,
+ ic.name,
+ ic.order,
+ s.name AS Consignatario,
+ e.supplierFk AS Id_Cliente,
+ e.isOrdered,
+ e.isConfirmed,
+ 10 AS Calidad,
+ LPAD(IFNULL(cpd.id, ip.code),
+ 5,
+ '0') AS path,
+ b.entryFk AS Id_Ticket,
+ t.landed AS Fecha,
+ b.itemFk,
+ b.quantity,
+ i.name AS Concepte,
+ i.size,
+ i.inkFk,
+ i.category,
+ o.code AS Origen,
+ 0 AS Bultos,
+ wIn.`name` AS Tipo,
+ 0 AS OK,
+ 0 AS Reservado,
+ i.stems,
+ b.id AS Id_Movimiento,
+ ip.code,
+ 'PEDIDO ASEGURADO' AS MSG,
+ 0 AS Seguro,
+ i.image,
+ pr.name AS producer
+ FROM vn.buy b
+ JOIN vn.entry e ON b.entryFk = e.id
+ JOIN vn.travel t ON t.id = e.travelFk
+ JOIN vn.warehouse wIn ON wIn.id = t.warehouseInFk
+ JOIN vn.warehouse wOut ON wOut.id = t.warehouseOutFk
+ JOIN vn.item i ON i.id = b.itemFk
+ JOIN vn.itemType it ON it.id =i.typeFk
+ JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+ JOIN vn.packaging pkg ON pkg.id = b.packageFk
+ LEFT JOIN vn.itemPlacement ip ON i.id = ip.itemFk AND ip.warehouseFk = wIn.id AND ip.warehouseFk = t.warehouseOutFk
+ LEFT JOIN (SELECT itemFk, code AS barcode FROM vn.itemBarcode GROUP BY itemFk) ib ON ib.itemFk = b.itemFk
+ LEFT JOIN vn.origin o ON o.id = i.originFk
+ LEFT JOIN vn.supplier s ON s.id = e.supplierFk
+ LEFT JOIN vn.producer pr on pr.id = i.producerFk
+ LEFT JOIN vn.coolerPathDetail cpd ON LEFT(ip.code, 3) = cpd.hallway
+ WHERE
+ NOT wIn.isFeedStock AND NOT e.isInventory AND NOT e.isRaid
+ AND e.id = 158772
+ AND i.typeFk IS NOT NULL
+ AND ic.display IS NOT FALSE;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59146,13 +58655,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entrySplit_move__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entrySplit_move__`()
BEGIN
/* CREATED PAK 08/09/2019
@@ -59192,13 +58701,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entryToTicket`(vEntryFk INT, vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entryToTicket`(vEntryFk INT, vTicketFk INT)
BEGIN
INSERT INTO vn.sale(ticketFk, itemFk, concept, quantity)
@@ -59221,27 +58730,27 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entryVolume__`(vEntryFk INT)
-BEGIN
-
- SELECT ELT(it.temperature + 1,'Calientes','Frios','Secos') AS Temp,
- CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
- vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.carro / 1000000 ,1) AS DECIMAL(10,2)) AS carros ,
- CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
- vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.espai / 1000000,1) AS DECIMAL(10,2)) AS espais
- FROM vn.buy b
- INNER JOIN vn.entry e ON e.id = b.entryFk
- INNER JOIN vn.travel tr ON tr.id = e.travelFk
- INNER JOIN vn.volumeConfig vc
- INNER JOIN vn.item i ON i.id = b.itemFk
- INNER JOIN vn.itemType it ON it.id = i.typeFk
- WHERE e.id = vEntryFk
- GROUP BY Temp;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entryVolume__`(vEntryFk INT)
+BEGIN
+
+ SELECT ELT(it.temperature + 1,'Calientes','Frios','Secos') AS Temp,
+ CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
+ vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.carro / 1000000 ,1) AS DECIMAL(10,2)) AS carros ,
+ CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
+ vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.espai / 1000000,1) AS DECIMAL(10,2)) AS espais
+ FROM vn.buy b
+ INNER JOIN vn.entry e ON e.id = b.entryFk
+ INNER JOIN vn.travel tr ON tr.id = e.travelFk
+ INNER JOIN vn.volumeConfig vc
+ INNER JOIN vn.item i ON i.id = b.itemFk
+ INNER JOIN vn.itemType it ON it.id = i.typeFk
+ WHERE e.id = vEntryFk
+ GROUP BY Temp;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59252,13 +58761,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entryWithItem`(vShipmentWarehouse INT, vLandingWarehouse INT,vSale INT, vVolume INT, netCost DECIMAL(10,2), vInOutDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entryWithItem`(vShipmentWarehouse INT, vLandingWarehouse INT,vSale INT, vVolume INT, netCost DECIMAL(10,2), vInOutDate DATE)
BEGIN
DECLARE vTravel INT;
@@ -59319,13 +58828,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entryWithItem__`(IN `vShipmentWarehouse` INT, IN `vLandingWarehouse` INT, IN `vSale` INT, IN `vVolume` INT, IN netCost DECIMAL(10,2), IN `vInOutDate` DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entryWithItem__`(IN `vShipmentWarehouse` INT, IN `vLandingWarehouse` INT, IN `vSale` INT, IN `vVolume` INT, IN netCost DECIMAL(10,2), IN `vInOutDate` DATE)
BEGIN
DECLARE vTravel INT;
@@ -59388,38 +58897,130 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entry_clone`(vSelf INT)
-BEGIN
-
- /* Clona una entrada
- *
- * @param vSelf Identificador de vn.entry
- */
-
- DECLARE vEntryFk INT;
-
- INSERT INTO vn.entry(supplierFk, dated, isInventory, notes, isRaid, commission, travelFk, currencyFk,
- companyFk, loadPriority )
- SELECT supplierFk, dated, isInventory, notes, isRaid, commission, travelFk, currencyFk,
- companyFk, loadPriority
- FROM vn.entry e
- WHERE e.id = vSelf;
-
- SET vEntryFk = LAST_INSERT_ID();
-
- INSERT INTO vn.buy(entryFk, itemFk, quantity, buyingValue, freightValue, isIgnored, stickers, packing, `grouping`, groupingMode, containerFk, comissionValue, packageValue, packageFk, price1, price2, price3, minPrice, producer, workerFk, weight, itemOriginalFk )
- SELECT vEntryFk, itemFk, quantity, buyingValue, freightValue, isIgnored, stickers, packing, `grouping`, groupingMode, containerFk, comissionValue, packageValue, packageFk, price1, price2, price3, minPrice, producer, workerFk, weight, itemOriginalFk
- FROM vn.buy b
- WHERE b.entryFk = vSelf;
-
- SELECT vEntryFk;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_clone`(vSelf INT)
+BEGIN
+
+/*
+ * Clona una entrada
+ *
+ * @param vSelf Identificador de vn.entry
+ */
+
+ DECLARE vNewEntryFk INT;
+
+ CALL vn.entry_cloneWithoutBuy(vSelf, vNewEntryFk);
+
+ INSERT INTO vn.buy( entryFk,
+ itemFk,
+ quantity,
+ buyingValue,
+ freightValue,
+ isIgnored,
+ stickers,
+ packing,
+ `grouping`,
+ groupingMode,
+ containerFk,
+ comissionValue,
+ packageValue,
+ packageFk,
+ price1,
+ price2,
+ price3,
+ minPrice,
+ producer,
+ workerFk,
+ weight,
+ itemOriginalFk)
+ SELECT vNewEntryFk,
+ itemFk,
+ quantity,
+ buyingValue,
+ freightValue,
+ isIgnored,
+ stickers,
+ packing,
+ `grouping`,
+ groupingMode,
+ containerFk,
+ comissionValue,
+ packageValue,
+ packageFk,
+ price1,
+ price2,
+ price3,
+ minPrice,
+ producer,
+ workerFk,
+ weight,
+ itemOriginalFk
+ FROM vn.buy b
+ WHERE b.entryFk = vSelf;
+
+ SELECT vNewEntryFk;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `entry_cloneWithoutBuy` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_cloneWithoutBuy`(vSelf INT, OUT vNewEntryFk INT)
+BEGIN
+
+/**
+ * Clona una entrada sin compras
+ *
+ * @param vSelf Identificador de vn.entry
+ *
+ * @return vNewEntryFk Identificador de la nueva entrada
+ */
+
+ START TRANSACTION;
+
+ INSERT INTO vn.entry(supplierFk,
+ dated,
+ isInventory,
+ notes,
+ isRaid,
+ commission,
+ travelFk,
+ currencyFk,
+ companyFk,
+ loadPriority)
+ SELECT supplierFk,
+ dated,
+ isInventory,
+ notes,
+ isRaid,
+ commission,
+ travelFk,
+ currencyFk,
+ companyFk,
+ loadPriority
+ FROM vn.entry e
+ WHERE e.id = vSelf;
+
+ SET vNewEntryFk = LAST_INSERT_ID();
+
+ COMMIT;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59430,71 +59031,71 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entry_fixMisfit`(vSelf INT)
-BEGIN
-
- /* Arregla el descuadre de una entrada, agregando registros en vn.buy para compensar la diferencia
- * entre las etiquetas impresas y las etiquetas esperadas
- *
- */
-
- INSERT INTO vn.buy(entryFk, itemFk)
- SELECT vSelf, i.id
- FROM vn.item i
- WHERE i.description = 'MISFIT'
- LIMIT 1;
-
- INSERT INTO vn.buy(entryFk,
- itemFk,
- quantity,
- buyingValue,
- freightValue,
- isIgnored,
- stickers,
- packing,
- `grouping`,
- groupingMode,
- containerFk,
- comissionValue,
- packageValue,
- location,
- packageFk,
- price1,
- price2,
- price3,
- minPrice,
- producer)
- SELECT vSelf,
- itemFk,
- (printedStickers - stickers) * packing AS quantity,
- buyingValue,
- freightValue,
- TRUE isIgnored,
- printedStickers - stickers,
- packing,
- `grouping`,
- groupingMode,
- containerFk,
- comissionValue,
- packageValue,
- location,
- packageFk,
- price1,
- price2,
- price3,
- minPrice,
- producer
- FROM vn.buy b
- WHERE b.entryFk = vSelf
- AND b.printedStickers != b.stickers;
-
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_fixMisfit`(vSelf INT)
+BEGIN
+
+ /* Arregla el descuadre de una entrada, agregando registros en vn.buy para compensar la diferencia
+ * entre las etiquetas impresas y las etiquetas esperadas
+ *
+ */
+
+ INSERT INTO vn.buy(entryFk, itemFk)
+ SELECT vSelf, i.id
+ FROM vn.item i
+ WHERE i.description = 'MISFIT'
+ LIMIT 1;
+
+ INSERT INTO vn.buy(entryFk,
+ itemFk,
+ quantity,
+ buyingValue,
+ freightValue,
+ isIgnored,
+ stickers,
+ packing,
+ `grouping`,
+ groupingMode,
+ containerFk,
+ comissionValue,
+ packageValue,
+ location,
+ packageFk,
+ price1,
+ price2,
+ price3,
+ minPrice,
+ producer)
+ SELECT vSelf,
+ itemFk,
+ (printedStickers - stickers) * packing AS quantity,
+ buyingValue,
+ freightValue,
+ TRUE isIgnored,
+ printedStickers - stickers,
+ packing,
+ `grouping`,
+ groupingMode,
+ containerFk,
+ comissionValue,
+ packageValue,
+ location,
+ packageFk,
+ price1,
+ price2,
+ price3,
+ minPrice,
+ producer
+ FROM vn.buy b
+ WHERE b.entryFk = vSelf
+ AND b.printedStickers != b.stickers;
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59505,13 +59106,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entry_getRate`(vEntry INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_getRate`(vEntry INT)
BEGIN
DECLARE vLanded DATE;
DECLARE vWarehouseFk INT;
@@ -59545,6 +59146,111 @@ BEGIN
) sub2
LIMIT 1;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `entry_moveNotPrinted` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_moveNotPrinted`(vSelf INT, vDays INT, vChangeEntry BOOL, OUT vNewEntryFk INT)
+BEGIN
+
+ /**
+ * Crea una entrada a futuro y divide las lineas de vn.buy de la entrada original en función
+ * de las etiquetas impresas
+ *
+ * @param vSelf Identificador de vn.entry
+ * @param vDays Número de dias a futuro que se quiere la nueva entrada
+ *
+ * @return vNewEntryFk Identificador de la nueva entrada
+ */
+
+ DECLARE vNewTravelFk INT;
+ DECLARE vTravelFk INT;
+
+ SELECT travelFk INTO vTravelFk
+ FROM vn.entry
+ WHERE id = vSelf;
+
+ CALL vn.travel_clone(vTravelFk, vDays, vNewTravelFk);
+
+ CALL vn.entry_cloneWithoutBuy(vSelf, vNewEntryFk);
+
+ UPDATE vn.entry e
+ SET e.travelFk = vNewTravelFk,
+ e.evaNotes = CONCAT('No impresas de: ', vSelf, ' ', IFNULL(e.evaNotes,''))
+ WHERE e.id = vNewEntryFk;
+
+ UPDATE vn.buy b
+ SET b.entryFk = vNewEntryFk
+ WHERE b.printedStickers = 0
+ AND b.entryFk = vSelf;
+
+ INSERT INTO vn.buy( entryFk,
+ itemFk,
+ quantity,
+ buyingValue,
+ freightValue,
+ isIgnored,
+ stickers,
+ packing,
+ `grouping`,
+ groupingMode,
+ containerFk,
+ comissionValue,
+ packageValue,
+ packageFk,
+ price1,
+ price2,
+ price3,
+ minPrice,
+ producer,
+ workerFk,
+ weight,
+ itemOriginalFk)
+ SELECT vNewEntryFk,
+ itemFk,
+ ((stickers - printedStickers) * packing) quantity,
+ buyingValue,
+ freightValue,
+ isIgnored,
+ (stickers - printedStickers) stickers,
+ packing,
+ `grouping`,
+ groupingMode,
+ containerFk,
+ comissionValue,
+ packageValue,
+ packageFk,
+ price1,
+ price2,
+ price3,
+ minPrice,
+ producer,
+ workerFk,
+ weight,
+ itemOriginalFk
+ FROM vn.buy b
+ WHERE b.entryFk = vSelf
+ AND b.printedStickers != b.stickers;
+
+ IF vChangeEntry THEN
+ UPDATE vn.buy
+ SET stickers = printedStickers,
+ quantity = printedStickers * packing
+ WHERE entryFk = vSelf;
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59555,13 +59261,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entry_recalc`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_recalc`()
BEGIN
/**
* Comprueba que las ventas creadas entre un rango de fechas tienen componentes
@@ -59602,43 +59308,43 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `entry_splitMisfit`(vSelf INT)
-BEGIN
-
- /* Divide una entrada, pasando los registros que ha insertado vn.entry_fixMisfit de la entrada original
- * a la nueva
- */
-
- DECLARE vNewEntryFk INT;
- DECLARE vBuyFk INT;
-
- SELECT MAX(b.id) INTO vBuyFk
- FROM vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- WHERE b.entryFk = vSelf
- AND i.description = 'MISFIT';
-
- INSERT INTO vn.entry(supplierFk, dated, notes, travelFk, currencyFk, companyFk)
- SELECT supplierFk, dated, CONCAT('E:',vSelf), travelFk, currencyFk, companyFk
- FROM vn.entry e
- WHERE e.id = vSelf;
-
- SET vNewEntryFk = LAST_INSERT_ID();
-
- UPDATE vn.buy b
- SET b.entryFk = vNewEntryFk
- WHERE b.entryFk = vSelf
- AND b.id > vBuyFk;
-
- SELECT vNewEntryFk;
-
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_splitMisfit`(vSelf INT)
+BEGIN
+
+ /* Divide una entrada, pasando los registros que ha insertado vn.entry_fixMisfit de la entrada original
+ * a la nueva
+ */
+
+ DECLARE vNewEntryFk INT;
+ DECLARE vBuyFk INT;
+
+ SELECT MAX(b.id) INTO vBuyFk
+ FROM vn.buy b
+ JOIN vn.item i ON i.id = b.itemFk
+ WHERE b.entryFk = vSelf
+ AND i.description = 'MISFIT';
+
+ INSERT INTO vn.entry(supplierFk, dated, notes, travelFk, currencyFk, companyFk)
+ SELECT supplierFk, dated, CONCAT('E:',vSelf), travelFk, currencyFk, companyFk
+ FROM vn.entry e
+ WHERE e.id = vSelf;
+
+ SET vNewEntryFk = LAST_INSERT_ID();
+
+ UPDATE vn.buy b
+ SET b.entryFk = vNewEntryFk
+ WHERE b.entryFk = vSelf
+ AND b.id > vBuyFk;
+
+ SELECT vNewEntryFk;
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59655,89 +59361,147 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `errorProduction_add`(vAction VARCHAR(25), vDepartment VARCHAR(25), vStateCode VARCHAR(25) CHARSET utf8, vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_add`(vAction VARCHAR(25), vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
- /**
- * Fill in the errorProduction table.
- */
- DROP TEMPORARY TABLE IF EXISTS tmp.total;
- IF (vDepartment = 'Encajadores')
- THEN
- CREATE TEMPORARY TABLE tmp.total
- ENGINE = MEMORY
- SELECT e.workerFk, Count(DISTINCT t.id) AS ticketCount
- FROM expedition e
- JOIN ticket t ON e.ticketFk = t.id
- WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
- GROUP BY e.workerFk;
- ELSE
- CREATE TEMPORARY TABLE tmp.total
- ENGINE = MEMORY
- SELECT st.workerFk, Count(DISTINCT t.id) AS ticketCount
- FROM state ss
- JOIN vn.saleTracking st ON st.stateFk = ss.id
- JOIN vn.sale s ON s.id = st.saleFk
- JOIN ticket t ON s.ticketFk = t.id
- WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo) AND ss.code = vStateCode
- GROUP BY st.workerFk;
- END IF;
+/**
+ * Fill in the errorProduction table
+ */
- CALL timeControl_calculateAll(vDatedFrom, vDatedTo);
+ DECLARE vDepartment VARCHAR(255);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
+ DROP TEMPORARY TABLE IF EXISTS tmp.total;
+ DROP TEMPORARY TABLE IF EXISTS tmp.itemPickerErrors;
+ DROP TEMPORARY TABLE IF EXISTS tmp.errorsByClaim;
+ DROP TEMPORARY TABLE IF EXISTS tmp.volume;
+ DROP TEMPORARY TABLE IF EXISTS tmp.errorsByChecker;
+
+ CASE
+ WHEN vAction = 'SACAR' THEN
+ SET vDepartment = 'Sacadores';
+ WHEN vAction = 'ENCAJAR' THEN
+ SET vDepartment = 'Encajadores';
+ WHEN vAction = 'CONTROLAR' THEN
+ SET vDepartment = 'Revisadores';
+ END CASE;
+
+ IF (vDepartment = 'Encajadores') THEN
+ CREATE TEMPORARY TABLE tmp.total
+ ENGINE = MEMORY
+ SELECT e.workerFk,
+ COUNT(DISTINCT t.id) ticketCount,
+ COUNT(s.id) lineCount
+ FROM expedition e
+ JOIN ticket t ON e.ticketFk = t.id
+ JOIN sale s ON s.ticketFk = t.id
+ WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+ GROUP BY e.workerFk;
+ ELSE
+ CREATE TEMPORARY TABLE tmp.total
+ ENGINE = MEMORY
+ SELECT st.workerFk,
+ COUNT(DISTINCT t.id) ticketCount,
+ COUNT(s.id) lineCount
+ FROM saleTracking st
+ JOIN vncontrol.accion a ON a.accion_id = st.actionFk
+ JOIN sale s ON s.id = st.saleFk
+ JOIN ticket t ON s.ticketFk = t.id
+ WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo) AND a.accion = vAction
+ GROUP BY st.workerFk;
+ END IF;
+
+ CALL timeControl_calculateAll(vDatedFrom, vDatedTo);
+
+
+ CREATE TEMPORARY TABLE tmp.errorsByClaim
+ ENGINE = MEMORY
+ SELECT COUNT(c.ticketFk) errors,
+ cd.workerFk
+ FROM claimDevelopment cd
+ JOIN claim c ON cd.claimFk = c.id
+ JOIN ticket t ON c.ticketFk = t.id
+ JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id
+ WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+ AND cr.description = vDepartment
+ GROUP BY cd.workerFk;
- INSERT INTO errorProduction(userFk, firstname, lastname, rol, ticketNumber, error, ratio, volume, hourStart, hourEnd, hourWorked, dated)
- SELECT sub1.id, sub1.firstName, sub1.lastName,
- CASE
- WHEN vDepartment = 'Encajadores' THEN 'Encajador'
- WHEN vDepartment = 'Sacadores' THEN 'Sacador'
- ELSE 'Revisador'
- END AS rol,
- CAST(sub1.totalTickets AS DECIMAL(10,0)) AS totalTickets,
- CAST(IFNULL(sub1.errors,0) + IFNULL(sub2.errors,0) AS DECIMAL(10,0)) AS errors,
- ((IFNULL(sub1.errors,0) + IFNULL(sub2.errors,0))/sub1.totalTickets)*100 AS ratio,
- IF(vDepartment = 'Revisadores', NULL, volume) AS volume,
- sub1.hourStart AS hourStart,
- sub1.hourEnd AS hourEnd,
- sub1.hourWorked AS hourWorked,
- vDatedFrom AS date
- FROM(
- SELECT w.id, w.code, w.firstName, w.lastName, t.ticketCount AS totalTickets, sub.errors, sub2.volume, SUBSTRING(tc.timed, 1, 5) AS hourStart, SUBSTRING(tc.timed, LENGTH(tc.timed)-4, 5) AS hourEnd, IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) AS hourWorked
- FROM tmp.total AS t
- JOIN worker w ON w.id = t.workerFk
- JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk
- LEFT JOIN (
- SELECT COUNT(c.ticketFk) AS errors, cd.workerFk
- FROM claimDevelopment cd
- JOIN claim c ON cd.claimFk = c.id
- JOIN ticket t ON c.ticketFk = t.id
- JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id
- WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo AND cr.description = vDepartment
- GROUP BY cd.workerFk
- )sub ON t.workerFk = sub.workerFk
- LEFT JOIN ( -- Añadir volume
- SELECT SUM(w.volume) AS volume, w.workerFk
- FROM bs.workerProductivity w
- INNER JOIN vn.`role` r ON r.id=w.roleFk
- WHERE IF(vDepartment = 'Encajadores', r.name='packager', r.name='itemPicker') AND w.dated BETWEEN vDatedFrom AND vDatedTo
- GROUP BY w.workerFk) sub2 ON w.id = sub2.workerFk
- GROUP BY w.code) sub1
- LEFT JOIN(
- SELECT sub1.workerFk, COUNT(id) AS errors
- FROM (
- SELECT st.workerFk, t.id
- FROM vn.saleMistake sm
- JOIN vn.saleTracking st ON sm.saleFk = st.saleFk
- JOIN state ss ON ss.id = st.stateFk
- JOIN vncontrol.accion a ON a.accion_id = st.actionFk
- JOIN vn.sale s ON s.id = sm.saleFk
- JOIN vn.ticket t on t.id = s.ticketFk
- WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo) AND a.accion = vAction AND ss.code = vStateCode
- GROUP BY s.ticketFk
- ) sub1
- GROUP BY sub1.workerFk) sub2 ON sub2.workerFk = sub1.id;
+ CREATE TEMPORARY TABLE tmp.volume
+ ENGINE = MEMORY
+ SELECT SUM(w.volume) volume,
+ w.workerFk
+ FROM bs.workerProductivity w
+ WHERE w.dated BETWEEN vDatedFrom AND vDatedTo
+ GROUP BY w.workerFk;
+
+ CREATE TEMPORARY TABLE tmp.errorsByChecker
+ ENGINE = MEMORY
+ SELECT sub1.workerFk, COUNT(id) errors
+ FROM (
+ SELECT st.workerFk,
+ t.id
+ FROM saleMistake sm
+ JOIN saleTracking st ON sm.saleFk = st.saleFk
+ JOIN vncontrol.accion a ON a.accion_id = st.actionFk
+ JOIN sale s ON s.id = sm.saleFk
+ JOIN ticket t on t.id = s.ticketFk
+ WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
+ AND a.accion = vAction
+ GROUP BY s.ticketFk
+ ) sub1
+ GROUP BY sub1.workerFk;
+
+ INSERT INTO errorProduction(userFk, firstname, lastname, rol, ticketNumber, lineNumber, error, volume, hourStart, hourEnd, hourWorked, dated)
+ SELECT w.id,
+ w.firstName,
+ w.lastName,
+ vDepartment,
+ t.ticketCount totalTickets,
+ t.lineCount,
+ IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) errors,
+ IF(vDepartment = 'Revisadores', NULL, v.volume) volume,
+ SUBSTRING(tc.timed, 1, 5) hourStart,
+ SUBSTRING(tc.timed, LENGTH(tc.timed)-4, 5) hourEnd,
+ IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked,
+ vDatedFrom dated
+ FROM tmp.total t
+ LEFT JOIN worker w ON w.id = t.workerFk
+ LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk
+ LEFT JOIN tmp.errorsByClaim ec ON ec.workerFk = t.workerFk
+ LEFT JOIN tmp.volume v ON v.workerFk = t.workerFk
+ LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = t.workerFk
+ GROUP BY w.id;
- DROP TEMPORARY TABLE tmp.timeControlCalculate;
- DROP TEMPORARY TABLE tmp.total;
+ IF (vDepartment = 'Sacadores') THEN
+ CREATE TEMPORARY TABLE tmp.itemPickerErrors -- Errores de los sacadores, derivadores de los revisadores
+ ENGINE = MEMORY
+ SELECT COUNT(c.ticketFk) errors,
+ tt.workerFk
+ FROM claimDevelopment cd
+ JOIN claim c ON cd.claimFk = c.id
+ JOIN ticket t ON c.ticketFk = t.id
+ JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id
+ JOIN ticketTracking tt ON tt.ticketFk = t.id
+ JOIN state s ON s.id = tt.stateFk
+ WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+ AND cr.description = 'Revisadores'
+ AND s.code = 'ON_PREPARATION'
+ GROUP BY workerFk;
+
+ UPDATE errorProduction ep
+ JOIN tmp.itemPickerErrors ipe ON ipe.workerFk = ep.userFk
+ SET ep.error = ep.error + ipe.errors
+ WHERE vDatedFrom = ep.dated AND ep.rol = 'Sacadores';
+
+ END IF;
+
+ DROP TEMPORARY TABLE tmp.timeControlCalculate;
+ DROP TEMPORARY TABLE tmp.total;
+ DROP TEMPORARY TABLE IF EXISTS tmp.itemPickerErrors;
+ DROP TEMPORARY TABLE tmp.errorsByClaim;
+ DROP TEMPORARY TABLE tmp.volume;
+ DROP TEMPORARY TABLE tmp.errorsByChecker;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59750,20 +59514,20 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `errorProduction_addLauncher`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_addLauncher`()
BEGIN
DECLARE vDatedFrom DATETIME;
DECLARE vDatedTo DATETIME;
SELECT DATE_SUB(CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo;
- CALL vn.errorProduction_add('SACAR' ,'Sacadores','PREPARED', vDatedFrom, vDatedTo);
- CALL vn.errorProduction_add('ENCAJAR' ,'Encajadores','PACKED', vDatedFrom, vDatedTo);
- CALL vn.errorProduction_add('CONTROLAR' ,'Revisadores','CHECKED', vDatedFrom, vDatedTo);
+ CALL vn.errorProduction_add('SACAR', vDatedFrom, vDatedTo);
+ CALL vn.errorProduction_add('ENCAJAR', vDatedFrom, vDatedTo);
+ CALL vn.errorProduction_add('CONTROLAR', vDatedFrom, vDatedTo);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59776,11 +59540,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `errorProduction_addLauncher__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_addLauncher__`()
BEGIN
DECLARE vDatedFrom DATETIME;
DECLARE vDatedTo DATETIME;
@@ -59804,11 +59568,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `errorProduction_add__`(vAction VARCHAR(25), vDepartment VARCHAR(25), vStateCode VARCHAR(25) CHARSET utf8, vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_add__`(vAction VARCHAR(25), vDepartment VARCHAR(25), vStateCode VARCHAR(25) CHARSET utf8, vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
* Fill in the errorProduction table.
@@ -59896,13 +59660,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionGetFromRoute`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionGetFromRoute`(
vExpeditionFk INT)
BEGIN
/**
@@ -59933,13 +59697,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionPallet_Del`(vPalletFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionPallet_Del`(vPalletFk INT)
BEGIN
DELETE FROM vn.expeditionPallet
@@ -59955,13 +59719,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionPallet_List`(vTruckFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionPallet_List`(vTruckFk INT)
BEGIN
SELECT ep.id Pallet,
@@ -59986,11 +59750,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionPallet_PrintSet`(vPalletFk INT,vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionPallet_PrintSet`(vPalletFk INT,vSectorFk INT)
BEGIN
DECLARE vLabel INT;
@@ -60032,23 +59796,9 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionPallet_View`(vPalletFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionPallet_View`(vPalletFk INT)
BEGIN
- /*
- DECLARE vIsPrint TINYINT;
- SELECT isPrint INTO vIsPrint
- FROM vn.expeditionPallet
- WHERE id = vPalletFk;
-
- -- IF vIsPrint = 2 THEN -- Valor por defecto cuando se crea un pallet. Tras imprimir, pasa a estado 1
-
- UPDATE vn.expeditionPallet
- SET isPrint = FALSE
- WHERE id = vPalletFk;
-
- -- END IF;
- */
SELECT ep.id Pallet,
t.routeFk Rutas,
count(*) Cajas
@@ -60071,11 +59821,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionScan_Add`(vPalletFk INT, vTruckFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionScan_Add`(vPalletFk INT, vTruckFk INT)
BEGIN
DECLARE vTotal INT DEFAULT 0;
@@ -60109,13 +59859,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionScan_Del`(vScanFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionScan_Del`(vScanFk INT)
BEGIN
DELETE FROM vn.expeditionScan
@@ -60133,11 +59883,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionScan_List`(vPalletFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionScan_List`(vPalletFk INT)
BEGIN
SELECT es.id,
@@ -60161,13 +59911,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionScan_Put`(vPalletFk INT, vExpeditionFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionScan_Put`(vPalletFk INT, vExpeditionFk INT)
BEGIN
REPLACE vn.expeditionScan(expeditionFk, palletFk)
@@ -60181,7 +59931,51 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `expeditionTruck_Add` */;
+/*!50003 DROP PROCEDURE IF EXISTS `expeditionState_add` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_add`(vParam INT, vStateCode VARCHAR(100))
+BEGIN
+
+ /**
+ * Inserta nuevos registros en la tabla vn.expeditionState, segun el parámetro
+ *
+ * @param vParam Identificador de vn.expedition o de vn.route
+ * @param vStateCode Corresponde a vn.expeditionStateType.code
+ */
+
+ IF (SELECT COUNT(*) FROM vn.route r WHERE r.id = vParam) THEN
+
+ INSERT INTO vn.expeditionState(expeditionFk, typeFk)
+ SELECT e.id, est.id
+ FROM vn.expedition e
+ JOIN vn.ticket t ON t.id = e.ticketFk
+ JOIN vn.expeditionStateType est ON est.code = vStateCode
+ WHERE t.routeFk = vParam;
+
+ ELSE
+
+ INSERT INTO vn.expeditionState(expeditionFk, typeFk)
+ SELECT vParam, est.id
+ FROM vn.expeditionStateType est
+ WHERE est.code = vStateCode;
+
+ END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `expeditionState_addByAdress` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -60191,7 +59985,105 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionTruck_Add`(vHour VARCHAR(5), vDescription VARCHAR(45))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_addByAdress`(vAdressFk INT, vRouteFk INT, vStateCode VARCHAR(100))
+BEGIN
+
+ /**
+ * Inserta nuevos registros en la tabla vn.expeditionState
+ *
+ * @param vAdressFk Identificador de vn.ticket
+ * @param vRouteFk Identificador de vn.route
+ * @param vStateCode Corresponde a vn.expeditionStateType.code
+ */
+
+ INSERT INTO vn.expeditionState(expeditionFk, typeFk)
+ SELECT e.id, est.id
+ FROM vn.expedition e
+ JOIN vn.expeditionStateType est ON est.code = vStateCode
+ JOIN vn.ticket t ON t.id = e.ticketFk
+ WHERE t.addressFk = vAdressFk AND t.routeFk = vRouteFk;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `expeditionState_addByExpedition` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_addByExpedition`(vExpeditionFk INT, vStateCode VARCHAR(100))
+BEGIN
+
+ /**
+ * Inserta nuevos registros en la tabla vn.expeditionState
+ *
+ * @param vExpeditionFk Identificador de vn.expedition
+ * @param vStateCode Corresponde a vn.expeditionStateType.code
+ */
+
+ INSERT INTO vn.expeditionState(expeditionFk, typeFk)
+ SELECT vExpeditionFk, est.id
+ FROM vn.expeditionStateType est
+ WHERE est.code = vStateCode;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `expeditionState_addByRoute` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_addByRoute`(vRouteFk INT, vStateCode VARCHAR(100))
+BEGIN
+
+ /**
+ * Inserta nuevos registros en la tabla vn.expeditionState, por rutas
+ *
+ * @param vRouteFk Identificador de vn.route
+ * @param vStateCode Corresponde a vn.expeditionStateType.code
+ */
+
+ INSERT INTO vn.expeditionState(expeditionFk, typeFk)
+ SELECT e.id, est.id
+ FROM vn.expedition e
+ JOIN vn.ticket t ON t.id = e.ticketFk
+ JOIN vn.expeditionStateType est ON est.code = vStateCode
+ WHERE t.routeFk = vRouteFk;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `expeditionTruck_Add` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionTruck_Add`(vHour VARCHAR(5), vDescription VARCHAR(45))
BEGIN
INSERT INTO vn.expeditionTruck(ETD,description)
@@ -60207,13 +60099,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionTruck_List`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionTruck_List`()
BEGIN
SELECT id truckFk,
@@ -60232,13 +60124,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expeditionUpdateChecked`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionUpdateChecked`(
vExpeditionFk INT, vChecked INT)
BEGIN
/**
@@ -60255,7 +60147,7 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `expedition_getState` */;
+/*!50003 DROP PROCEDURE IF EXISTS `expedition_getFromRoute` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -60265,7 +60157,60 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expedition_getState`(vExpeditionFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expedition_getFromRoute`(vRouteFk INT)
+BEGIN
+/**
+ * Obtiene las expediciones a partir de una ruta
+ * @param vRouteFk Id de la ruta
+ */
+
+
+ SELECT e.id,
+ e.ticketFk,
+ e.checked,
+ t.routeFk,
+ ts.alertLevel,
+ a.street,
+ a.city,
+ a.postalCode,
+ t.addressFk,
+ a.nickname,
+ sub2.itemPackingTypeConcat
+ FROM expedition e
+ JOIN ticket t ON t.id = e.ticketFk
+ JOIN ticketState ts ON ts.ticketFk = e.ticketFk
+ JOIN address a ON t.addressFk = a.id
+ LEFT JOIN warehouse w ON t.warehouseFk = w.id
+ LEFT JOIN (SELECT sub.ticketFk,
+ CONCAT('(', GROUP_CONCAT(DISTINCT sub.itemPackingTypeFk ORDER BY sub.items DESC SEPARATOR ','), ') ') itemPackingTypeConcat
+ FROM (SELECT s.ticketFk , i.itemPackingTypeFk, COUNT(*) items
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ WHERE t.routeFk = vRouteFk
+ GROUP BY t.id,i.itemPackingTypeFk)sub
+ GROUP BY sub.ticketFk
+ ) sub2 ON sub2.ticketFk = t.id
+ WHERE t.routeFk = vRouteFk AND e.isBox <> FALSE;
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `expedition_getState` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expedition_getState`(vExpeditionFk INT)
BEGIN
DECLARE vTicketsPendientes INT;
@@ -60329,13 +60274,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `expedition_StateGet`(vExpeditionFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `expedition_StateGet`(vExpeditionFk INT)
BEGIN
/* Devuelve una "ficha" con todos los datos relativos a la expedición
@@ -60416,13 +60361,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `faultsReview`(vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `faultsReview`(vWarehouseFk INT)
BEGIN
DECLARE vCalcVisibleFk INT;
@@ -60473,13 +60418,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `faultsReview_isChecked`(vItemFk INT, vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `faultsReview_isChecked`(vItemFk INT, vWarehouseFk INT)
BEGIN
UPDATE vn.sale s
@@ -60503,20 +60448,20 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `freelance_getInfo`(workerFk INT)
-BEGIN
- SELECT s.name, s.street, s.city, s.nif, s.postCode
- FROM route r
- JOIN agencyMode am ON r.agencyModeFk = am.id
- JOIN agency a ON am.agencyFk = a.id
- JOIN supplier s ON a.supplierFk = s.id
- WHERE r.workerFk = workerFk
- ORDER BY r.id DESC
- LIMIT 1;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `freelance_getInfo`(workerFk INT)
+BEGIN
+ SELECT s.name, s.street, s.city, s.nif, s.postCode
+ FROM route r
+ JOIN agencyMode am ON r.agencyModeFk = am.id
+ JOIN agency a ON am.agencyFk = a.id
+ JOIN supplier s ON a.supplierFk = s.id
+ WHERE r.workerFk = workerFk
+ ORDER BY r.id DESC
+ LIMIT 1;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60529,86 +60474,86 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `fustControl`(vFromDated DATE, vToDated DATE)
-BEGIN
-
- DECLARE vSijsnerClientFk INT DEFAULT 19752;
-
- DECLARE vDateStart DATETIME;
- DECLARE vDateEnd DATETIME;
-
- SET vDateStart = vFromDated;
- SET vDateEnd = util.Dayend(vToDated);
-
- SELECT p.id FustCode,
- CAST(sent.stucks AS DECIMAL(10,0)) FH,
- CAST(tp.stucks AS DECIMAL(10,0)) Tickets,
- CAST(-sj.stucks AS DECIMAL(10,0)) Sijsner,
- CAST(IFNULL(sent.stucks,0) - IFNULL(tp.stucks,0) + IFNULL(sj.stucks,0) AS DECIMAL(10,0)) saldo
- FROM vn.packaging p
- LEFT JOIN (
- SELECT FustCode, sum(fustQuantity) stucks
- FROM (
- SELECT IFNULL(pe.equivalentFk ,b.packageFk) FustCode, s.quantity / b.packing AS fustQuantity
- FROM vn.sale s
- JOIN vn.ticket t ON t.id = s.ticketFk
- JOIN vn.warehouse w ON w.id = t.warehouseFk
- JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
- JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = t.warehouseFk
- JOIN vn.buy b ON b.id = lb.buy_id
- JOIN vn.packaging p ON p.id = b.packageFk
- LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
- JOIN vn.address a ON a.id = t.addressFk
- JOIN vn.province p2 ON p2.id = a.provinceFk
- JOIN vn.country c ON c.id = p2.countryFk
- WHERE t.shipped BETWEEN vDateStart AND vDateEnd
- AND wa.name = 'VNH'
- AND p.isPackageReturnable
- AND c.country = 'FRANCIA') sub
- GROUP BY FustCode) sent ON sent.FustCode = p.id
- LEFT JOIN (
- SELECT FustCode, sum(quantity) stucks
- FROM (
- SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
- FROM vn.ticketPackaging tp
- JOIN vn.ticket t ON t.id = tp.ticketFk
- JOIN vn.warehouse w ON w.id = t.warehouseFk
- JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
- JOIN vn.packaging p ON p.id = tp.packagingFk
- LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
- JOIN vn.address a ON a.id = t.addressFk
- JOIN vn.province p2 ON p2.id = a.provinceFk
- JOIN vn.country c ON c.id = p2.countryFk
- WHERE t.shipped BETWEEN vDateStart AND vDateEnd
- AND wa.name = 'VNH'
- AND p.isPackageReturnable
- AND c.country = 'FRANCIA'
- AND t.clientFk != vSijsnerClientFk
- AND tp.quantity > 0) sub
- GROUP BY FustCode) tp ON tp.FustCode = p.id
- LEFT JOIN (
- SELECT FustCode, sum(quantity) stucks
- FROM (
- SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
- FROM vn.ticketPackaging tp
- JOIN vn.ticket t ON t.id = tp.ticketFk
- JOIN vn.warehouse w ON w.id = t.warehouseFk
- JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
- JOIN vn.packaging p ON p.id = tp.packagingFk
- LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
- WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, 1, vDateStart ) AND TIMESTAMPADD(DAY, 1, vDateEnd )
- AND wa.name = 'VNH'
- AND p.isPackageReturnable
- AND t.clientFk = vSijsnerClientFk) sub
- GROUP BY FustCode) sj ON sj.FustCode = p.id
- WHERE sent.stucks
- OR tp.stucks
- OR sj.stucks;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `fustControl`(vFromDated DATE, vToDated DATE)
+BEGIN
+
+ DECLARE vSijsnerClientFk INT DEFAULT 19752;
+
+ DECLARE vDateStart DATETIME;
+ DECLARE vDateEnd DATETIME;
+
+ SET vDateStart = vFromDated;
+ SET vDateEnd = util.Dayend(vToDated);
+
+ SELECT p.id FustCode,
+ CAST(sent.stucks AS DECIMAL(10,0)) FH,
+ CAST(tp.stucks AS DECIMAL(10,0)) Tickets,
+ CAST(-sj.stucks AS DECIMAL(10,0)) Sijsner,
+ CAST(IFNULL(sent.stucks,0) - IFNULL(tp.stucks,0) + IFNULL(sj.stucks,0) AS DECIMAL(10,0)) saldo
+ FROM vn.packaging p
+ LEFT JOIN (
+ SELECT FustCode, sum(fustQuantity) stucks
+ FROM (
+ SELECT IFNULL(pe.equivalentFk ,b.packageFk) FustCode, s.quantity / b.packing AS fustQuantity
+ FROM vn.sale s
+ JOIN vn.ticket t ON t.id = s.ticketFk
+ JOIN vn.warehouse w ON w.id = t.warehouseFk
+ JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
+ JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = t.warehouseFk
+ JOIN vn.buy b ON b.id = lb.buy_id
+ JOIN vn.packaging p ON p.id = b.packageFk
+ LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.province p2 ON p2.id = a.provinceFk
+ JOIN vn.country c ON c.id = p2.countryFk
+ WHERE t.shipped BETWEEN vDateStart AND vDateEnd
+ AND wa.name = 'VNH'
+ AND p.isPackageReturnable
+ AND c.country = 'FRANCIA') sub
+ GROUP BY FustCode) sent ON sent.FustCode = p.id
+ LEFT JOIN (
+ SELECT FustCode, sum(quantity) stucks
+ FROM (
+ SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
+ FROM vn.ticketPackaging tp
+ JOIN vn.ticket t ON t.id = tp.ticketFk
+ JOIN vn.warehouse w ON w.id = t.warehouseFk
+ JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
+ JOIN vn.packaging p ON p.id = tp.packagingFk
+ LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.province p2 ON p2.id = a.provinceFk
+ JOIN vn.country c ON c.id = p2.countryFk
+ WHERE t.shipped BETWEEN vDateStart AND vDateEnd
+ AND wa.name = 'VNH'
+ AND p.isPackageReturnable
+ AND c.country = 'FRANCIA'
+ AND t.clientFk != vSijsnerClientFk
+ AND tp.quantity > 0) sub
+ GROUP BY FustCode) tp ON tp.FustCode = p.id
+ LEFT JOIN (
+ SELECT FustCode, sum(quantity) stucks
+ FROM (
+ SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
+ FROM vn.ticketPackaging tp
+ JOIN vn.ticket t ON t.id = tp.ticketFk
+ JOIN vn.warehouse w ON w.id = t.warehouseFk
+ JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
+ JOIN vn.packaging p ON p.id = tp.packagingFk
+ LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
+ WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, 1, vDateStart ) AND TIMESTAMPADD(DAY, 1, vDateEnd )
+ AND wa.name = 'VNH'
+ AND p.isPackageReturnable
+ AND t.clientFk = vSijsnerClientFk) sub
+ GROUP BY FustCode) sj ON sj.FustCode = p.id
+ WHERE sent.stucks
+ OR tp.stucks
+ OR sj.stucks;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60621,43 +60566,43 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `fustControlDetail`(vFromDated DATE, vToDated DATE)
-BEGIN
-
- DECLARE vSijsnerClientFk INT DEFAULT 19752;
-
- DECLARE vDateStart DATETIME;
- DECLARE vDateEnd DATETIME;
-
- SET vDateStart = vFromDated;
- SET vDateEnd = util.Dayend(vToDated);
-
- SELECT a.nickname shopName,
- a.city ,
- IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode,
- tp.quantity,
- tp.ticketFk,
- CONCAT('From ', vFromDated,' to ', vToDated) AS dateRange
- FROM vn.ticketPackaging tp
- JOIN vn.ticket t ON t.id = tp.ticketFk
- JOIN vn.warehouse w ON w.id = t.warehouseFk
- JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
- JOIN vn.packaging p ON p.id = tp.packagingFk
- LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
- JOIN vn.address a ON a.id = t.addressFk
- JOIN vn.province p2 ON p2.id = a.provinceFk
- JOIN vn.country c ON c.id = p2.countryFk
- WHERE t.shipped BETWEEN vFromDated AND util.dayend(vToDated)
- AND wa.name = 'VNH'
- AND p.isPackageReturnable
- AND c.country = 'FRANCIA'
- AND t.clientFk != vSijsnerClientFk
- AND tp.quantity > 0;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `fustControlDetail`(vFromDated DATE, vToDated DATE)
+BEGIN
+
+ DECLARE vSijsnerClientFk INT DEFAULT 19752;
+
+ DECLARE vDateStart DATETIME;
+ DECLARE vDateEnd DATETIME;
+
+ SET vDateStart = vFromDated;
+ SET vDateEnd = util.Dayend(vToDated);
+
+ SELECT a.nickname shopName,
+ a.city ,
+ IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode,
+ tp.quantity,
+ tp.ticketFk,
+ CONCAT('From ', vFromDated,' to ', vToDated) AS dateRange
+ FROM vn.ticketPackaging tp
+ JOIN vn.ticket t ON t.id = tp.ticketFk
+ JOIN vn.warehouse w ON w.id = t.warehouseFk
+ JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
+ JOIN vn.packaging p ON p.id = tp.packagingFk
+ LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.province p2 ON p2.id = a.provinceFk
+ JOIN vn.country c ON c.id = p2.countryFk
+ WHERE t.shipped BETWEEN vFromDated AND util.dayend(vToDated)
+ AND wa.name = 'VNH'
+ AND p.isPackageReturnable
+ AND c.country = 'FRANCIA'
+ AND t.clientFk != vSijsnerClientFk
+ AND tp.quantity > 0;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60670,11 +60615,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `fv_pca`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `fv_pca`()
BEGIN
DECLARE done INT DEFAULT FALSE;
@@ -60782,13 +60727,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `getDayExpeditions`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `getDayExpeditions`()
BEGIN
SELECT
@@ -60812,11 +60757,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `getDeliveryWorkers`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `getDeliveryWorkers`()
BEGIN
SELECT w.id,
concat(p.firstname," ",p.name) AS fullName,
@@ -60849,11 +60794,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `getInfoDelivery`(vRouteFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `getInfoDelivery`(vRouteFk INT)
BEGIN
SELECT s.name, s.street, s.city, s.nif, s.postCode FROM vn.route r
JOIN vn.agencyMode am ON r.agencyModeFk = am.id
@@ -60872,25 +60817,19 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `getItemUbication`(vItemFk VARCHAR(22))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `getItemUbication`(vItemFk VARCHAR(22))
BEGIN
- SELECT vn.barcodeToItem(vItemFk) INTO vItemFk;
-
- SELECT pk.code as Parking,
- sh.code as Matricula,
- ish.visible as visible,
- ish.available as Disponible,
- ish.level as level,
- ish.created as created,
- ish.itemFk as itemFk
- FROM vn.itemShelving ish
- JOIN vn.shelving sh ON sh.`code` = ish.shelvingFk
- JOIN vn.parking pk ON pk.id = sh.parkingFk
- WHERE ish.itemFk = vItemFk ORDER BY created ASC;
+
+ /*
+ * @deprecated Utilizar itemShelving_getInfo
+ *
+ */
+
+ CALL itemshelving_getInfo(vItemFk);
END ;;
DELIMITER ;
@@ -60904,11 +60843,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `getItemVisibleAvailable__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `getItemVisibleAvailable__`(
vItem INT,
vDate DATE,
vWarehouse TINYINT,
@@ -60926,13 +60865,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `getPedidosInternos`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `getPedidosInternos`()
BEGIN
SELECT id,name as description,upToDown as quantity FROM vn.item WHERE upToDown;
@@ -60947,32 +60886,32 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `intrastat_data_neto_Update`(IN vInvoiceInFk INT)
-BEGIN
-
- UPDATE vn2008.intrastat_data id
- JOIN (
- SELECT i.intrastatFk,
- LEAST(SUM(b.quantity) * IFNULL(it.gramsMax,100000) / 1000,
- SUM(ic.cm3 * b.quantity) * IF(i.density, i.density, it.density) / 1000000) as neto
- FROM entry e
- JOIN travel tr ON tr.id = e.travelFk
- JOIN buy b ON b.entryFk = e.id
- JOIN item i ON i.id = b.itemFk
- join itemType it ON it.id = i.typeFk
- JOIN itemCost ic ON ic.itemFk = i.id AND tr.warehouseInFk = ic.warehouseFk
- WHERE e.invoiceInFk = vinvoiceInFk
- GROUP BY i.intrastatFk) sub ON sub.intrastatFk = id.intrastat_id
- SET id.neto = ROUND(sub.neto, 1)
- WHERE id.recibida_id = vInvoiceInFk;
-
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `intrastat_data_neto_Update`(IN vInvoiceInFk INT)
+BEGIN
+
+ UPDATE vn2008.intrastat_data id
+ JOIN (
+ SELECT i.intrastatFk,
+ LEAST(SUM(b.quantity) * IFNULL(it.gramsMax,100000) / 1000,
+ SUM(ic.cm3 * b.quantity) * IF(i.density, i.density, it.density) / 1000000) as neto
+ FROM entry e
+ JOIN travel tr ON tr.id = e.travelFk
+ JOIN buy b ON b.entryFk = e.id
+ JOIN item i ON i.id = b.itemFk
+ join itemType it ON it.id = i.typeFk
+ JOIN itemCost ic ON ic.itemFk = i.id AND tr.warehouseInFk = ic.warehouseFk
+ WHERE e.invoiceInFk = vinvoiceInFk
+ GROUP BY i.intrastatFk) sub ON sub.intrastatFk = id.intrastat_id
+ SET id.neto = ROUND(sub.neto, 1)
+ WHERE id.recibida_id = vInvoiceInFk;
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60983,13 +60922,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inventoryFailureAdd`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `inventoryFailureAdd`()
BEGIN
DECLARE done BOOL DEFAULT FALSE;
@@ -61046,11 +60985,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inventoryMake`(vDate DATE, vWh INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `inventoryMake`(vDate DATE, vWh INT)
proc: BEGIN
/**
* Recalcula los inventarios de todos los almacenes, si vWh = 0
@@ -61310,13 +61249,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inventoryMakeLauncher`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `inventoryMakeLauncher`()
BEGIN
/**
* Recalcula los inventarios de todos los almacenes.
@@ -61336,11 +61275,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inventoryMake__`(vDate DATE, vWh INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `inventoryMake__`(vDate DATE, vWh INT)
proc: BEGIN
/**
* bernat WORKING IN THIS FILE
@@ -61587,11 +61526,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inventory_repair`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `inventory_repair`()
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.lastEntry;
@@ -61711,11 +61650,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceExpenceMake`(IN vInvoice INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceExpenceMake`(IN vInvoice INT)
BEGIN
/* Inserta las partidas de gasto correspondientes a la factura
* REQUIERE tabla ticketToInvoice
@@ -61754,11 +61693,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceExpenceMake__`(IN vInvoice INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceExpenceMake__`(IN vInvoice INT)
BEGIN
/* Inserta las partidas de gasto correspondientes a la factura
* REQUIERE tabla ticketToInvoice
@@ -61790,17 +61729,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `invoiceFromAddress` */;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceFromAddress`(vMaxTicketDate DATETIME,vAddress INT,vCompany INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromAddress`(vMaxTicketDate DATETIME,vAddress INT,vCompany INT)
BEGIN
DECLARE vMinDateTicket DATE DEFAULT TIMESTAMPADD(MONTH, -3, CURDATE());
@@ -61822,18 +61760,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP PROCEDURE IF EXISTS `invoiceFromClient` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceFromClient`(IN vMaxTicketDate datetime, IN vClientFk INT, IN vCompanyFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromClient`(IN vMaxTicketDate datetime, IN vClientFk INT, IN vCompanyFk INT)
BEGIN
DECLARE vMinTicketDate DATE DEFAULT TIMESTAMPADD(YEAR, -3, CURDATE());
SET vMaxTicketDate = util.dayend(vMaxTicketDate);
@@ -61857,13 +61794,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceFromTicket`(IN vTicket INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromTicket`(IN vTicket INT)
BEGIN
DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`;
@@ -61884,13 +61821,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInBookingCommon`(vInvoiceInId INT, OUT vSerialNumber INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInBookingCommon`(vInvoiceInId INT, OUT vSerialNumber INT)
BEGIN
DROP TEMPORARY TABLE IF EXISTS newInvoiceIn;
@@ -61950,7 +61887,7 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInBookingMain`(vInvoiceInId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInBookingMain`(vInvoiceInId INT)
BEGIN
DECLARE vTotalAmount,vTotalAmountDivisa DECIMAL(10,2);
DECLARE vBookNumber,vSerialNumber INT;
@@ -61970,17 +61907,17 @@ BEGIN
-- Apunte del proveedor
- INSERT INTO vn2008.XDiario(ASIEN,
- FECHA,
- SUBCTA,
- EUROHABER,
- CONCEPTO,
- CAMBIO,
- HABERME,
- NFACTICK,
- CLAVE,
- empresa_id
- )
+ INSERT INTO XDiario(ASIEN,
+ FECHA,
+ SUBCTA,
+ EUROHABER,
+ CONCEPTO,
+ CAMBIO,
+ HABERME,
+ NFACTICK,
+ CLAVE,
+ empresa_id
+ )
SELECT
vBookNumber,
n.bookEntried,
@@ -61996,19 +61933,19 @@ BEGIN
JOIN newSupplier s;
-- Línea de Gastos
- INSERT INTO vn2008.XDiario ( ASIEN,
- FECHA,
- SUBCTA,
- CONTRA,
- EURODEBE,
- EUROHABER,
- CONCEPTO,
- CAMBIO,
- DEBEME,
- HABERME,
- NFACTICK,
- empresa_id
- )
+ INSERT INTO XDiario ( ASIEN,
+ FECHA,
+ SUBCTA,
+ CONTRA,
+ EURODEBE,
+ EUROHABER,
+ CONCEPTO,
+ CAMBIO,
+ DEBEME,
+ HABERME,
+ NFACTICK,
+ empresa_id
+ )
SELECT vBookNumber ASIEN,
n.bookEntried FECHA,
IF(e.isWithheld , LPAD(RIGHT(s.supplierAccount,5),10,iit.expenceFk),iit.expenceFk) SUBCTA,
@@ -62030,40 +61967,40 @@ BEGIN
-- Líneas de IVA
- INSERT INTO vn2008.XDiario( ASIEN,
- FECHA,
- SUBCTA,
- CONTRA,
- EURODEBE,
- BASEEURO,
- CONCEPTO,
- FACTURA,
- IVA,
- AUXILIAR,
- SERIE,
- TIPOOPE,
- FECHA_EX,
- FECHA_OP,
- NFACTICK,
- FACTURAEX,
- L340,
- LRECT349,
- TIPOCLAVE,
- TIPOEXENCI,
- TIPONOSUJE,
- TIPOFACT,
- TIPORECTIF,
- TERIDNIF,
- TERNIF,
- TERNOM,
- FECREGCON,
- empresa_id
- )
+ INSERT INTO XDiario( ASIEN,
+ FECHA,
+ SUBCTA,
+ CONTRA,
+ EURODEBE,
+ BASEEURO,
+ CONCEPTO,
+ FACTURA,
+ IVA,
+ AUXILIAR,
+ SERIE,
+ TIPOOPE,
+ FECHA_EX,
+ FECHA_OP,
+ NFACTICK,
+ FACTURAEX,
+ L340,
+ LRECT349,
+ TIPOCLAVE,
+ TIPOEXENCI,
+ TIPONOSUJE,
+ TIPOFACT,
+ TIPORECTIF,
+ TERIDNIF,
+ TERNIF,
+ TERNOM,
+ FECREGCON,
+ empresa_id
+ )
SELECT vBookNumber ASIEN,
n.bookEntried FECHA,
IF(n.expenceFkDeductible>0, n.expenceFkDeductible, ti.CuentaIvaSoportado) SUBCTA,
s.supplierAccount CONTRA,
- SUM(ROUND(ti.PorcentajeIva * it.taxableBase / 100 /* + 0.0001*/, 2)) EURODEBE,
+ SUM(ROUND(ti.PorcentajeIva * it.taxableBase / 100 /* + 0.0001*/ , 2)) EURODEBE,
SUM(it.taxableBase) BASEEURO,
GROUP_CONCAT(DISTINCT e.`name` SEPARATOR ', ') CONCEPTO,
vSerialNumber FACTURA,
@@ -62094,45 +62031,46 @@ BEGIN
JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = it.transactionTypeSageFk
JOIN invoiceInSerial iis ON iis.code = n.serial
JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = it.expenceFk
- LEFT JOIN (SELECT eWithheld.id
- FROM invoiceInTax hold
- JOIN expence eWithheld ON eWithheld.id = hold.expenceFk AND eWithheld.isWithheld
- WHERE hold.invoiceInFk = vInvoiceInId LIMIT 1
- ) eWithheld ON TRUE
+ LEFT JOIN (
+ SELECT eWithheld.id
+ FROM invoiceInTax hold
+ JOIN expence eWithheld ON eWithheld.id = hold.expenceFk AND eWithheld.isWithheld
+ WHERE hold.invoiceInFk = vInvoiceInId LIMIT 1
+ ) eWithheld ON TRUE
WHERE it.taxTypeSageFk IS NOT NULL
AND it.taxTypeSageFk NOT IN (22, 90)
GROUP BY ti.PorcentajeIva, e.id;
-- Línea iva inversor sujeto pasivo
- INSERT INTO vn2008.XDiario( ASIEN,
- FECHA,
- SUBCTA,
- CONTRA,
- EUROHABER,
- BASEEURO,
- CONCEPTO,
- FACTURA,
- IVA,
- AUXILIAR,
- SERIE,
- TIPOOPE,
- FECHA_EX,
- FECHA_OP,
- NFACTICK,
- FACTURAEX,
- L340,
- LRECT349,
- TIPOCLAVE,
- TIPOEXENCI,
- TIPONOSUJE,
- TIPOFACT,
- TIPORECTIF,
- TERIDNIF,
- TERNIF,
- TERNOM,
- empresa_id
- )
+ INSERT INTO XDiario( ASIEN,
+ FECHA,
+ SUBCTA,
+ CONTRA,
+ EUROHABER,
+ BASEEURO,
+ CONCEPTO,
+ FACTURA,
+ IVA,
+ AUXILIAR,
+ SERIE,
+ TIPOOPE,
+ FECHA_EX,
+ FECHA_OP,
+ NFACTICK,
+ FACTURAEX,
+ L340,
+ LRECT349,
+ TIPOCLAVE,
+ TIPOEXENCI,
+ TIPONOSUJE,
+ TIPOFACT,
+ TIPORECTIF,
+ TERIDNIF,
+ TERNIF,
+ TERNOM,
+ empresa_id
+ )
SELECT vBookNumber ASIEN,
n.bookEntried FECHA,
ti.CuentaIvaRepercutido SUBCTA,
@@ -62172,7 +62110,7 @@ BEGIN
-- Actualización del registro original
UPDATE invoiceIn ii
- JOIN newInvoiceIn ni ON ii.id = ni.id
+ JOIN newInvoiceIn ni ON ii.id = ni.id
SET ii.serialNumber = vSerialNumber,
ii.isBooked = TRUE;
@@ -62180,7 +62118,8 @@ BEGIN
UPDATE XDiario
SET EURODEBE = EURODEBE -
(SELECT IF(ABS(sub.difference) = 0.01, sub.difference, 0)
- FROM(SELECT SUM(IFNULL(ROUND(EURODEBE, 2),0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) difference
+ FROM(
+ SELECT SUM(IFNULL(ROUND(EURODEBE, 2),0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) difference
FROM XDiario
WHERE ASIEN = vBookNumber
)sub
@@ -62189,6 +62128,7 @@ BEGIN
AND EURODEBE <> 0
ORDER BY id DESC
LIMIT 1;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -62201,11 +62141,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInBookingMain__`(vInvoiceInId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInBookingMain__`(vInvoiceInId INT)
BEGIN
DECLARE vTotalAmount,vTotalAmountDivisa DECIMAL(10,2);
DECLARE vBookNumber,vSerialNumber INT;
@@ -62483,11 +62423,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInBookingMain___`(vInvoiceInId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInBookingMain___`(vInvoiceInId INT)
BEGIN
DECLARE vTotalAmount,vTotalAmountDivisa DECIMAL(10,2);
DECLARE vBookNumber,vSerialNumber INT;
@@ -62744,47 +62684,47 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInDueDay_calculate`(vInvoiceInFk INT)
-BEGIN
-
- IF !(SELECT COUNT(*)
- FROM invoiceInDueDay iid
- WHERE iid.invoiceInFk = vInvoiceInFk) THEN
-
- INSERT INTO invoiceInDueDay (invoiceInFk,
- dueDated,
- amount,
- foreignValue)
- SELECT vInvoiceInFk,
- IF(payDay,
- IF(vn2008.next_venc(issued, detalle, payDay) < DATE_ADD(created, INTERVAL 2 DAY),
- DATE_ADD(created, INTERVAL 2 DAY),
- vn2008.next_venc(issued, detalle, payDay)),
- GREATEST(TIMESTAMPADD(DAY, 2, created), TIMESTAMPADD(DAY, detalle, issued))),
- IF((@cont:=@cont + 1) < cont, TRUNCATE(venc / cont, 2),venc-(TRUNCATE(venc / cont, 2) * (cont - 1))),
- IF(@cont < cont, TRUNCATE(foreignValue / cont, 2), foreignValue - (TRUNCATE(foreignValue / cont, 2) * (cont - 1)))
- FROM ( SELECT SUM((1 + (IFNULL(ti.PorcentajeIva, 0) / 100)*(s.countryFk = s2.countryFk)) * iit.taxableBase)/COUNT(DISTINCT(pdd.detalle)) venc,
- SUM(iit.foreignValue)/COUNT(DISTINCT(pdd.detalle)) foreignValue,
- s.payDemFk,
- ii.companyFk,
- COUNT(DISTINCT(pdd.detalle)) cont,
- s.payDay,
- ii.issued,
- DATE(ii.created) created
- FROM invoiceIn ii
- JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
- LEFT JOIN sage.TiposIva AS ti ON ti.CodigoIva= iit.taxTypeSageFk
- JOIN supplier s ON s.id = ii.supplierFk
- JOIN supplier s2 ON s2.id = ii.companyFk
- JOIN vn2008.pay_dem_det pdd ON pdd.id = s.payDemFk
- WHERE ii.id = vInvoiceInFk
- GROUP BY ii.id
- ) sub
- JOIN (SELECT @cont:=0) sub2
- JOIN vn2008.pay_dem_det pdd ON pdd.id = sub.payDemFk
- GROUP BY detalle;
- END IF;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInDueDay_calculate`(vInvoiceInFk INT)
+BEGIN
+
+ IF !(SELECT COUNT(*)
+ FROM invoiceInDueDay iid
+ WHERE iid.invoiceInFk = vInvoiceInFk) THEN
+
+ INSERT INTO invoiceInDueDay (invoiceInFk,
+ dueDated,
+ amount,
+ foreignValue)
+ SELECT vInvoiceInFk,
+ IF(payDay,
+ IF(vn.getNextDueDate(issued, detail, payDay) < DATE_ADD(created, INTERVAL 2 DAY),
+ DATE_ADD(created, INTERVAL 2 DAY),
+ vn.getNextDueDate(issued, detail, payDay)),
+ GREATEST(TIMESTAMPADD(DAY, 2, created), TIMESTAMPADD(DAY, detail, issued))),
+ IF((@cont:=@cont + 1) < cont, TRUNCATE(venc / cont, 2),venc-(TRUNCATE(venc / cont, 2) * (cont - 1))),
+ IF(@cont < cont, TRUNCATE(foreignValue / cont, 2), foreignValue - (TRUNCATE(foreignValue / cont, 2) * (cont - 1)))
+ FROM ( SELECT SUM((1 + (IFNULL(ti.PorcentajeIva, 0) / 100)*(s.countryFk = s2.countryFk)) * iit.taxableBase)/COUNT(DISTINCT(pdd.detail)) venc,
+ SUM(iit.foreignValue)/COUNT(DISTINCT(pdd.detail)) foreignValue,
+ s.payDemFk,
+ ii.companyFk,
+ COUNT(DISTINCT(pdd.detail)) cont,
+ s.payDay,
+ ii.issued,
+ DATE(ii.created) created
+ FROM invoiceIn ii
+ JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
+ LEFT JOIN sage.TiposIva AS ti ON ti.CodigoIva= iit.taxTypeSageFk
+ JOIN supplier s ON s.id = ii.supplierFk
+ JOIN supplier s2 ON s2.id = ii.companyFk
+ JOIN vn.payDemDetail pdd ON pdd.id = s.payDemFk
+ WHERE ii.id = vInvoiceInFk
+ GROUP BY ii.id
+ ) sub
+ JOIN (SELECT @cont:=0) sub2
+ JOIN vn.payDemDetail pdd ON pdd.id = sub.payDemFk
+ GROUP BY detail;
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -62797,11 +62737,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInDueDay_calculate__`(vInvoiceInFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInDueDay_calculate__`(vInvoiceInFk INT)
BEGIN
IF !(SELECT COUNT(*)
@@ -62849,11 +62789,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInDueDay_recalc`(vInvoiceInFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInDueDay_recalc`(vInvoiceInFk INT)
BEGIN
DELETE FROM invoiceInDueDay
@@ -62871,13 +62811,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInTaxMakeByDua`(vDuaFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInTaxMakeByDua`(vDuaFk INT)
BEGIN
DECLARE done BOOL DEFAULT FALSE;
@@ -62918,11 +62858,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInTax_getFromDua`(vDuaFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInTax_getFromDua`(vDuaFk INT)
BEGIN
DECLARE done BOOL DEFAULT FALSE;
@@ -62963,11 +62903,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInTax_getFromEntries`(IN vId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInTax_getFromEntries`(IN vId INT)
BEGIN
DECLARE vRate DOUBLE DEFAULT 1;
DECLARE vDated DATE;
@@ -63019,13 +62959,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOutAgain`(IN vInvoiceRef VARCHAR(15), vTaxArea VARCHAR(25))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutAgain`(IN vInvoiceRef VARCHAR(15), vTaxArea VARCHAR(25))
BEGIN
/* Para tickets ya facturados, vuelve a repetir el proceso de facturación.
@@ -63091,11 +63031,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOutBooking`(IN vInvoice INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutBooking`(IN vInvoice INT)
BEGIN
/* Asienta la factura emitida
*
@@ -63297,13 +63237,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOutBookingRange`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutBookingRange`()
BEGIN
/* Reasentar facturas
@@ -63359,11 +63299,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOutDelete`(vRef VARCHAR(15))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutDelete`(vRef VARCHAR(15))
BEGIN
DECLARE vAsien INTEGER;
DECLARE vSendMail BOOL;
@@ -63438,11 +63378,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOutDelete__`(vRef VARCHAR(15))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutDelete__`(vRef VARCHAR(15))
BEGIN
UPDATE ticket
@@ -63465,11 +63405,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOutFix_BI_RE_IVA__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutFix_BI_RE_IVA__`()
BEGIN
DECLARE done BOOL DEFAULT FALSE;
@@ -63556,13 +63496,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOutListByCompany`(vCompany INT, vStarted DATE, vEnded DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutListByCompany`(vCompany INT, vStarted DATE, vEnded DATE)
BEGIN
SELECT
@@ -63596,13 +63536,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOutTaxAndExpence`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutTaxAndExpence`()
BEGIN
/* Para tickets ya facturados, vuelve a repetir el proceso de facturación.
@@ -63685,146 +63625,231 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_new`(
- vSerial VARCHAR(255),
- vInvoiceDate DATETIME,
- vTaxArea VARCHAR(25),
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_new`(
+ vSerial VARCHAR(255),
+ vInvoiceDate DATETIME,
+ vTaxArea VARCHAR(25),
OUT vNewInvoiceId INT)
-BEGIN
-
-/* Creación de facturas emitidas.
-* requiere previamente tabla ticketToInvoice(id).
-*
-* @param vSerial serie a la cual se hace la factura
-* @param vInvoiceDate fecha de la factura
-* @param vTaxArea tipo de iva en relacion a la empresa y al cliente
-* @param vNewInvoiceId id de la factura que se acaba de generar
-*
-* @return vNewInvoiceId
-*/
-
- DECLARE vSpainCountryCode INT DEFAULT 1;
- DECLARE vIsAnySaleToInvoice BOOL;
- DECLARE vIsAnyServiceToInvoice BOOL;
- DECLARE vNewRef VARCHAR(255);
- DECLARE vWorker INT DEFAULT account.myUser_getId();
- DECLARE vCompany INT;
- DECLARE vClient INT;
- DECLARE vCplusStandardInvoiceTypeFk INT DEFAULT 1;
- DECLARE vCplusCorrectingInvoiceTypeFk INT DEFAULT 6;
- DECLARE vCplusSimplifiedInvoiceTypeFk INT DEFAULT 2;
- DECLARE vCorrectingSerial VARCHAR(1) DEFAULT 'R';
- DECLARE vSimplifiedSerial VARCHAR(1) DEFAULT 'S';
-
- SET vInvoiceDate = IFNULL(vInvoiceDate,CURDATE());
-
- SELECT t.clientFk, t.companyFk
- INTO vClient, vCompany
- FROM ticketToInvoice tt
- JOIN ticket t ON t.id = tt.id
- LIMIT 1;
-
- -- Eliminem de ticketToInvoice els tickets que no han de ser facturats
- DELETE ti.*
- FROM ticketToInvoice ti
- JOIN ticket t ON t.id = ti.id
- JOIN client c ON c.id = t.clientFk
- WHERE YEAR(t.shipped) < 2001
- OR c.isTaxDataChecked = FALSE
- OR t.isDeleted
- OR c.hasToInvoice = FALSE;
-
- SELECT SUM(s.quantity * s.price * (100 - s.discount)/100), ts.id
- INTO vIsAnySaleToInvoice, vIsAnyServiceToInvoice
- FROM ticketToInvoice t
- LEFT JOIN sale s ON s.ticketFk = t.id
- LEFT JOIN ticketService ts ON ts.ticketFk = t.id;
-
- IF (vIsAnySaleToInvoice OR vIsAnyServiceToInvoice)
- AND (vCorrectingSerial = vSerial OR NOT hasAnyNegativeBase())
- THEN
-
- -- el trigger añade el siguiente Id_Factura correspondiente a la vSerial
- INSERT INTO invoiceOut
- (
- ref,
- serial,
- issued,
- clientFk,
- dued,
- companyFk,
- cplusInvoiceType477Fk
- )
- SELECT
- 1,
- vSerial,
- vInvoiceDate,
- vClient,
- getDueDate(vInvoiceDate, dueDay),
- vCompany,
- IF(vSerial = vCorrectingSerial,
- vCplusCorrectingInvoiceTypeFk,
- IF(vSerial = vSimplifiedSerial,
- vCplusSimplifiedInvoiceTypeFk,
- vCplusStandardInvoiceTypeFk))
- FROM client
- WHERE id = vClient;
-
-
- SET vNewInvoiceId = LAST_INSERT_ID();
-
- SELECT `ref`
- INTO vNewRef
- FROM invoiceOut
- WHERE id = vNewInvoiceId;
-
- UPDATE ticket t
- JOIN ticketToInvoice ti ON ti.id = t.id
- SET t.refFk = vNewRef;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
- CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
- SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
- FROM ticketToInvoice ti
- LEFT JOIN vn.ticketState ts ON ti.id = ts.ticket
- JOIN state s
- WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = vn.getAlert3State(ti.id);
-
- INSERT INTO vncontrol.inter(state_id,Id_Ticket,Id_Trabajador)
- SELECT * FROM tmp.updateInter;
-
-
- INSERT INTO ticketLog (action, userFk,originFk, description)
- SELECT 'UPDATE',account.userGetId(),ti.id, CONCAT('Crea factura ',vNewRef)
- FROM ticketToInvoice ti;
-
- CALL invoiceExpenceMake(vNewInvoiceId);
- CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
-
- UPDATE invoiceOut io
- JOIN (
- SELECT SUM(amount) AS total
- FROM invoiceOutExpence
- WHERE invoiceOutFk = vNewInvoiceId
- ) base
- JOIN (
- SELECT SUM(vat) AS total
- FROM invoiceOutTax
- WHERE invoiceOutFk = vNewInvoiceId
- ) vat
- SET io.amount = base.total + vat.total
- WHERE io.id = vNewInvoiceId;
-
- DROP TEMPORARY TABLE tmp.updateInter;
- END IF;
-
- DROP TEMPORARY TABLE `ticketToInvoice`;
+BEGIN
+
+/* Creación de facturas emitidas.
+* requiere previamente tabla ticketToInvoice(id).
+*
+* @param vSerial serie a la cual se hace la factura
+* @param vInvoiceDate fecha de la factura
+* @param vTaxArea tipo de iva en relacion a la empresa y al cliente
+* @param vNewInvoiceId id de la factura que se acaba de generar
+*
+* @return vNewInvoiceId
+*/
+
+ DECLARE vSpainCountryCode INT DEFAULT 1;
+ DECLARE vIsAnySaleToInvoice BOOL;
+ DECLARE vIsAnyServiceToInvoice BOOL;
+ DECLARE vNewRef VARCHAR(255);
+ DECLARE vWorker INT DEFAULT account.myUser_getId();
+ DECLARE vCompany INT;
+ DECLARE vSupplier INT;
+ DECLARE vClient INT;
+ DECLARE vCplusStandardInvoiceTypeFk INT DEFAULT 1;
+ DECLARE vCplusCorrectingInvoiceTypeFk INT DEFAULT 6;
+ DECLARE vCplusSimplifiedInvoiceTypeFk INT DEFAULT 2;
+ DECLARE vCorrectingSerial VARCHAR(1) DEFAULT 'R';
+ DECLARE vSimplifiedSerial VARCHAR(1) DEFAULT 'S';
+ DECLARE vNewInvoiceInId INT;
+ DECLARE vIsInterCompany BOOL;
+
+ SET vInvoiceDate = IFNULL(vInvoiceDate,CURDATE());
+
+ SELECT t.clientFk, t.companyFk
+ INTO vClient, vCompany
+ FROM ticketToInvoice tt
+ JOIN ticket t ON t.id = tt.id
+ LIMIT 1;
+
+ -- Eliminem de ticketToInvoice els tickets que no han de ser facturats
+ DELETE ti.*
+ FROM ticketToInvoice ti
+ JOIN ticket t ON t.id = ti.id
+ JOIN client c ON c.id = t.clientFk
+ WHERE YEAR(t.shipped) < 2001
+ OR c.isTaxDataChecked = FALSE
+ OR t.isDeleted
+ OR c.hasToInvoice = FALSE;
+
+ SELECT SUM(s.quantity * s.price * (100 - s.discount)/100), ts.id
+ INTO vIsAnySaleToInvoice, vIsAnyServiceToInvoice
+ FROM ticketToInvoice t
+ LEFT JOIN sale s ON s.ticketFk = t.id
+ LEFT JOIN ticketService ts ON ts.ticketFk = t.id;
+
+ IF (vIsAnySaleToInvoice OR vIsAnyServiceToInvoice)
+ AND (vCorrectingSerial = vSerial OR NOT hasAnyNegativeBase())
+ THEN
+
+ -- el trigger añade el siguiente Id_Factura correspondiente a la vSerial
+ INSERT INTO invoiceOut
+ (
+ ref,
+ serial,
+ issued,
+ clientFk,
+ dued,
+ companyFk,
+ cplusInvoiceType477Fk
+ )
+ SELECT
+ 1,
+ vSerial,
+ vInvoiceDate,
+ vClient,
+ getDueDate(vInvoiceDate, dueDay),
+ vCompany,
+ IF(vSerial = vCorrectingSerial,
+ vCplusCorrectingInvoiceTypeFk,
+ IF(vSerial = vSimplifiedSerial,
+ vCplusSimplifiedInvoiceTypeFk,
+ vCplusStandardInvoiceTypeFk))
+ FROM client
+ WHERE id = vClient;
+
+
+ SET vNewInvoiceId = LAST_INSERT_ID();
+
+ SELECT `ref`
+ INTO vNewRef
+ FROM invoiceOut
+ WHERE id = vNewInvoiceId;
+
+ UPDATE ticket t
+ JOIN ticketToInvoice ti ON ti.id = t.id
+ SET t.refFk = vNewRef;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
+ CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
+ SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
+ FROM ticketToInvoice ti
+ LEFT JOIN vn.ticketState ts ON ti.id = ts.ticket
+ JOIN state s
+ WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = vn.getAlert3State(ti.id);
+
+ INSERT INTO vncontrol.inter(state_id,Id_Ticket,Id_Trabajador)
+ SELECT * FROM tmp.updateInter;
+
+
+ INSERT INTO ticketLog (action, userFk,originFk, description)
+ SELECT 'UPDATE',account.userGetId(),ti.id, CONCAT('Crea factura ',vNewRef)
+ FROM ticketToInvoice ti;
+
+ CALL invoiceExpenceMake(vNewInvoiceId);
+ CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
+
+ UPDATE invoiceOut io
+ JOIN (
+ SELECT SUM(amount) AS total
+ FROM invoiceOutExpence
+ WHERE invoiceOutFk = vNewInvoiceId
+ ) base
+ JOIN (
+ SELECT SUM(vat) AS total
+ FROM invoiceOutTax
+ WHERE invoiceOutFk = vNewInvoiceId
+ ) vat
+ SET io.amount = base.total + vat.total
+ WHERE io.id = vNewInvoiceId;
+
+ DROP TEMPORARY TABLE tmp.updateInter;
+
+ SELECT ios.isCEE INTO vIsInterCompany
+ FROM vn.ticket t
+ JOIN vn.company c ON c.clientFk = t.clientFk
+ JOIN vn.invoiceOut io ON io.`ref` = t.refFk
+ JOIN vn.invoiceOutSerial ios ON ios.code = io.serial
+ WHERE t.refFk = vNewRef;
+
+ IF (vIsInterCompany) THEN
+
+ SELECT vCompany INTO vSupplier;
+ SELECT id INTO vCompany FROM company WHERE clientFk = vClient;
+
+ INSERT INTO invoiceIn(supplierFk, supplierRef, issued, companyFk)
+ SELECT vSupplier, vNewRef, vInvoiceDate, vCompany;
+
+ SET vNewInvoiceInId = LAST_INSERT_ID();
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+ CREATE TEMPORARY TABLE tmp.ticket
+ (KEY (ticketFk))
+ ENGINE = MEMORY
+ SELECT id ticketFk
+ FROM ticketToInvoice;
+
+ CALL `ticket_getTax`('NATIONAL');
+
+ SET @vTaxableBaseServices := 0.00;
+ SET @vTaxCodeGeneral := NULL;
+
+ INSERT INTO vn.invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+ SELECT vNewInvoiceInId, @vTaxableBaseServices, sub.expenceFk, sub.taxTypeSageFk , sub.transactionTypeSageFk
+ FROM (
+ SELECT @vTaxableBaseServices := SUM(tst.taxableBase) taxableBase, i.expenceFk, i.taxTypeSageFk , i.transactionTypeSageFk, @vTaxCodeGeneral := i.taxClassCodeFk
+ FROM tmp.ticketServiceTax tst
+ JOIN vn.invoiceOutTaxConfig i ON i.taxClassCodeFk = tst.code
+ WHERE i.isService
+ HAVING taxableBase
+ ) sub;
+
+ INSERT INTO vn.invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+ SELECT vNewInvoiceInId, SUM(tt.taxableBase) - IF(tt.code = @vTaxCodeGeneral, @vTaxableBaseServices, 0) taxableBase, i.expenceFk, i.taxTypeSageFk , i.transactionTypeSageFk
+ FROM tmp.ticketTax tt
+ JOIN vn.invoiceOutTaxConfig i ON i.taxClassCodeFk = tt.code
+ WHERE !i.isService
+ GROUP BY tt.pgcFk
+ HAVING taxableBase
+ ORDER BY tt.priority;
+
+ CALL `vn`.`invoiceInDueDay_calculate`(vNewInvoiceInId);
+
+ INSERT INTO vn2008.intrastat_data (recibida_id, intrastat_id, importe, unidades, Paises_Id, neto)
+ SELECT
+ vNewInvoiceInId,
+ i.intrastatFk,
+ CAST(SUM((s.quantity * s.price * (100 - s.discount) / 100)) AS DECIMAL(10,2)) importe,
+ CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL (10 , 2 )) stems,
+ s2.countryFk,
+ CAST(SUM(IF(sv.physicalWeight, sv.physicalWeight, i.density * sub.cm3delivery/1000000)) AS DECIMAL(10,2)) neto
+ FROM vn.sale s
+ LEFT JOIN (SELECT ic.itemFk, ic.cm3delivery
+ FROM vn.itemCost ic
+ WHERE ic.cm3
+ GROUP BY ic.itemFk) sub ON s.itemFk = sub.itemFk
+ LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
+ LEFT JOIN vn.ticket t ON s.ticketFk = t.id
+ LEFT JOIN vn.supplier s2 ON s2.id = t.companyFk
+ LEFT JOIN vn.item i ON i.id = s.itemFk
+ LEFT JOIN vn.intrastat it ON it.id = i.intrastatFk
+ JOIN vn.invoiceOut iOut ON iOut.ref = t.refFk
+ WHERE iOut.`ref` = vNewRef
+ GROUP BY i.intrastatFk
+ ORDER BY i.intrastatFk;
+
+
+ DROP TEMPORARY TABLE tmp.ticket;
+ DROP TEMPORARY TABLE tmp.ticketAmount;
+ DROP TEMPORARY TABLE tmp.ticketTax;
+ DROP TEMPORARY TABLE tmp.ticketServiceTax;
+
+ END IF;
+
+ END IF;
+
+ DROP TEMPORARY TABLE `ticketToInvoice`;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -63835,13 +63860,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_newFromClient`(IN vClientFk int, IN vSerial char(2), IN vMaxShipped date,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_newFromClient`(IN vClientFk int, IN vSerial char(2), IN vMaxShipped date,
IN vCompanyFk int, IN vTaxArea varchar(25),
IN vRef varchar(25), OUT vInvoiceId int)
BEGIN
@@ -63885,48 +63910,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `invoiceOut_newFromClient__` */;
+/*!50003 DROP PROCEDURE IF EXISTS `invoiceOut_newFromTicket` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_newFromClient__`(vClientFk INT, vSerial CHAR(1), vShipped DATE, vCompanyFk INT, vTaxArea VARCHAR(25), OUT vInvoiceId INT)
-BEGIN
-/**
- * Factura los tickets de un cliente
- * @param vTicketFk Id del ticket
- * @param vSerial Serie de factura
- * @return Id factura
- */
- CALL invoiceFromClient(vShipped, vClientFk, vCompanyFk);
- CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
-
- IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
- CALL invoiceOutBooking(vInvoiceId);
- INSERT INTO printServerQueue(priorityFk, reportFk, param1) VALUES(1, 3, vInvoiceId);
- END IF;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `invoiceOut_newFromTicket` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_newFromTicket`(IN vTicketFk int, IN vSerial char(2), IN vTaxArea varchar(25),
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_newFromTicket`(IN vTicketFk int, IN vSerial char(2), IN vTaxArea varchar(25),
IN vRef varchar(25), OUT vInvoiceId int)
BEGIN
/**
@@ -63967,13 +63961,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_new__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_new__`(
vSerial VARCHAR(255),
vInvoiceDate DATETIME,
vTaxArea VARCHAR(25),
@@ -64121,11 +64115,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceTaxMake`(vInvoice INT, vTaxArea VARCHAR(25))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceTaxMake`(vInvoice INT, vTaxArea VARCHAR(25))
BEGIN
/**
* Factura un conjunto de tickets.
@@ -64178,11 +64172,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceTaxMake__`(vInvoice INT, vTaxArea VARCHAR(25))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceTaxMake__`(vInvoice INT, vTaxArea VARCHAR(25))
BEGIN
/**
* Factura un conjunto de tickets.
@@ -64234,11 +64228,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemBarcode_update`(vItemFk INT,vCode VARCHAR(22), vDelete BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemBarcode_update`(vItemFk INT,vCode VARCHAR(22), vDelete BOOL)
BEGIN
IF vDelete THEN
DELETE FROM vn.itemBarcode WHERE itemFk = vItemFk AND code = vCode;
@@ -64258,89 +64252,89 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemCard`(IN `vBarcode` VARCHAR(22), IN `vWarehouseFk` INT, IN isBarcode BOOL)
-BEGIN
-
- /*
- * @deprecated: Utilizar item_getInfo
- */
-
- DECLARE vCacheVisibleFk INT;
- DECLARE vCacheAvailableFk INT;
- DECLARE vVisibleAltillo INT;
- DECLARE vItemFk INT;
-
- IF isBarcode THEN
- SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
- ELSE
- SELECT i.id INTO vItemFk
- FROM vn.item i
- WHERE i.name LIKE CONCAT('%',vBarcode,'%')
- ORDER BY i.id ASC
- LIMIT 1;
- END IF;
-
- IF vItemFk IS NULL THEN
- SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
- END IF;
-
- CALL cache.visible_refresh(vCacheVisibleFk, FALSE,vWarehouseFk);
- CALL cache.available_refresh(vCacheAvailableFk, FALSE,vWarehouseFk, CURDATE());
-
- SELECT SUM(visible) INTO vVisibleAltillo
- FROM vn.itemShelvingStock
- WHERE itemFk = vItemFk AND warehouseFk = vWarehouseFk;
-
- CALL vn.buyUltimate(vWarehouseFk, CURDATE());
-
- SELECT i.id,
- i.longName,
- i.tag5,
- i.value5,
- i.tag6,
- i.value6,
- i.tag7,
- i.value7,
- i.image,
- i.size,
- i.stems,
- i.category,
- i.minimum as min,
- i.upToDown as repo,
- p.name as producer,
- o.code as origin,
- ip.code as nicho,
- ip.reserve as reserva,
- v.visible - IFNULL(vVisibleAltillo,0) as enNicho,
- a.available,
- vVisibleAltillo as enAltillo,
- v.visible as total,
- c.`grouping` as `grouping`,
- c.Packing as packing,
- CONCAT('https://verdnatura.es/vn-image-data/catalog/200x200/', i.image) as urlImage200,
- CONCAT('https://verdnatura.es/vn-image-data/catalog/1600x900/', i.image) as urlImage,
- i.itemPackingTypeFk,
- i.comment as referencia
- FROM vn.item i
- LEFT JOIN vn.producer p ON p.id = i.producerFk
- LEFT JOIN vn.origin o ON o.id = i.originFk
- LEFT JOIN vn.itemPlacement ip ON ip.itemFk = i.id
- LEFT JOIN cache.visible v ON v.calc_id = vCacheVisibleFk AND v.item_id = i.id
- LEFT JOIN cache.available a ON a.calc_id = vCacheAvailableFk AND a.item_id = i.id
- LEFT JOIN (
- SELECT b.itemFk, b2.`grouping`, b2.packing
- FROM tmp.buyUltimate b
- JOIN vn.buy b2 ON b2.id = b.buyFk
- WHERE b.warehouseFk = vWarehouseFk
- ) c ON i.id = c.itemFk
- WHERE i.id = vItemFk;
-
- DROP TEMPORARY TABLE tmp.buyUltimate;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemCard`(IN `vBarcode` VARCHAR(22), IN `vWarehouseFk` INT, IN isBarcode BOOL)
+BEGIN
+
+ /*
+ * @deprecated: Utilizar item_getInfo
+ */
+
+ DECLARE vCacheVisibleFk INT;
+ DECLARE vCacheAvailableFk INT;
+ DECLARE vVisibleAltillo INT;
+ DECLARE vItemFk INT;
+
+ IF isBarcode THEN
+ SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
+ ELSE
+ SELECT i.id INTO vItemFk
+ FROM vn.item i
+ WHERE i.name LIKE CONCAT('%',vBarcode,'%')
+ ORDER BY i.id ASC
+ LIMIT 1;
+ END IF;
+
+ IF vItemFk IS NULL THEN
+ SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
+ END IF;
+
+ CALL cache.visible_refresh(vCacheVisibleFk, FALSE,vWarehouseFk);
+ CALL cache.available_refresh(vCacheAvailableFk, FALSE,vWarehouseFk, CURDATE());
+
+ SELECT SUM(visible) INTO vVisibleAltillo
+ FROM vn.itemShelvingStock
+ WHERE itemFk = vItemFk AND warehouseFk = vWarehouseFk;
+
+ CALL vn.buyUltimate(vWarehouseFk, CURDATE());
+
+ SELECT i.id,
+ i.longName,
+ i.tag5,
+ i.value5,
+ i.tag6,
+ i.value6,
+ i.tag7,
+ i.value7,
+ i.image,
+ i.size,
+ i.stems,
+ i.category,
+ i.minimum as min,
+ i.upToDown as repo,
+ p.name as producer,
+ o.code as origin,
+ ip.code as nicho,
+ ip.reserve as reserva,
+ v.visible - IFNULL(vVisibleAltillo,0) as enNicho,
+ a.available,
+ vVisibleAltillo as enAltillo,
+ v.visible as total,
+ c.`grouping` as `grouping`,
+ c.Packing as packing,
+ CONCAT('https://verdnatura.es/vn-image-data/catalog/200x200/', i.image) as urlImage200,
+ CONCAT('https://verdnatura.es/vn-image-data/catalog/1600x900/', i.image) as urlImage,
+ i.itemPackingTypeFk,
+ i.comment as referencia
+ FROM vn.item i
+ LEFT JOIN vn.producer p ON p.id = i.producerFk
+ LEFT JOIN vn.origin o ON o.id = i.originFk
+ LEFT JOIN vn.itemPlacement ip ON ip.itemFk = i.id
+ LEFT JOIN cache.visible v ON v.calc_id = vCacheVisibleFk AND v.item_id = i.id
+ LEFT JOIN cache.available a ON a.calc_id = vCacheAvailableFk AND a.item_id = i.id
+ LEFT JOIN (
+ SELECT b.itemFk, b2.`grouping`, b2.packing
+ FROM tmp.buyUltimate b
+ JOIN vn.buy b2 ON b2.id = b.buyFk
+ WHERE b.warehouseFk = vWarehouseFk
+ ) c ON i.id = c.itemFk
+ WHERE i.id = vItemFk;
+
+ DROP TEMPORARY TABLE tmp.buyUltimate;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -64353,11 +64347,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemCard__`(IN `vBarcode` VARCHAR(22), IN `vWarehouseFk` INT, isBarcode BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemCard__`(IN `vBarcode` VARCHAR(22), IN `vWarehouseFk` INT, isBarcode BOOL)
BEGIN
DECLARE vCacheVisibleFk INT;
@@ -64443,124 +64437,124 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemDiary__`(IN vItemId INT, IN vWarehouse INT)
-BEGIN
- DECLARE vDateInventory DATETIME;
- DECLARE vCurdate DATE DEFAULT CURDATE();
- DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
-
- SELECT vn.barcodeToItem(vItemId) INTO vItemId;
-
- -- traduccion: date, alertLevel, origin, reference, name, In, Out, Balance
- SELECT inventoried INTO vDateInventory FROM config;
- SET @a = 0;
- SELECT DATE(date) AS date,
- alertLevel,
- stateName,
- origin,
- reference,
- clientFk,
- name,
- `in`,
- `out`,
- @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
- isPicked,
- isTicket,
- `in` as invalue
- FROM
- ( SELECT tr.landed as date,
- b.quantity as `in`,
- NULL as `out`,
- IF(tr.isReceived != FALSE,3, IF(tr.isDelivered,1,0)) as alertLevel,
- st.name AS stateName,
- s.name as name,
- e.ref as reference,
- e.id as origin,
- s.id as clientFk,
- TRUE isPicked,
- FALSE AS isTicket
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel tr ON tr.id = e.travelFk
- JOIN supplier s ON s.id = e.supplierFk
- JOIN alertLevel al ON al.id =
- CASE
- WHEN tr.isReceived != FALSE THEN 3
- WHEN tr.isDelivered THEN 1
- ELSE 0
- END
- JOIN state st ON st.code = al.code
- WHERE tr.landed >= vDateInventory
- AND vWarehouse = tr.warehouseInFk
- AND b.itemFk = vItemId
- AND e.isInventory = 0
- AND e.isRaid = 0
- UNION ALL
-
- SELECT tr.shipped as date,
- NULL as `in`,
- b.quantity as `out`,
- IF(tr.isReceived != FALSE,3, IF(tr.isDelivered,1,0)) as alertLevel,
- st.name AS stateName,
- s.name as name,
- e.ref as reference,
- e.id as origin,
- s.id as clientFk,
- TRUE isPicked,
- FALSE AS isTicket
- FROM buy b
- JOIN entry e ON e.id = b.entryFk
- JOIN travel tr ON tr.id = e.travelFk
- JOIN warehouse w ON w.id = tr.warehouseOutFk
- JOIN supplier s ON s.id = e.supplierFk
- JOIN alertLevel al ON al.id =
- CASE
- WHEN tr.isReceived != FALSE THEN 3
- WHEN tr.isDelivered THEN 1
- ELSE 0
- END
- JOIN state st ON st.code = al.code
- WHERE tr.shipped >= vDateInventory
- AND vWarehouse =tr.warehouseOutFk
- AND s.id <> 4
- AND b.itemFk = vItemId
- AND e.isInventory = 0
- AND w.isFeedStock = 0
- AND e.isRaid = 0
- UNION ALL
-
- SELECT t.shipped as date,
- NULL as `in`,
- s.quantity as `out`,
- al.id as alertLevel,
- st.name AS stateName,
- t.nickname as name,
- t.refFk as reference,
- t.id as origin,
- t.clientFk,
- stk.id as isPicked, -- TRUE as isPicked
- TRUE as isTicket
- FROM sale s
- JOIN ticket t ON t.id = s.ticketFk
- LEFT JOIN ticketState ts ON ts.ticket = t.id
- LEFT JOIN state st ON st.code = ts.code
- JOIN client c ON c.id = t.clientFk
- JOIN alertLevel al ON al.id =
- CASE
- WHEN t.shipped < vCurdate THEN 3
- WHEN t.shipped > vDayEnd THEN 0
- ELSE IFNULL(ts.alertLevel, 0)
- END
- LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = 14 -- comentar
- WHERE t.shipped >= vDateInventory
- AND s.itemFk = vItemId
- AND vWarehouse =t.warehouseFk
- ) AS itemDiary
- ORDER BY date, isTicket, alertLevel DESC, isPicked DESC, `in` DESC, `out` DESC;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemDiary__`(IN vItemId INT, IN vWarehouse INT)
+BEGIN
+ DECLARE vDateInventory DATETIME;
+ DECLARE vCurdate DATE DEFAULT CURDATE();
+ DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
+
+ SELECT vn.barcodeToItem(vItemId) INTO vItemId;
+
+ -- traduccion: date, alertLevel, origin, reference, name, In, Out, Balance
+ SELECT inventoried INTO vDateInventory FROM config;
+ SET @a = 0;
+ SELECT DATE(date) AS date,
+ alertLevel,
+ stateName,
+ origin,
+ reference,
+ clientFk,
+ name,
+ `in`,
+ `out`,
+ @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
+ isPicked,
+ isTicket,
+ `in` as invalue
+ FROM
+ ( SELECT tr.landed as date,
+ b.quantity as `in`,
+ NULL as `out`,
+ IF(tr.isReceived != FALSE,3, IF(tr.isDelivered,1,0)) as alertLevel,
+ st.name AS stateName,
+ s.name as name,
+ e.ref as reference,
+ e.id as origin,
+ s.id as clientFk,
+ TRUE isPicked,
+ FALSE AS isTicket
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel tr ON tr.id = e.travelFk
+ JOIN supplier s ON s.id = e.supplierFk
+ JOIN alertLevel al ON al.id =
+ CASE
+ WHEN tr.isReceived != FALSE THEN 3
+ WHEN tr.isDelivered THEN 1
+ ELSE 0
+ END
+ JOIN state st ON st.code = al.code
+ WHERE tr.landed >= vDateInventory
+ AND vWarehouse = tr.warehouseInFk
+ AND b.itemFk = vItemId
+ AND e.isInventory = 0
+ AND e.isRaid = 0
+ UNION ALL
+
+ SELECT tr.shipped as date,
+ NULL as `in`,
+ b.quantity as `out`,
+ IF(tr.isReceived != FALSE,3, IF(tr.isDelivered,1,0)) as alertLevel,
+ st.name AS stateName,
+ s.name as name,
+ e.ref as reference,
+ e.id as origin,
+ s.id as clientFk,
+ TRUE isPicked,
+ FALSE AS isTicket
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel tr ON tr.id = e.travelFk
+ JOIN warehouse w ON w.id = tr.warehouseOutFk
+ JOIN supplier s ON s.id = e.supplierFk
+ JOIN alertLevel al ON al.id =
+ CASE
+ WHEN tr.isReceived != FALSE THEN 3
+ WHEN tr.isDelivered THEN 1
+ ELSE 0
+ END
+ JOIN state st ON st.code = al.code
+ WHERE tr.shipped >= vDateInventory
+ AND vWarehouse =tr.warehouseOutFk
+ AND s.id <> 4
+ AND b.itemFk = vItemId
+ AND e.isInventory = 0
+ AND w.isFeedStock = 0
+ AND e.isRaid = 0
+ UNION ALL
+
+ SELECT t.shipped as date,
+ NULL as `in`,
+ s.quantity as `out`,
+ al.id as alertLevel,
+ st.name AS stateName,
+ t.nickname as name,
+ t.refFk as reference,
+ t.id as origin,
+ t.clientFk,
+ stk.id as isPicked, -- TRUE as isPicked
+ TRUE as isTicket
+ FROM sale s
+ JOIN ticket t ON t.id = s.ticketFk
+ LEFT JOIN ticketState ts ON ts.ticket = t.id
+ LEFT JOIN state st ON st.code = ts.code
+ JOIN client c ON c.id = t.clientFk
+ JOIN alertLevel al ON al.id =
+ CASE
+ WHEN t.shipped < vCurdate THEN 3
+ WHEN t.shipped > vDayEnd THEN 0
+ ELSE IFNULL(ts.alertLevel, 0)
+ END
+ LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = 14 -- comentar
+ WHERE t.shipped >= vDateInventory
+ AND s.itemFk = vItemId
+ AND vWarehouse =t.warehouseFk
+ ) AS itemDiary
+ ORDER BY date, isTicket, alertLevel DESC, isPicked DESC, `in` DESC, `out` DESC;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -64571,13 +64565,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemFreight_Show`(vItemFk INT, vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemFreight_Show`(vItemFk INT, vWarehouseFk INT)
BEGIN
SELECT cm3 Volumen_Entrada,
@@ -64611,13 +64605,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemFuentesBalance`(vDaysInFuture INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemFuentesBalance`(vDaysInFuture INT)
BEGIN
/* Se utiliza para calcular la necesidad de mover mercancia entre el almacén de fuentes y el nuestro
@@ -64706,11 +64700,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemGetVisibleAvailable__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemGetVisibleAvailable__`(
vItem INT,
vDate DATE,
vWarehouse TINYINT,
@@ -64728,13 +64722,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemLastEntries__`(IN `vItem` INT, IN `vDays` DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemLastEntries__`(IN `vItem` INT, IN `vDays` DATE)
BEGIN
SELECT
w.id AS warehouseFk,
@@ -64778,13 +64772,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemPlacementFromTicket`(vTicket INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementFromTicket`(vTicket INT)
BEGIN
/**
* Llama a itemPlacementUpdateVisible
@@ -64815,13 +64809,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemPlacementReloadVisible`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementReloadVisible`()
BEGIN
/**
* Reemplaza únicamente el campo itemPlacement.pickable
@@ -64884,11 +64878,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemPlacementSave`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementSave`(
vCode VARCHAR(22),
vPlacement VARCHAR(10),
vWarehouseFk INT )
@@ -64915,13 +64909,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemPlacementSupplyAiming`(vShelvingFk VARCHAR(10), quantity INT, vItemFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementSupplyAiming`(vShelvingFk VARCHAR(10), quantity INT, vItemFk INT)
BEGIN
SELECT ish.itemFk,
@@ -64958,13 +64952,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemPlacementSupplyCloseOrder`(vId INT, vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementSupplyCloseOrder`(vId INT, vQuantity INT)
BEGIN
UPDATE vn.itemPlacementSupply
@@ -64981,13 +64975,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemPlacementSupplyGetOrder`(vSector INT )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementSupplyGetOrder`(vSector INT )
BEGIN
DECLARE vId INT;
@@ -65031,13 +65025,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemPlacementSupplyStockGetTargetList`(vItemFk INT,vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementSupplyStockGetTargetList`(vItemFk INT,vSectorFk INT)
BEGIN
/* Devuelve la lista de ubicaciones para itemFk en ese sector. Se utiliza en la preparación previa.
@@ -65068,7 +65062,7 @@ BEGIN
AND ish.visible > 0
AND ish.itemFk = vItemFk
GROUP BY ish.id
- ORDER BY ish.priority DESC;
+ ORDER BY sh.priority DESC;
END ;;
@@ -65081,13 +65075,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemPlacementUpdateVisible`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementUpdateVisible`()
BEGIN
/**
* Reemplaza únicamente el campo itemPlacement.pickable
@@ -65161,11 +65155,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemProposal`(vItemFk INT, vTicketFk INT,vShowType BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemProposal`(vItemFk INT, vTicketFk INT,vShowType BOOL)
BEGIN
/**
@@ -65261,11 +65255,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemProposal_Add`(vSaleFk INT, vMateFk INT, vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemProposal_Add`(vSaleFk INT, vMateFk INT, vQuantity INT)
BEGIN
/**
* Añade un nuevo articulo para sustituir a otro, y actualiza la memoria de sustituciones.
@@ -65331,13 +65325,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemProposal_beta`(vItemFk INT, vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemProposal_beta`(vItemFk INT, vTicketFk INT)
BEGIN
DECLARE vWarehouseFk INT;
@@ -65420,13 +65414,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemProposal__`(vItemFk INT, vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemProposal__`(vItemFk INT, vTicketFk INT)
BEGIN
DECLARE vWarehouseFk INT;
@@ -65507,11 +65501,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemProposal__2`(vItemFk INT, vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemProposal__2`(vItemFk INT, vTicketFk INT)
BEGIN
DECLARE vWarehouseFk INT;
@@ -65594,13 +65588,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemRefreshTags`(IN vItem INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemRefreshTags`(IN vItem INT)
BEGIN
/**
* Crea la tabla temporal necesaria para el procedimiento item_refreshTags
@@ -65629,11 +65623,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemSale_byWeek`(vWeek INT, IN vYear INT, vItemFk INT, vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemSale_byWeek`(vWeek INT, IN vYear INT, vItemFk INT, vWarehouseFk INT)
BEGIN
DECLARE vStarted DATE;
@@ -65688,11 +65682,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemSale_byWeek__`(vWeek INT, IN vYear INT, vItemFk INT, vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemSale_byWeek__`(vWeek INT, IN vYear INT, vItemFk INT, vWarehouseFk INT)
BEGIN
DECLARE vStarted DATE;
@@ -65746,13 +65740,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemSaveMin`(min INT,vBarcode VARCHAR(22))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemSaveMin`(min INT,vBarcode VARCHAR(22))
BEGIN
DECLARE vItemFk INT;
@@ -65774,11 +65768,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemSearchShelving`(`vShelvingFk` VARCHAR(3))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemSearchShelving`(`vShelvingFk` VARCHAR(3))
BEGIN
SELECT p.`column` AS col , p.`row`
FROM vn.shelving s
@@ -65794,13 +65788,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingDelete`(vId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingDelete`(vId INT)
BEGIN
DELETE FROM vn.itemShelving WHERE id = vId;
@@ -65811,19 +65805,22 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingEdit` */;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingEdit__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingEdit`(vVisible INT,vPacking INT,vId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingEdit__`(vVisible INT,vPacking INT,vId INT)
BEGIN
+ /*
+ * @deprecated: utilizar itemShelving_update
+ */
UPDATE vn.itemShelving SET available = vVisible, visible = vVisible, packing = vPacking WHERE id = vId;
END ;;
@@ -65832,18 +65829,22 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingList` */;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingList__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingList`(IN `vShelvingFk` VARCHAR(8))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingList__`(IN `vShelvingFk` VARCHAR(8))
BEGIN
+
+ /*
+ * @deprecated:Utilizar itemShelving_get
+ */
/*MODIFICADA POR QUIQUE: OBTENEMOS DEEP Y PARKING*/
SELECT ish.itemFk as item,
@@ -65874,11 +65875,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingLog_get`(vShelvingFk VARCHAR(10) )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingLog_get`(vShelvingFk VARCHAR(10) )
BEGIN
/**
@@ -65916,93 +65917,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingMake` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingMake`(IN `vShelvingFk` VARCHAR(8), IN `vBarcode` VARCHAR(22), IN `vShelve` VARCHAR(2), IN `vDeep` INT, IN `vQuantity` INT, IN `vPackagingFk` VARCHAR(10), IN `vGrouping` INT, IN `vPacking` INT, IN `vWarehouseFk` INT, IN `vLevel` INT)
-BEGIN
-
- DECLARE vItemFk INT;
-
- SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
-
- /*SELECT itemFk INTO vItemFk
- FROM vn.buy b
- WHERE b.id = vItemFk;*/
-
- IF (SELECT COUNT(*) FROM vn.shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
-
- INSERT IGNORE INTO vn.parking(`code`) VALUES(vShelvingFk);
- INSERT INTO vn.shelving(`code`, parkingFk)
- SELECT vShelvingFk, id
- FROM vn.parking
- WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci;
-
- END IF;
-
- IF (SELECT COUNT(*) FROM vn.itemShelving
- WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
- AND itemFk = vItemFk
- AND packing = vPacking) = 1 THEN
-
- UPDATE vn.itemShelving SET quantity = quantity+vQuantity,visible = visible+vQuantity,available = available+vQuantity
- WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
-
- ELSE
- CALL cache.last_buy_refresh(FALSE);
- INSERT INTO itemShelving( itemFk,
- shelvingFk,
- shelve,
- deep,
- quantity,
- visible,
- available,
- `grouping`,
- packing,
- packagingFk,
- level)
-
- SELECT
- vItemFk,
- vShelvingFk,
- vShelve,
- vDeep,
- vQuantity,
- vQuantity,
- vQuantity,
- IF(vGrouping = 0, IFNULL(b.packing, vPacking), vGrouping) as `grouping`,
- IF(vPacking = 0, b.packing, vPacking) as packing,
- IF(vPackagingFk = '', b.packageFk, vPackagingFk) as packaging,
- vLevel
- FROM vn.item i
- LEFT JOIN cache.last_buy lb ON i.id = lb.item_id AND lb.warehouse_id = vWarehouseFk
- LEFT JOIN vn.buy b ON b.id = lb.buy_id
- WHERE i.id = vItemFk;
- END IF;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingMakeFromDate` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingMakeFromDate`(IN `vShelvingFk` VARCHAR(8), IN `vBarcode` VARCHAR(22), IN `vShelve` VARCHAR(2), IN `vDeep` INT, IN `vQuantity` INT, IN `vPackagingFk` VARCHAR(10), IN `vGrouping` INT, IN `vPacking` INT, IN `vWarehouseFk` INT, IN `vLevel` INT,`vCreated` VARCHAR(22))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingMakeFromDate`(IN `vShelvingFk` VARCHAR(8), IN `vBarcode` VARCHAR(22), IN `vShelve` VARCHAR(2), IN `vDeep` INT, IN `vQuantity` INT, IN `vPackagingFk` VARCHAR(10), IN `vGrouping` INT, IN `vPacking` INT, IN `vWarehouseFk` INT, IN `vLevel` INT,`vCreated` VARCHAR(22))
BEGIN
@@ -66076,17 +66001,98 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingMake__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingMake__`(IN `vShelvingFk` VARCHAR(8), IN `vBarcode` VARCHAR(22), IN `vShelve` VARCHAR(2), IN `vDeep` INT, IN `vQuantity` INT, IN `vPackagingFk` VARCHAR(10), IN `vGrouping` INT, IN `vPacking` INT, IN `vWarehouseFk` INT, IN `vLevel` INT)
+BEGIN
+
+
+ /*
+ * @deprecated:utilizar itemShelving_add
+ */
+
+ DECLARE vItemFk INT;
+
+ SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
+
+ /*SELECT itemFk INTO vItemFk
+ FROM vn.buy b
+ WHERE b.id = vItemFk;*/
+
+ IF (SELECT COUNT(*) FROM vn.shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
+
+ INSERT IGNORE INTO vn.parking(`code`) VALUES(vShelvingFk);
+ INSERT INTO vn.shelving(`code`, parkingFk)
+ SELECT vShelvingFk, id
+ FROM vn.parking
+ WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci;
+
+ END IF;
+
+ IF (SELECT COUNT(*) FROM vn.itemShelving
+ WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
+ AND itemFk = vItemFk
+ AND packing = vPacking) = 1 THEN
+
+ UPDATE vn.itemShelving SET quantity = quantity+vQuantity,visible = visible+vQuantity,available = available+vQuantity
+ WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
+
+ ELSE
+ CALL cache.last_buy_refresh(FALSE);
+ INSERT INTO itemShelving( itemFk,
+ shelvingFk,
+ shelve,
+ deep,
+ quantity,
+ visible,
+ available,
+ `grouping`,
+ packing,
+ packagingFk,
+ level)
+
+ SELECT
+ vItemFk,
+ vShelvingFk,
+ vShelve,
+ vDeep,
+ vQuantity,
+ vQuantity,
+ vQuantity,
+ IF(vGrouping = 0, IFNULL(b.packing, vPacking), vGrouping) as `grouping`,
+ IF(vPacking = 0, b.packing, vPacking) as packing,
+ IF(vPackagingFk = '', b.packageFk, vPackagingFk) as packaging,
+ vLevel
+ FROM vn.item i
+ LEFT JOIN cache.last_buy lb ON i.id = lb.item_id AND lb.warehouse_id = vWarehouseFk
+ LEFT JOIN vn.buy b ON b.id = lb.buy_id
+ WHERE i.id = vItemFk;
+ END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingMatch` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingMatch`(vEntryFk INT, vAllTravel BOOLEAN, vFromTimed DATETIME, vToTimed DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingMatch`(vEntryFk INT, vAllTravel BOOLEAN, vFromTimed DATETIME, vToTimed DATETIME)
BEGIN
DECLARE vTravelFk INT;
@@ -66124,13 +66130,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingPlacementSupplyAdd`(vItemShelvingFk INT, vItemPlacementSupplyFk INT, vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingPlacementSupplyAdd`(vItemShelvingFk INT, vItemPlacementSupplyFk INT, vQuantity INT)
BEGIN
INSERT INTO vn.itemShelvingPlacementSupply( itemShelvingFk,
@@ -66159,13 +66165,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingProblem`(vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingProblem`(vSectorFk INT)
BEGIN
DECLARE vVisibleCache INT;
@@ -66223,11 +66229,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingRadar`(vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingRadar`(vSectorFk INT)
proc:BEGIN
DECLARE vCalcVisibleFk INT;
@@ -66442,13 +66448,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingRadar_Entry`(vEntryFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingRadar_Entry`(vEntryFk INT)
BEGIN
DECLARE vWarehouseFk INT DEFAULT 1;
@@ -66509,11 +66515,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingRadar_Entry_State_beta`(vEntryFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingRadar_Entry_State_beta`(vEntryFk INT)
BEGIN
DECLARE vWarehouseFk INT DEFAULT 1;
@@ -66560,11 +66566,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingRadar_Urgent`(vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingRadar_Urgent`(vWorkerFk INT)
BEGIN
DECLARE vCalcVisibleFk INT;
DECLARE vWarehouseFk INT DEFAULT 60;
@@ -66654,11 +66660,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingRadar_Urgent__`(vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingRadar_Urgent__`(vWorkerFk INT)
BEGIN
DECLARE vCalcVisibleFk INT;
DECLARE vWarehouseFk INT DEFAULT 60;
@@ -66746,13 +66752,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingSaleAdd`(vItemShelvingFk INT, saleFk INT, vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSaleAdd`(vItemShelvingFk INT, saleFk INT, vQuantity INT)
BEGIN
IF saleFk <> 0 THEN
@@ -66785,28 +66791,37 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingSaleSupplyAdd`(vItemShelvingFk INT, saleFk INT, vQuantity INT,idMovimiento INT)
-BEGIN
-
-INSERT INTO vn.itemShelvingSale( itemShelvingFk,
- saleFk,
- quantity,
- userFk)
- VALUES ( vItemShelvingFk,
- saleFk,
- vQuantity,
- getUser());
-
- UPDATE vn.itemShelving
- SET quantity = quantity - vQuantity,
- visible = visible - vQuantity,
- available = available - vQuantity
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSaleSupplyAdd`(vItemShelvingFk INT, saleFk INT, vQuantity INT)
+BEGIN
+
+/*
+ * Añade línea a itemShelvingSale y regulariza el carro
+ *
+ * @param vItemShelvingFk Id itemShelving
+ * @param saleFk Id de sale
+ * @param vQuantity cantidad a regularizar
+ *
+ */
+
+ INSERT INTO itemShelvingSale( itemShelvingFk,
+ saleFk,
+ quantity,
+ userFk)
+ VALUES ( vItemShelvingFk,
+ saleFk,
+ vQuantity,
+ getUser());
+
+ UPDATE itemShelving
+ SET quantity = quantity - vQuantity,
+ visible = visible - vQuantity,
+ available = available - vQuantity
WHERE id = vItemShelvingFk;
-
- UPDATE vn2008.Movimientos_mark
- SET valor = 1
- WHERE Id_Movimiento = idMovimiento;
-
+
+ UPDATE vn2008.Movimientos_mark
+ SET valor = 1
+ WHERE Id_Movimiento = saleFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -66819,11 +66834,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingSaleSupplyAddVoz`(vItemShelvingFk VARCHAR(50), saleFk INT, vQuantity INT,idMovimiento INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSaleSupplyAddVoz`(vItemShelvingFk VARCHAR(50), saleFk INT, vQuantity INT,idMovimiento INT)
BEGIN
@@ -66861,7 +66876,7 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingTicketSource__` */;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingSaleSupplyAdd_` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -66871,7 +66886,45 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingTicketSource__`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSaleSupplyAdd_`(vItemShelvingFk INT, saleFk INT, vQuantity INT,idMovimiento INT)
+BEGIN
+
+INSERT INTO vn.itemShelvingSale( itemShelvingFk,
+ saleFk,
+ quantity,
+ userFk)
+ VALUES ( vItemShelvingFk,
+ saleFk,
+ vQuantity,
+ getUser());
+
+ UPDATE vn.itemShelving
+ SET quantity = quantity - vQuantity,
+ visible = visible - vQuantity,
+ available = available - vQuantity
+ WHERE id = vItemShelvingFk;
+
+ UPDATE vn2008.Movimientos_mark
+ SET valor = 1
+ WHERE Id_Movimiento = idMovimiento;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingTicketSource__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingTicketSource__`(vTicketFk INT)
BEGIN
DECLARE vCalcFk INT;
DECLARE vWarehouseFk INT;
@@ -66912,11 +66965,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingTransfer`(vItemShelvingFk INT,shelvingFkD VARCHAR(22))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingTransfer`(vItemShelvingFk INT,shelvingFkD VARCHAR(22))
BEGIN
UPDATE vn.itemShelving
@@ -66935,13 +66988,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vShelve VARCHAR(2), IN vDeep INT, IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT, IN vLevel INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vShelve VARCHAR(2), IN vDeep INT, IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT, IN vLevel INT)
BEGIN
/**
@@ -66963,7 +67016,7 @@ BEGIN
DECLARE vItemFk INT;
SELECT barcodeToItem(vBarcode) INTO vItemFk;
-
+
IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
INSERT IGNORE INTO parking(code) VALUES(vShelvingFk);
@@ -66973,7 +67026,7 @@ BEGIN
WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci;
END IF;
-
+
IF (SELECT COUNT(*) FROM itemShelving
WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
AND itemFk = vItemFk
@@ -67025,11 +67078,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_BuyerGet`( )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_BuyerGet`( )
BEGIN
SELECT * FROM vn.buyer;
@@ -67044,13 +67097,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_BuyerTask`(vWorkerFk INT )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_BuyerTask`(vWorkerFk INT )
BEGIN
SELECT ish.id,
@@ -67085,11 +67138,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_filterBuyer`(vBuyerFk INT, vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_filterBuyer`(vBuyerFk INT, vWarehouseFk INT)
proc:BEGIN
/**
* Lista de articulos filtrados por comprador
@@ -67183,11 +67236,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_get`(IN vShelvingFk VARCHAR(8))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_get`(IN vShelvingFk VARCHAR(8))
BEGIN
/**
* Lista artículos de itemshelving
@@ -67213,6 +67266,48 @@ BEGIN
LEFT JOIN parking p ON s.parkingFk = p.id
WHERE ish.shelvingFk COLLATE utf8_unicode_ci = vShelvingFk;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_getInfo` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_getInfo`(vItemFk VARCHAR(22))
+BEGIN
+
+ /*
+ * Muestra información realtiva a la ubicación de un ítem
+ *
+ * @param vItemFk Id del ítem
+ *
+ */
+
+ SELECT vn.barcodeToItem(vItemFk) INTO vItemFk;
+
+ SELECT pk.code as Parking,
+ sh.code as Matricula,
+ ish.visible as visible,
+ ish.available as Disponible,
+ ish.level as level,
+ ish.created as created,
+ ish.itemFk as itemFk,
+ sh.priority
+ FROM vn.itemShelving ish
+ JOIN vn.shelving sh ON sh.`code` = ish.shelvingFk
+ JOIN vn.parking pk ON pk.id = sh.parkingFk
+ WHERE ish.itemFk = vItemFk
+ ORDER BY sh.priority DESC, created ASC;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -67225,11 +67320,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_getSaleDate`(vShelvingFk VARCHAR(3))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_getSaleDate`(vShelvingFk VARCHAR(3))
BEGIN
/* Devuelve la minima fecha en que se necesita cada producto en esa matricula.
@@ -67326,52 +67421,53 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_inventory`(vParkingFromFk INT, vParkingToFk INT)
-BEGIN
-
- /* Devuelve un listado de ubicaciones a revisar
- *
- * @param vParkingFromFk Parking de partida, identificador de vn.parking
- * @param vParkingToFk Parking de llegada, identificador de vn.parking
- */
-
- DECLARE vSectorFk INT;
- DECLARE vPickingOrderFrom INT;
- DECLARE vPickingOrderTo INT;
-
- SELECT p.sectorFk, p.pickingOrder INTO vSectorFk, vPickingOrderFrom
- FROM vn.parking p
- WHERE p.id = vParkingFromFk;
-
- SELECT p.pickingOrder INTO vPickingOrderTo
- FROM vn.parking p
- WHERE p.id = vParkingToFk;
-
- CALL vn.visible_getMisfit(vSectorFk);
-
- SELECT p.code parking ,
- ish.shelvingFk ,
- ish.itemFk,
- i.longName,
- ish.visible ,
- ish.visible / ish.packing packs,
- ish.packing,
- sm.visible - sm.parked faltan
- FROM vn.itemShelving ish
- JOIN vn.item i ON i.id = ish.itemFk
- JOIN tmp.stockMisfit sm ON sm.itemFk = ish.itemFk
- JOIN vn.shelving sh ON sh.code = ish.shelvingFk
- JOIN vn.parking p ON p.id = sh.parkingFk
- WHERE p.pickingOrder BETWEEN vPickingOrderFrom AND vPickingOrderTo
- AND p.sectorFk = vSectorFk
- ORDER BY p.pickingOrder ;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_inventory`(vParkingFromFk INT, vParkingToFk INT)
+BEGIN
+
+ /**
+ * Devuelve un listado de ubicaciones a revisar
+ *
+ * @param vParkingFromFk Parking de partida, identificador de vn.parking
+ * @param vParkingToFk Parking de llegada, identificador de vn.parking
+ */
+
+ DECLARE vSectorFk INT;
+ DECLARE vPickingOrderFrom INT;
+ DECLARE vPickingOrderTo INT;
+
+ SELECT p.sectorFk, p.pickingOrder INTO vSectorFk, vPickingOrderFrom
+ FROM vn.parking p
+ WHERE p.id = vParkingFromFk;
+
+ SELECT p.pickingOrder INTO vPickingOrderTo
+ FROM vn.parking p
+ WHERE p.id = vParkingToFk;
+
+ CALL vn.visible_getMisfit(vSectorFk);
+
+ SELECT p.code parking ,
+ ish.shelvingFk ,
+ ish.itemFk,
+ i.longName,
+ ish.visible ,
+ ish.visible / ish.packing packs,
+ ish.packing,
+ sm.visible - sm.parked faltan
+ FROM vn.itemShelving ish
+ JOIN vn.item i ON i.id = ish.itemFk
+ JOIN tmp.stockMisfit sm ON sm.itemFk = ish.itemFk
+ JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+ JOIN vn.parking p ON p.id = sh.parkingFk
+ WHERE p.pickingOrder BETWEEN vPickingOrderFrom AND vPickingOrderTo
+ AND p.sectorFk = vSectorFk
+ ORDER BY p.pickingOrder ;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -67382,13 +67478,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_StarsUpdate`(vId INT, vStars INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_StarsUpdate`(vId INT, vStars INT)
BEGIN
UPDATE vn.itemShelving
@@ -67407,11 +67503,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemShelving_update`(vVisible INT, vPacking INT, vShelf INT ,vGrouping INT )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_update`(vVisible INT, vPacking INT, vShelf INT ,vGrouping INT )
BEGIN
/**
* Actualiza itemShelving.
@@ -67438,13 +67534,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemStock`(vWarehouseFk SMALLINT, vDated DATETIME, vItemFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemStock`(vWarehouseFk SMALLINT, vDated DATETIME, vItemFk INT)
BEGIN
/**
* Calcula el stock del vWarehouseFk desde FechaInventario hasta vDated
@@ -67503,90 +67599,6 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemStockUpdate` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemStockUpdate`(
- vItemFk INT,
- vWarehouseFk INT,
- vNewVisible INT,
- vIsTrash BOOLEAN)
-BEGIN
-
- DECLARE vTicketFk INT;
- DECLARE vClientFk INT;
- DECLARE vCompanyVnlFk INT DEFAULT 442;
- DECLARE vVisible INT DEFAULT 0;
- DECLARE vCalc INT;
- DECLARE vParkedStuff INT;
-
- SELECT barcodeToItem(vItemFk) INTO vItemFk;
-
- CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
-
- SELECT IFNULL(visible,0) INTO vVisible
- FROM cache.visible
- WHERE calc_id = vCalc
- AND item_id = vItemFk;
-
- SELECT sum(visible) INTO vParkedStuff
- FROM itemShelvingStock
- WHERE warehouseFk = vWarehouseFk
- AND itemFk = vItemFk;
-
- SET vNewVisible = vNewVisible + IFNULL(vParkedStuff,0);
-
- SELECT IF(vIsTrash, 200, 400) INTO vClientFk;
-
- SELECT t.id INTO vTicketFk
- FROM ticket t
- JOIN address a ON a.id=t.addressFk
- WHERE t.warehouseFk = vWarehouseFk
- AND t.clientFk = vClientFk
- AND DATE(t.shipped) = CURDATE()
- AND a.isDefaultAddress
- LIMIT 1;
-
- IF vTicketFk IS NULL THEN
-
- CALL ticket_add(
- vClientFk,
- CURDATE(),
- vWarehouseFk,
- vCompanyVnlFk,
- NULL,
- NULL,
- NULL,
- CURDATE(),
- account.userGetId(),
- FALSE,
- vTicketFk);
-
- END IF;
-
- INSERT INTO sale(ticketFk, itemFk, concept, quantity, price, discount)
- SELECT vTicketFk, vItemFk, CONCAT(longName,' ', getWorkerCode(), ' ',LEFT(CAST(NOW() AS TIME),5)), vVisible - vNewVisible, 0, 0
- FROM item
- WHERE id = vItemFk;
-
- UPDATE cache.visible
- SET visible = vNewVisible
- WHERE calc_id = vCalc
- AND item_id = vItemFk;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemStockUpdate__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -67597,65 +67609,74 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemStockUpdate__`(
- vItemFk INT,
- vWarehouseFk INT,
- vNewVisible INT,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemStockUpdate__`(
+ vItemFk INT,
+ vWarehouseFk INT,
+ vNewVisible INT,
vIsTrash BOOLEAN)
-BEGIN
-
- DECLARE vTicketFk INT;
- DECLARE vClientFk INT;
- DECLARE vCompanyVnlFk INT DEFAULT 442;
- DECLARE vAgencyModeOthersFk INT DEFAULT 2;
- DECLARE vVisible INT DEFAULT 0;
- DECLARE vCalc INT;
- DECLARE vCurrentTime VARCHAR(5);
- DECLARE vParkedStuff INT;
-
- SELECT vn.barcodeToItem(vItemFk) INTO vItemFk;
-
- CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
-
- SELECT IFNULL(visible,0) INTO vVisible
- FROM cache.visible
- WHERE calc_id = vCalc
- AND item_id = vItemFk;
-
- SELECT sum(visible) INTO vParkedStuff
- FROM vn.itemShelvingStock
- WHERE warehouseFk = vWarehouseFk
- AND itemFk = vItemFk;
-
- SET vNewVisible = vNewVisible + IFNULL(vParkedStuff,0);
-
- SELECT IF(vIsTrash,200,400) INTO vClientFk;
-
- SELECT t.id INTO vTicketFk
- FROM vn.ticket t
- JOIN vn.address a ON a.id=t.addressFk
- WHERE t.warehouseFk = vWarehouseFk
- AND t.clientFk = vClientFk
- AND DATE(t.shipped) = CURDATE()
- AND a.isDefaultAddress
- LIMIT 1;
-
- IF vTicketFk IS NULL THEN
-
- CALL vn.ticketCreateWithoutZone(vClientFk, CURDATE(), vWarehouseFk, vCompanyVnlFk, NULL, vAgencyModeOthersFk, NULL, CURDATE(), account.userGetId(),vTicketFk);
-
- END IF;
-
- INSERT INTO sale(ticketFk, itemFk, concept, quantity, price, discount)
- SELECT vTicketFk, vItemFk, CONCAT(longName," ",vn.getWorkerCode(), " ",LEFT(CAST(NOW() AS TIME),5)), vVisible - vNewVisible,0,0
- FROM vn.item
- WHERE id = vItemFk;
-
- UPDATE cache.visible
- SET visible = vNewVisible
- WHERE calc_id = vCalc
- AND item_id = vItemFk;
-
+BEGIN
+
+ DECLARE vTicketFk INT;
+ DECLARE vClientFk INT;
+ DECLARE vCompanyVnlFk INT DEFAULT 442;
+ DECLARE vVisible INT DEFAULT 0;
+ DECLARE vCalc INT;
+ DECLARE vParkedStuff INT;
+
+ SELECT barcodeToItem(vItemFk) INTO vItemFk;
+
+ CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
+
+ SELECT IFNULL(visible,0) INTO vVisible
+ FROM cache.visible
+ WHERE calc_id = vCalc
+ AND item_id = vItemFk;
+
+ SELECT sum(visible) INTO vParkedStuff
+ FROM itemShelvingStock
+ WHERE warehouseFk = vWarehouseFk
+ AND itemFk = vItemFk;
+
+ SET vNewVisible = vNewVisible + IFNULL(vParkedStuff,0);
+
+ SELECT IF(vIsTrash, 200, 400) INTO vClientFk;
+
+ SELECT t.id INTO vTicketFk
+ FROM ticket t
+ JOIN address a ON a.id=t.addressFk
+ WHERE t.warehouseFk = vWarehouseFk
+ AND t.clientFk = vClientFk
+ AND DATE(t.shipped) = CURDATE()
+ AND a.isDefaultAddress
+ LIMIT 1;
+
+ IF vTicketFk IS NULL THEN
+
+ CALL ticket_add(
+ vClientFk,
+ CURDATE(),
+ vWarehouseFk,
+ vCompanyVnlFk,
+ NULL,
+ NULL,
+ NULL,
+ CURDATE(),
+ account.userGetId(),
+ FALSE,
+ vTicketFk);
+
+ END IF;
+
+ INSERT INTO sale(ticketFk, itemFk, concept, quantity, price, discount)
+ SELECT vTicketFk, vItemFk, CONCAT(longName,' ', getWorkerCode(), ' ',LEFT(CAST(NOW() AS TIME),5)), vVisible - vNewVisible, 0, 0
+ FROM item
+ WHERE id = vItemFk;
+
+ UPDATE cache.visible
+ SET visible = vNewVisible
+ WHERE calc_id = vCalc
+ AND item_id = vItemFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -67666,13 +67687,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemStockVisible_verify`(vItemFk INT, vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemStockVisible_verify`(vItemFk INT, vQuantity INT)
BEGIN
INSERT INTO vn.itemShelving(itemFk,
@@ -67698,13 +67719,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemTagMake`(vItemFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagMake`(vItemFk INT)
BEGIN
/* * Crea los tags usando la tabla plantilla itemTag
@@ -67767,13 +67788,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemTagReorder`(itemTypeFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReorder`(itemTypeFk INT)
BEGIN
SET @isTriggerDisabled = TRUE;
@@ -67809,11 +67830,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemTagReorderByName`(vName VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReorderByName`(vName VARCHAR(255))
BEGIN
SET @isTriggerDisabled = TRUE;
@@ -67849,11 +67870,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemTagReorderByName__`(vName VARCHAR(255))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReorderByName__`(vName VARCHAR(255))
BEGIN
DECLARE vDone BOOL DEFAULT FALSE;
@@ -67902,11 +67923,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemTagReorder__`(itemTypeFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReorder__`(itemTypeFk INT)
BEGIN
DECLARE vDone BOOL DEFAULT FALSE;
@@ -67953,13 +67974,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemTagReplace__`(fromItemFk INT, toItemFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReplace__`(fromItemFk INT, toItemFk INT)
BEGIN
/*
@@ -67983,44 +68004,44 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemTag_replace`(vItemFromFk INT, vItemToFk INT, vPicture VARCHAR(100))
-BEGIN
-
- /* Reemplaza los tags de un artículo por los de otro, así como su imagen
- *
- * @param vItemFromFk id de vn.item con el artículo del que se toman los tags
- * @param vItemToFk id de vn.item con el artículo del que se toman los tags
- * @param vPicture imagen del artículo. Opcional. Si no se especifica, hereada la del vItemFromFk
- */
-
- DELETE FROM vn.itemTag
- WHERE itemFk = vItemToFk;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT vItemToFk, tagFk, value, priority
- FROM vn.itemTag
- WHERE itemFk = vItemFromFk;
-
- IF ISNULL(vPicture) THEN
-
- SELECT image INTO vPicture
- FROM vn.item
- WHERE id = vItemFromFk;
-
- END IF;
-
- UPDATE vn.item i
- SET i.image = vPicture
- WHERE i.id = vItemToFk;
-
- CALL vn.itemRefreshTags(vItemToFk);
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTag_replace`(vItemFromFk INT, vItemToFk INT, vPicture VARCHAR(100))
+BEGIN
+
+ /* Reemplaza los tags de un artículo por los de otro, así como su imagen
+ *
+ * @param vItemFromFk id de vn.item con el artículo del que se toman los tags
+ * @param vItemToFk id de vn.item con el artículo del que se toman los tags
+ * @param vPicture imagen del artículo. Opcional. Si no se especifica, hereada la del vItemFromFk
+ */
+
+ DELETE FROM vn.itemTag
+ WHERE itemFk = vItemToFk;
+
+ INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+ SELECT vItemToFk, tagFk, value, priority
+ FROM vn.itemTag
+ WHERE itemFk = vItemFromFk;
+
+ IF ISNULL(vPicture) THEN
+
+ SELECT image INTO vPicture
+ FROM vn.item
+ WHERE id = vItemFromFk;
+
+ END IF;
+
+ UPDATE vn.item i
+ SET i.image = vPicture
+ WHERE i.id = vItemToFk;
+
+ CALL vn.itemRefreshTags(vItemToFk);
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -68031,13 +68052,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemTopSeller`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTopSeller`()
BEGIN
DECLARE vCategoryFk INTEGER;
DECLARE vDone INT DEFAULT FALSE;
@@ -68109,127 +68130,66 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemTrash`(
- vItemFk INT,
- vWarehouseFk INT,
- vQuantity INT,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTrash`(
+ vItemFk INT,
+ vWarehouseFk INT,
+ vQuantity INT,
vIsTrash BOOLEAN)
-BEGIN
-
- DECLARE vTicketFk INT;
- DECLARE vClientFk INT;
- DECLARE vCompanyVnlFk INT DEFAULT 442;
- DECLARE vCalc INT;
-
- SELECT barcodeToItem(vItemFk) INTO vItemFk;
-
- SELECT IF(vIsTrash, 200, 400) INTO vClientFk;
-
- SELECT t.id INTO vTicketFk
- FROM ticket t
- JOIN address a ON a.id=t.addressFk
- WHERE t.warehouseFk = vWarehouseFk
- AND t.clientFk = vClientFk
- AND DATE(t.shipped) = CURDATE()
- AND a.isDefaultAddress
- LIMIT 1;
-
- CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
-
- IF vTicketFk IS NULL THEN
-
- CALL ticket_add(
- vClientFk,
- CURDATE(),
- vWarehouseFk,
- vCompanyVnlFk,
- NULL,
- NULL,
- NULL,
- CURDATE(),
- account.userGetId(),
- FALSE,
- vTicketFk);
- END IF;
-
- INSERT INTO sale(ticketFk, itemFk, concept, quantity)
- SELECT vTicketFk,
- vItemFk,
- CONCAT(longName,' ',getWorkerCode(), ' ', LEFT(CAST(NOW() AS TIME),5)),
- vQuantity
- FROM item
- WHERE id = vItemFk;
-
- UPDATE cache.visible
- SET visible = visible - vQuantity
- WHERE calc_id = vCalc
- AND item_id = vItemFk;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemTrash__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemTrash__`(
- vItemFk INT,
- vWarehouseFk INT,
- vQuantity INT,
- vIsTrash BOOLEAN)
-BEGIN
-
- DECLARE vTicketFk INT;
- DECLARE vClientFk INT;
- DECLARE vCompanyVnlFk INT DEFAULT 442;
- DECLARE vAgencyModeOthersFk INT DEFAULT 2;
- DECLARE vCurrentTime VARCHAR(5);
- DECLARE vCalc INT;
-
- SELECT vn.barcodeToItem(vItemFk) INTO vItemFk;
-
- SELECT IF(vIsTrash,200,400) INTO vClientFk;
-
- SELECT t.id INTO vTicketFk
- FROM vn.ticket t
- JOIN vn.address a ON a.id=t.addressFk
- WHERE t.warehouseFk = vWarehouseFk
- AND t.clientFk = vClientFk
- AND DATE(t.shipped) = CURDATE()
- AND a.isDefaultAddress
- LIMIT 1;
-
- CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
-
- IF vTicketFk IS NULL THEN
-
- CALL vn.ticketCreateWithoutZone(vClientFk, CURDATE(), vWarehouseFk, vCompanyVnlFk, NULL, vAgencyModeOthersFk, NULL, CURDATE(), account.userGetId(),vTicketFk);
-
- END IF;
-
- INSERT INTO sale(ticketFk, itemFk, concept, quantity, price, discount)
- SELECT vTicketFk, vItemFk, CONCAT(longName," ",vn.getWorkerCode(), " ",LEFT(CAST(NOW() AS TIME),5)), vQuantity,0,0
- FROM vn.item
- WHERE id = vItemFk;
-
- UPDATE cache.visible
- SET visible = visible - vQuantity
- WHERE calc_id = vCalc
- AND item_id = vItemFk;
-
+BEGIN
+
+ DECLARE vTicketFk INT;
+ DECLARE vClientFk INT;
+ DECLARE vCompanyVnlFk INT DEFAULT 442;
+ DECLARE vCalc INT;
+
+ SELECT barcodeToItem(vItemFk) INTO vItemFk;
+
+ SELECT IF(vIsTrash, 200, 400) INTO vClientFk;
+
+ SELECT t.id INTO vTicketFk
+ FROM ticket t
+ JOIN address a ON a.id=t.addressFk
+ WHERE t.warehouseFk = vWarehouseFk
+ AND t.clientFk = vClientFk
+ AND DATE(t.shipped) = CURDATE()
+ AND a.isDefaultAddress
+ LIMIT 1;
+
+ CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
+
+ IF vTicketFk IS NULL THEN
+
+ CALL ticket_add(
+ vClientFk,
+ CURDATE(),
+ vWarehouseFk,
+ vCompanyVnlFk,
+ NULL,
+ NULL,
+ NULL,
+ CURDATE(),
+ account.userGetId(),
+ FALSE,
+ vTicketFk);
+ END IF;
+
+ INSERT INTO sale(ticketFk, itemFk, concept, quantity)
+ SELECT vTicketFk,
+ vItemFk,
+ CONCAT(longName,' ',getWorkerCode(), ' ', LEFT(CAST(NOW() AS TIME),5)),
+ vQuantity
+ FROM item
+ WHERE id = vItemFk;
+
+ UPDATE cache.visible
+ SET visible = visible - vQuantity
+ WHERE calc_id = vCalc
+ AND item_id = vItemFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -68240,13 +68200,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `itemUpdateTag`(IN vItem BIGINT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemUpdateTag`(IN vItem BIGINT)
BEGIN
@@ -68284,6 +68244,258 @@ SET tag8 = t.name, value8 = it.value
WHERE it.priority = 4
AND (vItem IS NULL OR vItem = it.itemFk);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_clean` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_clean`(vItemFrom INT, vItemTo INT)
+BEGIN
+
+/*
+ * Elimina todos los items repetidos y los sustituye por el que tiene menor id
+ */
+
+ START TRANSACTION;
+
+ SET @isModeInventory:= TRUE;
+
+ -- Deletes
+
+ UPDATE IGNORE vn.itemCost ic
+ JOIN tmp.itemsToReplace itr ON ic.itemFk = itr.idOld
+ SET ic.itemFk = itr.idNew;
+
+ DELETE ic.*
+ FROM vn.itemCost ic
+ JOIN tmp.itemsToReplace itr ON ic.itemFk = itr.idOld;
+
+ DELETE rt.*
+ FROM vn2008.rec_translator rt
+ JOIN tmp.itemsToReplace itr ON rt.Id_Article = itr.idOld;
+
+ DELETE w.*
+ FROM bs.waste w
+ JOIN tmp.itemsToReplace itr ON w.itemFk = itr.idOld;
+
+ DELETE pf.*
+ FROM vn.priceFixed pf
+ JOIN tmp.itemsToReplace itr ON pf.itemFk = itr.idOld;
+
+ DELETE imp.*
+ FROM vn.itemMatchProperties imp
+ JOIN tmp.itemsToReplace itr ON imp.itemFk = itr.idOld;
+
+ DELETE ib.*
+ FROM vn.itemBotanical ib
+ JOIN tmp.itemsToReplace itr ON ib.itemFk = itr.idOld;
+
+ DELETE ip.*
+ FROM vn.itemProposal ip
+ JOIN tmp.itemsToReplace itr ON ip.itemFk = itr.idOld;
+
+ DELETE it.*
+ FROM vn.itemTag it
+ JOIN tmp.itemsToReplace itr ON it.itemFk = itr.idOld;
+
+ DELETE ib.*
+ FROM vn.itemBarcode ib
+ JOIN tmp.itemsToReplace itr ON ib.itemFk = itr.idOld;
+
+ DELETE itc.*
+ FROM vn.itemTaxCountry itc
+ JOIN tmp.itemsToReplace itr ON itc.itemFk = itr.idOld;
+
+ DELETE ip.*
+ FROM vn.itemPlacement ip
+ JOIN tmp.itemsToReplace itr ON ip.itemFk = itr.idOld;
+
+ -- Updates
+
+ UPDATE vn.buy b
+ JOIN tmp.itemsToReplace itr ON b.itemFk = itr.idOld
+ SET b.itemFk = itr.idNew;
+
+ UPDATE vn.sale s
+ JOIN tmp.itemsToReplace itr ON s.itemFk = itr.idOld
+ SET s.itemFk = itr.idNew;
+
+ UPDATE vn.specialPrice sp
+ JOIN tmp.itemsToReplace itr ON sp.itemFk = itr.idOld
+ SET sp.itemFk = itr.idNew;
+
+ UPDATE vn.packaging p
+ JOIN tmp.itemsToReplace itr ON p.itemFk = itr.idOld
+ SET p.itemFk = itr.idNew;
+
+ UPDATE vn.packaging p
+ JOIN tmp.itemsToReplace itr ON p.freightItemFk = itr.idOld
+ SET p.freightItemFk = itr.idNew;
+
+ UPDATE hedera.orderRow o
+ JOIN tmp.itemsToReplace itr ON o.itemFk = itr.idOld
+ SET o.itemFk = itr.idNew;
+
+ UPDATE vn.itemLog il
+ JOIN tmp.itemsToReplace itr ON il.originFk = itr.idOld
+ SET il.originFk = itr.idNew;
+
+ UPDATE vn.itemShelving ish
+ JOIN tmp.itemsToReplace itr ON ish.itemFk = itr.idOld
+ SET ish.itemFk = itr.idNew;
+
+ UPDATE vn.ticketPackagingStartingStock tpss
+ JOIN tmp.itemsToReplace itr ON tpss.itemFk = itr.idOld
+ SET tpss.itemFk = itr.idNew;
+
+ UPDATE vn.inventoryFailure ifa
+ JOIN tmp.itemsToReplace itr ON ifa.itemFk = itr.idOld
+ SET ifa.itemFk = itr.idNew;
+
+ UPDATE vn.genericAllocation ga
+ JOIN tmp.itemsToReplace itr ON ga.itemFk = itr.idOld
+ SET ga.itemFk = itr.idNew;
+
+ UPDATE vn.itemPlacementSupply ips
+ JOIN tmp.itemsToReplace itr ON ips.itemFk = itr.idOld
+ SET ips.itemFk = itr.idNew;
+
+ -- Eliminamos los items repetidos
+
+ DELETE i.*
+ FROM vn.item i
+ JOIN tmp.itemsToReplace itr ON i.id = itr.idOld;
+
+ SET @isModeInventory:= FALSE;
+
+ COMMIT;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_cleanLauncher` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_cleanLauncher`()
+BEGIN
+
+ DECLARE vItemTo INT DEFAULT 0;
+ DECLARE vStep INT DEFAULT 500;
+ DECLARE vCounter INT DEFAULT 0;
+ DECLARE vItemFrom INT;
+ DECLARE vItemEnd INT;
+
+ SELECT itemFrom INTO vItemFrom
+ FROM tmp.itemCleanCount
+ ORDER BY created DESC
+ LIMIT 1;
+
+ SET vItemEnd = vItemFrom + 100000;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.itemsToReplaceSource;
+ CREATE TEMPORARY TABLE tmp.itemsToReplaceSource
+ SELECT i.id idOld,
+ i2.id idNew
+ FROM vn.item i
+ JOIN ( SELECT i.id,
+ i.name,
+ i.subname,
+ i.value5,
+ i.value6,
+ i.value7,
+ i.value8,
+ i.value9,
+ i.value10,
+ i.NumberOfItemsPerCask,
+ i.EmbalageCode,
+ i.quality
+ FROM vn.item i
+ LEFT JOIN (SELECT i.id,
+ sr.NumberOfUnits,
+ MAX(di.LatestOrderDateTime) lodt
+ FROM vn.item i
+ JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
+ JOIN edi.deliveryInformation di ON di.supplyResponseID = i.supplyResponseFk
+ GROUP BY i.id) sub ON sub.id = i.id
+ WHERE i.id > 170000
+ AND (ISNULL(i.supplyResponseFk)
+ OR sub.NumberOfUnits=0
+ OR sub.lodt < NOW())
+ GROUP BY i.name,
+ subname,
+ value5,
+ value6,
+ value7,
+ value8,
+ value9,
+ value10,
+ NumberOfItemsPerCask,
+ EmbalageCode,
+ quality
+ ORDER BY i.id) i2 ON i2.name <=> i.name
+ AND i2.subname <=> i.subname
+ AND i2.value5 <=> i.value5
+ AND i2.value6 <=> i.value6
+ AND i2.value7 <=> i.value7
+ AND i2.value8 <=> i.value8
+ AND i2.value9 <=> i.value9
+ AND i2.value10 <=> i.value10
+ AND i2.NumberOfItemsPerCask <=> i.NumberOfItemsPerCask
+ AND i2.EmbalageCode <=> i.EmbalageCode
+ AND i2.quality <=> i.quality
+ WHERE i.id > 170000
+ AND i.id <> i2.id
+ ORDER BY i2.id;
+
+ WHILE vItemTo < vItemEnd AND NOT (SELECT isStop FROM tmp.stoper) DO
+
+ SET vItemTo = LEAST(vItemEnd, vItemFrom + vStep);
+
+ SELECT COUNT(*) INTO vCounter
+ FROM tmp.itemsToReplaceSource
+ WHERE idNew BETWEEN vItemFrom
+ AND vItemTo;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.itemsToReplace;
+ CREATE TEMPORARY TABLE tmp.itemsToReplace
+ SELECT *
+ FROM tmp.itemsToReplaceSource
+ WHERE idNew BETWEEN vItemFrom
+ AND vItemTo;
+
+ CALL vn.item_clean(vItemFrom, vItemTo);
+
+ SET vItemFrom = vItemTo;
+
+ INSERT INTO tmp.itemCleanCount(itemFrom, itemDeleted)
+ VALUES (vItemFrom, vCounter);
+
+ END WHILE;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.itemsToReplace;
+ DROP TEMPORARY TABLE IF EXISTS tmp.itemsToReplaceSource;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -68294,13 +68506,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getBalance`(IN vItemId int, IN vWarehouse int)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getBalance`(IN vItemId int, IN vWarehouse int)
BEGIN
DECLARE vDateInventory DATETIME;
DECLARE vCurdate DATE DEFAULT CURDATE();
@@ -68447,76 +68659,76 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getInfo`(IN `vBarcode` VARCHAR(22), IN `vWarehouseFk` INT)
-BEGIN
-
- /*
- * Devuelve información relativa al item correspondiente del vBarcode pasado
- *
- * @param vBarcode código relativo al ítem
- * @param vWarehouseFk código del almacén
- */
-
- DECLARE vCacheVisibleFk INT;
- DECLARE vCacheAvailableFk INT;
- DECLARE vVisibleItemShelving INT;
- DECLARE vItemFk INT;
-
- SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
-
- CALL cache.visible_refresh(vCacheVisibleFk, FALSE,vWarehouseFk);
- CALL cache.available_refresh(vCacheAvailableFk, FALSE,vWarehouseFk, CURDATE());
-
- SELECT SUM(visible) INTO vVisibleItemShelving
- FROM vn.itemShelvingStock
- WHERE itemFk = vItemFk AND warehouseFk = vWarehouseFk;
-
- CALL vn.buyUltimate(vWarehouseFk, CURDATE());
-
- SELECT i.id,
- i.longName,
- i.tag5,
- i.value5,
- i.tag6,
- i.value6,
- i.tag7,
- i.value7,
- i.image,
- i.size,
- i.stems,
- i.category,
- i.minimum as min,
- p.name as producer,
- o.code as origin,
- v.visible - IFNULL(vVisibleItemShelving,0) as unlocated,
- a.available,
- vVisibleItemShelving,
- v.visible,
- c.`grouping`,
- c.packing,
- CONCAT('https://verdnatura.es/vn-image-data/catalog/200x200/', i.image) as urlImage200,
- CONCAT('https://verdnatura.es/vn-image-data/catalog/1600x900/', i.image) as urlImage,
- i.itemPackingTypeFk,
- i.comment as reference
- FROM vn.item i
- LEFT JOIN vn.producer p ON p.id = i.producerFk
- LEFT JOIN vn.origin o ON o.id = i.originFk
- LEFT JOIN cache.visible v ON v.calc_id = vCacheVisibleFk AND v.item_id = i.id
- LEFT JOIN cache.available a ON a.calc_id = vCacheAvailableFk AND a.item_id = i.id
- LEFT JOIN (
- SELECT b.itemFk, b2.`grouping`, b2.packing
- FROM tmp.buyUltimate b
- JOIN vn.buy b2 ON b2.id = b.buyFk
- WHERE b.warehouseFk = vWarehouseFk
- ) c ON i.id = c.itemFk
- WHERE i.id = vItemFk;
-
- DROP TEMPORARY TABLE tmp.buyUltimate;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getInfo`(IN `vBarcode` VARCHAR(22), IN `vWarehouseFk` INT)
+BEGIN
+
+ /*
+ * Devuelve información relativa al item correspondiente del vBarcode pasado
+ *
+ * @param vBarcode código relativo al ítem
+ * @param vWarehouseFk código del almacén
+ */
+
+ DECLARE vCacheVisibleFk INT;
+ DECLARE vCacheAvailableFk INT;
+ DECLARE vVisibleItemShelving INT;
+ DECLARE vItemFk INT;
+
+ SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
+
+ CALL cache.visible_refresh(vCacheVisibleFk, FALSE,vWarehouseFk);
+ CALL cache.available_refresh(vCacheAvailableFk, FALSE,vWarehouseFk, CURDATE());
+
+ SELECT SUM(visible) INTO vVisibleItemShelving
+ FROM vn.itemShelvingStock
+ WHERE itemFk = vItemFk AND warehouseFk = vWarehouseFk;
+
+ CALL vn.buyUltimate(vWarehouseFk, CURDATE());
+
+ SELECT i.id,
+ i.longName,
+ i.tag5,
+ i.value5,
+ i.tag6,
+ i.value6,
+ i.tag7,
+ i.value7,
+ i.image,
+ i.size,
+ i.stems,
+ i.category,
+ i.minimum as min,
+ p.name as producer,
+ o.code as origin,
+ v.visible - IFNULL(vVisibleItemShelving,0) as unlocated,
+ a.available,
+ vVisibleItemShelving,
+ v.visible,
+ c.`grouping`,
+ c.packing,
+ CONCAT('https://verdnatura.es/vn-image-data/catalog/200x200/', i.image) as urlImage200,
+ CONCAT('https://verdnatura.es/vn-image-data/catalog/1600x900/', i.image) as urlImage,
+ i.itemPackingTypeFk,
+ i.comment as reference
+ FROM vn.item i
+ LEFT JOIN vn.producer p ON p.id = i.producerFk
+ LEFT JOIN vn.origin o ON o.id = i.originFk
+ LEFT JOIN cache.visible v ON v.calc_id = vCacheVisibleFk AND v.item_id = i.id
+ LEFT JOIN cache.available a ON a.calc_id = vCacheAvailableFk AND a.item_id = i.id
+ LEFT JOIN (
+ SELECT b.itemFk, b2.`grouping`, b2.packing
+ FROM tmp.buyUltimate b
+ JOIN vn.buy b2 ON b2.id = b.buyFk
+ WHERE b.warehouseFk = vWarehouseFk
+ ) c ON i.id = c.itemFk
+ WHERE i.id = vItemFk;
+
+ DROP TEMPORARY TABLE tmp.buyUltimate;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -68529,11 +68741,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getLack`(IN vForce BOOLEAN, IN vDays INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getLack`(IN vForce BOOLEAN, IN vDays INT)
BEGIN
/**
* Calcula una tabla con el máximo negativo visible para cada producto y almacen
@@ -68594,11 +68806,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getMinacum`(IN vWarehouseFk TINYINT, IN vDatedFrom DATETIME, IN vRange INT, IN vItemFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getMinacum`(IN vWarehouseFk TINYINT, IN vDatedFrom DATETIME, IN vRange INT, IN vItemFk INT)
BEGIN
/**
* Cálculo del mínimo acumulado, para un item si especificado, para todo el stock si es nulo
@@ -68682,11 +68894,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getMinETD`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getMinETD`()
BEGIN
/* Devuelve una tabla temporal con la primera ETD, para todos los artículos con salida hoy.
@@ -68719,11 +68931,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getSimilar`(vItemFk INT, vWarehouseFk INT, vDate DATE, vIsShowedByType BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getSimilar`(vItemFk INT, vWarehouseFk INT, vDate DATE, vIsShowedByType BOOL)
BEGIN
/**
@@ -68814,13 +69026,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_GetVisible`(vWarehouse SMALLINT, vItem INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_GetVisible`(vWarehouse SMALLINT, vItem INT)
BEGIN
DECLARE vTomorrow DATETIME DEFAULT TIMESTAMPADD(DAY, 1, CURDATE());
@@ -68867,17 +69079,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `item_getVisibleAvailable` */;
+/*!50003 DROP PROCEDURE IF EXISTS `item_getVisibleAvailable__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getVisibleAvailable`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getVisibleAvailable__`(
vItem INT,
vDate DATE,
vWarehouse TINYINT,
@@ -68949,13 +69161,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_refreshTags`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_refreshTags`()
BEGIN
/**
* Actualiza la tabla item, los campos "cache" de tags
@@ -69102,13 +69314,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_refreshTags_beta`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_refreshTags_beta`()
BEGIN
/**
* Actualiza la tabla item, los campos "cache" de tags
@@ -69245,13 +69457,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_refreshTags__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_refreshTags__`()
BEGIN
/**
* Actualiza la tabla item, los campos "cache" de tags
@@ -69376,26 +69588,26 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_saveReference`(vBarcode VARCHAR(22), vReference VARCHAR(150))
-BEGIN
-
-/**
- * Actualiza la referencia del item
- *
- * @param vBarcode del item
- * @param vReference referencia a actualizar
- */
-
- DECLARE vItemFk INT;
-
- SELECT barcodeToItem(vBarcode) INTO vItemFk;
-
- UPDATE item SET comment = vReference WHERE id = vItemFk;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_saveReference`(vBarcode VARCHAR(22), vReference VARCHAR(150))
+BEGIN
+
+/**
+ * Actualiza la referencia del item
+ *
+ * @param vBarcode del item
+ * @param vReference referencia a actualizar
+ */
+
+ DECLARE vItemFk INT;
+
+ SELECT barcodeToItem(vBarcode) INTO vItemFk;
+
+ UPDATE item SET comment = vReference WHERE id = vItemFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69408,11 +69620,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_setCompression__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_setCompression__`()
BEGIN
/**
* Actualiza la compression de los articulos con un packing.hasCompressionVariations = TRUE
@@ -69470,40 +69682,40 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_setGeneric`(vSelf INT)
-BEGIN
-
- /* Asigna el código genérico a un item
- *
- * @param vSelf identificador de vn.item
- */
-
- DECLARE vGenericFk INT;
-
- SELECT ga.itemFk INTO vGenericFk
- FROM vn.genericAllocation ga
- JOIN vn.item i ON (i.typeFk = ga.typeFk OR ISNULL(ga.typeFk))
- JOIN vn.itemTag it1 ON it1.itemFk = i.id AND (it1.value = ga.origin OR ISNULL(ga.origin))
- JOIN vn.itemTag it2 ON it2.itemFk = i.id AND (it2.value = ga.color OR ISNULL(ga.color))
- JOIN vn.itemTag it3 ON it3.itemFk = i.id AND (it3.value = ga.quality OR ISNULL(ga.quality))
- JOIN vn.itemTag it4 ON it4.itemFk = i.id AND (it4.value = ga.numFlores OR ISNULL(ga.numFlores))
- JOIN vn.itemTag it5 ON it5.itemFk = i.id AND (it5.value = ga.category OR ISNULL(ga.category))
- JOIN vn.itemTag it6 ON it6.itemFk = i.id AND (it6.value = ga.productor OR ISNULL(ga.productor))
- WHERE i.id = vSelf
- AND ga.itemFk != vSelf
- AND NOT i.isFloramondo
- LIMIT 1;
-
- UPDATE vn.item
- SET genericFk = vGenericFk
- WHERE id = vSelf;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_setGeneric`(vSelf INT)
+BEGIN
+
+ /* Asigna el código genérico a un item
+ *
+ * @param vSelf identificador de vn.item
+ */
+
+ DECLARE vGenericFk INT;
+
+ SELECT ga.itemFk INTO vGenericFk
+ FROM vn.genericAllocation ga
+ JOIN vn.item i ON (i.typeFk = ga.typeFk OR ISNULL(ga.typeFk))
+ JOIN vn.itemTag it1 ON it1.itemFk = i.id AND (it1.value = ga.origin OR ISNULL(ga.origin))
+ JOIN vn.itemTag it2 ON it2.itemFk = i.id AND (it2.value = ga.color OR ISNULL(ga.color))
+ JOIN vn.itemTag it3 ON it3.itemFk = i.id AND (it3.value = ga.quality OR ISNULL(ga.quality))
+ JOIN vn.itemTag it4 ON it4.itemFk = i.id AND (it4.value = ga.numFlores OR ISNULL(ga.numFlores))
+ JOIN vn.itemTag it5 ON it5.itemFk = i.id AND (it5.value = ga.category OR ISNULL(ga.category))
+ JOIN vn.itemTag it6 ON it6.itemFk = i.id AND (it6.value = ga.productor OR ISNULL(ga.productor))
+ WHERE i.id = vSelf
+ AND ga.itemFk != vSelf
+ AND NOT i.isFloramondo
+ LIMIT 1;
+
+ UPDATE vn.item
+ SET genericFk = vGenericFk
+ WHERE id = vSelf;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69520,19 +69732,20 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_updatePackingShelve`(vSelf INT, vPacking INT)
-BEGIN
-
- /* Actualiza el valor de item.packingShelve
- *
- * @param vSelf Identificador de vn.item
- * @param vPacking Cantidad de unidades de venta que caben en una bandeja
- */
-
- UPDATE vn.item i
- SET i.packingShelve = vPacking
- WHERE i.id = vSelf;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_updatePackingShelve`(vSelf INT, vPacking INT)
+BEGIN
+
+ /**
+ * Actualiza el valor de item.packingShelve
+ *
+ * @param vSelf Identificador de vn.item
+ * @param vPacking Cantidad de unidades de venta que caben en una bandeja
+ */
+
+ UPDATE vn.item i
+ SET i.packingShelve = vPacking
+ WHERE i.id = vSelf;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69545,20 +69758,20 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_updatePackingType`(vItem INT, vItemPackingTypeFk VARCHAR(1))
-BEGIN
-/**
- * Update the packing type of an item
- *
- * @param vItem id del item a actualizar
- * @param vItemPackingTypeFk packing type
- */
- UPDATE item SET itemPackingTypeFk = vItemPackingTypeFk WHERE id = vItem;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_updatePackingType`(vItem INT, vItemPackingTypeFk VARCHAR(1))
+BEGIN
+/**
+ * Update the packing type of an item
+ *
+ * @param vItem id del item a actualizar
+ * @param vItemPackingTypeFk packing type
+ */
+ UPDATE item SET itemPackingTypeFk = vItemPackingTypeFk WHERE id = vItem;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69569,13 +69782,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_ValuateInventory`(IN vDated DATE, IN vIsDetailed BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_ValuateInventory`(IN vDated DATE, IN vIsDetailed BOOLEAN)
BEGIN
DECLARE vInventoried DATE;
@@ -69774,13 +69987,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `item_ValuateInventory__`(IN vDated DATE, IN vIsDetailed BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_ValuateInventory__`(IN vDated DATE, IN vIsDetailed BOOLEAN)
BEGIN
DECLARE vInventoried DATE;
@@ -69969,13 +70182,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ledger_doCompensation`(vDated DATE, vCompensationAccount VARCHAR(10) , vBankFk VARCHAR(10), vConcept VARCHAR(255), vAmount DECIMAL(10,2), vCompanyFk INT, vOriginalAccount VARCHAR(10))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ledger_doCompensation`(vDated DATE, vCompensationAccount VARCHAR(10) , vBankFk VARCHAR(10), vConcept VARCHAR(255), vAmount DECIMAL(10,2), vCompanyFk INT, vOriginalAccount VARCHAR(10))
BEGIN
/**
* Compensa un pago o un recibo insertando en contabilidad
@@ -70062,11 +70275,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ledger_next`(OUT vNewBookEntry INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ledger_next`(OUT vNewBookEntry INT)
BEGIN
UPDATE vn.ledgerConfig SET lastBookEntry = LAST_INSERT_ID(lastBookEntry + 1);
@@ -70082,13 +70295,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `logAdd`(vOriginFk INT, vActionCode VARCHAR(45), vEntity VARCHAR(45), vDescription TEXT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `logAdd`(vOriginFk INT, vActionCode VARCHAR(45), vEntity VARCHAR(45), vDescription TEXT)
BEGIN
/**
* Guarda las acciones realizadas por el usuario
@@ -70110,13 +70323,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `logAddWithUser`(vOriginFk INT, vUserId INT, vActionCode VARCHAR(45), vEntity VARCHAR(45), vDescription TEXT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `logAddWithUser`(vOriginFk INT, vUserId INT, vActionCode VARCHAR(45), vEntity VARCHAR(45), vDescription TEXT)
BEGIN
/**
* Guarda las acciones realizadas por el usuario
@@ -70151,13 +70364,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `logShow`(vOriginFk INT, vEntity VARCHAR(45))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `logShow`(vOriginFk INT, vEntity VARCHAR(45))
BEGIN
/**
* Muestra las acciones realizadas por el usuario
@@ -70187,13 +70400,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `lungSize_generator`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `lungSize_generator`(vDate DATE)
BEGIN
SET @buildingOrder := 0;
@@ -70248,13 +70461,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `machineWorker_add`(vPlate VARCHAR(10), vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_add`(vPlate VARCHAR(10), vWorkerFk INT)
BEGIN
/**
@@ -70285,11 +70498,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `machineWorker_getHistorical`(vPlate VARCHAR(20), vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_getHistorical`(vPlate VARCHAR(20), vWorkerFk INT)
BEGIN
/**
* Obtiene historial de la matrícula vPlate que el trabajador vWorkerFk escanea,
@@ -70305,7 +70518,7 @@ BEGIN
FROM machineWorker mw
JOIN machine m ON m.plate = vPlate
WHERE mw.machineFk = m.id
- AND mw.workerFk = IF(account.user_hasRole(vWorkerName, 'productionAssi'), mw.workerFk, vWorkerFk)
+ AND mw.workerFk = IF(account.user_hasRole(vWorkerName, 'coolerAssist'), mw.workerFk, vWorkerFk)
ORDER BY mw.inTimed DESC;
END ;;
DELIMITER ;
@@ -70319,11 +70532,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `machineWorker_update`(vPlate VARCHAR(10), vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_update`(vPlate VARCHAR(10), vWorkerFk INT)
BEGIN
/**
@@ -70370,27 +70583,27 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `machine_getWorkerPlate`(vWorkerFk INT)
-BEGIN
-/**
- * Selecciona la matrícula del vehículo del workerfk
- *
- * @param vWorkerFk el id del trabajador
- *
- *
- **/
-
- SELECT m.plate
- FROM machine m
- JOIN machineWorker mw ON mw.machineFk = m.id
- WHERE mw.inTimed >= TIMESTAMPADD(HOUR , -12,NOW())
- AND ISNULL(mw.outTimed)
- AND mw.workerFk = vWorkerFk;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `machine_getWorkerPlate`(vWorkerFk INT)
+BEGIN
+/**
+ * Selecciona la matrícula del vehículo del workerfk
+ *
+ * @param vWorkerFk el id del trabajador
+ *
+ *
+ **/
+
+ SELECT m.plate
+ FROM machine m
+ JOIN machineWorker mw ON mw.machineFk = m.id
+ WHERE mw.inTimed >= TIMESTAMPADD(HOUR , -12,NOW())
+ AND ISNULL(mw.outTimed)
+ AND mw.workerFk = vWorkerFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70407,7 +70620,7 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `mail_insert`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `mail_insert`(
vReceiver VARCHAR(255),
vReplyTo VARCHAR(50),
vSubject VARCHAR(100),
@@ -70429,7 +70642,8 @@ BEGIN
WHERE creationDate >= CURDATE()
AND `receiver` = vReceiver
AND `replyTo` = vReplyTo
- AND `subject` = vSubject;
+ AND `subject` = vSubject
+ AND !sent;
IF NOT vIsRepeated THEN
@@ -70451,13 +70665,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `makeNewItem`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `makeNewItem`()
BEGIN
DECLARE newItemFk INT;
@@ -70480,13 +70694,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `makePCSGraf`(vDated DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `makePCSGraf`(vDated DATE)
BEGIN
@@ -70534,11 +70748,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `manaSpellersRequery`(vWorkerFk INTEGER)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `manaSpellersRequery`(vWorkerFk INTEGER)
BEGIN
/**
* Recalcula el mana consumido por un trabajador
@@ -70610,17 +70824,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `mergeTicketUnattended` */;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `mergeTicketUnattended`(IN vMainTicket INT(11), IN hasSameAgency BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `mergeTicketUnattended`(IN vMainTicket INT(11), IN hasSameAgency BOOLEAN)
BEGIN
DECLARE isBilled BOOLEAN;
@@ -70656,18 +70869,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP PROCEDURE IF EXISTS `mergeTicketWithArray` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `mergeTicketWithArray`(IN vMainTicket INT(11), IN arrayTickets VARCHAR(50))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `mergeTicketWithArray`(IN vMainTicket INT(11), IN arrayTickets VARCHAR(50))
BEGIN
DECLARE isBilled BOOLEAN;
@@ -70764,11 +70976,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `mysqlConnectionsSorter_kill`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqlConnectionsSorter_kill`()
BEGIN
/**
@@ -70814,11 +71026,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `mysqlPreparedCount_check`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqlPreparedCount_check`()
BEGIN
DECLARE vPreparedCount INTEGER;
@@ -70848,11 +71060,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nestAdd__`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vParentFk` INT, IN `vChild` VARCHAR(100))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nestAdd__`(IN `vScheme` VARCHAR(45), IN `vTable` VARCHAR(45), IN `vParentFk` INT, IN `vChild` VARCHAR(100))
BEGIN
DECLARE vSql TEXT;
DECLARE vTableClone VARCHAR(45);
@@ -70938,11 +71150,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nestLeave__`(vScheme VARCHAR(45), vTable VARCHAR(45), vParentFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nestLeave__`(vScheme VARCHAR(45), vTable VARCHAR(45), vParentFk INT)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.tree;
@@ -70976,11 +71188,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nestTree__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nestTree__`(
vSourceSchema VARCHAR(45),
vSourceTable VARCHAR(45),
vDestinationSchema VARCHAR(45),
@@ -71028,13 +71240,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `nextShelvingCodeMake`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `nextShelvingCodeMake`()
BEGIN
DECLARE newShelving VARCHAR(3);
@@ -71084,11 +71296,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `observationAdd`(vOriginFk INT, vTableCode VARCHAR(45), vDescription TEXT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `observationAdd`(vOriginFk INT, vTableCode VARCHAR(45), vDescription TEXT)
BEGIN
/**
* Guarda las observaciones realizadas por el usuario
@@ -71123,13 +71335,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `orderCreate`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `orderCreate`(
vLanded DATE,
vAgencyMode INT,
vAddress INT,
@@ -71163,13 +71375,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `orderDelete`(IN vId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `orderDelete`(IN vId INT)
BEGIN
DELETE FROM hedera.`order` where id = vId;
@@ -71184,13 +71396,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `orderListCreate`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `orderListCreate`(
vLanded DATE,
vAgencyMode INT,
vAddress INT,
@@ -71211,13 +71423,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `orderListVolume`(IN vOrderId INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `orderListVolume`(IN vOrderId INT)
BEGIN
SELECT
@@ -71242,11 +71454,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `packageInvoicing`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `packageInvoicing`(
IN vClient INT,
IN vDate DATE,
IN vCompany INT,
@@ -71373,13 +71585,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `packingListPrinted`(ticketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `packingListPrinted`(ticketFk INT)
BEGIN
UPDATE vn2008.Movimientos_mark mm
@@ -71401,11 +71613,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `packingListSwitch`(saleFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `packingListSwitch`(saleFk INT)
BEGIN
DECLARE valueFk INT;
@@ -71432,13 +71644,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `parking_add`(vFromColumn INT, vToColumn INT, vFromRow INT, vToRow INT, vSectorFk INT, vIsLetterMode BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `parking_add`(vFromColumn INT, vToColumn INT, vFromRow INT, vToRow INT, vSectorFk INT, vIsLetterMode BOOLEAN)
BEGIN
DECLARE vColumn INT;
@@ -71486,13 +71698,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `parking_add__`(vFromColumn INT, vToColumn INT, vFromRow INT, vToRow INT, vSectorFk INT, vIsLetterMode BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `parking_add__`(vFromColumn INT, vToColumn INT, vFromRow INT, vToRow INT, vSectorFk INT, vIsLetterMode BOOLEAN)
BEGIN
DECLARE vColumn INT;
@@ -71540,13 +71752,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `parking_algemesi`(vFromRow INT, vToRow INT, vSectorFk INT, vLetter VARCHAR(1), vPickingOrder INT, vTrolleysByLine INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `parking_algemesi`(vFromRow INT, vToRow INT, vSectorFk INT, vLetter VARCHAR(1), vPickingOrder INT, vTrolleysByLine INT)
BEGIN
DECLARE vRow INT;
@@ -71615,13 +71827,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `parking_new`(vStart INT, vEnd INT, vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `parking_new`(vStart INT, vEnd INT, vSectorFk INT)
BEGIN
DECLARE vRow INT;
@@ -71660,13 +71872,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `parking_new__`(vStart INT, vEnd INT, vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `parking_new__`(vStart INT, vEnd INT, vSectorFk INT)
BEGIN
DECLARE vRow INT;
@@ -71705,36 +71917,36 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `parking_setOrder`(vWarehouseFk INT)
-BEGIN
-
- /*
- * Ordena el orden de preparacion de los parking de acuerdo con la tabla vn.corridor
- */
-
- UPDATE vn.parking p
- JOIN (
- SELECT code,
- @orden := @orden + 10 AS po
- FROM (
- SELECT c.prepOrder,
- p.code,
- @orden := 0,
- IF(c.isAscendent, 1,-1) * CAST(SUBSTRING(p.code,3,2) AS DECIMAL(2,0)) subCorridor ,
- CAST(IF(LENGTH(p.code) > 5, SUBSTRING(p.code,6,2), 0) AS DECIMAL(2,0)) ubication
- FROM vn.parking p
- JOIN vn.sector s ON s.id = p.sectorFk
- JOIN vn.corridor c ON c.code = LEFT(p.code,1) COLLATE utf8_general_ci
- WHERE s.warehouseFk = vWarehouseFk) sub
- ORDER BY sub.prepOrder, subCorridor, ubication) sub2 ON sub2.code = p.code
- SET p.pickingOrder = sub2.po;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `parking_setOrder`(vWarehouseFk INT)
+BEGIN
+
+ /*
+ * Ordena el orden de preparacion de los parking de acuerdo con la tabla vn.corridor
+ */
+
+ UPDATE vn.parking p
+ JOIN (
+ SELECT code,
+ @orden := @orden + 10 AS po
+ FROM (
+ SELECT c.prepOrder,
+ p.code,
+ @orden := 0,
+ IF(c.isAscendent, 1,-1) * CAST(SUBSTRING(p.code,3,2) AS DECIMAL(2,0)) subCorridor ,
+ CAST(IF(LENGTH(p.code) > 5, SUBSTRING(p.code,6,2), 0) AS DECIMAL(2,0)) ubication
+ FROM vn.parking p
+ JOIN vn.sector s ON s.id = p.sectorFk
+ JOIN vn.corridor c ON c.code = LEFT(p.code,1) COLLATE utf8_general_ci
+ WHERE s.warehouseFk = vWarehouseFk) sub
+ ORDER BY sub.prepOrder, subCorridor, ubication) sub2 ON sub2.code = p.code
+ SET p.pickingOrder = sub2.po;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -71747,11 +71959,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `payRoll__`(IN vFromDated DATE, IN vToDated DATE, IN vFromPaid DATE, IN vToPaid DATE, IN vPartTime BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `payRoll__`(IN vFromDated DATE, IN vToDated DATE, IN vFromPaid DATE, IN vToPaid DATE, IN vPartTime BOOL)
BEGIN
SET @userFk := 0;
@@ -71822,185 +72034,185 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `placement_test`(vParamFk INT(11))
-BEGIN
-
- DECLARE vCalcFk INT;
- DECLARE vWarehouseFk INT;
- DECLARE vWarehouseAliasFk INT;
- DECLARE vCurrentYear INT DEFAULT YEAR(NOW());
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale;
- CREATE TEMPORARY TABLE tmp.sale
- ENGINE = MEMORY
- SELECT 0000000 as ticketFk,
- 0000000 as saleFk,
- 0000000 as itemFk,
- FALSE as isStowaway,
- 0 as quantity;
-
- INSERT INTO tmp.sale(ticketFk, saleFk, itemFk, isStowaway)
- SELECT s.ticketFk, s.id, s.itemFk, FALSE
- FROM vn.ticketCollection tc
- JOIN vn.collection c ON c.id = tc.collectionFk
- JOIN vn.sale s ON s.ticketFk = tc.ticketFk
- JOIN vn.item i ON i.id = s.itemFk
- WHERE tc.collectionFk = vParamFk
- AND (i.itemPackingTypeFk = c.itemPackingTypeFk OR ISNULL(c.itemPackingTypeFk))
- UNION ALL
- SELECT s.ticketFk, s.id, s.itemFk, FALSE
- FROM vn.sale s
- WHERE s.ticketFk = vParamFk;
-
-
- /* UNION ALL
- SELECT sw.shipFk, s.id, s.itemFk, TRUE
- FROM vn.sale s
- JOIN vn.stowaway sw ON sw.id = s.ticketFk
- JOIN vn.ticketCollection tc ON tc.ticketFk = sw.shipFk
- WHERE tc.collectionFk = vParamFk;
-
- INSERT INTO tmp.sale(ticketFk, saleFk, itemFk, isStowaway)
- SELECT s.ticketFk, s.id, s.itemFk, FALSE
- FROM vn.sale s
- JOIN vn.ticket t ON t.id = s.ticketFk
- WHERE s.ticketFk = vParamFk
- AND t.shipped > '2020-01-01'
- UNION ALL
- SELECT sw.shipFk, s.id, s.itemFk, TRUE
- FROM vn.sale s
- JOIN vn.stowaway sw ON sw.id = s.ticketFk
- WHERE sw.shipFk = vParamFk;
-
- DELETE FROM tmp.sale
- WHERE saleFk = 0;
- */
- SELECT t.warehouseFk, w.aliasFk
- INTO vWarehouseFk, vWarehouseAliasFk
- FROM vn.ticket t
- JOIN tmp.sale ts ON ts.ticketFk = t.id
- JOIN vn.warehouse w ON w.id = t.warehouseFk
- LIMIT 1;
-
- CALL cache.visible_refresh(vCalcFk,FALSE,vWarehouseFk);
-
- UPDATE tmp.sale ts
- JOIN ( SELECT itemFk, sum(visible) as visible
- FROM vn.itemShelvingStock iss
- JOIN vn.warehouse w ON w.id = iss.warehouseFk
- WHERE w.aliasFk = vWarehouseAliasFk
- GROUP BY iss.itemFk ) iss ON iss.itemFk = ts.itemFk
- SET ts.quantity = iss.visible;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale2;
- CREATE TEMPORARY TABLE tmp.sale2
- ENGINE = MEMORY
- SELECT * FROM tmp.sale;
-
-
- DROP TEMPORARY TABLE IF EXISTS tmp.`grouping`;
- CREATE TEMPORARY TABLE tmp.`grouping`
- (PRIMARY KEY (itemFk))
- ENGINE = MEMORY
- SELECT b.itemFk,
- CASE b.groupingMode
- WHEN 0 THEN 1
- WHEN 2 THEN b.packing
- ELSE b.`grouping`
- END AS `grouping`
- FROM buy b
- JOIN cache.last_buy lb ON lb.buy_id = b.id
- WHERE lb.warehouse_id = vWarehouseFk
- ;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.grouping2;
- CREATE TEMPORARY TABLE tmp.grouping2
- ENGINE = MEMORY
- SELECT * FROM tmp.`grouping`;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList;
- CREATE TEMPORARY TABLE tmp.salePlacementList
- ENGINE = MEMORY
-
- SELECT ts.saleFk,
- ts.itemFk,
- CONCAT(
- IF( iss.id,
- CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
- ''),
- p.`code`) COLLATE utf8_general_ci as placement ,
- sh.code COLLATE utf8_general_ci as shelving,
- ish.created,
- ish.visible,
- IF(ts.isStowaway, - 100000, IF(ish.visible > 0 OR iss.id, 1, 100000)) * p.pickingOrder as `order`,
- IFNULL(IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`),1) as `grouping`,
- IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,NOW()))) as priority,
- 0 as saleOrder,
- sc.isPreviousPrepared,
- iss.id as itemShelvingSaleFk,
- ts.ticketFk
- ,iss.id
- , st.saleFk as salePreviousPrepared
- , iss.userFk
- FROM tmp.sale ts
- LEFT JOIN (SELECT DISTINCT saleFk
- FROM vn.saleTracking st
- JOIN vn.state s ON s.id = st.stateFk
- WHERE st.isChecked
- AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
- JOIN vn.itemShelving ish ON ish.itemFk = ts.itemFk
- JOIN vn.shelving sh ON sh.code = ish.shelvingFk
- JOIN vn.parking p ON p.id = sh.parkingFk
- JOIN vn.sector sc ON sc.id = p.sectorFk
- JOIN vn.warehouse w ON w.id = sc.warehouseFk
- LEFT JOIN tmp.`grouping` g ON g.itemFk = ts.itemFk
- LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = ts.saleFk AND iss.itemShelvingFk = ish.id
- LEFT JOIN vn.worker wk ON wk.id = iss.userFk
- WHERE w.aliasFk = vWarehouseAliasFk
- HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL
- ;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_2;
- CREATE TEMPORARY TABLE tmp.salePlacementList_2
- ENGINE MEMORY
- SELECT saleFk, priority as olderPriority
- FROM (SELECT saleFk, priority
- FROM tmp.salePlacementList
- ORDER BY IF(isPreviousPrepared,2,1), IF(visible > 0 OR itemShelvingSaleFk,1,2), priority
- ) sub
- GROUP BY saleFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_3;
- CREATE TEMPORARY TABLE tmp.salePlacementList_3
- ENGINE MEMORY
- SELECT s1.saleFk, `order`as saleOrder
- FROM tmp.salePlacementList s1
- JOIN tmp.salePlacementList_2 s2 ON s2.saleFk = s1.saleFk AND s2.olderPriority = s1.priority;
-
- UPDATE tmp.salePlacementList s1
- JOIN tmp.salePlacementList_3 s3 ON s3.saleFk = s1.saleFk
- SET s1.saleOrder = s3.saleOrder;
- /*
- -- Anula el orden de antigüedad y ordena por ubicación */
- UPDATE tmp.salePlacementList
- SET saleOrder = `order`;
-
- SELECT *
- FROM tmp.salePlacementList
- ORDER BY visible <> 0 DESC,saleOrder, IF(isPreviousPrepared,2,1), IF(itemShelvingSaleFk,1,2),priority;
-
- DROP TEMPORARY TABLE
- tmp.sale,
- tmp.sale2,
- tmp.`grouping`,
- tmp.grouping2,
- tmp.salePlacementList_2,
- tmp.salePlacementList_3;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `placement_test`(vParamFk INT(11))
+BEGIN
+
+ DECLARE vCalcFk INT;
+ DECLARE vWarehouseFk INT;
+ DECLARE vWarehouseAliasFk INT;
+ DECLARE vCurrentYear INT DEFAULT YEAR(NOW());
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+ CREATE TEMPORARY TABLE tmp.sale
+ ENGINE = MEMORY
+ SELECT 0000000 as ticketFk,
+ 0000000 as saleFk,
+ 0000000 as itemFk,
+ FALSE as isStowaway,
+ 0 as quantity;
+
+ INSERT INTO tmp.sale(ticketFk, saleFk, itemFk, isStowaway)
+ SELECT s.ticketFk, s.id, s.itemFk, FALSE
+ FROM vn.ticketCollection tc
+ JOIN vn.collection c ON c.id = tc.collectionFk
+ JOIN vn.sale s ON s.ticketFk = tc.ticketFk
+ JOIN vn.item i ON i.id = s.itemFk
+ WHERE tc.collectionFk = vParamFk
+ AND (i.itemPackingTypeFk = c.itemPackingTypeFk OR ISNULL(c.itemPackingTypeFk))
+ UNION ALL
+ SELECT s.ticketFk, s.id, s.itemFk, FALSE
+ FROM vn.sale s
+ WHERE s.ticketFk = vParamFk;
+
+
+ /* UNION ALL
+ SELECT sw.shipFk, s.id, s.itemFk, TRUE
+ FROM vn.sale s
+ JOIN vn.stowaway sw ON sw.id = s.ticketFk
+ JOIN vn.ticketCollection tc ON tc.ticketFk = sw.shipFk
+ WHERE tc.collectionFk = vParamFk;
+
+ INSERT INTO tmp.sale(ticketFk, saleFk, itemFk, isStowaway)
+ SELECT s.ticketFk, s.id, s.itemFk, FALSE
+ FROM vn.sale s
+ JOIN vn.ticket t ON t.id = s.ticketFk
+ WHERE s.ticketFk = vParamFk
+ AND t.shipped > '2020-01-01'
+ UNION ALL
+ SELECT sw.shipFk, s.id, s.itemFk, TRUE
+ FROM vn.sale s
+ JOIN vn.stowaway sw ON sw.id = s.ticketFk
+ WHERE sw.shipFk = vParamFk;
+
+ DELETE FROM tmp.sale
+ WHERE saleFk = 0;
+ */
+ SELECT t.warehouseFk, w.aliasFk
+ INTO vWarehouseFk, vWarehouseAliasFk
+ FROM vn.ticket t
+ JOIN tmp.sale ts ON ts.ticketFk = t.id
+ JOIN vn.warehouse w ON w.id = t.warehouseFk
+ LIMIT 1;
+
+ CALL cache.visible_refresh(vCalcFk,FALSE,vWarehouseFk);
+
+ UPDATE tmp.sale ts
+ JOIN ( SELECT itemFk, sum(visible) as visible
+ FROM vn.itemShelvingStock iss
+ JOIN vn.warehouse w ON w.id = iss.warehouseFk
+ WHERE w.aliasFk = vWarehouseAliasFk
+ GROUP BY iss.itemFk ) iss ON iss.itemFk = ts.itemFk
+ SET ts.quantity = iss.visible;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale2;
+ CREATE TEMPORARY TABLE tmp.sale2
+ ENGINE = MEMORY
+ SELECT * FROM tmp.sale;
+
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.`grouping`;
+ CREATE TEMPORARY TABLE tmp.`grouping`
+ (PRIMARY KEY (itemFk))
+ ENGINE = MEMORY
+ SELECT b.itemFk,
+ CASE b.groupingMode
+ WHEN 0 THEN 1
+ WHEN 2 THEN b.packing
+ ELSE b.`grouping`
+ END AS `grouping`
+ FROM buy b
+ JOIN cache.last_buy lb ON lb.buy_id = b.id
+ WHERE lb.warehouse_id = vWarehouseFk
+ ;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.grouping2;
+ CREATE TEMPORARY TABLE tmp.grouping2
+ ENGINE = MEMORY
+ SELECT * FROM tmp.`grouping`;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList;
+ CREATE TEMPORARY TABLE tmp.salePlacementList
+ ENGINE = MEMORY
+
+ SELECT ts.saleFk,
+ ts.itemFk,
+ CONCAT(
+ IF( iss.id,
+ CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
+ ''),
+ p.`code`) COLLATE utf8_general_ci as placement ,
+ sh.code COLLATE utf8_general_ci as shelving,
+ ish.created,
+ ish.visible,
+ IF(ts.isStowaway, - 100000, IF(ish.visible > 0 OR iss.id, 1, 100000)) * p.pickingOrder as `order`,
+ IFNULL(IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`),1) as `grouping`,
+ IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,NOW()))) as priority,
+ 0 as saleOrder,
+ sc.isPreviousPrepared,
+ iss.id as itemShelvingSaleFk,
+ ts.ticketFk
+ ,iss.id
+ , st.saleFk as salePreviousPrepared
+ , iss.userFk
+ FROM tmp.sale ts
+ LEFT JOIN (SELECT DISTINCT saleFk
+ FROM vn.saleTracking st
+ JOIN vn.state s ON s.id = st.stateFk
+ WHERE st.isChecked
+ AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
+ JOIN vn.itemShelving ish ON ish.itemFk = ts.itemFk
+ JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+ JOIN vn.parking p ON p.id = sh.parkingFk
+ JOIN vn.sector sc ON sc.id = p.sectorFk
+ JOIN vn.warehouse w ON w.id = sc.warehouseFk
+ LEFT JOIN tmp.`grouping` g ON g.itemFk = ts.itemFk
+ LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = ts.saleFk AND iss.itemShelvingFk = ish.id
+ LEFT JOIN vn.worker wk ON wk.id = iss.userFk
+ WHERE w.aliasFk = vWarehouseAliasFk
+ HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL
+ ;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_2;
+ CREATE TEMPORARY TABLE tmp.salePlacementList_2
+ ENGINE MEMORY
+ SELECT saleFk, priority as olderPriority
+ FROM (SELECT saleFk, priority
+ FROM tmp.salePlacementList
+ ORDER BY IF(isPreviousPrepared,2,1), IF(visible > 0 OR itemShelvingSaleFk,1,2), priority
+ ) sub
+ GROUP BY saleFk;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_3;
+ CREATE TEMPORARY TABLE tmp.salePlacementList_3
+ ENGINE MEMORY
+ SELECT s1.saleFk, `order`as saleOrder
+ FROM tmp.salePlacementList s1
+ JOIN tmp.salePlacementList_2 s2 ON s2.saleFk = s1.saleFk AND s2.olderPriority = s1.priority;
+
+ UPDATE tmp.salePlacementList s1
+ JOIN tmp.salePlacementList_3 s3 ON s3.saleFk = s1.saleFk
+ SET s1.saleOrder = s3.saleOrder;
+ /*
+ -- Anula el orden de antigüedad y ordena por ubicación */
+ UPDATE tmp.salePlacementList
+ SET saleOrder = `order`;
+
+ SELECT *
+ FROM tmp.salePlacementList
+ ORDER BY visible <> 0 DESC,saleOrder, IF(isPreviousPrepared,2,1), IF(itemShelvingSaleFk,1,2),priority;
+
+ DROP TEMPORARY TABLE
+ tmp.sale,
+ tmp.sale2,
+ tmp.`grouping`,
+ tmp.grouping2,
+ tmp.salePlacementList_2,
+ tmp.salePlacementList_3;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72011,25 +72223,25 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `prepareClientList`()
-BEGIN
-
- /*
- * Require la tabla tmp.ticket(id,clientFk)
- */
-
- DROP TEMPORARY TABLE IF EXISTS tmp.client;
- CREATE TEMPORARY TABLE tmp.client
- (PRIMARY KEY (id))
- ENGINE = MEMORY
- SELECT DISTINCT clientFk id
- FROM tmp.ticket;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `prepareClientList`()
+BEGIN
+
+ /*
+ * Require la tabla tmp.ticket(id,clientFk)
+ */
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.client;
+ CREATE TEMPORARY TABLE tmp.client
+ (PRIMARY KEY (id))
+ ENGINE = MEMORY
+ SELECT DISTINCT clientFk id
+ FROM tmp.ticket;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72040,32 +72252,32 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `prepareTicketList`(vStartingDate DATETIME, vEndingDate DATETIME)
-BEGIN
-
- DROP TEMPORARY TABLE IF EXISTS tmp.productionTicket;
- CREATE TEMPORARY TABLE tmp.productionTicket
- (PRIMARY KEY (ticketFk))
- ENGINE = MEMORY
- SELECT t.id ticketFk, t.clientFk
- FROM vn.ticket t
- LEFT JOIN vn.ticketState ts ON ts.ticket = t.id
- JOIN vn.client c ON c.id = t.clientFk
- WHERE c.typeFk IN ('normal','handMaking','internalUse')
- AND (
- t.shipped BETWEEN CURDATE() AND vEndingDate
- OR (
- ts.alertLevel < 3
- AND t.shipped >= vStartingDate
- AND t.shipped < CURDATE()
- )
- );
+CREATE DEFINER=`root`@`localhost` PROCEDURE `prepareTicketList`(vStartingDate DATETIME, vEndingDate DATETIME)
+BEGIN
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.productionTicket;
+ CREATE TEMPORARY TABLE tmp.productionTicket
+ (PRIMARY KEY (ticketFk))
+ ENGINE = MEMORY
+ SELECT t.id ticketFk, t.clientFk
+ FROM vn.ticket t
+ LEFT JOIN vn.ticketState ts ON ts.ticket = t.id
+ JOIN vn.client c ON c.id = t.clientFk
+ WHERE c.typeFk IN ('normal','handMaking','internalUse')
+ AND (
+ t.shipped BETWEEN CURDATE() AND vEndingDate
+ OR (
+ ts.alertLevel < 3
+ AND t.shipped >= vStartingDate
+ AND t.shipped < CURDATE()
+ )
+ );
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72076,13 +72288,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `previousPreparationSticker_get__`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `previousPreparationSticker_get__`(vTicketFk INT)
BEGIN
SELECT t.id ticketFk,
@@ -72116,13 +72328,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `previousSticker_get`(vSaleGroupFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `previousSticker_get`(vSaleGroupFk INT)
BEGIN
/*
@@ -72137,7 +72349,7 @@ BEGIN
t.observations,
IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) shippingHour,
IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) shippingMinute ,
- i.itemPackingTypeFk ,
+ IFNULL(MAX(i.itemPackingTypeFk),'H') itemPackingTypeFk ,
count(*) items
FROM vn.sale s
JOIN vn.item i ON i.id = s.itemFk
@@ -72160,11 +72372,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `printTrolleyLabel`(vTicket INT, vPrinter INT, vReport INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `printTrolleyLabel`(vTicket INT, vPrinter INT, vReport INT)
BEGIN
/**
* Inserta en la cola de impresion una nueva etiqueta de carro, para el sacador
@@ -72206,232 +72418,232 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `prod`(vWarehouseFk INT, vScopeDays INT)
-proc: BEGIN
-
- DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,util.dayEnd(CURDATE()));
-
- DECLARE vIsTodayRelative BOOLEAN;
-
- SELECT isTodayRelative INTO vIsTodayRelative
- FROM vn.worker
- WHERE userFk = vn.getUser();
-
- CALL vn.prepareTicketList(TIMESTAMPADD(DAY,-1,CURDATE()), vEndingDate);
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT * FROM tmp.productionTicket;
-
- CALL vn.prepareClientList();
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketGetProblems;
- CREATE TEMPORARY TABLE tmp.ticketGetProblems
- (INDEX (ticketFk)) ENGINE = MEMORY
- SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
- FROM tmp.productionTicket tt
- JOIN vn.ticket t ON t.id = tt.ticketFk;
-
- CALL vn.ticketGetProblems(vIsTodayRelative);
-
- DROP TEMPORARY TABLE IF EXISTS tmp.productionBuffer;
- CREATE TEMPORARY TABLE tmp.productionBuffer
- (PRIMARY KEY(ticketFk))
- ENGINE = MEMORY
- SELECT tt.ticketFk
- , tt.clientFk
- , t.warehouseFk
- , t.nickname
- , t.packages
- , IF(HOUR(t.shipped), HOUR(t.shipped), IFNULL(HOUR(zc.hour),HOUR(z.hour))) as HH
- , IFNULL(HOUR(zc.hour),HOUR(z.hour)) as Departure
- , IF(MINUTE(t.shipped), MINUTE(t.shipped), IFNULL(MINUTE(zc.hour), MINUTE(z.hour))) as mm
- , t.routeFk
- , IF(am.deliveryMethodFk = 2,z.`id`,0) as zona
- , t.nickname addressNickname
- , a.postalCode
- , a.city
- , p.name province
- , CONCAT(z.`name`,' ',IFNULL(RIGHT(t.routeFk,3),'')) agency
- , am.id agencyModeFk
- , 0 AS `lines`
- , CAST( 0 AS DECIMAL(5,2)) AS m3
- , CAST( 0 AS DECIMAL(5,2)) AS preparationRate
- , "" as problem
- , IFNULL(tls.state,2) AS state
- , w.code workerCode
- , DATE(t.shipped) shipped
- , wk.code AS salesPersonCode
- , p.id provinceFk
- , tls.productionOrder
- , ifnull(tls.alertLevel,0) alertLevel
- , t.isBoxed as palletized
- , rg.deviceId ubicacion
- , tlu.lastUpdated
- -- , tls.updated lastUpdated
- , ifnull(st.graphCategory,0) graphCategory
- , pk.code as parking
- , 0 AS H
- , 0 AS V
- , 0 AS F
- , 0 AS P
- , st.isOk
- , ag.isOwn
- FROM tmp.productionTicket tt
- JOIN vn.ticket t on tt.ticketFk = t.id
- LEFT JOIN vn.ticketStateToday tst ON tst.ticket = t.id
- LEFT JOIN vn.state st ON st.id = tst.state
- LEFT JOIN vn.client c ON c.id = t.clientFk
- LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
- JOIN vn.address a on a.id = t.addressFk
- LEFT JOIN vn.province p on p.id = a.provinceFk
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- JOIN vn.agency ag ON ag.id = am.agencyFk
- LEFT JOIN vn.ticketState tls on tls.ticket = tt.ticketFk
- LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
- LEFT JOIN vn.worker w on w.id = tls.worker
- LEFT JOIN vn.routeGate rg ON rg.routeFk = t.routeFk
- LEFT JOIN vn.zone z ON z.id = t.zoneFk
- LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND date(t.shipped) = zc.dated
- LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
- LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
- WHERE t.warehouseFk = vWarehouseFk
- AND am.deliveryMethodFk IN (1,2,3);
-
- ALTER TABLE tmp.productionBuffer
- CHANGE COLUMN `problem` `problem` VARCHAR(255),
- ADD COLUMN `collectionH` INT,
- ADD COLUMN `collectionV` INT,
- ADD COLUMN `collectionF` INT,
- ADD COLUMN `collectionP` INT;
-
- -- Líneas y volumen por ticket
- UPDATE tmp.productionBuffer pb
- JOIN (
- SELECT tt.ticketFk,
- COUNT(*) as `lines`,
- sum(sv.volume) as m3,
- IFNULL(sum(IF(sv.isPicked,sv.volume,0)) / sum(sv.volume),0) as rate
- FROM tmp.productionTicket tt
- JOIN vn.saleVolume sv on sv.ticketFk = tt.ticketFk
- GROUP BY tt.ticketFk
- ) m on m.ticketFk = pb.ticketFk
- SET pb.`lines` = m.`lines`,
- pb.m3 = m.m3,
- pb.preparationRate = m.rate;
-
- DELETE FROM tmp.productionBuffer
- WHERE `lines`= 0;
-
- -- Lineas por linea de encajado
- UPDATE tmp.productionBuffer pb
- JOIN ( SELECT ticketFk,
- sum(sub.H) H,
- sum(sub.V) V,
- sum(sub.F) F,
- sum(sub.P) P
- FROM (
- SELECT t.ticketFk,
- sum(i.itemPackingTypeFk = 'H') H,
- sum(i.itemPackingTypeFk = 'V') V,
- sum(i.itemPackingTypeFk = 'F') F,
- sum(i.itemPackingTypeFk = 'P') P
- FROM tmp.productionTicket t
- JOIN vn.sale s ON s.ticketFk = t.ticketFk
- JOIN vn.item i ON i.id = s.itemFk
- GROUP BY t.ticketFk, i.itemPackingTypeFk) sub
- GROUP BY ticketFk
- ) sub2 ON sub2.ticketFk = pb.ticketFk
- SET pb.H = sub2.H,
- pb.V = sub2.V,
- pb.F = sub2.F,
- pb.P = sub2.P;
-
- -- Colecciones segun tipo de encajado
- UPDATE tmp.productionBuffer pb
- JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
- JOIN vn.collection c ON c.id = tc.collectionFk
- SET pb.collectionH = c.id
- WHERE c.itemPackingTypeFk = 'H' OR ISNULL(c.itemPackingTypeFk);
-
- UPDATE tmp.productionBuffer pb
- JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
- JOIN vn.collection c ON c.id = tc.collectionFk
- SET pb.collectionV = c.id
- WHERE c.itemPackingTypeFk = 'V' OR ISNULL(c.itemPackingTypeFk);
-
- UPDATE tmp.productionBuffer pb
- JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
- JOIN vn.collection c ON c.id = tc.collectionFk
- SET pb.collectionF = c.id
- WHERE c.itemPackingTypeFk = 'F' OR ISNULL(c.itemPackingTypeFk);
-
- UPDATE tmp.productionBuffer pb
- JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
- JOIN vn.collection c ON c.id = tc.collectionFk
- SET pb.collectionP = c.id
- WHERE c.itemPackingTypeFk = 'P' OR ISNULL(c.itemPackingTypeFk);
-
- -- Cajas
- ALTER TABLE tmp.productionBuffer
- ADD Cajas DOUBLE DEFAULT NULL;
- /*
- -- Problemas por ticket
- UPDATE tmp.productionBuffer pb
- JOIN tmp.ticketProblems tp ON tp.ticketFk = pb.ticketFk
- SET pb.problem = CAST(CONCAT( IFNULL(tp.itemShortage,''),
- IFNULL(tp.itemDelay,''),
- IF(tp.isFreezed,' CONGELADO',''),
- IF(tp.risk,' RIESGO',''),
- IF(tp.hasTicketRequest, ' COD 100',''),
- IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
- IF(tp.componentLack,' COMPONENTES', '')
- ) as char(255));
- */
- -- Refresca la caché para el cierre dinámico de agencias
- -- CALL cache.departure_timing(vWarehouseFk);
-/*
- -- Tickets de recogida
- REPLACE tmp.productionBuffer(
- shipped
- , ticketFk
- , agency
- , clientFk
- , addressNickname
- , state
- , workerCode
- , alertLevel
- , warehouseFk
- )
- SELECT DATE(t.shipped)
- , t.id
- , am.name
- , t.clientFk
- , a.nickname
- , s.id as state
- , w.code
- , ifnull(tls.alertLevel,0) alert_level
- , vWarehouseFk
- FROM vn.ticket t
- JOIN vn.address a on a.id = t.addressFk
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- LEFT JOIN vn2008.warehouse_pickup wp ON wp.agency_id = am.id
- LEFT JOIN vn.ticketState tls on tls.ticket = t.id
- LEFT JOIN vn.state s ON s.id = tls.state
- LEFT JOIN vn.worker w on w.id = tls.worker
- WHERE t.shipped between TIMESTAMPADD(WEEK,-1,CURDATE()) AND util.dayend(TIMESTAMPADD(DAY,-1,CURDATE()))
- AND wp.warehouse_id = vWarehouseFk;
-*/
- DROP TEMPORARY TABLE tmp.productionTicket;
- DROP TEMPORARY TABLE tmp.ticket;
- DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `prod`(vWarehouseFk INT, vScopeDays INT)
+proc: BEGIN
+
+ DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,util.dayEnd(CURDATE()));
+
+ DECLARE vIsTodayRelative BOOLEAN;
+
+ SELECT isTodayRelative INTO vIsTodayRelative
+ FROM vn.worker
+ WHERE userFk = vn.getUser();
+
+ CALL vn.prepareTicketList(TIMESTAMPADD(DAY,-1,CURDATE()), vEndingDate);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+ CREATE TEMPORARY TABLE tmp.ticket
+ SELECT * FROM tmp.productionTicket;
+
+ CALL vn.prepareClientList();
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketGetProblems;
+ CREATE TEMPORARY TABLE tmp.ticketGetProblems
+ (INDEX (ticketFk)) ENGINE = MEMORY
+ SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
+ FROM tmp.productionTicket tt
+ JOIN vn.ticket t ON t.id = tt.ticketFk;
+
+ CALL vn.ticketGetProblems(vIsTodayRelative);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.productionBuffer;
+ CREATE TEMPORARY TABLE tmp.productionBuffer
+ (PRIMARY KEY(ticketFk))
+ ENGINE = MEMORY
+ SELECT tt.ticketFk
+ , tt.clientFk
+ , t.warehouseFk
+ , t.nickname
+ , t.packages
+ , IF(HOUR(t.shipped), HOUR(t.shipped), IFNULL(HOUR(zc.hour),HOUR(z.hour))) as HH
+ , IFNULL(HOUR(zc.hour),HOUR(z.hour)) as Departure
+ , IF(MINUTE(t.shipped), MINUTE(t.shipped), IFNULL(MINUTE(zc.hour), MINUTE(z.hour))) as mm
+ , t.routeFk
+ , IF(am.deliveryMethodFk = 2,z.`id`,0) as zona
+ , t.nickname addressNickname
+ , a.postalCode
+ , a.city
+ , p.name province
+ , CONCAT(z.`name`,' ',IFNULL(RIGHT(t.routeFk,3),'')) agency
+ , am.id agencyModeFk
+ , 0 AS `lines`
+ , CAST( 0 AS DECIMAL(5,2)) AS m3
+ , CAST( 0 AS DECIMAL(5,2)) AS preparationRate
+ , "" as problem
+ , IFNULL(tls.state,2) AS state
+ , w.code workerCode
+ , DATE(t.shipped) shipped
+ , wk.code AS salesPersonCode
+ , p.id provinceFk
+ , tls.productionOrder
+ , ifnull(tls.alertLevel,0) alertLevel
+ , t.isBoxed as palletized
+ , rg.deviceId ubicacion
+ , tlu.lastUpdated
+ -- , tls.updated lastUpdated
+ , ifnull(st.graphCategory,0) graphCategory
+ , pk.code as parking
+ , 0 AS H
+ , 0 AS V
+ , 0 AS F
+ , 0 AS P
+ , st.isOk
+ , ag.isOwn
+ FROM tmp.productionTicket tt
+ JOIN vn.ticket t on tt.ticketFk = t.id
+ LEFT JOIN vn.ticketStateToday tst ON tst.ticket = t.id
+ LEFT JOIN vn.state st ON st.id = tst.state
+ LEFT JOIN vn.client c ON c.id = t.clientFk
+ LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
+ JOIN vn.address a on a.id = t.addressFk
+ LEFT JOIN vn.province p on p.id = a.provinceFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ JOIN vn.agency ag ON ag.id = am.agencyFk
+ LEFT JOIN vn.ticketState tls on tls.ticket = tt.ticketFk
+ LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
+ LEFT JOIN vn.worker w on w.id = tls.worker
+ LEFT JOIN vn.routeGate rg ON rg.routeFk = t.routeFk
+ LEFT JOIN vn.zone z ON z.id = t.zoneFk
+ LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND date(t.shipped) = zc.dated
+ LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+ LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
+ WHERE t.warehouseFk = vWarehouseFk
+ AND am.deliveryMethodFk IN (1,2,3);
+
+ ALTER TABLE tmp.productionBuffer
+ CHANGE COLUMN `problem` `problem` VARCHAR(255),
+ ADD COLUMN `collectionH` INT,
+ ADD COLUMN `collectionV` INT,
+ ADD COLUMN `collectionF` INT,
+ ADD COLUMN `collectionP` INT;
+
+ -- Líneas y volumen por ticket
+ UPDATE tmp.productionBuffer pb
+ JOIN (
+ SELECT tt.ticketFk,
+ COUNT(*) as `lines`,
+ sum(sv.volume) as m3,
+ IFNULL(sum(IF(sv.isPicked,sv.volume,0)) / sum(sv.volume),0) as rate
+ FROM tmp.productionTicket tt
+ JOIN vn.saleVolume sv on sv.ticketFk = tt.ticketFk
+ GROUP BY tt.ticketFk
+ ) m on m.ticketFk = pb.ticketFk
+ SET pb.`lines` = m.`lines`,
+ pb.m3 = m.m3,
+ pb.preparationRate = m.rate;
+
+ DELETE FROM tmp.productionBuffer
+ WHERE `lines`= 0;
+
+ -- Lineas por linea de encajado
+ UPDATE tmp.productionBuffer pb
+ JOIN ( SELECT ticketFk,
+ sum(sub.H) H,
+ sum(sub.V) V,
+ sum(sub.F) F,
+ sum(sub.P) P
+ FROM (
+ SELECT t.ticketFk,
+ sum(i.itemPackingTypeFk = 'H') H,
+ sum(i.itemPackingTypeFk = 'V') V,
+ sum(i.itemPackingTypeFk = 'F') F,
+ sum(i.itemPackingTypeFk = 'P') P
+ FROM tmp.productionTicket t
+ JOIN vn.sale s ON s.ticketFk = t.ticketFk
+ JOIN vn.item i ON i.id = s.itemFk
+ GROUP BY t.ticketFk, i.itemPackingTypeFk) sub
+ GROUP BY ticketFk
+ ) sub2 ON sub2.ticketFk = pb.ticketFk
+ SET pb.H = sub2.H,
+ pb.V = sub2.V,
+ pb.F = sub2.F,
+ pb.P = sub2.P;
+
+ -- Colecciones segun tipo de encajado
+ UPDATE tmp.productionBuffer pb
+ JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
+ JOIN vn.collection c ON c.id = tc.collectionFk
+ SET pb.collectionH = c.id
+ WHERE c.itemPackingTypeFk = 'H' OR ISNULL(c.itemPackingTypeFk);
+
+ UPDATE tmp.productionBuffer pb
+ JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
+ JOIN vn.collection c ON c.id = tc.collectionFk
+ SET pb.collectionV = c.id
+ WHERE c.itemPackingTypeFk = 'V' OR ISNULL(c.itemPackingTypeFk);
+
+ UPDATE tmp.productionBuffer pb
+ JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
+ JOIN vn.collection c ON c.id = tc.collectionFk
+ SET pb.collectionF = c.id
+ WHERE c.itemPackingTypeFk = 'F' OR ISNULL(c.itemPackingTypeFk);
+
+ UPDATE tmp.productionBuffer pb
+ JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
+ JOIN vn.collection c ON c.id = tc.collectionFk
+ SET pb.collectionP = c.id
+ WHERE c.itemPackingTypeFk = 'P' OR ISNULL(c.itemPackingTypeFk);
+
+ -- Cajas
+ ALTER TABLE tmp.productionBuffer
+ ADD Cajas DOUBLE DEFAULT NULL;
+ /*
+ -- Problemas por ticket
+ UPDATE tmp.productionBuffer pb
+ JOIN tmp.ticketProblems tp ON tp.ticketFk = pb.ticketFk
+ SET pb.problem = CAST(CONCAT( IFNULL(tp.itemShortage,''),
+ IFNULL(tp.itemDelay,''),
+ IF(tp.isFreezed,' CONGELADO',''),
+ IF(tp.risk,' RIESGO',''),
+ IF(tp.hasTicketRequest, ' COD 100',''),
+ IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
+ IF(tp.componentLack,' COMPONENTES', '')
+ ) as char(255));
+ */
+ -- Refresca la caché para el cierre dinámico de agencias
+ -- CALL cache.departure_timing(vWarehouseFk);
+/*
+ -- Tickets de recogida
+ REPLACE tmp.productionBuffer(
+ shipped
+ , ticketFk
+ , agency
+ , clientFk
+ , addressNickname
+ , state
+ , workerCode
+ , alertLevel
+ , warehouseFk
+ )
+ SELECT DATE(t.shipped)
+ , t.id
+ , am.name
+ , t.clientFk
+ , a.nickname
+ , s.id as state
+ , w.code
+ , ifnull(tls.alertLevel,0) alert_level
+ , vWarehouseFk
+ FROM vn.ticket t
+ JOIN vn.address a on a.id = t.addressFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ LEFT JOIN vn2008.warehouse_pickup wp ON wp.agency_id = am.id
+ LEFT JOIN vn.ticketState tls on tls.ticket = t.id
+ LEFT JOIN vn.state s ON s.id = tls.state
+ LEFT JOIN vn.worker w on w.id = tls.worker
+ WHERE t.shipped between TIMESTAMPADD(WEEK,-1,CURDATE()) AND util.dayend(TIMESTAMPADD(DAY,-1,CURDATE()))
+ AND wp.warehouse_id = vWarehouseFk;
+*/
+ DROP TEMPORARY TABLE tmp.productionTicket;
+ DROP TEMPORARY TABLE tmp.ticket;
+ DROP TEMPORARY TABLE IF EXISTS tmp.risk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72448,138 +72660,164 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `productionControl`(vWarehouseFk INT, vScopeDays INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `productionControl`(vWarehouseFk INT, vScopeDays INT)
proc: BEGIN
-
- DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,util.dayEnd(CURDATE()));
-
- DECLARE vIsTodayRelative BOOLEAN;
-
- CALL util.debugAdd('vn.productionControl',CONCAT('warehouse: ',vWarehouseFk,' scopeDays:',vScopeDays));
-
- SELECT isTodayRelative INTO vIsTodayRelative
- FROM vn.worker
- WHERE userFk = vn.getUser();
-
- CALL vn.prepareTicketList(TIMESTAMPADD(DAY,-1,CURDATE()), vEndingDate);
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT * FROM tmp.productionTicket;
-
- CALL vn.prepareClientList();
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems;
- CREATE TEMPORARY TABLE tmp.sale_getProblems
- (INDEX (ticketFk)) ENGINE = MEMORY
- SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
- FROM tmp.productionTicket tt
- JOIN vn.ticket t ON t.id = tt.ticketFk;
- CALL vn.ticket_getProblems(vIsTodayRelative);
-
- DROP TEMPORARY TABLE IF EXISTS tmp.productionBuffer;
- CREATE TEMPORARY TABLE tmp.productionBuffer
- (PRIMARY KEY(ticketFk))
- ENGINE = MEMORY
- SELECT tt.ticketFk
- , tt.clientFk
- , t.warehouseFk
- , t.nickname
- , t.packages
- , IF(HOUR(t.shipped), HOUR(t.shipped), IFNULL(HOUR(zc.hour),HOUR(z.hour))) as HH
- , IFNULL(HOUR(zc.hour),HOUR(z.hour)) as Departure
- , IF(MINUTE(t.shipped), MINUTE(t.shipped), IFNULL(MINUTE(zc.hour), MINUTE(z.hour))) as mm
- , t.routeFk
- , IF(am.deliveryMethodFk = 2,z.`id`,0) as zona
- , t.nickname addressNickname
- , a.postalCode
- , a.city
- , p.name province
- , CONCAT(z.`name`,' ',IFNULL(RIGHT(t.routeFk,3),'')) agency
- , am.id agencyModeFk
- , 0 AS `lines`
- , CAST( 0 AS DECIMAL(5,2)) AS m3
- , CAST( 0 AS DECIMAL(5,2)) AS preparationRate
- , "" as problem
- , IFNULL(tls.state,2) AS state
- , w.code workerCode
- , DATE(t.shipped) shipped
- , wk.code AS salesPersonCode
- , p.id provinceFk
- , tls.productionOrder
- , ifnull(tls.alertLevel,0) alertLevel
- , t.isBoxed as palletized
- , IF(rm.isPickingAllowed ,rm.bufferFk, NULL) ubicacion
- , tlu.lastUpdated
- , ifnull(st.graphCategory,0) graphCategory
- , pk.code as parking
- , 0 AS H
- , 0 AS V
- , 0 AS N
- , st.isOk
- , ag.isOwn
- FROM tmp.productionTicket tt
- JOIN vn.ticket t on tt.ticketFk = t.id
- LEFT JOIN vn.ticketStateToday tst ON tst.ticket = t.id
- LEFT JOIN vn.state st ON st.id = tst.state
- LEFT JOIN vn.client c ON c.id = t.clientFk
- LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
- JOIN vn.address a on a.id = t.addressFk
- LEFT JOIN vn.province p on p.id = a.provinceFk
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- JOIN vn.agency ag ON ag.id = am.agencyFk
- LEFT JOIN vn.ticketState tls on tls.ticket = tt.ticketFk
- LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
- LEFT JOIN vn.worker w on w.id = tls.worker
- LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
- LEFT JOIN vn.zone z ON z.id = t.zoneFk
- LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND date(t.shipped) = zc.dated
- LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
- LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
- WHERE t.warehouseFk = vWarehouseFk
- AND am.deliveryMethodFk IN (1,2,3);
+ /**
+ * Devuelve un listado de tickets con parámetros relativos a la producción de los días en rango
+ *
+ * @param vWarehouseFk Identificador de vn.warehouse
+ * @param vScopeDays Número de días desde hoy en adelante que entran en el cálculo.
+ *
+ * @return Table tmp.productionBuffer
+ */
+ DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,util.dayEnd(CURDATE()));
+
+ DECLARE vIsTodayRelative BOOLEAN;
+
+ SELECT isTodayRelative INTO vIsTodayRelative
+ FROM vn.worker
+ WHERE userFk = vn.getUser();
+
+ CALL vn.prepareTicketList(TIMESTAMPADD(DAY,-1,CURDATE()), vEndingDate);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+ CREATE TEMPORARY TABLE tmp.ticket
+ SELECT * FROM tmp.productionTicket;
+
+ CALL vn.prepareClientList();
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems;
+ CREATE TEMPORARY TABLE tmp.sale_getProblems
+ (INDEX (ticketFk)) ENGINE = MEMORY
+ SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
+ FROM tmp.productionTicket tt
+ JOIN vn.ticket t ON t.id = tt.ticketFk;
+
+ CALL vn.ticket_getProblems(vIsTodayRelative);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.productionBuffer;
+ CREATE TEMPORARY TABLE tmp.productionBuffer
+ (PRIMARY KEY(ticketFk))
+ ENGINE = MEMORY
+ SELECT tt.ticketFk
+ , tt.clientFk
+ , t.warehouseFk
+ , t.nickname
+ , t.packages
+ , IF(HOUR(t.shipped), HOUR(t.shipped), IFNULL(HOUR(zc.hour),HOUR(z.hour))) as HH
+ , IFNULL(HOUR(zc.hour),HOUR(z.hour)) as Departure
+ , IF(MINUTE(t.shipped), MINUTE(t.shipped), IFNULL(MINUTE(zc.hour), MINUTE(z.hour))) as mm
+ , t.routeFk
+ , IF(am.deliveryMethodFk = 2,z.`id`,0) as zona
+ , t.nickname addressNickname
+ , a.postalCode
+ , a.city
+ , p.name province
+ , CONCAT(z.`name`,' ',IFNULL(RIGHT(t.routeFk,3),'')) agency
+ , am.id agencyModeFk
+ , 0 AS `lines`
+ , CAST( 0 AS DECIMAL(5,2)) AS m3
+ , CAST( 0 AS DECIMAL(5,2)) AS preparationRate
+ , "" as problem
+ , IFNULL(tls.state,2) AS state
+ , w.code workerCode
+ , DATE(t.shipped) shipped
+ , wk.code AS salesPersonCode
+ , p.id provinceFk
+ , tls.productionOrder
+ , ifnull(tls.alertLevel,0) alertLevel
+ , t.isBoxed as palletized
+ , IF(rm.isPickingAllowed ,rm.bufferFk, NULL) ubicacion
+ , tlu.lastUpdated
+ , ifnull(st.graphCategory,0) graphCategory
+ , pk.code as parking
+ , 0 AS H
+ , 0 AS V
+ , 0 AS N
+ , st.isOk
+ , ag.isOwn
+ FROM tmp.productionTicket tt
+ JOIN vn.ticket t on tt.ticketFk = t.id
+ LEFT JOIN vn.ticketStateToday tst ON tst.ticket = t.id
+ LEFT JOIN vn.state st ON st.id = tst.state
+ LEFT JOIN vn.client c ON c.id = t.clientFk
+ LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
+ JOIN vn.address a on a.id = t.addressFk
+ LEFT JOIN vn.province p on p.id = a.provinceFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ JOIN vn.agency ag ON ag.id = am.agencyFk
+ LEFT JOIN vn.ticketState tls on tls.ticket = tt.ticketFk
+ LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
+ LEFT JOIN vn.worker w on w.id = tls.worker
+ LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
+ LEFT JOIN vn.zone z ON z.id = t.zoneFk
+ LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND date(t.shipped) = zc.dated
+ LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+ LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
+ WHERE t.warehouseFk = vWarehouseFk
+ AND am.deliveryMethodFk IN (1,2,3);
+
+ -- Problemas por ticket
ALTER TABLE tmp.productionBuffer
CHANGE COLUMN `problem` `problem` VARCHAR(255),
ADD COLUMN `collectionH` INT,
ADD COLUMN `collectionV` INT;
-
- -- Líneas y volumen por ticket
- UPDATE tmp.productionBuffer pb
- JOIN (
- SELECT tt.ticketFk,
- COUNT(*) as `lines`,
- sum(sv.volume) as m3,
- IFNULL(sum(IF(sv.isPicked,sv.volume,0)) / sum(sv.volume),0) as rate
- FROM tmp.productionTicket tt
- JOIN vn.saleVolume sv on sv.ticketFk = tt.ticketFk
- GROUP BY tt.ticketFk
- ) m on m.ticketFk = pb.ticketFk
- SET pb.`lines` = m.`lines`,
- pb.m3 = m.m3,
- pb.preparationRate = m.rate;
-
- DELETE FROM tmp.productionBuffer
- WHERE `lines`= 0;
+
+ UPDATE tmp.productionBuffer pb
+ JOIN tmp.ticket_problems tp ON tp.ticketFk = pb.ticketFk
+ SET pb.problem = TRIM(CAST(CONCAT( IFNULL(tp.itemShortage,''),
+ IFNULL(tp.itemDelay,''),
+ IF(tp.isFreezed,' CONGELADO',''),
+ IF(tp.hasHighRisk,' RIESGO',''),
+ IF(tp.hasTicketRequest, ' COD 100',''),
+ IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
+ IF(tp.hasComponentLack,' COMPONENTES', ''),
+ IF(HOUR(NOW()) < pb.HH AND tp.isTooLittle,' PEQUEÑO', '')
+ ) as char(255)));
+
+ -- Clientes Nuevos o Recuperados
+ UPDATE tmp.productionBuffer pb
+ LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = pb.clientFk
+ SET pb.problem = TRIM(CAST(CONCAT('NUEVO ', pb.problem) AS CHAR(255)))
+ WHERE ISNULL(cnb.clientFk) OR cnb.isRookie ;
+
+ -- Líneas y volumen por ticket
+ UPDATE tmp.productionBuffer pb
+ JOIN (
+ SELECT tt.ticketFk,
+ COUNT(*) as `lines`,
+ sum(sv.volume) as m3,
+ IFNULL(sum(IF(sv.isPicked,sv.volume,0)) / sum(sv.volume),0) as rate
+ FROM tmp.productionTicket tt
+ JOIN vn.saleVolume sv on sv.ticketFk = tt.ticketFk
+ GROUP BY tt.ticketFk
+ ) m on m.ticketFk = pb.ticketFk
+ SET pb.`lines` = m.`lines`,
+ pb.m3 = m.m3,
+ pb.preparationRate = m.rate;
- -- Lineas por linea de encajado
- UPDATE tmp.productionBuffer pb
- JOIN ( SELECT ticketFk,
- sum(sub.H) H,
- sum(sub.V) V,
- sum(sub.N) N
- FROM (
- SELECT t.ticketFk,
- sum(i.itemPackingTypeFk = 'H') H,
- sum(i.itemPackingTypeFk = 'V') V,
+ DELETE FROM tmp.productionBuffer
+ WHERE `lines`= 0;
+
+ -- Lineas por linea de encajado
+ UPDATE tmp.productionBuffer pb
+ JOIN ( SELECT ticketFk,
+ sum(sub.H) H,
+ sum(sub.V) V,
+ sum(sub.N) N
+ FROM (
+ SELECT t.ticketFk,
+ sum(i.itemPackingTypeFk = 'H') H,
+ sum(i.itemPackingTypeFk = 'V') V,
sum(ISNULL(i.itemPackingTypeFk)) N
- FROM tmp.productionTicket t
- JOIN vn.sale s ON s.ticketFk = t.ticketFk
- JOIN vn.item i ON i.id = s.itemFk
- GROUP BY t.ticketFk, i.itemPackingTypeFk) sub
+ FROM tmp.productionTicket t
+ JOIN vn.sale s ON s.ticketFk = t.ticketFk
+ JOIN vn.item i ON i.id = s.itemFk
+ GROUP BY t.ticketFk, i.itemPackingTypeFk) sub
GROUP BY ticketFk
- ) sub2 ON sub2.ticketFk = pb.ticketFk
+ ) sub2 ON sub2.ticketFk = pb.ticketFk
SET pb.H = sub2.H,
pb.V = sub2.V,
pb.N = sub2.N;
@@ -72589,69 +72827,99 @@ proc: BEGIN
JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
JOIN vn.collection c ON c.id = tc.collectionFk
SET pb.collectionH = c.id
- WHERE c.itemPackingTypeFk = 'H' OR ISNULL(c.itemPackingTypeFk);
+ WHERE (c.itemPackingTypeFk = 'H' OR ISNULL(c.itemPackingTypeFk))
+ AND pb.H;
UPDATE tmp.productionBuffer pb
JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
JOIN vn.collection c ON c.id = tc.collectionFk
SET pb.collectionV = c.id
- WHERE c.itemPackingTypeFk = 'V' OR ISNULL(c.itemPackingTypeFk);
-
- -- Cajas
- ALTER TABLE tmp.productionBuffer
- ADD Cajas DOUBLE DEFAULT NULL;
-
- -- Problemas por ticket
- UPDATE tmp.productionBuffer pb
- JOIN tmp.ticket_problems tp ON tp.ticketFk = pb.ticketFk
- SET pb.problem = TRIM(CAST(CONCAT( IFNULL(tp.itemShortage,''),
- IFNULL(tp.itemDelay,''),
- IF(tp.isFreezed,' CONGELADO',''),
- IF(tp.hasHighRisk,' RIESGO',''),
- IF(tp.hasTicketRequest, ' COD 100',''),
- IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
- IF(tp.hasComponentLack,' COMPONENTES', ''),
- IF(tp.isTooLittle,' PEQUEÑO', '')
- ) as char(255)));
-
- -- Refresca la caché para el cierre dinámico de agencias
- -- CALL cache.departure_timing(vWarehouseFk);
+ WHERE (c.itemPackingTypeFk = 'V' OR ISNULL(c.itemPackingTypeFk))
+ AND pb.V;
+
+ -- Previa pendiente
+ ALTER TABLE tmp.productionBuffer
+ ADD previousWithoutParking BOOL DEFAULT FALSE;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketWithPrevia;
+ CREATE TEMPORARY TABLE tmp.ticketWithPrevia
+ (ticketFk INT PRIMARY KEY,
+ salesCount INT DEFAULT 0,
+ salesInParkingCount INT DEFAULT 0)
+ ENGINE = MEMORY;
+
+ -- Insertamos todos los tickets que tienen productos parkineados en sectores de previa, segun el sector
+ INSERT INTO tmp.ticketWithPrevia(ticketFk, salesCount)
+ SELECT pb.ticketFk, COUNT(DISTINCT s.id)
+ FROM tmp.productionBuffer pb
+ JOIN vn.sale s ON s.ticketFk = pb.ticketFk
+ JOIN vn.itemShelvingStock iss ON iss.itemFk = s.itemFk
+ JOIN vn.sector sc ON sc.id = iss.sectorFk
+ JOIN vn.item i ON i.id = iss.itemFk
+ WHERE iss.isPreviousPrepared
+ AND (ISNULL(sc.itemPackingTypeFk)
+ OR ISNULL(i.itemPackingTypeFk)
+ OR sc.itemPackingTypeFk = i.itemPackingTypeFk )
+ GROUP BY pb.ticketFk;
+
+ -- Se calcula la cantidad de productos que estan ya preparados porque su saleGroup está aparcado
+ UPDATE tmp.ticketWithPrevia twp
+ JOIN ( SELECT pb.ticketFk, count(DISTINCT s.id) salesInParkingCount
+ FROM tmp.productionBuffer pb
+ JOIN vn.sale s ON s.ticketFk = pb.ticketFk
+ JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
+ JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk
+ WHERE NOT ISNULL(sg.parkingFk)
+ GROUP BY pb.ticketFk ) sub ON twp.ticketFk = sub.ticketFk
+ SET twp.salesInParkingCount = sub.salesInParkingCount;
+
+ -- Marcamos como pendientes aquellos que no coinciden las cantidades
+ UPDATE tmp.productionBuffer pb
+ JOIN tmp.ticketWithPrevia twp ON twp.ticketFk = pb.ticketFk
+ SET pb.previousWithoutParking = TRUE
+ WHERE twp.salesCount > twp.salesInParkingCount;
+
/*
- -- Tickets de recogida
- REPLACE tmp.productionBuffer(
- shipped
- , ticketFk
- , agency
- , clientFk
- , addressNickname
- , state
- , workerCode
- , alertLevel
- , warehouseFk
- )
- SELECT DATE(t.shipped)
- , t.id
- , am.name
- , t.clientFk
- , a.nickname
- , s.id as state
- , w.code
- , ifnull(tls.alertLevel,0) alert_level
- , vWarehouseFk
- FROM vn.ticket t
- JOIN vn.address a on a.id = t.addressFk
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- LEFT JOIN vn2008.warehouse_pickup wp ON wp.agency_id = am.id
- LEFT JOIN vn.ticketState tls on tls.ticket = t.id
- LEFT JOIN vn.state s ON s.id = tls.state
- LEFT JOIN vn.worker w on w.id = tls.worker
- WHERE t.shipped between TIMESTAMPADD(WEEK,-1,CURDATE()) AND util.dayend(TIMESTAMPADD(DAY,-1,CURDATE()))
- AND wp.warehouse_id = vWarehouseFk;
+ -- Refresca la caché para el cierre dinámico de agencias
+ CALL cache.departure_timing(vWarehouseFk);
+
+ -- Tickets de recogida
+ REPLACE tmp.productionBuffer(
+ shipped
+ , ticketFk
+ , agency
+ , clientFk
+ , addressNickname
+ , state
+ , workerCode
+ , alertLevel
+ , warehouseFk
+ )
+ SELECT DATE(t.shipped)
+ , t.id
+ , am.name
+ , t.clientFk
+ , a.nickname
+ , s.id as state
+ , w.code
+ , ifnull(tls.alertLevel,0) alert_level
+ , vWarehouseFk
+ FROM vn.ticket t
+ JOIN vn.address a on a.id = t.addressFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ LEFT JOIN vn2008.warehouse_pickup wp ON wp.agency_id = am.id
+ LEFT JOIN vn.ticketState tls on tls.ticket = t.id
+ LEFT JOIN vn.state s ON s.id = tls.state
+ LEFT JOIN vn.worker w on w.id = tls.worker
+ WHERE t.shipped between TIMESTAMPADD(WEEK,-1,CURDATE()) AND util.dayend(TIMESTAMPADD(DAY,-1,CURDATE()))
+ AND wp.warehouse_id = vWarehouseFk;
*/
- DROP TEMPORARY TABLE tmp.productionTicket;
- DROP TEMPORARY TABLE tmp.ticket;
- DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-
+ DROP TEMPORARY TABLE tmp.productionTicket;
+ DROP TEMPORARY TABLE tmp.ticket;
+ DROP TEMPORARY TABLE tmp.risk;
+ DROP TEMPORARY TABLE tmp.ticket_problems;
+ DROP TEMPORARY TABLE tmp.ticketWithPrevia;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72662,245 +72930,272 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `productionControl__`(vWarehouseFk INT, vScopeDays INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `productionControl__`(vWarehouseFk INT, vScopeDays INT)
proc: BEGIN
-
- DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,util.dayEnd(CURDATE()));
-
- DECLARE vIsTodayRelative BOOLEAN;
-
- CALL util.debugAdd('vn.productionControl',CONCAT('warehouse: ',vWarehouseFk,' scopeDays:',vScopeDays));
-
- SELECT isTodayRelative INTO vIsTodayRelative
- FROM vn.worker
- WHERE userFk = vn.getUser();
-
- CALL vn.prepareTicketList(TIMESTAMPADD(DAY,-1,CURDATE()), vEndingDate);
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT * FROM tmp.productionTicket;
-
- CALL vn.prepareClientList();
- /*
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketGetProblems;
- CREATE TEMPORARY TABLE tmp.ticketGetProblems
- (INDEX (ticketFk)) ENGINE = MEMORY
- SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
- FROM tmp.productionTicket tt
- JOIN vn.ticket t ON t.id = tt.ticketFk;
- CALL vn.ticketGetProblems(vIsTodayRelative);
+ /**
+ * Devuelve un listado de tickets con parámetros relativos a la producción de los días en rango
+ *
+ * @param vWarehouseFk Identificador de vn.warehouse
+ * @param vScopeDays Número de días desde hoy en adelante que entran en el cálculo.
+ *
+ * @return Table tmp.productionBuffer
*/
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems;
- CREATE TEMPORARY TABLE tmp.sale_getProblems
- (INDEX (ticketFk)) ENGINE = MEMORY
- SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
- FROM tmp.productionTicket tt
- JOIN vn.ticket t ON t.id = tt.ticketFk;
-
- CALL vn.ticket_getProblems(vIsTodayRelative);
-
- DROP TEMPORARY TABLE IF EXISTS tmp.productionBuffer;
- CREATE TEMPORARY TABLE tmp.productionBuffer
- (PRIMARY KEY(ticketFk))
- ENGINE = MEMORY
- SELECT tt.ticketFk
- , tt.clientFk
- , t.warehouseFk
- , t.nickname
- , t.packages
- , IF(HOUR(t.shipped), HOUR(t.shipped), IFNULL(HOUR(zc.hour),HOUR(z.hour))) as HH
- , IFNULL(HOUR(zc.hour),HOUR(z.hour)) as Departure
- , IF(MINUTE(t.shipped), MINUTE(t.shipped), IFNULL(MINUTE(zc.hour), MINUTE(z.hour))) as mm
- , t.routeFk
- , IF(am.deliveryMethodFk = 2,z.`id`,0) as zona
- , t.nickname addressNickname
- , a.postalCode
- , a.city
- , p.name province
- , CONCAT(z.`name`,' ',IFNULL(RIGHT(t.routeFk,3),'')) agency
- , am.id agencyModeFk
- , 0 AS `lines`
- , CAST( 0 AS DECIMAL(5,2)) AS m3
- , CAST( 0 AS DECIMAL(5,2)) AS preparationRate
- , "" as problem
- , IFNULL(tls.state,2) AS state
- , w.code workerCode
- , DATE(t.shipped) shipped
- , wk.code AS salesPersonCode
- , p.id provinceFk
- , tls.productionOrder
- , ifnull(tls.alertLevel,0) alertLevel
- , t.isBoxed as palletized
- , IF(rm.isPickingAllowed ,rm.bufferFk, NULL) ubicacion
- , tlu.lastUpdated
- , ifnull(st.graphCategory,0) graphCategory
- , pk.code as parking
- , 0 AS H
- , 0 AS V
- , 0 AS F
- , 0 AS P
- , st.isOk
- , ag.isOwn
- FROM tmp.productionTicket tt
- JOIN vn.ticket t on tt.ticketFk = t.id
- LEFT JOIN vn.ticketStateToday tst ON tst.ticket = t.id
- LEFT JOIN vn.state st ON st.id = tst.state
- LEFT JOIN vn.client c ON c.id = t.clientFk
- LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
- JOIN vn.address a on a.id = t.addressFk
- LEFT JOIN vn.province p on p.id = a.provinceFk
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- JOIN vn.agency ag ON ag.id = am.agencyFk
- LEFT JOIN vn.ticketState tls on tls.ticket = tt.ticketFk
- LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
- LEFT JOIN vn.worker w on w.id = tls.worker
- -- LEFT JOIN vn.routeGate rg ON rg.routeFk = t.routeFk
- LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
- LEFT JOIN vn.zone z ON z.id = t.zoneFk
- LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND date(t.shipped) = zc.dated
- LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
- LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
- WHERE t.warehouseFk = vWarehouseFk
- AND am.deliveryMethodFk IN (1,2,3);
+ DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,util.dayEnd(CURDATE()));
+
+ DECLARE vIsTodayRelative BOOLEAN;
+
+ SELECT isTodayRelative INTO vIsTodayRelative
+ FROM vn.worker
+ WHERE userFk = vn.getUser();
+
+ CALL vn.prepareTicketList(TIMESTAMPADD(DAY,-1,CURDATE()), vEndingDate);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+ CREATE TEMPORARY TABLE tmp.ticket
+ SELECT * FROM tmp.productionTicket;
+
+ CALL vn.prepareClientList();
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems;
+ CREATE TEMPORARY TABLE tmp.sale_getProblems
+ (INDEX (ticketFk)) ENGINE = MEMORY
+ SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
+ FROM tmp.productionTicket tt
+ JOIN vn.ticket t ON t.id = tt.ticketFk;
+
+ CALL vn.ticket_getProblems(vIsTodayRelative);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.productionBuffer;
+ CREATE TEMPORARY TABLE tmp.productionBuffer
+ (PRIMARY KEY(ticketFk))
+ ENGINE = MEMORY
+ SELECT tt.ticketFk
+ , tt.clientFk
+ , t.warehouseFk
+ , t.nickname
+ , t.packages
+ , IF(HOUR(t.shipped), HOUR(t.shipped), IFNULL(HOUR(zc.hour),HOUR(z.hour))) as HH
+ , IFNULL(HOUR(zc.hour),HOUR(z.hour)) as Departure
+ , IF(MINUTE(t.shipped), MINUTE(t.shipped), IFNULL(MINUTE(zc.hour), MINUTE(z.hour))) as mm
+ , t.routeFk
+ , IF(am.deliveryMethodFk = 2,z.`id`,0) as zona
+ , t.nickname addressNickname
+ , a.postalCode
+ , a.city
+ , p.name province
+ , CONCAT(z.`name`,' ',IFNULL(RIGHT(t.routeFk,3),'')) agency
+ , am.id agencyModeFk
+ , 0 AS `lines`
+ , CAST( 0 AS DECIMAL(5,2)) AS m3
+ , CAST( 0 AS DECIMAL(5,2)) AS preparationRate
+ , "" as problem
+ , IFNULL(tls.state,2) AS state
+ , w.code workerCode
+ , DATE(t.shipped) shipped
+ , wk.code AS salesPersonCode
+ , p.id provinceFk
+ , tls.productionOrder
+ , ifnull(tls.alertLevel,0) alertLevel
+ , t.isBoxed as palletized
+ , IF(rm.isPickingAllowed ,rm.bufferFk, NULL) ubicacion
+ , tlu.lastUpdated
+ , ifnull(st.graphCategory,0) graphCategory
+ , pk.code as parking
+ , 0 AS H
+ , 0 AS V
+ , 0 AS N
+ , st.isOk
+ , ag.isOwn
+ FROM tmp.productionTicket tt
+ JOIN vn.ticket t on tt.ticketFk = t.id
+ LEFT JOIN vn.ticketStateToday tst ON tst.ticket = t.id
+ LEFT JOIN vn.state st ON st.id = tst.state
+ LEFT JOIN vn.client c ON c.id = t.clientFk
+ LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
+ JOIN vn.address a on a.id = t.addressFk
+ LEFT JOIN vn.province p on p.id = a.provinceFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ JOIN vn.agency ag ON ag.id = am.agencyFk
+ LEFT JOIN vn.ticketState tls on tls.ticket = tt.ticketFk
+ LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
+ LEFT JOIN vn.worker w on w.id = tls.worker
+ LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
+ LEFT JOIN vn.zone z ON z.id = t.zoneFk
+ LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND date(t.shipped) = zc.dated
+ LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+ LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
+ WHERE t.warehouseFk = vWarehouseFk
+ AND am.deliveryMethodFk IN (1,2,3);
+
+ -- Problemas por ticket
ALTER TABLE tmp.productionBuffer
CHANGE COLUMN `problem` `problem` VARCHAR(255),
ADD COLUMN `collectionH` INT,
- ADD COLUMN `collectionV` INT,
- ADD COLUMN `collectionF` INT,
- ADD COLUMN `collectionP` INT;
-
- -- Líneas y volumen por ticket
- UPDATE tmp.productionBuffer pb
- JOIN (
- SELECT tt.ticketFk,
- COUNT(*) as `lines`,
- sum(sv.volume) as m3,
- IFNULL(sum(IF(sv.isPicked,sv.volume,0)) / sum(sv.volume),0) as rate
- FROM tmp.productionTicket tt
- JOIN vn.saleVolume sv on sv.ticketFk = tt.ticketFk
- GROUP BY tt.ticketFk
- ) m on m.ticketFk = pb.ticketFk
- SET pb.`lines` = m.`lines`,
- pb.m3 = m.m3,
- pb.preparationRate = m.rate;
-
- DELETE FROM tmp.productionBuffer
- WHERE `lines`= 0;
+ ADD COLUMN `collectionV` INT;
+
+ UPDATE tmp.productionBuffer pb
+ JOIN tmp.ticket_problems tp ON tp.ticketFk = pb.ticketFk
+ SET pb.problem = TRIM(CAST(CONCAT( IFNULL(tp.itemShortage,''),
+ IFNULL(tp.itemDelay,''),
+ IF(tp.isFreezed,' CONGELADO',''),
+ IF(tp.hasHighRisk,' RIESGO',''),
+ IF(tp.hasTicketRequest, ' COD 100',''),
+ IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
+ IF(tp.hasComponentLack,' COMPONENTES', ''),
+ IF(HOUR(NOW()) < pb.HH AND tp.isTooLittle,' PEQUEÑO', '')
+ ) as char(255)));
+
+ -- Clientes Nuevos o Recuperados
+ UPDATE tmp.productionBuffer pb
+ LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = pb.clientFk
+ SET pb.problem = TRIM(CAST(CONCAT('NUEVO ', pb.problem) AS CHAR(255)))
+ WHERE ISNULL(cnb.clientFk) OR cnb.isRookie ;
+
+ -- Líneas y volumen por ticket
+ UPDATE tmp.productionBuffer pb
+ JOIN (
+ SELECT tt.ticketFk,
+ COUNT(*) as `lines`,
+ sum(sv.volume) as m3,
+ IFNULL(sum(IF(sv.isPicked,sv.volume,0)) / sum(sv.volume),0) as rate
+ FROM tmp.productionTicket tt
+ JOIN vn.saleVolume sv on sv.ticketFk = tt.ticketFk
+ GROUP BY tt.ticketFk
+ ) m on m.ticketFk = pb.ticketFk
+ SET pb.`lines` = m.`lines`,
+ pb.m3 = m.m3,
+ pb.preparationRate = m.rate;
- -- Lineas por linea de encajado
- UPDATE tmp.productionBuffer pb
- JOIN ( SELECT ticketFk,
- sum(sub.H) H,
- sum(sub.V) V,
- sum(sub.F) F,
- sum(sub.P) P
- FROM (
- SELECT t.ticketFk,
- sum(i.itemPackingTypeFk = 'H') H,
- sum(i.itemPackingTypeFk = 'V') V,
- sum(i.itemPackingTypeFk = 'F') F,
- sum(i.itemPackingTypeFk = 'P') P
- FROM tmp.productionTicket t
- JOIN vn.sale s ON s.ticketFk = t.ticketFk
- JOIN vn.item i ON i.id = s.itemFk
- GROUP BY t.ticketFk, i.itemPackingTypeFk) sub
+ DELETE FROM tmp.productionBuffer
+ WHERE `lines`= 0;
+
+ -- Lineas por linea de encajado
+ UPDATE tmp.productionBuffer pb
+ JOIN ( SELECT ticketFk,
+ sum(sub.H) H,
+ sum(sub.V) V,
+ sum(sub.N) N
+ FROM (
+ SELECT t.ticketFk,
+ sum(i.itemPackingTypeFk = 'H') H,
+ sum(i.itemPackingTypeFk = 'V') V,
+ sum(ISNULL(i.itemPackingTypeFk)) N
+ FROM tmp.productionTicket t
+ JOIN vn.sale s ON s.ticketFk = t.ticketFk
+ JOIN vn.item i ON i.id = s.itemFk
+ GROUP BY t.ticketFk, i.itemPackingTypeFk) sub
GROUP BY ticketFk
- ) sub2 ON sub2.ticketFk = pb.ticketFk
+ ) sub2 ON sub2.ticketFk = pb.ticketFk
SET pb.H = sub2.H,
pb.V = sub2.V,
- pb.F = sub2.F,
- pb.P = sub2.P;
+ pb.N = sub2.N;
-- Colecciones segun tipo de encajado
UPDATE tmp.productionBuffer pb
JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
JOIN vn.collection c ON c.id = tc.collectionFk
SET pb.collectionH = c.id
- WHERE c.itemPackingTypeFk = 'H' OR ISNULL(c.itemPackingTypeFk);
+ WHERE (c.itemPackingTypeFk = 'H' OR ISNULL(c.itemPackingTypeFk))
+ AND pb.H;
UPDATE tmp.productionBuffer pb
JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
JOIN vn.collection c ON c.id = tc.collectionFk
SET pb.collectionV = c.id
- WHERE c.itemPackingTypeFk = 'V' OR ISNULL(c.itemPackingTypeFk);
+ WHERE (c.itemPackingTypeFk = 'V' OR ISNULL(c.itemPackingTypeFk))
+ AND pb.V;
- UPDATE tmp.productionBuffer pb
- JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
- JOIN vn.collection c ON c.id = tc.collectionFk
- SET pb.collectionF = c.id
- WHERE c.itemPackingTypeFk = 'F' OR ISNULL(c.itemPackingTypeFk);
+ -- Previa pendiente
+ ALTER TABLE tmp.productionBuffer
+ ADD previousWithoutParking BOOL DEFAULT FALSE;
- UPDATE tmp.productionBuffer pb
- JOIN vn.ticketCollection tc ON pb.ticketFk = tc.ticketFk
- JOIN vn.collection c ON c.id = tc.collectionFk
- SET pb.collectionP = c.id
- WHERE c.itemPackingTypeFk = 'P' OR ISNULL(c.itemPackingTypeFk);
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketWithPrevia;
+ CREATE TEMPORARY TABLE tmp.ticketWithPrevia
+ (ticketFk INT PRIMARY KEY,
+ salesCount INT DEFAULT 0,
+ salesInParkingCount INT DEFAULT 0)
+ ENGINE = MEMORY;
+
+ -- Insertamos todos los tickets que tienen productos parkineados en sectores de previa, segun el sector
+ INSERT INTO tmp.ticketWithPrevia(ticketFk, salesCount)
+ SELECT pb.ticketFk, COUNT(DISTINCT s.id)
+ FROM tmp.productionBuffer pb
+ JOIN vn.sale s ON s.ticketFk = pb.ticketFk
+ JOIN vn.itemShelvingStock iss ON iss.itemFk = s.itemFk
+ JOIN vn.sector sc ON sc.id = iss.sectorFk
+ JOIN vn.item i ON i.id = iss.itemFk
+ WHERE iss.isPreviousPrepared
+ AND (ISNULL(sc.itemPackingTypeFk)
+ OR ISNULL(i.itemPackingTypeFk)
+ OR sc.itemPackingTypeFk = i.itemPackingTypeFk )
+ GROUP BY pb.ticketFk;
+
+ -- Se calcula la cantidad de productos que estan ya preparados porque su saleGroup está aparcado
+ UPDATE tmp.ticketWithPrevia twp
+ JOIN ( SELECT pb.ticketFk, count(DISTINCT s.id) salesInParkingCount
+ FROM tmp.productionBuffer pb
+ JOIN vn.sale s ON s.ticketFk = pb.ticketFk
+ JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
+ JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk
+ WHERE NOT ISNULL(sg.parkingFk)
+ GROUP BY pb.ticketFk ) sub ON twp.ticketFk = sub.ticketFk
+ SET twp.salesInParkingCount = sub.salesInParkingCount;
+
+ -- Marcamos como pendientes aquellos que no coinciden las cantidades
+ UPDATE tmp.productionBuffer pb
+ JOIN tmp.ticketWithPrevia twp ON twp.ticketFk = pb.ticketFk
+ SET pb.previousWithoutParking = TRUE
+ WHERE twp.salesCount > twp.salesInParkingCount;
- -- Cajas
- ALTER TABLE tmp.productionBuffer
- ADD Cajas DOUBLE DEFAULT NULL;
-
- -- Problemas por ticket
- UPDATE tmp.productionBuffer pb
- JOIN tmp.ticket_problems tp ON tp.ticketFk = pb.ticketFk
- SET pb.problem = TRIM(CAST(CONCAT( IFNULL(tp.itemShortage,''),
- IFNULL(tp.itemDelay,''),
- IF(tp.isFreezed,' CONGELADO',''),
- IF(tp.hasHighRisk,' RIESGO',''),
- IF(tp.hasTicketRequest, ' COD 100',''),
- IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
- IF(tp.hasComponentLack,' COMPONENTES', ''),
- IF(tp.isTooLittle,' PEQUEÑO', '')
- ) as char(255)));
-
- -- Refresca la caché para el cierre dinámico de agencias
- -- CALL cache.departure_timing(vWarehouseFk);
/*
- -- Tickets de recogida
- REPLACE tmp.productionBuffer(
- shipped
- , ticketFk
- , agency
- , clientFk
- , addressNickname
- , state
- , workerCode
- , alertLevel
- , warehouseFk
- )
- SELECT DATE(t.shipped)
- , t.id
- , am.name
- , t.clientFk
- , a.nickname
- , s.id as state
- , w.code
- , ifnull(tls.alertLevel,0) alert_level
- , vWarehouseFk
- FROM vn.ticket t
- JOIN vn.address a on a.id = t.addressFk
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- LEFT JOIN vn2008.warehouse_pickup wp ON wp.agency_id = am.id
- LEFT JOIN vn.ticketState tls on tls.ticket = t.id
- LEFT JOIN vn.state s ON s.id = tls.state
- LEFT JOIN vn.worker w on w.id = tls.worker
- WHERE t.shipped between TIMESTAMPADD(WEEK,-1,CURDATE()) AND util.dayend(TIMESTAMPADD(DAY,-1,CURDATE()))
- AND wp.warehouse_id = vWarehouseFk;
+ -- Refresca la caché para el cierre dinámico de agencias
+ CALL cache.departure_timing(vWarehouseFk);
+
+ -- Tickets de recogida
+ REPLACE tmp.productionBuffer(
+ shipped
+ , ticketFk
+ , agency
+ , clientFk
+ , addressNickname
+ , state
+ , workerCode
+ , alertLevel
+ , warehouseFk
+ )
+ SELECT DATE(t.shipped)
+ , t.id
+ , am.name
+ , t.clientFk
+ , a.nickname
+ , s.id as state
+ , w.code
+ , ifnull(tls.alertLevel,0) alert_level
+ , vWarehouseFk
+ FROM vn.ticket t
+ JOIN vn.address a on a.id = t.addressFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ LEFT JOIN vn2008.warehouse_pickup wp ON wp.agency_id = am.id
+ LEFT JOIN vn.ticketState tls on tls.ticket = t.id
+ LEFT JOIN vn.state s ON s.id = tls.state
+ LEFT JOIN vn.worker w on w.id = tls.worker
+ WHERE t.shipped between TIMESTAMPADD(WEEK,-1,CURDATE()) AND util.dayend(TIMESTAMPADD(DAY,-1,CURDATE()))
+ AND wp.warehouse_id = vWarehouseFk;
*/
- DROP TEMPORARY TABLE tmp.productionTicket;
- DROP TEMPORARY TABLE tmp.ticket;
- DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-
+ DROP TEMPORARY TABLE tmp.productionTicket;
+ DROP TEMPORARY TABLE tmp.ticket;
+ DROP TEMPORARY TABLE tmp.risk;
+ DROP TEMPORARY TABLE tmp.ticket_problems;
+ DROP TEMPORARY TABLE tmp.ticketWithPrevia;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72917,82 +73212,116 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `productionSectorList`(vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `productionSectorList`(vSectorFk INT)
BEGIN
+ /**
+ * Devuelve el listado de vn.sale que se puede preparar en previa para ese sector
+ *
+ * @param vSectorFk Identificador de vn.sector
+ */
+
DECLARE vWarehouseFk INT;
SELECT warehouseFk INTO vWarehouseFk
FROM vn.sector
WHERE id = vSectorFk;
- CALL vn.productionControl(vWarehouseFk, 0);
+ DROP TEMPORARY TABLE IF EXISTS tmp.whiteTicket;
+ CREATE TEMPORARY TABLE tmp.whiteTicket
+ (ticketFk INT PRIMARY KEY)
+ SELECT s.ticketFk , count(*) AS saleNum, sum(ISNULL(i.itemPackingTypeFk)) iptNull
+ FROM vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.ticket t ON t.id = s.ticketFk
+ WHERE t.shipped BETWEEN CURDATE() AND TIMESTAMPADD(HOUR, 23, CURDATE())
+ GROUP BY s.ticketFk
+ HAVING saleNum = iptNull;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sectorTypeTicket;
+ CREATE TEMPORARY TABLE tmp.sectorTypeTicket
+ (ticketFk INT PRIMARY KEY)
+ SELECT s.ticketFk , sum(i.itemPackingTypeFk <=> sc.itemPackingTypeFk) iptSector
+ FROM vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.ticket t ON t.id = s.ticketFk
+ JOIN vn.sector sc ON sc.id = vSectorFk
+ WHERE t.shipped BETWEEN CURDATE() AND TIMESTAMPADD(HOUR, 23, CURDATE())
+ GROUP BY s.ticketFk
+ HAVING iptSector;
+
+ CALL vn.productionControl(vWarehouseFk, 0);
SELECT 0,999999,0 INTO @sameTicket, @ticket, @litrosTicket;
-
+
SELECT @litrosTicket := IF(sub.ticketFk = @ticket, @litrosTicket + Litros, Litros) as LitrosTicket,
- @sameTicket := IF(sub.ticketFk = @ticket, @sameTicket, IF(@sameTicket, 0 , 1)) as sameTicket,
- sub.*,
- @ticket := ticketFk
+ @sameTicket := IF(sub.ticketFk = @ticket, @sameTicket, IF(@sameTicket, 0 , 1)) as sameTicket,
+ sub.*,
+ @ticket := ticketFk AS lastTicket
FROM
(
SELECT * FROM
(
- SELECT isa.saleFk,
- isa.Modificado,
- isa.ticketFk,
- isa.isPicked,
- isa.itemFk,
- isa.quantity,
+ SELECT isa.saleFk,
+ isa.Modificado,
+ isa.ticketFk,
+ isa.isPicked,
+ isa.itemFk,
+ isa.quantity,
isa.concept,
- i.itemPackingTypeFk,
- isa.`size`,
- isa.Estado,
- isa.sectorProdPriority,
- isa.available,
- isa.sectorFk,
- isa.matricula,
- isa.parking,
- isa.itemShelving,
- isa.Agency,
- isa.shipped,
- isa.`grouping`,
- isa.packing,
- isa.`hour`,
- isa.isPreviousPreparable,
- isa.physicalVolume,
- isa.warehouseFk ,
- sum(isa.available) as totalAvailable,
- IF (HOUR(isa.shipped),HOUR(isa.shipped), HOUR(isa.`hour`)) Hora,
- IF (MINUTE(isa.shipped),MINUTE(isa.shipped), MINUTE(isa.`hour`)) Minuto,
+ i.itemPackingTypeFk,
+ isa.`size`,
+ isa.Estado,
+ isa.sectorProdPriority,
+ isa.available,
+ isa.sectorFk,
+ isa.matricula,
+ isa.parking,
+ isa.itemShelving,
+ isa.Agency,
+ isa.shipped,
+ isa.`grouping`,
+ isa.packing,
+ isa.`hour`,
+ isa.isPreviousPreparable,
+ isa.physicalVolume,
+ isa.warehouseFk ,
+ sum(isa.available) as totalAvailable,
+ IF (HOUR(isa.shipped),HOUR(isa.shipped), HOUR(isa.`hour`)) Hora,
+ IF (MINUTE(isa.shipped),MINUTE(isa.shipped), MINUTE(isa.`hour`)) Minuto,
i.subName,
CAST(isa.physicalVolume * 1000 AS DECIMAL(10,0)) as Litros
FROM vn.itemShelvingAvailable isa
JOIN vn.item i ON i.id = isa.itemFk
- JOIN vn.sector s ON s.id = isa.sectorFk
- AND s.warehouseFk = isa.warehouseFk
- AND (i.itemPackingTypeFk = s.itemPackingTypeFk
- -- OR ISNULL(i.itemPackingTypeFk)
- OR ISNULL(s.itemPackingTypeFk))
- JOIN vn.ticket t ON t.id = isa.ticketFk
- JOIN vn.client c ON c.id = t.clientFk
- JOIN tmp.productionBuffer pb ON pb.ticketFk = t.id
- JOIN vn.packagingConfig pc
+ JOIN vn.sector s ON s.id = isa.sectorFk AND s.warehouseFk = isa.warehouseFk
+ JOIN vn.ticket t ON t.id = isa.ticketFk
+ LEFT JOIN tmp.whiteTicket wt ON wt.ticketFk = isa.ticketFk
+ LEFT JOIN tmp.sectorTypeTicket stt ON stt.ticketFk = isa.ticketFk
+ JOIN vn.client c ON c.id = t.clientFk
+ JOIN tmp.productionBuffer pb ON pb.ticketFk = t.id
+ JOIN vn.packagingConfig pc
WHERE IF(s.isPreviousPreparedByPacking,
i.`size` > pc.previousPreparationMinimumSize
AND isa.packing > 1
- AND (MOD(TRUNCATE(isa.quantity,0), isa.packing)= 0 ),
+ AND (MOD(TRUNCATE(isa.quantity,0), isa.packing)= 0 ),
TRUE)
AND isa.sectorFk = vSectorFk
AND isa.quantity > 0
- AND pb.problem = ""
+ AND pb.problem = ""
+ AND (i.itemPackingTypeFk <=> s.itemPackingTypeFk
+ OR ISNULL(s.itemPackingTypeFk)
+ OR wt.ticketFk
+ OR (stt.ticketFk AND ISNULL(i.itemPackingTypeFk)))
GROUP BY saleFk
HAVING isa.quantity <= totalAvailable
) sub2
ORDER BY Hora, Minuto, ticketFk
) sub
- ;
-
+ ;
+
+ DROP TEMPORARY TABLE tmp.whiteTicket;
+ DROP TEMPORARY TABLE tmp.sectorTypeTicket;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73005,11 +73334,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `rangeDateInfo`(vStarted DATE, vEnded DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `rangeDateInfo`(vStarted DATE, vEnded DATE)
BEGIN
/**
* Crea una tabla temporal con las fechas
@@ -73055,11 +73384,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `rankingTeamByQuarter`(vYear INT, vQuarter INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `rankingTeamByQuarter`(vYear INT, vQuarter INT)
BEGIN
DECLARE vMinimumSalesByQuarter INT;
@@ -73136,11 +73465,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `rate_getPrices`(vDated DATE, vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `rate_getPrices`(vDated DATE, vWarehouseFk INT)
BEGIN
/**
* Prepara una tabla con las tarifas aplicables en funcion de la fecha y el almacén
@@ -73180,11 +73509,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `rate_getPrices2`(vLanded DATE, vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `rate_getPrices2`(vLanded DATE, vWarehouseFk INT)
BEGIN
-- Prepara una tabla con las tarifas aplicables en funcion de la fecha y el almacén
@@ -73219,11 +73548,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `rate_getPrices__`(vLanded DATE, vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `rate_getPrices__`(vLanded DATE, vWarehouseFk INT)
BEGIN
-- Prepara una tabla con las tarifas aplicables en funcion de la fecha y el almacén
@@ -73258,13 +73587,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `recipe_Cook`(vItemFk INT, vBunchesQuantity INT, vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `recipe_Cook`(vItemFk INT, vBunchesQuantity INT, vDate DATE)
BEGIN
DECLARE vCalc INT;
@@ -73345,13 +73674,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `recipe_Plaster`(vItemFk INT, vTicketFk INT, vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `recipe_Plaster`(vItemFk INT, vTicketFk INT, vQuantity INT)
BEGIN
DECLARE vLastCost DECIMAL(10,2);
@@ -73542,13 +73871,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `replaceMovimientosMark`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `replaceMovimientosMark`(
idMovimiento INT,
detalle INT,
originalQuantity INT,
@@ -73587,203 +73916,117 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `reportLabelCollection_get`(vCollectionFk INT)
-BEGIN
-/**
- * Obtiene los datos necesarios de una colección
- *
- * @param vCollectionFk La colección de la que sacar los datos
- **/
- DECLARE vItemPackingTypeFk VARCHAR(1);
-
- -- Si los sacadores NO son de V, pinta los colores
- SELECT c.itemPackingTypeFk INTO vItemPackingTypeFk
- FROM vn.collection c
- WHERE c.id = vCollectionFk;
-
- IF !(vItemPackingTypeFk <=> 'V') THEN
-
- SELECT * FROM (
- SELECT CONCAT(tc.collectionFk,' ',LEFT(cc.code,4)) `level`,
- tc.ticketFk,
- LEFT(IF(t.routeFk IS null, am.name, zo.name ),12) agencyDescription,
- am.name,
- t.clientFk,
- count(*) notes,
- w.code workerCode,
- tt.labelCount,
- IF(HOUR(t.shipped),TIME(t.shipped),TIME(zo.HOUR)) AS horaagencia,
- t.shipped,
- count(*) lineas,
- t.nickName,
- CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5,2)) , "m³") m3
- FROM vn.ticket t
- JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
- JOIN vn.collection c ON c.id = tc.collectionFk
- JOIN vn.collectionColors cc
- ON cc.shelve = tc.`level`
- AND cc.wagon = tc.wagon
- AND cc.trainFk = c.trainFk
- JOIN vn.sale s ON s.ticketFk = t.id
- LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
- JOIN vn.worker w ON w.id = c.workerFk
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
- LEFT JOIN vn.address a ON a.id = t.addressFk
- LEFT JOIN vn.route r ON r.id = t.routeFk
- LEFT JOIN vn.zoneEstimatedDelivery ze ON ze.zoneFk = t.zoneFk
- LEFT JOIN vn.agencyMode agm ON r.agencyModeFk =agm.id
- LEFT JOIN vn.zone zo ON t.zoneFk = zo.id
- WHERE tc.collectionFk = vCollectionFk
- GROUP BY t.id) sub
- ORDER BY `level`;
- ELSE
- SELECT CONCAT(tc.collectionFk,' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-',tc.level) `level`,
- tc.ticketFk,
- LEFT(IF(t.routeFk IS null, am.name, zo.name ),12) agencyDescription,
- am.name,
- t.clientFk,
- CAST(IF(ic.code = 'plant', CONCAT(MAX(i.size),' cm'),count(*)) AS CHAR) notes,
- w.code workerCode,
- tt.labelCount,
- IF(HOUR(t.shipped),TIME(t.shipped),TIME(zo.HOUR)) horaagencia,
- t.shipped,
- count(*) lineas,
- t.nickName,
- CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5,2)) , "m³") m3
- FROM vn.ticket t
- JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
- JOIN vn.collection c ON c.id = tc.collectionFk
- JOIN vn.sale s ON s.ticketFk = t.id
- LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- JOIN vn.worker w ON w.id = c.workerFk
- JOIN vn.agencyMode am on am.id = t.agencyModeFk
- LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
- LEFT JOIN vn.address a ON a.id = t.addressFk
- LEFT JOIN vn.route r ON r.id = t.routeFk
- LEFT JOIN vn.zoneEstimatedDelivery ze ON ze.zoneFk = t.zoneFk
- LEFT JOIN vn.agencyMode agm ON r.agencyModeFk =agm.id
- LEFT JOIN vn.zone zo ON t.zoneFk = zo.id
- WHERE tc.collectionFk = vCollectionFk
- GROUP BY t.id;
- END IF;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `reportLabelCollection_get`(vSelf INT)
+BEGIN
+
+/**
+ * Obtiene los datos necesarios de un ticket o colección
+ *
+ * @param vSelf Ticket/Colección del que sacar los datos
+ **/
+
+ DECLARE vItemPackingTypeFk VARCHAR(1);
+ DECLARE vIsTicket BOOL;
+
+ -- Averiguamos si es un ticket o una colección
+ SELECT IF(id, TRUE, FALSE) INTO vIsTicket
+ FROM vn.ticket
+ WHERE created > (CURRENT_DATE() - INTERVAL 1 MONTH)
+ AND id = vSelf;
+
+ -- Si los sacadores NO son de V, pinta los colores
+ SELECT itemPackingTypeFk INTO vItemPackingTypeFk
+ FROM vn.collection
+ WHERE id = vSelf;
+
+ IF !(vItemPackingTypeFk <=> 'V') THEN
+
+ SELECT CONCAT(tc.collectionFk, ' ', LEFT(cc.code,4)) `level`,
+ tc.ticketFk,
+ LEFT(IF(t.routeFk IS NULL, am.name, zo.name ), 12) agencyDescription,
+ am.name,
+ t.clientFk,
+ COUNT(*) notes,
+ w.code workerCode,
+ tt.labelCount,
+ IF(HOUR(t.shipped), TIME(t.shipped), TIME(zo.`hour`)) horaagencia,
+ t.shipped,
+ COUNT(*) lineas,
+ t.nickName,
+ CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5,2)) , "m³") m3
+ FROM vn.ticket t
+ JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
+ JOIN vn.collection c ON c.id = tc.collectionFk
+ JOIN vn.collectionColors cc ON cc.shelve = tc.`level`
+ AND cc.wagon = tc.wagon
+ AND cc.trainFk = c.trainFk
+ JOIN vn.sale s ON s.ticketFk = t.id
+ LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
+ JOIN vn.worker w ON w.id = c.workerFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
+ LEFT JOIN vn.address a ON a.id = t.addressFk
+ LEFT JOIN vn.route r ON r.id = t.routeFk
+ LEFT JOIN vn.zoneEstimatedDelivery ze ON ze.zoneFk = t.zoneFk
+ LEFT JOIN vn.agencyMode agm ON r.agencyModeFk =agm.id
+ LEFT JOIN vn.zone zo ON t.zoneFk = zo.id
+ WHERE IF(vIsTicket, tc.ticketFk = vSelf, tc.collectionFk = vSelf)
+ GROUP BY t.id
+ ORDER BY cc.code;
+
+ ELSE
+
+ SELECT CONCAT(tc.collectionFk,' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-', tc.`level`) `level`,
+ tc.ticketFk,
+ LEFT(IF(t.routeFk IS NULL, am.name, zo.name ), 12) agencyDescription,
+ am.name,
+ t.clientFk,
+ CAST(IF(ic.code = 'plant', CONCAT(MAX(i.`size`),' cm'), COUNT(*)) AS CHAR) notes,
+ w.code workerCode,
+ tt.labelCount,
+ IF(HOUR(t.shipped), TIME(t.shipped), TIME(zo.`hour`)) horaagencia,
+ t.shipped,
+ COUNT(*) lineas,
+ t.nickName,
+ CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5,2)), "m³") m3
+ FROM vn.ticket t
+ JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
+ JOIN vn.collection c ON c.id = tc.collectionFk
+ JOIN vn.sale s ON s.ticketFk = t.id
+ LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.itemType it ON it.id = i.typeFk
+ JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+ JOIN vn.worker w ON w.id = c.workerFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
+ LEFT JOIN vn.address a ON a.id = t.addressFk
+ LEFT JOIN vn.route r ON r.id = t.routeFk
+ LEFT JOIN vn.zoneEstimatedDelivery ze ON ze.zoneFk = t.zoneFk
+ LEFT JOIN vn.agencyMode agm ON r.agencyModeFk =agm.id
+ LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
+ WHERE IF(vIsTicket, tc.ticketFk = vSelf, tc.collectionFk = vSelf)
+ GROUP BY t.id;
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `reportLabelCollection_get__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `reportLabelCollection_get__`(vCollectionFk INT)
-BEGIN
-
- DECLARE vItemPackingTypeFk VARCHAR(1);
-
- -- Si los sacadores NO son de V, pinta los colores
- SELECT c.itemPackingTypeFk INTO vItemPackingTypeFk
- FROM vn.collection c
- WHERE c.id = vCollectionFk;
-
- IF !(vItemPackingTypeFk <=> 'V') THEN
-
- SELECT * FROM (
- SELECT CONCAT(tc.collectionFk,' ',LEFT(cc.code,4)) `level`,
- tc.ticketFk,
- LEFT(IF(t.routeFk IS null, am.name, zo.name ),12) agencyDescription,
- am.name,
- t.clientFk,
- count(*) notes,
- w.code workerCode,
- tt.labelCount,
- IF(HOUR(t.shipped),TIME(t.shipped),TIME(zo.HOUR)) as horaagencia,
- t.shipped,
- count(*) AS lineas ,
- t.nickName,
- CAST(sv.litros / 1000 AS DECIMAL(5,2)) m3
- FROM vn.ticket t
- JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
- JOIN vn.collection c ON c.id = tc.collectionFk
- JOIN vn.collectionColors cc
- ON cc.shelve = tc.`level`
- AND cc.wagon = tc.wagon
- AND cc.trainFk = c.trainFk
- JOIN vn.sale s ON s.ticketFk = t.id
- LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
- JOIN vn.worker w ON w.id = c.workerFk
- JOIN vn.agencyMode am on am.id = t.agencyModeFk
- LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
- LEFT JOIN vn.address a ON a.id = t.addressFk
- LEFT JOIN vn.route r on r.id = t.routeFk
- LEFT JOIN vn.zoneEstimatedDelivery ze ON ze.zoneFk = t.zoneFk
- LEFT JOIN vn.agencyMode agm on r.agencyModeFk =agm.id
- LEFT JOIN vn.zone zo ON t.zoneFk = zo.id
- WHERE tc.collectionFk = vCollectionFk
- GROUP BY t.id) sub
- ORDER BY `level`;
-
- ELSE
-
- SELECT CONCAT(tc.collectionFk,' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-',tc.level) `level`,
- tc.ticketFk,
- LEFT(IF(t.routeFk IS null, am.name, zo.name ),12) agencyDescription,
- am.name,
- t.clientFk,
- CAST(IF(ic.code = 'plant', CONCAT(MAX(i.size),' cm'),count(*)) AS CHAR) notes,
- w.code workerCode,
- tt.labelCount,
- IF(HOUR(t.shipped),TIME(t.shipped),TIME(zo.HOUR)) as horaagencia,
- t.shipped,
- count(*) AS urgente ,
- t.nickName
- FROM vn.ticket t
- JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
- JOIN vn.collection c ON c.id = tc.collectionFk
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- JOIN vn.worker w ON w.id = c.workerFk
- JOIN vn.agencyMode am on am.id = t.agencyModeFk
- LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
- LEFT JOIN vn.address a ON a.id = t.addressFk
- LEFT JOIN vn.route r on r.id = t.routeFk
- LEFT JOIN vn.zoneEstimatedDelivery ze ON ze.zoneFk = t.zoneFk
- LEFT JOIN vn.agencyMode agm on r.agencyModeFk =agm.id
- LEFT JOIN vn.zone zo ON t.zoneFk = zo.id
- WHERE tc.collectionFk = vCollectionFk
- GROUP BY t.id;
-
- END IF;
-
- END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `riskAllClients` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `riskAllClients`(maxRiskDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `riskAllClients`(maxRiskDate DATE)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
@@ -73821,11 +74064,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `routeGateAsign__`(vDevice VARCHAR(30), vRouteFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `routeGateAsign__`(vDevice VARCHAR(30), vRouteFk INT)
BEGIN
/*
UPDATE routeGate
@@ -73866,13 +74109,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `routeGateUpdate`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `routeGateUpdate`()
BEGIN
UPDATE vn.routeGate rg
@@ -73913,30 +74156,30 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `routeGate_assignDevice`(vDevice VARCHAR(30), vRouteFk INT)
-BEGIN
-/**
- * Asigna el dispositivo la ruta
- *
- * @param vDevice Dispositivo a remplazar
- * @param vRouteFk Ruta a la cual asignarlo
- */
- IF ISNULL(vDevice) THEN
-
- DELETE FROM routeGate
- WHERE routeFk = vRouteFk;
-
- ELSE
-
- REPLACE routeGate(routeFk, deviceId)
- VALUES(vRouteFk, vDevice);
-
- END IF;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `routeGate_assignDevice`(vDevice VARCHAR(30), vRouteFk INT)
+BEGIN
+/**
+ * Asigna el dispositivo la ruta
+ *
+ * @param vDevice Dispositivo a remplazar
+ * @param vRouteFk Ruta a la cual asignarlo
+ */
+ IF ISNULL(vDevice) THEN
+
+ DELETE FROM routeGate
+ WHERE routeFk = vRouteFk;
+
+ ELSE
+
+ REPLACE routeGate(routeFk, deviceId)
+ VALUES(vRouteFk, vDevice);
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73947,13 +74190,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `routeGuessPriority`(IN vRuta INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `routeGuessPriority`(IN vRuta INT)
BEGIN
/* Usa los valores del ultimo año para adivinar el orden de los tickets en la ruta
* vRuta id ruta
@@ -73982,11 +74225,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `routeInfo`(vRouteFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `routeInfo`(vRouteFk INT)
BEGIN
DECLARE vPackages INT;
@@ -74028,11 +74271,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `routeMonitor_calculate`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `routeMonitor_calculate`(vDate DATE)
BEGIN
DECLARE vDateEND DATETIME;
@@ -74139,13 +74382,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `routeSetOk`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `routeSetOk`(
vRouteFk INT)
BEGIN
@@ -74163,13 +74406,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `routeUpdateM3`(vRoute INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `routeUpdateM3`(vRoute INT)
BEGIN
/**
* @deprecated Use vn.route_updateM3()
@@ -74185,13 +74428,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `route_doRecalc`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `route_doRecalc`()
proc: BEGIN
/**
* Recalculates modified route.
@@ -74248,69 +74491,69 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `route_getTickets`(vRouteFk INT)
-BEGIN
-/**
- * Pasado un RouteFk devuelve la información
- * de sus tickets.
- *
- * @param vRouteFk
- *
- * @select Información de los tickets
- */
-
- SELECT
- t.id AS Id,
- t.clientFk AS Client,
- a.id AS Address,
- a.nickname AS ClientName,
- t.packages AS Packages,
- a.street AS AddressName,
- a.postalCode AS PostalCode,
- a.city AS City,
- sub2.itemPackingTypeFk AS PackingType,
- c.phone AS ClientPhone,
- c.mobile AS ClientMobile,
- a.phone AS AddressPhone,
- a.mobile AS AddressMobile,
- tl.longitude AS Longitude,
- tl.latitude AS Latitude,
- wm.mediaValue AS SalePersonPhone,
- tob.Note AS Note,
- t.isSigned AS Signed,
- st.id AS Polizon
- FROM ticket t
- JOIN client c ON t.clientFk = c.id
- JOIN address a ON t.addressFk = a.id
- LEFT JOIN ticketLocation tl ON tl.ticketFk = t.id
- LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk
- LEFT JOIN
- (SELECT tob.description AS Note, t.id
- FROM ticketObservation tob
- JOIN ticket t ON tob.ticketFk = t.id
- JOIN observationType ot ON ot.id = tob.observationTypeFk
- WHERE t.routeFk = vRouteFk
- AND ot.code = 'delivery'
- )tob ON tob.id = t.id
- LEFT JOIN stowaway st ON st.shipFk = t.id
- LEFT JOIN
- (SELECT sub.ticketFk,
- CONCAT('(', GROUP_CONCAT(DISTINCT sub.itemPackingTypeFk ORDER BY sub.items DESC SEPARATOR ','), ') ') itemPackingTypeFk
- FROM (SELECT s.ticketFk , i.itemPackingTypeFk, COUNT(*) items
- FROM ticket t
- JOIN sale s ON s.ticketFk = t.id
- JOIN item i ON i.id = s.itemFk
- WHERE t.routeFk = vRouteFk
- GROUP BY t.id,i.itemPackingTypeFk)sub
- GROUP BY sub.ticketFk
- ) sub2 ON sub2.ticketFk = t.id
- WHERE t.routeFk = vRouteFk
- GROUP BY t.id
- ORDER BY t.priority;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `route_getTickets`(vRouteFk INT)
+BEGIN
+/**
+ * Pasado un RouteFk devuelve la información
+ * de sus tickets.
+ *
+ * @param vRouteFk
+ *
+ * @select Información de los tickets
+ */
+
+ SELECT
+ t.id AS Id,
+ t.clientFk AS Client,
+ a.id AS Address,
+ a.nickname AS ClientName,
+ t.packages AS Packages,
+ a.street AS AddressName,
+ a.postalCode AS PostalCode,
+ a.city AS City,
+ sub2.itemPackingTypeFk AS PackingType,
+ c.phone AS ClientPhone,
+ c.mobile AS ClientMobile,
+ a.phone AS AddressPhone,
+ a.mobile AS AddressMobile,
+ tl.longitude AS Longitude,
+ tl.latitude AS Latitude,
+ wm.mediaValue AS SalePersonPhone,
+ tob.Note AS Note,
+ t.isSigned AS Signed,
+ st.id AS Polizon
+ FROM ticket t
+ JOIN client c ON t.clientFk = c.id
+ JOIN address a ON t.addressFk = a.id
+ LEFT JOIN ticketLocation tl ON tl.ticketFk = t.id
+ LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk
+ LEFT JOIN
+ (SELECT tob.description AS Note, t.id
+ FROM ticketObservation tob
+ JOIN ticket t ON tob.ticketFk = t.id
+ JOIN observationType ot ON ot.id = tob.observationTypeFk
+ WHERE t.routeFk = vRouteFk
+ AND ot.code = 'delivery'
+ )tob ON tob.id = t.id
+ LEFT JOIN stowaway st ON st.shipFk = t.id
+ LEFT JOIN
+ (SELECT sub.ticketFk,
+ CONCAT('(', GROUP_CONCAT(DISTINCT sub.itemPackingTypeFk ORDER BY sub.items DESC SEPARATOR ','), ') ') itemPackingTypeFk
+ FROM (SELECT s.ticketFk , i.itemPackingTypeFk, COUNT(*) items
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ WHERE t.routeFk = vRouteFk
+ GROUP BY t.id,i.itemPackingTypeFk)sub
+ GROUP BY sub.ticketFk
+ ) sub2 ON sub2.ticketFk = t.id
+ WHERE t.routeFk = vRouteFk
+ GROUP BY t.id
+ ORDER BY t.priority;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -74321,13 +74564,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `route_updateM3`(vRoute INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `route_updateM3`(vRoute INT)
BEGIN
UPDATE vn.route r
@@ -74348,13 +74591,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `rutasAnalyze`(vYear INT, vMonth INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `rutasAnalyze`(vYear INT, vMonth INT)
BEGIN
/* Analiza los costes de las rutas de reparto y lo almacena en la tabla Rutas_Master
@@ -74526,35 +74769,35 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleBuy_Add`(vSaleFk INT, vBuyFk INT)
-BEGIN
-
- /* Añade un registro a la tabla saleBuy en el caso de que sea posible mantener la trazabilidad
- *
- * @param vSaleFk clave primaria de vn.sale
- * @param vBuyFk clave primaria de vn.buy
- */
- /*IF (SELECT COUNT(*)
- FROM vn.sale s
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- WHERE s.id = vSaleFk
- AND ic.code = 'fruit') THEN */
-
- IF (SELECT COUNT(*) FROM vn.buy WHERE id = vBuyFk AND itemOriginalFk) THEN
-
- INSERT INTO vn.saleBuy (saleFk, buyFk)
- VALUES(vSaleFk, vBuyFk);
-
- END IF;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleBuy_Add`(vSaleFk INT, vBuyFk INT)
+BEGIN
+
+ /* Añade un registro a la tabla saleBuy en el caso de que sea posible mantener la trazabilidad
+ *
+ * @param vSaleFk clave primaria de vn.sale
+ * @param vBuyFk clave primaria de vn.buy
+ */
+ /*IF (SELECT COUNT(*)
+ FROM vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.itemType it ON it.id = i.typeFk
+ JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+ WHERE s.id = vSaleFk
+ AND ic.code = 'fruit') THEN */
+
+ IF (SELECT COUNT(*) FROM vn.buy WHERE id = vBuyFk AND itemOriginalFk) THEN
+
+ INSERT INTO vn.saleBuy (saleFk, buyFk)
+ VALUES(vSaleFk, vBuyFk);
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -74565,24 +74808,24 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleGroup_add`()
-BEGIN
-
- /*
- * Añade un nuevo registro a la tabla y devuelve su id
- */
-
- INSERT INTO vn.saleGroup(userFk)
- VALUES (account.myUser_getId());
-
- SELECT LAST_INSERT_ID();
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleGroup_add`()
+BEGIN
+
+ /*
+ * Añade un nuevo registro a la tabla y devuelve su id
+ */
+
+ INSERT INTO vn.saleGroup(userFk)
+ VALUES (account.myUser_getId());
+
+ SELECT LAST_INSERT_ID();
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -74595,11 +74838,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleItemShelvingDelete__`(vSaleFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleItemShelvingDelete__`(vSaleFk INT)
BEGIN
UPDATE vn.itemShelving ish
@@ -74623,11 +74866,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleItemShelvingIsPicked__`(vTicketFk INT, vIsPicked BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleItemShelvingIsPicked__`(vTicketFk INT, vIsPicked BOOL)
BEGIN
DECLARE vStateFk INT;
@@ -74659,82 +74902,82 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleItemShelvingMake__`(IN `vTicketFk` INT, IN `vSectorFk` INT)
-BEGIN
-
- SET @rest:= CAST(0 AS DECIMAL(10,0));
- SET @saleFk := CAST(0 AS DECIMAL(10,0));
- SET @reserved := CAST(0 AS DECIMAL(10,0));
-
- UPDATE vn.itemShelving ish
- JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id
- JOIN sale s ON s.id = sis.saleFk
- SET ish.visible = sis.quantity + ish.visible,
- ish.available = sis.quantity + ish.visible
- WHERE s.ticketFk = vTicketFk;
-
- DELETE sis.*
- FROM saleItemShelving sis
- JOIN sale s ON s.id = sis.saleFk
- WHERE s.ticketFk = vTicketFk;
-
- INSERT INTO saleItemShelving( saleFk,
- itemShelvingFk,
- quantity,
- ubication)
- SELECT saleFk,
- itemShelvingFk,
- CAST(Reserved as DECIMAL(10,0)) as Reserved,
- ubication
- FROM
- (SELECT saleFk,
- itemShelvingFk,
- ubication,
- @rest := IF(@saleFk = saleFk, @rest, quantity) as Falta,
- @reserved := IF(available < @rest, available, IF(@rest < packing,0,@rest)) as Reserved,
- @rest := @rest - @reserved,
- @saleFk := saleFk
- FROM
- ( SELECT s.id as saleFk,
- ish.created,
- ish.id as itemShelvingFk,
- ish.available,
- s.quantity,
- ish.packing,
- CONCAT(p.`column`, '-',p.`row`,': ', sh.code ) as ubication
- FROM vn.sale s
- JOIN vn.ticket t ON t.id = s.ticketFk
- JOIN vn.sector sc ON sc.warehouseFk = t.warehouseFk
- JOIN vn.parking p ON p.sectorFk = sc.id
- JOIN vn.shelving sh ON sh.parkingFk = p.id
- JOIN vn.itemShelving ish ON ish.shelvingFk = sh.code AND ish.itemFk = s.itemFk
- WHERE t.id = vTicketFk
- AND sc.id = vSectorFk
- AND s.quantity MOD ish.packing = 0
- AND s.quantity >= ish.packing
- ORDER BY s.id,
- sh.priority DESC,
- ish.packing DESC,
- ish.created
- ) sub
- ) sub2
- WHERE Reserved > 0;
-
- UPDATE vn.itemShelving ish
- JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id
- JOIN vn.sale s ON s.id = sis.saleFk
- SET ish.available = ish.visible - sis.quantity,
- ish.visible = ish.visible - sis.quantity
- WHERE s.ticketFk = vTicketFk
- AND s.isPicked = FALSE;
-
- CALL vn.saleItemShelvingIsPicked(vTicketFk, TRUE);
-
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleItemShelvingMake__`(IN `vTicketFk` INT, IN `vSectorFk` INT)
+BEGIN
+
+ SET @rest:= CAST(0 AS DECIMAL(10,0));
+ SET @saleFk := CAST(0 AS DECIMAL(10,0));
+ SET @reserved := CAST(0 AS DECIMAL(10,0));
+
+ UPDATE vn.itemShelving ish
+ JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id
+ JOIN sale s ON s.id = sis.saleFk
+ SET ish.visible = sis.quantity + ish.visible,
+ ish.available = sis.quantity + ish.visible
+ WHERE s.ticketFk = vTicketFk;
+
+ DELETE sis.*
+ FROM saleItemShelving sis
+ JOIN sale s ON s.id = sis.saleFk
+ WHERE s.ticketFk = vTicketFk;
+
+ INSERT INTO saleItemShelving( saleFk,
+ itemShelvingFk,
+ quantity,
+ ubication)
+ SELECT saleFk,
+ itemShelvingFk,
+ CAST(Reserved as DECIMAL(10,0)) as Reserved,
+ ubication
+ FROM
+ (SELECT saleFk,
+ itemShelvingFk,
+ ubication,
+ @rest := IF(@saleFk = saleFk, @rest, quantity) as Falta,
+ @reserved := IF(available < @rest, available, IF(@rest < packing,0,@rest)) as Reserved,
+ @rest := @rest - @reserved,
+ @saleFk := saleFk
+ FROM
+ ( SELECT s.id as saleFk,
+ ish.created,
+ ish.id as itemShelvingFk,
+ ish.available,
+ s.quantity,
+ ish.packing,
+ CONCAT(p.`column`, '-',p.`row`,': ', sh.code ) as ubication
+ FROM vn.sale s
+ JOIN vn.ticket t ON t.id = s.ticketFk
+ JOIN vn.sector sc ON sc.warehouseFk = t.warehouseFk
+ JOIN vn.parking p ON p.sectorFk = sc.id
+ JOIN vn.shelving sh ON sh.parkingFk = p.id
+ JOIN vn.itemShelving ish ON ish.shelvingFk = sh.code AND ish.itemFk = s.itemFk
+ WHERE t.id = vTicketFk
+ AND sc.id = vSectorFk
+ AND s.quantity MOD ish.packing = 0
+ AND s.quantity >= ish.packing
+ ORDER BY s.id,
+ sh.priority DESC,
+ ish.packing DESC,
+ ish.created
+ ) sub
+ ) sub2
+ WHERE Reserved > 0;
+
+ UPDATE vn.itemShelving ish
+ JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id
+ JOIN vn.sale s ON s.id = sis.saleFk
+ SET ish.available = ish.visible - sis.quantity,
+ ish.visible = ish.visible - sis.quantity
+ WHERE s.ticketFk = vTicketFk
+ AND s.isPicked = FALSE;
+
+ CALL vn.saleItemShelvingIsPicked(vTicketFk, TRUE);
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -74745,13 +74988,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleMistake_Add`(vSaleFk INT, vUserFk INT, vTypeFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleMistake_Add`(vSaleFk INT, vUserFk INT, vTypeFk INT)
BEGIN
INSERT INTO vn.saleMistake(saleFk, userFk, typeFk)
@@ -74769,11 +75012,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleMove`(IN vSaleFk BIGINT, IN vQuantity BIGINT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleMove`(IN vSaleFk BIGINT, IN vQuantity BIGINT)
BEGIN
DECLARE vShipped DATE;
@@ -74858,27 +75101,27 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleParking_add__`(vSaleFk INT, vParkingCode VARCHAR(10))
-BEGIN
-
- /*
- * Inserta registro en saleParking
- *
- * vSaleFk Identificador de vn.sale
- * vParkingCode Code de vn.parking
- */
-
- INSERT INTO vn.saleParking(saleFk, parkingFk, userFk)
- SELECT vSaleFk, p.id, account.myUser_getId()
- FROM vn.parking p
- WHERE p.code = vParkingCode COLLATE utf8_unicode_ci;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleParking_add__`(vSaleFk INT, vParkingCode VARCHAR(10))
+BEGIN
+
+ /*
+ * Inserta registro en saleParking
+ *
+ * vSaleFk Identificador de vn.sale
+ * vParkingCode Code de vn.parking
+ */
+
+ INSERT INTO vn.saleParking(saleFk, parkingFk, userFk)
+ SELECT vSaleFk, p.id, account.myUser_getId()
+ FROM vn.parking p
+ WHERE p.code = vParkingCode COLLATE utf8_unicode_ci;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -74891,11 +75134,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `salePreparingList`(IN ticketFk BIGINT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `salePreparingList`(IN ticketFk BIGINT)
BEGIN
CALL cache.last_buy_refresh(FALSE);
@@ -74949,13 +75192,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `salesMerge`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `salesMerge`(vTicketFk INT)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.salesToPreserve;
@@ -74989,13 +75232,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `salesMerge_byCollection`(vCollectionFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `salesMerge_byCollection`(vCollectionFk INT)
BEGIN
DECLARE vDone BOOL;
@@ -75039,13 +75282,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleSplit`(vSaleFk INT, vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleSplit`(vSaleFk INT, vQuantity INT)
BEGIN
@@ -75101,29 +75344,103 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleTracking_add`(vSaleGroupFk INT)
-BEGIN
-
- /* Inserta en vn.saleTracking las lineas de una previa
- *
- * @param vSaleGroupFk Identificador de vn.saleGroup
- */
-
- REPLACE vn.saleTracking(saleFk,
- isChecked,
- workerFk,
- actionFk,
- stateFk)
- SELECT sgd.saleFk ,
- TRUE,
- account.myUser_getId(),
- a.accion_id,
- s.id
- FROM vn.saleGroupDetail sgd
- JOIN vncontrol.accion a ON a.accion = 'SACAR'
- JOIN vn.state s ON s.code = 'ON_PREPARATION'
- WHERE sgd.saleGroupFk = vSaleGroupFk;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_add`(vSaleGroupFk INT)
+BEGIN
+
+ /* Inserta en vn.saleTracking las lineas de una previa
+ *
+ * @param vSaleGroupFk Identificador de vn.saleGroup
+ */
+
+ REPLACE vn.saleTracking(saleFk,
+ isChecked,
+ workerFk,
+ actionFk,
+ stateFk)
+ SELECT sgd.saleFk ,
+ TRUE,
+ account.myUser_getId(),
+ a.accion_id,
+ s.id
+ FROM vn.saleGroupDetail sgd
+ JOIN vncontrol.accion a ON a.accion = 'SACAR'
+ JOIN vn.state s ON s.code = 'ON_PREPARATION'
+ WHERE sgd.saleGroupFk = vSaleGroupFk;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `saleTracking_addPreparedSaleGroup` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_addPreparedSaleGroup`(vSaleGroupFk INT)
+BEGIN
+
+ /**
+ * Inserta lineas de vn.saleTracking para un saleGroup (previa) que escanea un sacador
+ *
+ * @param vSaleGroupFk Identificador de vn.saleGroup
+ */
+
+ REPLACE vn.saleTracking(saleFk, isChecked, workerFk, actionFk, stateFk)
+ SELECT sgd.saleFk, TRUE, account.myUser_getId(), a.accion_id id, s.id
+ FROM vn.saleGroupDetail sgd
+ JOIN vncontrol.accion a ON a.accion = 'SACAR'
+ JOIN vn.state s ON s.code = 'PREPARED'
+ WHERE sgd.saleGroupFk = vSaleGroupFk;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `saleTracking_addPrevOK` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_addPrevOK`(vSectorCollectionFk INT)
+BEGIN
+
+ /**
+ * Inserta los registros de la colección de sector con el estado PREVIA OK
+ *
+ * @param vSectorCollectionFk Identificador de vn.sectorCollection
+ */
+
+ REPLACE vn.saleTracking(saleFk,
+ isChecked,
+ workerFk,
+ actionFk,
+ stateFk)
+ SELECT sgd.saleFk,
+ TRUE,
+ sc.userFk,
+ a.accion_id,
+ s.id
+ FROM vn.sectorCollection sc
+ JOIN vn.sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
+ JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = scsg.saleGroupFk
+ JOIN vn.state s ON s.code = 'OK PREVIOUS'
+ JOIN vncontrol.accion a ON a.accion = 'PRESACAR'
+ WHERE sc.id = vSectorCollectionFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -75134,13 +75451,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleTracking_del`(vSaleFk INT, vState VARCHAR(50))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_del`(vSaleFk INT, vState VARCHAR(50))
BEGIN
DELETE FROM itemShelvingSale
@@ -75164,11 +75481,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleTracking_new`( vSaleFK INT,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_new`( vSaleFK INT,
vIsChecked BOOLEAN,
vOriginalQuantity INT,
vWorkerFk INT,
@@ -75205,14 +75522,54 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_Replace`(vSaleFk INT, vIsChecked INT, vOriginalQuantity INT, vStateFk INT)
+BEGIN
+ REPLACE vn.saleTracking(saleFk, isChecked, originalQuantity, stateFk)
+ VALUES(vSaleFk, vIsChecked, vOriginalQuantity, vStateFk);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `saleTracking_updateIsChecked` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saleTracking_Replace`(vSaleFk INT, vIsChecked INT, vOriginalQuantity INT, vStateFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_updateIsChecked`(vSaleFk INT, vIsChecked BOOL)
BEGIN
- REPLACE vn.saleTracking(saleFk, isChecked, originalQuantity, stateFk)
- VALUES(vSaleFk, vIsChecked, vOriginalQuantity, vStateFk);
+
+ /**
+ * Actualiza el estado del campo vn.saleTracking.isChecked y elimina las lineas de vn.itemShelving
+ * si procede, en el caso de las preparaciones previas, por usuario
+ *
+ * @param vSaleFk Identificador de vn.sale
+ * @param vIsChecked Estado del registro
+ */
+
+ UPDATE vn.saleTracking st
+ JOIN vn.state s ON s.id = st.stateFk AND s.code = 'PREVIOUS_PREPARATION'
+ SET st.isChecked = vIsChecked
+ WHERE st.saleFk = vSaleFk
+ AND st.workerFk = account.myUser_getId();
+
+ IF vIsChecked = FALSE THEN
+
+ DELETE FROM vn.itemShelvingSale
+ WHERE saleFk = vSaleFk;
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -75223,13 +75580,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_calculateComponent`(vSale INT, vOption INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_calculateComponent`(vSale INT, vOption INT)
proc: BEGIN
/**
* Crea tabla temporal para vn.sale_recalcComponent() para recalcular los componentes
@@ -75256,13 +75613,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_calculateComponent__`(vSale INT, vOption INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_calculateComponent__`(vSale INT, vOption INT)
proc: BEGIN
/**
* Actualiza los componentes
@@ -75339,11 +75696,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_calculateComponent__2`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_calculateComponent__2`()
proc: BEGIN
/**
* Actualiza los componentes
@@ -75469,13 +75826,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_checkNoComponents`(vCreatedFrom DATETIME, vCreatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_checkNoComponents`(vCreatedFrom DATETIME, vCreatedTo DATETIME)
BEGIN
/**
* Comprueba que las ventas creadas entre un rango de fechas tienen componentes
@@ -75549,17 +75906,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `sale_fruitWithoutLot` */;
+/*!50003 DROP PROCEDURE IF EXISTS `sale_fruitWithoutLot__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_fruitWithoutLot`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_fruitWithoutLot__`()
BEGIN
/**
*
@@ -75598,228 +75955,182 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `sale_getFromTicketOrCollection` */;
+/*!50003 DROP PROCEDURE IF EXISTS `sale_getForSijsner__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_getFromTicketOrCollection`(vParam INT)
-BEGIN
-
- /*
- * Visualizar lineas de la tabla sale a través del parámetro vParam que puede ser ticket o collection
- *
- * @param vParam Identificador de vn.ticket o vn.collection
- */
-
- DECLARE vItemPackingTypeFk VARCHAR(1);
- DECLARE vIsCollection BOOL;
-
- SELECT COUNT(*) INTO vIsCollection
- FROM vn.collection c
- WHERE c.id = vParam;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
-
- IF vIsCollection THEN
-
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT tc.ticketFk id, clientFk, tc.ticketFk as showTicketFk
- FROM vn.ticketCollection tc
- JOIN vn.ticket t ON t.id = tc.ticketFk
- WHERE tc.collectionFk = vParam;
-
- ELSE
-
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT t.id, clientFk, t.id as showTicketFk
- FROM vn.ticket t
- WHERE t.id = vParam;
-
- END IF;
-
- SELECT showTicketFk ticketFk,
- sgd.saleGroupFk,
- s.id as saleFk,
- s.itemFk,
- s.quantity,
- i.longName,
- i.size,
- s.reserved,
- MAX(IF(st.semaphore <=> 1, TRUE, FALSE)) as isPreviousPrepared,
- MAX(IF(st.semaphore <=> 2, TRUE, FALSE)) as isPrepared,
- MAX(IF(st.semaphore <=> 3, TRUE, FALSE)) as isControlled,
- MAX(IF(st.semaphore <=> 4, TRUE, FALSE)) as isPreControlled,
- ic.color,
- ip.productor,
- s.discount,
- s.price,
- i.stems,
- i.category,
- o.code AS origin,
- t.clientFk,
- s.originalQuantity,
- TRIM(CONCAT(
- LPAD(s.concept,30,' '), ' ',
- RPAD(IFNULL(i.size,''),5,' ')
- )
- ) as line1,
- '' cel1,
- TRIM(CONCAT(LPAD(IFNULL(ip.productor,''),30,' '), ' ',LPAD(IFNULL(o.code,''),4,' '))) as line2,
- IF(s.quantity MOD IFNULL(b.packing,s.quantity + 1),
- CONCAT(CAST(s.quantity/IFNULL(b.`grouping`,1) AS decimal(10,0)),' x ',IFNULL(b.`grouping`,1)),
- CONCAT(CAST(s.quantity / IFNULL(b.packing,1) AS DECIMAL(10,0)),' pack de ',IFNULL(b.packing,1))) cel2,
- TRIM(CONCAT(ic.color))as line3,
- p.code cel3,
- s.isAdded,
- str.originalQuantity as startQuantity, -- eliminar cuando tengamos la nueva apk
- IFNULL(c.workerFk,getUser()) as workerFk,
- IFNULL(SUM(iss.quantity),0) as pickedQuantity,
- i.packingShelve
- FROM vn.sale s
- JOIN tmp.ticket t ON t.id = s.ticketFk
- JOIN vn.ticket tt ON tt.id = t.id
- LEFT JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = tt.warehouseFk
- LEFT JOIN vn.buy b ON b.id = lb.buy_id
- JOIN vn.item i ON i.id = s.itemFk
- LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
- LEFT JOIN vn.collection c ON c.id = tc.collectionFk
- LEFT JOIN vn.saleTracking str ON str.saleFk = s.id AND str.isChecked = 1
- LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
- LEFT JOIN vn.state st ON st.id = str.stateFk
- LEFT JOIN vn.itemColor ic ON ic.itemFk = s.itemFk
- LEFT JOIN vn.itemProductor ip ON ip.itemFk = s.itemFk
- LEFT JOIN vn.origin o ON o.id = i.originFk
- LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
- LEFT JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk
- LEFT JOIN vn.parking p ON p.id = sg.parkingFk
- -- WHERE (i.itemPackingTypeFk = c.itemPackingTypeFk OR ISNULL(c.itemPackingTypeFk))
- GROUP BY s.id;
-
- DROP TEMPORARY TABLE tmp.ticket;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_getForSijsner__`(vDated DATE)
+BEGIN
+
+ /**
+ * Devuelve el listado de ventas que tiene que etiquetar Sijsner para la fecha dada
+ *
+ * @param vDated Fecha de preparación de los tickets
+ */
+
+ SELECT b.printedStickers OR s.isPicked isPrinted,
+ t.shipped ,
+ t.nickname ,
+ s.ticketFk ,
+ s.itemFk ,
+ FLOOR(s.quantity / e.pac) stickers,
+ CONCAT(FLOOR(s.quantity / e.pac) , ' x ', e.pac ) amount,
+ s.concept,
+ e.kop,
+ e.sub,
+ sp.company_name supplier,
+ b.id buyFk
+ FROM vn.sale s
+ JOIN vn.ticket t ON t.id = s.ticketFk
+ JOIN vn.warehouse w ON w.id = t.warehouseFk
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.province p ON p.id = a.provinceFk
+ JOIN vn.country c ON c.id = p.countryFk
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = t.warehouseFk
+ JOIN vn.buy b ON b.id = lb.buy_id
+ LEFT JOIN edi.ekt e ON e.id = b.ektFk
+ LEFT JOIN edi.supplier sp ON sp.supplier_id = e.pro
+ WHERE t.shipped BETWEEN vDated AND TIMESTAMPADD(HOUR,23,vDated)
+ AND c.code != 'ES'
+ AND w.code IN ('FLM','VNH')
+ AND s.quantity ;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `sale_getFromTicketOrCollection__` */;
+/*!50003 DROP PROCEDURE IF EXISTS `sale_getFromTicketOrCollection` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_getFromTicketOrCollection__`(vParam INT)
-BEGIN
-
- /*
- * Visualizar lineas de la tabla sale a través del parámetro vParam que puede ser ticket o collection
- */
-
- DECLARE vItemPackingTypeFk VARCHAR(1);
-
- IF (SELECT COUNT(*) FROM vn.ticket WHERE id = vParam AND id > 2000000) THEN
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT t.id, clientFk, t.id as showTicketFk
- FROM vn.ticket t
- WHERE t.id = vParam;
-
- ELSE
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT tc.ticketFk id, clientFk, tc.ticketFk as showTicketFk
- FROM vn.ticketCollection tc
- JOIN vn.ticket t ON t.id = tc.ticketFk
- WHERE tc.collectionFk = vParam;
-
- END IF;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket3;
- CREATE TEMPORARY TABLE tmp.ticket3
- SELECT * FROM tmp.ticket;
-
- SELECT showTicketFk ticketFk,
- s.id as saleFk,
- s.itemFk,
- s.quantity,
- i.longName,
- i.size,
- s.reserved,
- MAX(IF(st.semaphore <=> 1, TRUE, FALSE)) as isPreviousPrepared,
- MAX(IF(st.semaphore <=> 2, TRUE, FALSE)) as isPrepared,
- MAX(IF(st.semaphore <=> 3, TRUE, FALSE)) as isControlled,
- ic.color,
- ip.productor,
- s.discount,
- s.price,
- i.stems,
- i.category,
- o.code AS origin,
- t.clientFk,
- s.originalQuantity,
- TRIM(CONCAT(
- LPAD(s.concept,30,' '), ' ',
- RPAD(IFNULL(i.size,''),5,' ')
- )
- ) as line1,
- '' cel1,
- TRIM(CONCAT(LPAD(IFNULL(ip.productor,''),30,' '), ' ',LPAD(IFNULL(o.code,''),4,' '))) as line2,
- IF(s.quantity MOD IFNULL(b.packing,s.quantity + 1),
- CONCAT(CAST(s.quantity/IFNULL(b.`grouping`,1) AS decimal(10,0)),' x ',IFNULL(b.`grouping`,1)),
- CONCAT(CAST(s.quantity / IFNULL(b.packing,1) AS DECIMAL(10,0)),' pack de ',IFNULL(b.packing,1))) cel2,
- TRIM(CONCAT(ic.color))as line3,
- p.code cel3,
- -- TRIM(CONCAT(ic.color, IF(MAX(IF(st.semaphore <=> 1, TRUE, FALSE)) AND t.id != t.showTicketFk, CONCAT(' [ TICKET ',t.id,' ] '),''), IFNULL(LPAD(st.parkingCode,40,' '),''))) as line3,
- s.isAdded,
- str.originalQuantity as startQuantity, -- eliminar cuando tengamos la nueva apk
- IFNULL(c.workerFk,getUser()) as workerFk,
- IFNULL(SUM(iss.quantity),0) as pickedQuantity
- FROM vn.sale s
- JOIN tmp.ticket t ON t.id = s.ticketFk
- JOIN vn.ticket tt ON tt.id = t.id
- LEFT JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = tt.warehouseFk
- LEFT JOIN vn.buy b ON b.id = lb.buy_id
- JOIN vn.item i ON i.id = s.itemFk
- LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
- LEFT JOIN vn.collection c ON c.id = tc.collectionFk
- LEFT JOIN vn.saleTracking str ON str.saleFk = s.id AND str.isChecked = 1
- LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
- LEFT JOIN vn.state st ON st.id = str.stateFk
- LEFT JOIN vn.itemColor ic ON ic.itemFk = s.itemFk
- LEFT JOIN vn.itemProductor ip ON ip.itemFk = s.itemFk
- LEFT JOIN vn.origin o ON o.id = i.originFk
- LEFT JOIN vn.saleParking sp ON sp.saleFk = s.id
- LEFT JOIN vn.parking p ON p.id = sp.parkingFk
- /*LEFT JOIN (SELECT st.saleFk, p.`code` as parkingCode
- FROM vn.saleTracking st
- JOIN vn.state s ON s.id = st.stateFk
- JOIN vn.sale sa ON sa.id = st.saleFk
- JOIN tmp.ticket3 t ON t.id = sa.ticketFk
- JOIN vn.ticketParking tp ON tp.ticketFk = sa.ticketFk
- JOIN vn.parking p ON p.id = tp.parkingFk
- WHERE st.isChecked
- AND s.semaphore = 1
- GROUP BY st.saleFk) st ON st.saleFk = s.id
- */
- WHERE (i.itemPackingTypeFk = c.itemPackingTypeFk OR ISNULL(c.itemPackingTypeFk))
- GROUP BY s.id;
-
- DROP TEMPORARY TABLE tmp.ticket;
- DROP TEMPORARY TABLE tmp.ticket3;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_getFromTicketOrCollection`(vParam INT)
+BEGIN
+/*
+ * Visualizar lineas de la tabla sale a través del parámetro vParam que puede ser ticket o collection
+ *
+ * @param vParam Identificador de ticket o collection
+ */
+
+ DECLARE vItemPackingTypeFk VARCHAR(1);
+ DECLARE vIsCollection BOOL;
+
+ SELECT COUNT(*) INTO vIsCollection
+ FROM collection c
+ WHERE c.id = vParam;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket2;
+
+ IF vIsCollection THEN
+
+ CREATE TEMPORARY TABLE tmp.ticket
+ (INDEX (id))
+ ENGINE = MEMORY
+ SELECT tc.ticketFk id
+ FROM ticketCollection tc
+ JOIN ticket t ON t.id = tc.ticketFk
+ WHERE tc.collectionFk = vParam;
+
+ CREATE TEMPORARY TABLE tmp.ticket2
+ (INDEX (id))
+ ENGINE = MEMORY
+ SELECT tc.ticketFk id
+ FROM ticketCollection tc
+ JOIN ticket t ON t.id = tc.ticketFk
+ WHERE tc.collectionFk = vParam;
+ ELSE
+ CREATE TEMPORARY TABLE tmp.ticket
+ (INDEX (id))
+ ENGINE = MEMORY
+ SELECT vParam id;
+
+ CREATE TEMPORARY TABLE tmp.ticket2
+ (INDEX (id))
+ ENGINE = MEMORY
+ SELECT vParam id;
+ END IF;
+
+
+
+ SELECT s.ticketFk,
+ sgd.saleGroupFk,
+ s.id as saleFk,
+ s.itemFk,
+ s.quantity,
+ i.longName,
+ i.size,
+ s.reserved,
+ MAX(IF(st.semaphore <=> 1, TRUE, FALSE)) as isPreviousPrepared,
+ MAX(IF(st.semaphore <=> 2, TRUE, FALSE)) as isPrepared,
+ MAX(IF(st.semaphore <=> 3, TRUE, FALSE)) as isControlled,
+ MAX(IF(st.semaphore <=> 4, TRUE, FALSE)) as isPreControlled,
+ ic.color,
+ ip.productor,
+ s.discount,
+ s.price,
+ i.stems,
+ i.category,
+ o.code origin,
+ tt.clientFk,
+ s.originalQuantity,
+ TRIM(CONCAT(LPAD(s.concept,30,' '), ' ',
+ RPAD(IFNULL(i.size,''),5,' '))) line1,
+ '' cel1,
+ TRIM(CONCAT(LPAD(IFNULL(ip.productor,''),30,' '), ' ',LPAD(IFNULL(o.code,''),4,' '))) line2,
+ IF(s.quantity MOD IFNULL(b.packing,s.quantity + 1),
+ CONCAT(CAST(s.quantity/IFNULL(b.`grouping`,1) AS DECIMAL(10,0)),' x ',IFNULL(b.`grouping`,1)),
+ CONCAT(CAST(s.quantity / IFNULL(b.packing,1) AS DECIMAL(10,0)),' pack de ',IFNULL(b.packing,1))) cel2,
+ TRIM(CONCAT(ic.color)) line3,
+ p.code cel3,
+ s.isAdded,
+ sub2.originalQuantity as startQuantity, -- eliminar cuando tengamos la nueva apk
+ IFNULL(c.workerFk,getUser()) as workerFk,
+ IFNULL(SUM(iss.quantity),0) as pickedQuantity,
+ i.packingShelve
+ FROM tmp.ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN ticket tt ON tt.id = t.id
+ LEFT JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = tt.warehouseFk
+ LEFT JOIN buy b ON b.id = lb.buy_id
+ JOIN item i ON i.id = s.itemFk
+ LEFT JOIN ticketCollection tc ON tc.ticketFk = t.id
+ LEFT JOIN collection c ON c.id = tc.collectionFk
+ LEFT JOIN (SELECT sub.saleFk, sub.isChecked, sub.stateFk, sub.originalQuantity
+ FROM (SELECT DISTINCT st.id, st.saleFk, st.isChecked, st.stateFk, st.originalQuantity
+ FROM tmp.ticket2 t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN saleTracking st ON st.saleFk = s.id
+ ORDER BY st.id DESC) sub
+ GROUP BY sub.saleFk, sub.stateFK) sub2 ON sub2.saleFk = s.id AND sub2.isChecked = 1
+ LEFT JOIN itemShelvingSale iss ON iss.saleFk = s.id
+ LEFT JOIN state st ON st.id = sub2.stateFk
+ LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
+ LEFT JOIN itemProductor ip ON ip.itemFk = s.itemFk
+ LEFT JOIN origin o ON o.id = i.originFk
+ LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+ LEFT JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
+ LEFT JOIN parking p ON p.id = sg.parkingFk
+ GROUP BY s.id;
+
+
+ DROP TEMPORARY TABLE tmp.ticket;
+ DROP TEMPORARY TABLE tmp.ticket2;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -75836,212 +76147,215 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_getProblems`(IN vIsTodayRelative tinyint(1))
-BEGIN
-/**
- * Calcula los problemas de cada venta
- * para un conjunto de tickets.
- *
- * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Identificadores de los tickets a calcular
- * @return tmp.sale_problems
- */
- DECLARE vWarehouse INT;
- DECLARE vDate DATE;
- DECLARE vAvailableCache INT;
- DECLARE vDone INT DEFAULT 0;
- DECLARE vComponentCount INT;
-
- DECLARE vCursor CURSOR FOR
- SELECT DISTINCT tt.warehouseFk, IF(vIsTodayRelative, CURDATE(), date(tt.shipped))
- FROM tmp.sale_getProblems tt
- WHERE DATE(tt.shipped) BETWEEN CURDATE()
- AND TIMESTAMPADD(DAY, IF(vIsTodayRelative, 9.9, 1.9), CURDATE());
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale_problems;
- CREATE TEMPORARY TABLE tmp.sale_problems (
- ticketFk INT(11),
- saleFk INT(11),
- isFreezed INTEGER(1) DEFAULT 0,
- risk DECIMAL(10,2) DEFAULT 0,
- hasHighRisk TINYINT(1) DEFAULT 0,
- hasTicketRequest INTEGER(1) DEFAULT 0,
- isAvailable INTEGER(1) DEFAULT 1,
- itemShortage VARCHAR(250),
- isTaxDataChecked INTEGER(1) DEFAULT 1,
- itemDelay VARCHAR(250),
- hasComponentLack INTEGER(1),
- isTooLittle BOOL DEFAULT FALSE,
- PRIMARY KEY (ticketFk, saleFk)
- ) ENGINE = MEMORY;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
- CREATE TEMPORARY TABLE tmp.ticket_list
- (PRIMARY KEY (ticketFk))
- ENGINE = MEMORY
- SELECT tp.ticketFk, c.id clientFk
- FROM tmp.sale_getProblems tp
- JOIN vn.client c ON c.id = tp.clientFk;
-
- SELECT COUNT(*) INTO vComponentCount
- FROM vn.component c
- WHERE c.isRequired;
-
- INSERT INTO tmp.sale_problems(ticketFk, isTooLittle)
- SELECT sub.ticketFk, TRUE
- FROM (SELECT tl.ticketFk, SUM(sv.litros) litros, t.totalWithoutVat
- FROM tmp.ticket_list tl
- JOIN vn.saleVolume sv ON sv.ticketFk = tl.ticketFk
- JOIN vn.ticket t ON t.id = tl.ticketFk
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_getProblems`(IN vIsTodayRelative tinyint(1))
+BEGIN
+/**
+ * Calcula los problemas de cada venta
+ * para un conjunto de tickets.
+ *
+ * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Identificadores de los tickets a calcular
+ * @return tmp.sale_problems
+ */
+ DECLARE vWarehouse INT;
+ DECLARE vDate DATE;
+ DECLARE vAvailableCache INT;
+ DECLARE vDone INT DEFAULT 0;
+ DECLARE vComponentCount INT;
+
+ DECLARE vCursor CURSOR FOR
+ SELECT DISTINCT tt.warehouseFk, IF(vIsTodayRelative, CURDATE(), date(tt.shipped))
+ FROM tmp.sale_getProblems tt
+ WHERE DATE(tt.shipped) BETWEEN CURDATE()
+ AND TIMESTAMPADD(DAY, IF(vIsTodayRelative, 9.9, 1.9), CURDATE());
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale_problems;
+ CREATE TEMPORARY TABLE tmp.sale_problems (
+ ticketFk INT(11),
+ saleFk INT(11),
+ isFreezed INTEGER(1) DEFAULT 0,
+ risk DECIMAL(10,2) DEFAULT 0,
+ hasHighRisk TINYINT(1) DEFAULT 0,
+ hasTicketRequest INTEGER(1) DEFAULT 0,
+ isAvailable INTEGER(1) DEFAULT 1,
+ itemShortage VARCHAR(250),
+ isTaxDataChecked INTEGER(1) DEFAULT 1,
+ itemDelay VARCHAR(250),
+ hasComponentLack INTEGER(1),
+ isTooLittle BOOL DEFAULT FALSE,
+ PRIMARY KEY (ticketFk, saleFk)
+ ) ENGINE = MEMORY;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
+ CREATE TEMPORARY TABLE tmp.ticket_list
+ (PRIMARY KEY (ticketFk))
+ ENGINE = MEMORY
+ SELECT tp.ticketFk, c.id clientFk
+ FROM tmp.sale_getProblems tp
+ JOIN vn.client c ON c.id = tp.clientFk;
+
+ SELECT COUNT(*) INTO vComponentCount
+ FROM vn.component c
+ WHERE c.isRequired;
+
+ INSERT INTO tmp.sale_problems(ticketFk, isTooLittle)
+ SELECT sub.ticketFk, TRUE
+ FROM (SELECT tl.ticketFk, SUM(sv.litros) litros, t.totalWithoutVat
+ FROM tmp.ticket_list tl
+ JOIN vn.saleVolume sv ON sv.ticketFk = tl.ticketFk
+ JOIN vn.ticket t ON t.id = tl.ticketFk
JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND zc.dated = CURDATE()
- WHERE NOW() < TIMESTAMPADD(MINUTE,MINUTE(zc.`hour`) ,TIMESTAMPADD(HOUR,HOUR(zc.`hour`),CURDATE()))
- GROUP BY tl.ticketFk) sub
- JOIN vn.volumeConfig vc
- WHERE sub.litros < vc.minTicketVolume
- AND sub.totalWithoutVat < vc.minTicketValue;
-
- INSERT INTO tmp.sale_problems(ticketFk, hasComponentLack, saleFk)
- SELECT tl.ticketFk, (COUNT(DISTINCT s.id) * vComponentCount > COUNT(c.id)), s.id
- FROM tmp.ticket_list tl
- JOIN vn.sale s ON s.ticketFk = tl.ticketFk
- LEFT JOIN vn.saleComponent sc ON sc.saleFk = s.id
- LEFT JOIN vn.component c ON c.id = sc.componentFk AND c.isRequired
- JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
- WHERE dm.code IN('AGENCY','DELIVERY','PICKUP')
- GROUP BY tl.ticketFk, s.id;
-
- INSERT INTO tmp.sale_problems(ticketFk, isFreezed)
- SELECT DISTINCT tl.ticketFk, TRUE
- FROM tmp.ticket_list tl
- JOIN vn.client c ON c.id = tl.clientFk
- WHERE c.isFreezed
- ON DUPLICATE KEY UPDATE
- isFreezed = c.isFreezed;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
- CREATE TEMPORARY TABLE tmp.clientGetDebt
- (PRIMARY KEY (clientFk))
- ENGINE = MEMORY
- SELECT DISTINCT clientFk
- FROM tmp.ticket_list;
-
- CALL clientGetDebt(CURDATE());
-
- INSERT INTO tmp.sale_problems(ticketFk, risk, hasHighRisk)
- SELECT DISTINCT tl.ticketFk, r.risk, ((r.risk - cc.riskTolerance) > c.credit + 10)
- FROM tmp.ticket_list tl
- JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.agencyMode a ON t.agencyModeFk = a.id
- JOIN tmp.risk r ON r.clientFk = t.clientFk
- JOIN vn.client c ON c.id = t.clientFk
- JOIN vn.clientConfig cc
- WHERE r.risk > c.credit + 10
- AND a.isRiskFree = FALSE
- ON DUPLICATE KEY UPDATE
- risk = r.risk, hasHighRisk = ((r.risk - cc.riskTolerance) > c.credit + 10);
-
- INSERT INTO tmp.sale_problems(ticketFk, hasTicketRequest)
- SELECT DISTINCT tl.ticketFk, TRUE
- FROM tmp.ticket_list tl
- JOIN vn.ticketRequest tr ON tr.ticketFk = tl.ticketFk
- WHERE tr.isOK IS NULL
- ON DUPLICATE KEY UPDATE
- hasTicketRequest = TRUE;
-
- OPEN vCursor;
-
- WHILE NOT vDone
- DO
- FETCH vCursor INTO vWarehouse, vDate;
-
- CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouse, vDate);
-
- INSERT INTO tmp.sale_problems(ticketFk, isAvailable, saleFk)
- SELECT tl.ticketFk, FALSE, s.id
- FROM tmp.ticket_list tl
- JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it on it.id = i.typeFk
- LEFT JOIN cache.available av ON av.item_id = i.id
- AND av.calc_id = vAvailableCache
- WHERE date(t.shipped) = vDate
- AND it.categoryFk != 6
- AND IFNULL(av.available, 0) < 0
- AND s.isPicked = FALSE
- AND NOT i.generic
- AND vWarehouse = t.warehouseFk
- GROUP BY tl.ticketFk
- ON DUPLICATE KEY UPDATE
- isAvailable = FALSE, saleFk = VALUES(saleFk);
-
- INSERT INTO tmp.sale_problems(ticketFk, itemShortage, saleFk)
- SELECT ticketFk, problem, saleFk
- FROM (
- SELECT tl.ticketFk, CONCAT('F: ',GROUP_CONCAT(i.id, ' ', i.longName, ' ')) problem, s.id AS saleFk
- FROM tmp.ticket_list tl
- JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it on it.id = i.typeFk
- LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
- LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
- WHERE IFNULL(av.available, 0) <= 0
- AND s.quantity > IFNULL(issw.visible, 0)
- AND s.quantity > 0
- AND s.isPicked = FALSE
- AND s.reserved = FALSE
- AND it.categoryFk != 6
- AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
- AND NOT i.generic
- AND CURDATE() = vDate
- AND t.warehouseFk = vWarehouse
- GROUP BY tl.ticketFk) sub
- ON DUPLICATE KEY UPDATE
- itemShortage = sub.problem, saleFk = sub.saleFk;
-
- INSERT INTO tmp.sale_problems(ticketFk, itemDelay, saleFk)
- SELECT ticketFk, problem, saleFk
- FROM (
- SELECT tl.ticketFk, GROUP_CONCAT('I: ',i.id, ' ', i.longName, ' ') problem, s.id AS saleFk
- FROM tmp.ticket_list tl
- JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it on it.id = i.typeFk
- LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
- LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
- WHERE IFNULL(av.available, 0) >= s.quantity
- AND s.quantity > IFNULL(issw.visible, 0)
- AND s.quantity > 0
- AND s.isPicked = FALSE
- AND s.reserved = FALSE
- AND it.categoryFk != 6
- AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
- AND NOT i.generic
- AND CURDATE() = vDate
- AND t.warehouseFk = vWarehouse
- GROUP BY tl.ticketFk) sub
- ON DUPLICATE KEY UPDATE
- itemDelay = sub.problem, saleFk = sub.saleFk;
- END WHILE;
-
- CLOSE vCursor;
-
- INSERT INTO tmp.sale_problems(ticketFk, isTaxDataChecked)
- SELECT DISTINCT tl.ticketFk, FALSE
- FROM tmp.ticket_list tl
- JOIN vn.client c ON c.id = tl.clientFk
- WHERE c.isTaxDataChecked = FALSE
- ON DUPLICATE KEY UPDATE
- isTaxDataChecked = FALSE;
-
- DROP TEMPORARY TABLE
- tmp.clientGetDebt,
- tmp.ticket_list;
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
+ WHERE NOW() < TIMESTAMPADD(MINUTE,MINUTE(zc.`hour`) ,TIMESTAMPADD(HOUR,HOUR(zc.`hour`),CURDATE()))
+ AND dm.code IN('AGENCY','DELIVERY','PICKUP')
+ GROUP BY tl.ticketFk) sub
+ JOIN vn.volumeConfig vc
+ WHERE sub.litros < vc.minTicketVolume
+ AND sub.totalWithoutVat < vc.minTicketValue;
+
+ INSERT INTO tmp.sale_problems(ticketFk, hasComponentLack, saleFk)
+ SELECT tl.ticketFk, (COUNT(DISTINCT s.id) * vComponentCount > COUNT(c.id)), s.id
+ FROM tmp.ticket_list tl
+ JOIN vn.sale s ON s.ticketFk = tl.ticketFk
+ LEFT JOIN vn.saleComponent sc ON sc.saleFk = s.id
+ LEFT JOIN vn.component c ON c.id = sc.componentFk AND c.isRequired
+ JOIN vn.ticket t ON t.id = tl.ticketFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
+ WHERE dm.code IN('AGENCY','DELIVERY','PICKUP')
+ GROUP BY tl.ticketFk, s.id;
+
+ INSERT INTO tmp.sale_problems(ticketFk, isFreezed)
+ SELECT DISTINCT tl.ticketFk, TRUE
+ FROM tmp.ticket_list tl
+ JOIN vn.client c ON c.id = tl.clientFk
+ WHERE c.isFreezed
+ ON DUPLICATE KEY UPDATE
+ isFreezed = c.isFreezed;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
+ CREATE TEMPORARY TABLE tmp.clientGetDebt
+ (PRIMARY KEY (clientFk))
+ ENGINE = MEMORY
+ SELECT DISTINCT clientFk
+ FROM tmp.ticket_list;
+
+ CALL clientGetDebt(CURDATE());
+
+ INSERT INTO tmp.sale_problems(ticketFk, risk, hasHighRisk)
+ SELECT DISTINCT tl.ticketFk, r.risk, ((r.risk - cc.riskTolerance) > c.credit + 10)
+ FROM tmp.ticket_list tl
+ JOIN vn.ticket t ON t.id = tl.ticketFk
+ JOIN vn.agencyMode a ON t.agencyModeFk = a.id
+ JOIN tmp.risk r ON r.clientFk = t.clientFk
+ JOIN vn.client c ON c.id = t.clientFk
+ JOIN vn.clientConfig cc
+ WHERE r.risk > c.credit + 10
+ AND a.isRiskFree = FALSE
+ ON DUPLICATE KEY UPDATE
+ risk = r.risk, hasHighRisk = ((r.risk - cc.riskTolerance) > c.credit + 10);
+
+ INSERT INTO tmp.sale_problems(ticketFk, hasTicketRequest)
+ SELECT DISTINCT tl.ticketFk, TRUE
+ FROM tmp.ticket_list tl
+ JOIN vn.ticketRequest tr ON tr.ticketFk = tl.ticketFk
+ WHERE tr.isOK IS NULL
+ ON DUPLICATE KEY UPDATE
+ hasTicketRequest = TRUE;
+
+ OPEN vCursor;
+
+ WHILE NOT vDone
+ DO
+ FETCH vCursor INTO vWarehouse, vDate;
+
+ CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouse, vDate);
+
+ INSERT INTO tmp.sale_problems(ticketFk, isAvailable, saleFk)
+ SELECT tl.ticketFk, FALSE, s.id
+ FROM tmp.ticket_list tl
+ JOIN vn.ticket t ON t.id = tl.ticketFk
+ JOIN vn.sale s ON s.ticketFk = t.id
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.itemType it on it.id = i.typeFk
+ LEFT JOIN cache.available av ON av.item_id = i.id
+ AND av.calc_id = vAvailableCache
+ WHERE date(t.shipped) = vDate
+ AND it.categoryFk != 6
+ AND IFNULL(av.available, 0) < 0
+ AND s.isPicked = FALSE
+ AND NOT i.generic
+ AND vWarehouse = t.warehouseFk
+ GROUP BY tl.ticketFk
+ ON DUPLICATE KEY UPDATE
+ isAvailable = FALSE, saleFk = VALUES(saleFk);
+
+ INSERT INTO tmp.sale_problems(ticketFk, itemShortage, saleFk)
+ SELECT ticketFk, problem, saleFk
+ FROM (
+ SELECT tl.ticketFk, CONCAT('F: ',GROUP_CONCAT(i.id, ' ', i.longName, ' ')) problem, s.id AS saleFk
+ FROM tmp.ticket_list tl
+ JOIN vn.ticket t ON t.id = tl.ticketFk
+ JOIN vn.sale s ON s.ticketFk = t.id
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.itemType it on it.id = i.typeFk
+ LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
+ LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
+ WHERE IFNULL(av.available, 0) <= 0
+ AND s.quantity > IFNULL(issw.visible, 0)
+ AND s.quantity > 0
+ AND s.isPicked = FALSE
+ AND s.reserved = FALSE
+ AND it.categoryFk != 6
+ AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
+ AND NOT i.generic
+ AND CURDATE() = vDate
+ AND t.warehouseFk = vWarehouse
+ GROUP BY tl.ticketFk) sub
+ ON DUPLICATE KEY UPDATE
+ itemShortage = sub.problem, saleFk = sub.saleFk;
+
+ INSERT INTO tmp.sale_problems(ticketFk, itemDelay, saleFk)
+ SELECT ticketFk, problem, saleFk
+ FROM (
+ SELECT tl.ticketFk, GROUP_CONCAT('I: ',i.id, ' ', i.longName, ' ') problem, s.id AS saleFk
+ FROM tmp.ticket_list tl
+ JOIN vn.ticket t ON t.id = tl.ticketFk
+ JOIN vn.sale s ON s.ticketFk = t.id
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.itemType it on it.id = i.typeFk
+ LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
+ LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
+ WHERE IFNULL(av.available, 0) >= s.quantity
+ AND s.quantity > IFNULL(issw.visible, 0)
+ AND s.quantity > 0
+ AND s.isPicked = FALSE
+ AND s.reserved = FALSE
+ AND it.categoryFk != 6
+ AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
+ AND NOT i.generic
+ AND CURDATE() = vDate
+ AND t.warehouseFk = vWarehouse
+ GROUP BY tl.ticketFk) sub
+ ON DUPLICATE KEY UPDATE
+ itemDelay = sub.problem, saleFk = sub.saleFk;
+ END WHILE;
+
+ CLOSE vCursor;
+
+ INSERT INTO tmp.sale_problems(ticketFk, isTaxDataChecked)
+ SELECT DISTINCT tl.ticketFk, FALSE
+ FROM tmp.ticket_list tl
+ JOIN vn.client c ON c.id = tl.clientFk
+ WHERE c.isTaxDataChecked = FALSE
+ ON DUPLICATE KEY UPDATE
+ isTaxDataChecked = FALSE;
+
+ DROP TEMPORARY TABLE
+ tmp.clientGetDebt,
+ tmp.ticket_list;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76052,13 +76366,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_getProblemsByTicket`(IN vTicketFk INT, IN vIsTodayRelative TINYINT(1))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_getProblemsByTicket`(IN vTicketFk INT, IN vIsTodayRelative TINYINT(1))
BEGIN
/**
* Calcula los problemas de cada venta
@@ -76091,13 +76405,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_getProblems__`(IN vIsTodayRelative tinyint(1))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_getProblems__`(IN vIsTodayRelative tinyint(1))
BEGIN
/**
* Calcula los problemas de cada venta
@@ -76310,31 +76624,31 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_PriceFix`(vTicketFk INT)
-BEGIN
-
- DELETE sc.*
- FROM vn.saleComponent sc
- JOIN vn.sale s ON s.id = sc.saleFk
- JOIN vn.component c ON c.id = sc.componentFk
- JOIN vn.componentType ct ON ct.id = c.typeFk
- WHERE s.ticketFk = vTicketFk
- AND ct.`type` = 'otros';
-
- UPDATE vn.sale s
- JOIN (
- SELECT sc.saleFk, sum(sc.value ) price
- FROM vn.saleComponent sc
- JOIN vn.sale s ON s.id = sc.saleFk
- WHERE s.ticketFk = vTicketFk
- GROUP BY sc.saleFk) sub ON sub.saleFk = s.id
- SET s.price = sub.price;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_PriceFix`(vTicketFk INT)
+BEGIN
+
+ DELETE sc.*
+ FROM vn.saleComponent sc
+ JOIN vn.sale s ON s.id = sc.saleFk
+ JOIN vn.component c ON c.id = sc.componentFk
+ JOIN vn.componentType ct ON ct.id = c.typeFk
+ WHERE s.ticketFk = vTicketFk
+ AND ct.`type` = 'otros';
+
+ UPDATE vn.sale s
+ JOIN (
+ SELECT sc.saleFk, sum(sc.value ) price
+ FROM vn.saleComponent sc
+ JOIN vn.sale s ON s.id = sc.saleFk
+ WHERE s.ticketFk = vTicketFk
+ GROUP BY sc.saleFk) sub ON sub.saleFk = s.id
+ SET s.price = sub.price;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76345,13 +76659,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_recalcComponent`(vOption INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_recalcComponent`(vOption INT)
proc: BEGIN
/**
* Actualiza los componentes
@@ -76367,7 +76681,6 @@ proc: BEGIN
DECLARE vLanded DATE;
DECLARE vIsEditable BOOLEAN;
DECLARE vZoneFk INTEGER;
- DECLARE vOption INTEGER;
DECLARE vSale INTEGER;
DECLARE vDone BOOL DEFAULT FALSE;
@@ -76477,36 +76790,36 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_setQuantity`(vSaleFk INT, vQuantity INT)
-BEGIN
-/*
- * Actualiza la cantidad de la línea de venta
- *
- * @vSaleFk id de la línea de venta
- * @vQuantity cantidad a modificar
- *
- */
-
- DECLARE vDescription VARCHAR(100);
- DECLARE vOrigin INT;
-
- SELECT CONCAT("Cambio cantidad ",concept," de ", quantity," a ", vQuantity) INTO vDescription
- FROM sale
- WHERE id = vSaleFk;
-
- SELECT ticketFk INTO vOrigin FROM sale WHERE id = vSaleFk;
-
- CALL logAdd(vOrigin, 'update', 'ticket', vDescription);
-
- UPDATE sale
- SET originalQuantity = quantity,
- quantity = vQuantity
- WHERE id = vSaleFk;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_setQuantity`(vSaleFk INT, vQuantity INT)
+BEGIN
+/*
+ * Actualiza la cantidad de la línea de venta
+ *
+ * @vSaleFk id de la línea de venta
+ * @vQuantity cantidad a modificar
+ *
+ */
+
+ DECLARE vDescription VARCHAR(100);
+ DECLARE vOrigin INT;
+
+ SELECT CONCAT("Cambio cantidad ",concept," de ", quantity," a ", vQuantity) INTO vDescription
+ FROM sale
+ WHERE id = vSaleFk;
+
+ SELECT ticketFk INTO vOrigin FROM sale WHERE id = vSaleFk;
+
+ CALL logAdd(vOrigin, 'update', 'ticket', vDescription);
+
+ UPDATE sale
+ SET originalQuantity = quantity,
+ quantity = vQuantity
+ WHERE id = vSaleFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76517,13 +76830,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_updateOriginalQuantity`(vSale INT, vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_updateOriginalQuantity`(vSale INT, vQuantity INT)
proc: BEGIN
UPDATE vn.sale SET originalQuantity = vQuantity
@@ -76541,13 +76854,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `saveLoadWorker`(routeFk INT, workerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saveLoadWorker`(routeFk INT, workerFk INT)
BEGIN
@@ -76566,38 +76879,225 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `scanTreeCreate__`()
+BEGIN
+ CALL nestTree(
+ 'vn2008',
+ 'scan',
+ 'vn2008',
+ 'scanTree'
+ );
+
+ UPDATE vn2008.scanTree st
+ JOIN (
+ SELECT sl.scan_id,
+ MAX(sl.odbc_date) lastScanned,
+ COUNT(DISTINCT t.routeFk) routeCount,
+ MIN(t.routeFk) mod 1000 as minRoute,
+ MAX(t.routeFk) mod 1000 as maxRoute,
+ COUNT(sl.scan_line_id) as scanned
+ FROM vn2008.scan_line sl
+ JOIN expedition e ON e.id = sl.`code`
+ JOIN ticket t ON t.id = e.ticketFk
+ WHERE t.routeFk
+ GROUP BY sl.scan_id
+ ) rs ON rs.scan_id = st.id
+ SET st.lastScanned = rs.lastScanned,
+ st.routeCount = rs.routeCount,
+ st.minRoute = rs.minRoute,
+ st.maxRoute = IF(rs.minRoute != rs.maxRoute, rs.maxRoute,NULL),
+ st.scanned = rs.scanned;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `sectorCollectionSaleGroup_add` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `scanTreeCreate__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollectionSaleGroup_add`(vSaleGroupFk INT, vSectorCollectionFk INT)
BEGIN
- CALL nestTree(
- 'vn2008',
- 'scan',
- 'vn2008',
- 'scanTree'
- );
-
- UPDATE vn2008.scanTree st
- JOIN (
- SELECT sl.scan_id,
- MAX(sl.odbc_date) lastScanned,
- COUNT(DISTINCT t.routeFk) routeCount,
- MIN(t.routeFk) mod 1000 as minRoute,
- MAX(t.routeFk) mod 1000 as maxRoute,
- COUNT(sl.scan_line_id) as scanned
- FROM vn2008.scan_line sl
- JOIN expedition e ON e.id = sl.`code`
- JOIN ticket t ON t.id = e.ticketFk
- WHERE t.routeFk
- GROUP BY sl.scan_id
- ) rs ON rs.scan_id = st.id
- SET st.lastScanned = rs.lastScanned,
- st.routeCount = rs.routeCount,
- st.minRoute = rs.minRoute,
- st.maxRoute = IF(rs.minRoute != rs.maxRoute, rs.maxRoute,NULL),
- st.scanned = rs.scanned;
+
+ /**
+ * Inserta un nuevo registro en vn.sectorCollectionSaleGroup
+ * Actualiza el usuario en vn.saleGroup y reemplaza los registros de vn.saleTracking
+ *
+ * @param vSaleGroupFk Identificador de vn.saleGroup
+ * @param vSectorCollectionFk Identificador de vn.sectorCollection
+ */
+
+ REPLACE vn.sectorCollectionSaleGroup(sectorCollectionFk, saleGroupFk)
+ VALUES(vSectorCollectionFk, vSaleGroupFk);
+
+ UPDATE vn.saleGroup sg
+ JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sg.id
+ JOIN vn.sectorCollection sc ON sc.id = scsg.sectorCollectionFk
+ SET sg.userFk = sc.userFk
+ WHERE sg.id = vSaleGroupFk;
+
+
+ INSERT IGNORE vn.saleTracking(saleFk,
+ isChecked,
+ workerFk,
+ actionFk,
+ stateFk)
+ SELECT sgd.saleFk ,
+ FALSE,
+ sc.userFk,
+ a.accion_id,
+ s.id
+ FROM vn.saleGroupDetail sgd
+ JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sgd.saleGroupFk
+ JOIN vn.sectorCollection sc ON sc.id = scsg.sectorCollectionFk
+ JOIN vncontrol.accion a ON a.accion = 'SACAR'
+ JOIN vn.state s ON s.code = 'PREVIOUS_PREPARATION'
+ WHERE sgd.saleGroupFk = vSaleGroupFk;
+
+ UPDATE vn.saleTracking st
+ JOIN vn.saleGroupDetail sgd ON sgd.saleFk = st.saleFk
+ SET st.isChecked = TRUE
+ WHERE sgd.saleGroupFk = vSaleGroupFk AND st.workerFk = 20;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `sectorCollection_get` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollection_get`(vSectorFk INT)
+BEGIN
+
+ /**
+ * Devuelve las colecciones del sector que corresponden al usuario conectado, y que estan incompletas
+ *
+ * @param vSectorFk Identificador de vn.sector
+ */
+
+ SELECT DISTINCT sc.id collectionFk, sc.created
+ FROM vn.sectorCollection sc
+ JOIN vn.state s ON s.code = 'PREVIOUS_PREPARATION'
+ LEFT JOIN vn.sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
+ LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = scsg.saleGroupFk
+ LEFT JOIN vn.saleTracking st ON st.saleFk = sgd.saleFk AND st.stateFk = s.id AND st.workerFk = sc.userFk
+ LEFT JOIN vn.sale sl ON sl.id = st.saleFk
+ WHERE sc.userFk = account.myUser_getId()
+ AND (ISNULL(scsg.sectorCollectionFk)
+ OR
+ (NOT st.isChecked AND sl.quantity > 0));
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `sectorCollection_getSale` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollection_getSale`(vSelf INT)
+BEGIN
+
+ /**
+ * Devuelve las lineas de venta correspondientes a esa coleccion de sector
+ *
+ * @param vSelf Identificador de vn.sectorCollection
+ */
+
+ SELECT s.ticketFk,
+ s.itemFk,
+ i.longName,
+ IFNULL(i.itemPackingTypeFk,' ') itemPackingTypeFk,
+ IFNULL(i.subName ,' ') subName,
+ s.quantity,
+ w.code workerCode,
+ sgd.saleFk,
+ IFNULL(iss.quantity,0) pickedQuantity,
+ c.salesPersonFk
+ FROM vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
+ JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sgd.saleGroupFk
+ JOIN vn.saleTracking st ON st.saleFk = s.id
+ JOIN vn.state stt ON stt.id = st.stateFk AND stt.code = 'PREVIOUS_PREPARATION'
+ JOIN vn.worker w ON w.id = st.workerFk
+ JOIN vn.ticket t ON t.id= s.ticketFk
+ JOIN vn.client c ON c.id=t.clientFk
+ LEFT JOIN vn.itemShelvingSaleSum iss ON iss.saleFk = s.id
+ WHERE scsg.sectorCollectionFk = vSelf;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `sectorCollection_new` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollection_new`(vSectorFk INT)
+BEGIN
+
+ /**
+ * Inserta una nueva colección, si el usuario no tiene ninguna vacia.
+ * Esto se hace para evitar que por error se generen colecciones sin sentido.
+ *
+ * @param vSectorFk Identificador de vn.sector
+ */
+
+ DECLARE hasEmptyCollections BOOLEAN;
+ DECLARE vUserFk INT;
+
+ SET vUserFk = account.myUser_getId();
+
+ SELECT (COUNT(sc.id) > 0) INTO hasEmptyCollections
+ FROM vn.sectorCollection sc
+ LEFT JOIN vn.sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
+ WHERE ISNULL(scsg.id)
+ AND sc.userFk = vUserFk
+ AND sc.sectorFk = vSectorFk;
+
+ IF NOT hasEmptyCollections THEN
+
+ INSERT INTO vn.sectorCollection(userFk, sectorFk)
+ VALUES(vUserFk, vSectorFk);
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76614,39 +77114,79 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sectorProductivity_add`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorProductivity_add`()
BEGIN
DECLARE vDatedFrom DATETIME;
DECLARE vDatedTo DATETIME;
-
+
SELECT DATE_SUB(CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
+ DROP TEMPORARY TABLE IF EXISTS tmp.errorsByChecker;
+ DROP TEMPORARY TABLE IF EXISTS tmp.previousErrors;
CALL timeControl_calculateAll(vDatedFrom, vDatedTo);
- INSERT INTO sectorProductivity(workerFk, firstName, lastName, sector, ticketCount, saleCount, volume, hourWorked, dated)
- SELECT sub.*, SUM(wp.volume) volume, IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) AS hourWorked, DATE(vDatedFrom) dated
- FROM(
- SELECT w.id workerFk,
- w.firstName,
- w.lastName,
- se.description sector,
- COUNT(DISTINCT t.id) ticketCount,
- COUNT(st.saleFk) saleCount
- FROM vn.saleTracking st
- JOIN vn.worker w ON w.id = st.workerFk
- JOIN vn.sale s ON s.id = st.saleFk
+ CREATE TEMPORARY TABLE tmp.errorsByChecker
+ ENGINE = MEMORY
+ SELECT sub1.workerFk, COUNT(sub1.id) errorsByChecker
+ FROM (
+ SELECT st.workerFk, t.id
+ FROM saleMistake sm
+ JOIN saleTracking st ON sm.saleFk = st.saleFk
+ JOIN vncontrol.accion a ON a.accion_id = st.actionFk
+ JOIN sale s ON s.id = sm.saleFk
+ JOIN ticket t on t.id = s.ticketFk
JOIN vn.item i ON i.id = s.itemFk
JOIN vn.sector se ON se.id = i.sectorFk
- JOIN vn.ticket t ON s.ticketFk = t.id
- WHERE st.created > vDatedFrom
- AND se.code IN ('ALGEMESI ARTIFI','COMPLEMENTOS')
- GROUP BY w.id
- ) sub
- LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = sub.workerFk
- LEFT JOIN bs.workerProductivity wp ON wp.workerFk = sub.workerFk
- WHERE wp.dated = vDatedFrom
- GROUP BY sub.workerFk;
+ WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo) AND a.accion = 'PRESACAR' AND se.code IN ('ALGEMESI ARTIFI','COMPLEMENTOS')
+ GROUP BY s.ticketFk
+ ) sub1
+ GROUP BY sub1.workerFk;
+
+ CREATE TEMPORARY TABLE tmp.previousErrors -- Errores de previa, derivadores de los revisadores (por reclamación)
+ ENGINE = MEMORY
+ SELECT tt.workerFk, COUNT(c.ticketFk) errorsByClaim
+ FROM claimDevelopment cd
+ JOIN claim c ON cd.claimFk = c.id
+ JOIN ticket t ON c.ticketFk = t.id
+ JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id
+ JOIN ticketTracking tt ON tt.ticketFk = t.id
+ JOIN state s ON s.id = tt.stateFk
+ WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo AND cr.description = 'Revisadores' AND s.code = 'OK PREVIOUS'
+ GROUP BY workerFk;
+
+ INSERT INTO sectorProductivity(workerFk, firstName, lastName, sector, ticketCount, saleCount, error, volume, hourWorked, dated)
+ SELECT w.id workerFk,
+ w.firstName,
+ w.lastName,
+ se.description sector,
+ COUNT(DISTINCT t.id) ticketCount,
+ COUNT(st.saleFk) saleCount,
+ IFNULL(ec2.errorsByChecker,0) + IFNULL(pe.errorsByClaim, 0) errors,
+ wp.volume,
+ IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) AS hourWorked,
+ DATE(vDatedFrom) dated
+ FROM vn.saleTracking st
+ LEFT JOIN vn.worker w ON w.id = st.workerFk
+ LEFT JOIN vn.sale s ON s.id = st.saleFk
+ LEFT JOIN vn.item i ON i.id = s.itemFk
+ LEFT JOIN vn.sector se ON se.id = i.sectorFk
+ LEFT JOIN vn.ticket t ON s.ticketFk = t.id
+ LEFT JOIN vncontrol.accion a ON a.accion_id = st.actionFk
+ LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = w.id
+ LEFT JOIN bs.workerProductivity wp ON wp.workerFk = w.id AND a.accion = 'PRESACAR'
+ LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = w.id
+ LEFT JOIN tmp.previousErrors pe ON pe.workerFk = w.id
+ WHERE DATE(st.created) = vDatedFrom
+ AND se.code IN ('ALGEMESI ARTIFI','COMPLEMENTOS')
+ AND wp.dated = vDatedFrom
+ GROUP BY w.id;
+
+ DROP TEMPORARY TABLE tmp.timeControlCalculate;
+ DROP TEMPORARY TABLE tmp.errorsByChecker;
+ DROP TEMPORARY TABLE tmp.previousErrors;
END ;;
DELIMITER ;
@@ -76660,16 +77200,20 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sector_get`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sector_get`()
BEGIN
- SELECT s.id,s.description,s.warehouseFk
- FROM vn.sector s;
-
+/**
+ * Obtiene los sectores
+*/
+
+ SELECT s.id,s.description,s.warehouseFk
+ FROM vn.sector s;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76680,13 +77224,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sector_getWarehouse`(vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sector_getWarehouse`(vSectorFk INT)
BEGIN
SELECT s.warehouseFk
@@ -76703,13 +77247,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `setPlacementReserve`(vItemFk INT, vPlacement VARCHAR(10), vWarehouseFk INT )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `setPlacementReserve`(vItemFk INT, vPlacement VARCHAR(10), vWarehouseFk INT )
BEGIN
DECLARE vReserve VARCHAR(10);
@@ -76746,13 +77290,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `shelvingChange`(IN `vShelvingO` VARCHAR(8), IN `vShelvingD` VARCHAR(8))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingChange`(IN `vShelvingO` VARCHAR(8), IN `vShelvingD` VARCHAR(8))
BEGIN
UPDATE vn.itemShelving
@@ -76770,13 +77314,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `shelvingFuture__`(vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingFuture__`(vSectorFk INT)
BEGIN
DECLARE vDone BOOL DEFAULT FALSE;
@@ -76951,11 +77495,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `shelvingLog_get`(shelvingFk VARCHAR(10))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingLog_get`(shelvingFk VARCHAR(10))
BEGIN
/* Lista el log de un carro
@@ -76980,36 +77524,51 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `shelvingPark`(IN `vParam` VARCHAR(8), IN `vParkingCode` VARCHAR(8))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingPark`(IN `vParam` VARCHAR(8), IN `vParkingCode` VARCHAR(8))
proc: BEGIN
- /* Aparca una colección, un ticket, un saleGroup o un shelving en un parking
- *
- * @param vParam
- *
- */
- DECLARE vParkingFk INT;
- DECLARE vColumn VARCHAR(3);
- DECLARE vRow VARCHAR(2);
- DECLARE vReturn VARCHAR(50);
- DECLARE vIsSaleGroup BOOL;
- DECLARE vIsTicket BOOL;
- DECLARE vIsCollection BOOL;
-
- SET vParkingCode = replace(vParkingCode,' ','') ;
-
- SELECT id INTO vParkingFk
- FROM vn.parking
- WHERE code = vParkingCode COLLATE utf8_unicode_ci;
+/*
+ * Aparca una colección, un ticket, un saleGroup o un shelving en un parking
+ *
+ * @param vParam id del ticket, colección, saleGroup o shelving
+ * @param vParkingCode código del parking
+ *
+ */
- IF vParkingFk IS NULL THEN
-
+ DECLARE vParkingFk INT;
+ DECLARE vColumn VARCHAR(3);
+ DECLARE vRow VARCHAR(2);
+ DECLARE vReturn VARCHAR(50);
+ DECLARE vIsSaleGroup BOOL;
+ DECLARE vIsTicket BOOL;
+ DECLARE vIsCollection BOOL;
+ DECLARE vCollection INT DEFAULT NULL;
+ DECLARE vDone INT DEFAULT FALSE;
+ DECLARE vTicketFk INT;
+ DECLARE vCursor CURSOR FOR
+ SELECT IFNULL(tc2.ticketFk, t.id)
+ FROM ticket t
+ LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
+ LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
+ WHERE t.id = vParam;
+
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ SET vParkingCode = replace(vParkingCode,' ','') ;
+
+ SELECT id INTO vParkingFk
+ FROM vn.parking
+ WHERE code = vParkingCode COLLATE utf8_unicode_ci;
+
+ IF vParkingFk IS NULL THEN
+
LEAVE proc;
END IF;
@@ -77026,7 +77585,7 @@ proc: BEGIN
WHERE sg.id = vParam
AND sg.created >= TIMESTAMPADD(WEEK,-1,CURDATE());
- CALL vn.ticket_setPreviousState(vn.ticket_get(vParam));
+ CALL vn.ticket_setNextState(vn.ticket_get(vParam));
LEAVE proc;
@@ -77037,51 +77596,64 @@ proc: BEGIN
FROM vn.ticket t
WHERE t.id = vParam
AND t.shipped >= TIMESTAMPADD(WEEK,-1,CURDATE());
-
+
IF vIsTicket THEN
-
- REPLACE vn.ticketParking(ticketFk,parkingFk)
- VALUES (vParam, vParkingFk);
-
- CALL vn.ticket_setPreviousState(vParam);
+
+ INSERT INTO vn.ticketParking(ticketFk, parkingFk)
+ SELECT IFNULL(tc2.ticketFk, t.id), vParkingFk
+ FROM ticket t
+ LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
+ LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
+ WHERE t.id = vParam
+ ON DUPLICATE KEY UPDATE parkingFk = vParkingFk;
+
+ OPEN vCursor;
+ l: LOOP
+
+ FETCH vCursor INTO vTicketFk;
+
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+
+ CALL vn.ticket_setNextState(vTicketFk);
+
+ END LOOP;
+
+ CLOSE vCursor;
LEAVE proc;
-
- END IF;
- -- Se comprueba si es una coleccion de tickets
- SELECT COUNT(*) INTO vIsCollection
+ END IF;
+
+ -- Se comprueba si es una coleccion de tickets
+ SELECT COUNT(*) INTO vIsCollection
FROM vn.collection c
- WHERE c.id = vParam
+ WHERE c.id = vParam
AND c.created >= TIMESTAMPADD(WEEK,-1,CURDATE());
IF vIsCollection THEN
-
+
REPLACE vn.ticketParking(ticketFk,parkingFk)
SELECT tc.ticketFk, vParkingFk
FROM vn.ticketCollection tc
WHERE tc.collectionFk = vParam;
LEAVE proc;
-
- END IF;
-
- -- Por descarte, se considera una matrícula
- INSERT INTO vn.shelvingLog (originFk, userFk, action , description)
- SELECT vParam, getUser(), 'update', CONCAT("Cambio parking ",vParam," de ", p.code," a ", vParkingCode)
+
+ END IF;
+
+ -- Por descarte, se considera una matrícula
+ INSERT INTO vn.shelvingLog (originFk, userFk, action , description)
+ SELECT vParam, account.userGetId(), 'update', CONCAT("Cambio parking ",vParam," de ", p.code," a ", vParkingCode)
FROM parking p
JOIN shelving s ON s.parkingFk = p.id
WHERE s.code = vParam COLLATE utf8_unicode_ci;
-
+
UPDATE vn.shelving
- SET parkingFk = vParkingFk, parked = NOW(), isPrinted = 1
+ SET parkingFk = vParkingFk, parked = NOW(), isPrinted = TRUE
WHERE `code` = vParam COLLATE utf8_unicode_ci;
-
- SELECT (COUNT(*) > 0) AS IsUpdated
- FROM vn.shelving
- WHERE parkingFk = vParkingFk
- AND `code` = vParam COLLATE utf8_unicode_ci;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -77092,13 +77664,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `shelvingParking_get`(vShelvingFk VARCHAR(10), vWarehouseFk INT, vDayRange INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingParking_get`(vShelvingFk VARCHAR(10), vWarehouseFk INT, vDayRange INT)
BEGIN
@@ -77128,13 +77700,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `shelvingPark__`(IN `vParam` VARCHAR(8), IN `vParkingCode` VARCHAR(8))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingPark__`(IN `vParam` VARCHAR(8), IN `vParkingCode` VARCHAR(8))
proc: BEGIN
/* Aparca una colección, un ticket, un saleGroup o un shelving en un parking
@@ -77242,11 +77814,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `shelvingPriority_update`(priority INT,vShelvingFk VARCHAR(10))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingPriority_update`(priority INT,vShelvingFk VARCHAR(10))
BEGIN
UPDATE vn.shelving SET priority = priority WHERE code=vShelvingFk COLLATE utf8_unicode_ci;
@@ -77267,31 +77839,32 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `shelving_clean`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `shelving_clean`()
BEGIN
DELETE FROM vn.shelving
WHERE length(code) > 3
AND parked < TIMESTAMPADD(WEEK,-1,CURDATE());
- DELETE FROM vn.itemShelving
+ DELETE FROM vn.itemShelving
WHERE visible <= 0
- AND created < TIMESTAMPADD(MONTH,-1,CURDATE());
-
- DELETE ish.*
+ AND created < TIMESTAMPADD(MONTH,-1,CURDATE());
+
+ DELETE ish.*
FROM vn.itemShelving ish
JOIN vn.shelving sh ON sh.code = ish.shelvingFk
- WHERE sh.parkingFk IS NULL
- AND ish.created < TIMESTAMPADD(WEEK,-1,CURDATE());
+ WHERE sh.parkingFk IS NULL
+ AND ish.created < TIMESTAMPADD(WEEK,-1,CURDATE());
UPDATE vn.shelving sh
LEFT JOIN vn.itemShelving its ON its.shelvingFk = sh.`code`
SET isPrinted = 0,
parkingFk = NULL
- WHERE its.id IS NULL
- AND ( sh.parked IS NULL
+ WHERE its.id IS NULL
+ AND sh.isRecyclable
+ AND ( sh.parked IS NULL
OR
- sh.parked < TIMESTAMPADD(MONTH,-1,CURDATE())
+ sh.parked < TIMESTAMPADD(MONTH,-1,CURDATE())
);
END ;;
@@ -77304,94 +77877,95 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `shelving_getSpam`(vDated DATE, vWarehouseFk INT)
-BEGIN
-
- /* Devuelve las matrículas con productos que no son necesarios para la venta hasta la fecha señalada
- *
- * @param vDated Fecha hasta la que se puede pasar sin esos productos.
- * @param vWarehouse Identificador único de vn.warehouse
- */
-
- DROP TEMPORARY TABLE IF EXISTS tmp.stock;
-
- CALL cache.stock_refresh(FALSE);
-
- CREATE TEMPORARY TABLE tmp.stock
- SELECT i.id itemFk,
- v.amount - IFNULL(fue.reserva,0) as visible,
- fue.reserva,
- sale.venta,
- IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) as compra,
- IFNULL(v.amount,0) + IFNULL(sale.venta,0) + IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) - IFNULL(fue.reserva,0) as saldo
- FROM vn.item i
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN (
- SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS reserva
- FROM vn.itemShelving ish
- JOIN vn.shelving sh ON sh.code = ish.shelvingFk
- JOIN vn.parking p ON p.id = sh.parkingFk
- JOIN vn.sector s ON s.id = p.sectorFk
- WHERE s.code = 'FUENTES_PICASSE'
- OR sh.isSpam
- GROUP BY ish.itemFk
- ) fue ON fue.itemFk = i.id
- LEFT JOIN cache.stock v ON i.id = v.item_id AND v.warehouse_id = vWarehouseFk
- LEFT JOIN (
- SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as venta
- FROM vn2008.item_out
- WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
- AND warehouse_id = vWarehouseFk
- GROUP BY item_id
- ) sale ON sale.item_id = i.id
- LEFT JOIN (
- SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as compra
- FROM vn2008.item_entry_in
- WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
- AND warehouse_id = vWarehouseFk
- AND isVirtualStock = FALSE
- GROUP BY item_id
- ) buy ON buy.item_id = i.id
- LEFT JOIN (
- SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as traslado
- FROM vn2008.item_entry_out
- WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
- AND warehouse_id = vWarehouseFk
- GROUP BY item_id
- ) mov ON mov.item_id = i.id
- WHERE v.amount;
-
- SELECT ish.shelvingFk matricula,
- i.longName articulo,
- ish.visible,
- count(*) lineas,
- sum(ish.visible <= s.saldo) spam,
- p.code parking,
- s.description sector ,
- w.name AS almacen,
- sh.isSpam
- FROM vn.itemShelving ish
- JOIN vn.item i ON i.id = ish.itemFk
- JOIN vn.shelving sh ON sh.code = ish.shelvingFk
- JOIN vn.parking p ON p.id = sh.parkingFk
- JOIN vn.sector s ON s.id = p.sectorFk
- JOIN vn.warehouse w ON w.id = s.warehouseFk
- LEFT JOIN tmp.stock s ON s.itemFk = ish.itemFk
- WHERE (w.name = 'Algemesi'
- OR (w.name = 'NuncaJamas' AND ish.created < curdate()))
- AND ish.visible
- GROUP BY ish.shelvingFk
- HAVING lineas = spam OR isSpam;
-
- DROP TEMPORARY TABLE tmp.stock;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `shelving_getSpam`(vDated DATE, vWarehouseFk INT)
+BEGIN
+
+ /**
+ * Devuelve las matrículas con productos que no son necesarios para la venta hasta la fecha señalada
+ *
+ * @param vDated Fecha hasta la que se puede pasar sin esos productos.
+ * @param vWarehouse Identificador único de vn.warehouse
+ */
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.stock;
+
+ CALL cache.stock_refresh(FALSE);
+
+ CREATE TEMPORARY TABLE tmp.stock
+ SELECT i.id itemFk,
+ v.amount - IFNULL(fue.reserva,0) as visible,
+ fue.reserva,
+ sale.venta,
+ IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) as compra,
+ IFNULL(v.amount,0) + IFNULL(sale.venta,0) + IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) - IFNULL(fue.reserva,0) as saldo
+ FROM vn.item i
+ JOIN vn.itemType it ON it.id = i.typeFk
+ JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN (
+ SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS reserva
+ FROM vn.itemShelving ish
+ JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+ JOIN vn.parking p ON p.id = sh.parkingFk
+ JOIN vn.sector s ON s.id = p.sectorFk
+ WHERE s.code = 'FUENTES_PICASSE'
+ OR sh.isSpam
+ GROUP BY ish.itemFk
+ ) fue ON fue.itemFk = i.id
+ LEFT JOIN cache.stock v ON i.id = v.item_id AND v.warehouse_id = vWarehouseFk
+ LEFT JOIN (
+ SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as venta
+ FROM vn2008.item_out
+ WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
+ AND warehouse_id = vWarehouseFk
+ GROUP BY item_id
+ ) sale ON sale.item_id = i.id
+ LEFT JOIN (
+ SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as compra
+ FROM vn2008.item_entry_in
+ WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
+ AND warehouse_id = vWarehouseFk
+ AND isVirtualStock = FALSE
+ GROUP BY item_id
+ ) buy ON buy.item_id = i.id
+ LEFT JOIN (
+ SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as traslado
+ FROM vn2008.item_entry_out
+ WHERE dat BETWEEN CURDATE() AND util.dayend(vDated)
+ AND warehouse_id = vWarehouseFk
+ GROUP BY item_id
+ ) mov ON mov.item_id = i.id
+ WHERE v.amount;
+
+ SELECT ish.shelvingFk matricula,
+ i.longName articulo,
+ ish.visible,
+ count(*) lineas,
+ sum(ish.visible <= s.saldo) spam,
+ p.code parking,
+ s.description sector ,
+ w.name AS almacen,
+ sh.isSpam
+ FROM vn.itemShelving ish
+ JOIN vn.item i ON i.id = ish.itemFk
+ JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+ JOIN vn.parking p ON p.id = sh.parkingFk
+ JOIN vn.sector s ON s.id = p.sectorFk
+ JOIN vn.warehouse w ON w.id = s.warehouseFk
+ LEFT JOIN tmp.stock s ON s.itemFk = ish.itemFk
+ WHERE (w.name = 'Algemesi'
+ OR (w.name = 'NuncaJamas' AND ish.created < curdate()))
+ AND ish.visible
+ GROUP BY ish.shelvingFk
+ HAVING lineas = spam OR isSpam;
+
+ DROP TEMPORARY TABLE tmp.stock;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -77404,11 +77978,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `silla_algemesi__`(vDate DATE, vItemFk INT, vQuantity INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `silla_algemesi__`(vDate DATE, vItemFk INT, vQuantity INT)
BEGIN
DECLARE done INT DEFAULT FALSE;
@@ -77535,13 +78109,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sleep_X_min`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sleep_X_min`()
BEGIN
# Ernesto. 4.8.2020
# Para su uso en las tareas ejecutadas a las 2AM (visibles con: SELECT * FROM bs.nightTask order by started asc;)
@@ -77554,17 +78128,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `solunionRiskRequest` */;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `solunionRiskRequest`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `solunionRiskRequest`()
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
@@ -77597,100 +78170,99 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 DROP PROCEDURE IF EXISTS `stockBuyed` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stockBuyed`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stockBuyed`(vDate DATE)
BEGIN
- DECLARE vVolume DECIMAL(10,2);
- DECLARE vWarehouse INT DEFAULT 7;
- DECLARE vRuben INT;
- DECLARE vClaudi INT;
- DECLARE vJose INT;
+ DECLARE vVolume DECIMAL(10,2);
+ DECLARE vWarehouse INT DEFAULT 7;
+ DECLARE vRuben INT;
+ DECLARE vClaudi INT;
+ DECLARE vJose INT;
- SELECT w.id INTO vRuben
- FROM vn.worker w
- WHERE w.code = 'RET';
-
- SELECT w.id INTO vClaudi
- FROM vn.worker w
- WHERE w.code = 'CSR';
-
- SELECT w.id INTO vJose
- FROM vn.worker w
- WHERE w.code = 'ATJ';
-
- CALL stockTraslation(vDate);
+ SELECT w.id INTO vRuben
+ FROM vn.worker w
+ WHERE w.code = 'RET';
- -- SELECT Volumen INTO vVolume FROM vn2008.Cubos WHERE Id_Cubo = 'cc' LIMIT 1;
-
- INSERT INTO stockBuyed(user, buyed, `date`)
- SELECT tr.user_id, SUM(( amount / c.packing ) * vn.buy_getVolume(Id_Compra)) / vc.palletM3 / 1000000 buyed, vDate
- FROM tmp_item i
- JOIN vn2008.Articles a ON a.Id_Article = i.item_id
- JOIN vn2008.Tipos t ON a.tipo_id = t.tipo_id
+ SELECT w.id INTO vClaudi
+ FROM vn.worker w
+ WHERE w.code = 'CSR';
+
+ SELECT w.id INTO vJose
+ FROM vn.worker w
+ WHERE w.code = 'ATJ';
+
+ CALL stockTraslation(vDate);
+
+ -- SELECT Volumen INTO vVolume FROM vn2008.Cubos WHERE Id_Cubo = 'cc' LIMIT 1;
+
+ INSERT INTO stockBuyed(user, buyed, `date`)
+ SELECT tr.user_id, SUM(( amount / c.packing ) * vn.buy_getVolume(Id_Compra)) / vc.palletM3 / 1000000 buyed, vDate
+ FROM tmp_item i
+ JOIN vn2008.Articles a ON a.Id_Article = i.item_id
+ JOIN vn2008.Tipos t ON a.tipo_id = t.tipo_id
JOIN vn2008.reinos r ON r.id = t.reino_id
JOIN vn2008.Trabajadores tr ON tr.Id_Trabajador = t.Id_Trabajador
- JOIN vn2008.t_item_last_buy ilb ON ilb.item_id = Id_Article AND ilb.warehouse_id = vWarehouse
- JOIN vn2008.Compres c ON c.Id_compra = ilb.buy_id
+ JOIN tmp.buyUltimate bu ON bu.itemFk = Id_Article AND bu.warehouseFk = vWarehouse
+ JOIN vn2008.Compres c ON c.Id_compra = bu.buyFk
JOIN vn.volumeConfig vc
WHERE r.display <> 0
- GROUP BY tr.Id_Trabajador
+ GROUP BY tr.Id_Trabajador
ON DUPLICATE KEY UPDATE buyed = VALUES(buyed);
-
+
INSERT INTO stockBuyed(USER, buyed, `date`)
- SELECT vRuben, @amount := SUM(ic.cm3 * io.amount / vc.palletM3 / 1000000), vDate
- FROM vn2008.item_out io
- JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse
- JOIN vn.ticket t ON t.id = io.ticketFk
- JOIN vn.address a ON a.id = t.addressFk
- JOIN vn.province p ON p.id = a.provinceFk
- JOIN vn.country c ON c.id = p.countryFk
- JOIN vn.volumeConfig vc
- WHERE dat = vDate
- AND warehouse_id = vWarehouse
- AND c.country = 'Francia'
- ON DUPLICATE KEY UPDATE buyed = buyed + @amount;
-
- INSERT INTO stockBuyed(USER, buyed, `date`)
- SELECT vJose, @amount := SUM(ic.cm3 * io.amount / vc.palletM3 / 1000000), vDate
- FROM vn2008.item_out io
- JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse
- JOIN vn.ticket t ON t.id = io.ticketFk
- JOIN vn.address a ON a.id = t.addressFk
- JOIN vn.province p ON p.id = a.provinceFk
- JOIN vn.country c ON c.id = p.countryFk
- JOIN vn.volumeConfig vc
- WHERE dat = vDate
- AND warehouse_id = vWarehouse
- AND c.country = 'Holanda'
- ON DUPLICATE KEY UPDATE buyed = buyed + @amount;
-
- INSERT INTO stockBuyed(USER, buyed, `date`)
- SELECT vClaudi, @amount := SUM(ic.cm3 * io.amount / vc.palletM3 / 1000000), vDate
- FROM vn2008.item_out io
- JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse
- JOIN vn.ticket t ON t.id = io.ticketFk
- JOIN vn.address a ON a.id = t.addressFk
- JOIN vn.province p ON p.id = a.provinceFk
- JOIN vn.country c ON c.id = p.countryFk
- JOIN vn.volumeConfig vc
- WHERE dat BETWEEN vDate AND util.dayend(vDate)
- AND warehouse_id = vWarehouse
- AND c.country NOT IN ('Francia','Holanda')
- ON DUPLICATE KEY UPDATE buyed = buyed + @amount;
-
- DROP TEMPORARY TABLE
- vn2008.t_item_last_buy,
- tmp_item;
+ SELECT vRuben, @amount := SUM(ic.cm3 * io.amount / vc.palletM3 / 1000000), vDate
+ FROM vn2008.item_out io
+ JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse
+ JOIN vn.ticket t ON t.id = io.ticketFk
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.province p ON p.id = a.provinceFk
+ JOIN vn.country c ON c.id = p.countryFk
+ JOIN vn.volumeConfig vc
+ WHERE dat = vDate
+ AND warehouse_id = vWarehouse
+ AND c.country = 'Francia'
+ ON DUPLICATE KEY UPDATE buyed = buyed + @amount;
+
+ INSERT INTO stockBuyed(USER, buyed, `date`)
+ SELECT vJose, @amount := SUM(ic.cm3 * io.amount / vc.palletM3 / 1000000), vDate
+ FROM vn2008.item_out io
+ JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse
+ JOIN vn.ticket t ON t.id = io.ticketFk
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.province p ON p.id = a.provinceFk
+ JOIN vn.country c ON c.id = p.countryFk
+ JOIN vn.volumeConfig vc
+ WHERE dat = vDate
+ AND warehouse_id = vWarehouse
+ AND c.country = 'Holanda'
+ ON DUPLICATE KEY UPDATE buyed = buyed + @amount;
+
+ INSERT INTO stockBuyed(USER, buyed, `date`)
+ SELECT vClaudi, @amount := SUM(ic.cm3 * io.amount / vc.palletM3 / 1000000), vDate
+ FROM vn2008.item_out io
+ JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse
+ JOIN vn.ticket t ON t.id = io.ticketFk
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.province p ON p.id = a.provinceFk
+ JOIN vn.country c ON c.id = p.countryFk
+ JOIN vn.volumeConfig vc
+ WHERE dat BETWEEN vDate AND util.dayend(vDate)
+ AND warehouse_id = vWarehouse
+ AND c.country NOT IN ('Francia','Holanda')
+ ON DUPLICATE KEY UPDATE buyed = buyed + @amount;
+
+ DROP TEMPORARY TABLE
+ tmp.buyUltimate,
+ tmp_item;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -77701,34 +78273,34 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stockBuyedByWorker`(vDate DATE, vWorker INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stockBuyedByWorker`(vDate DATE, vWorker INT)
BEGIN
-
- DECLARE vVolume DECIMAL(10,2);
- DECLARE vWarehouse INT DEFAULT 7;
- CALL stockTraslation(vDate);
-
- SELECT Volumen INTO vVolume FROM vn2008.Cubos WHERE Id_Cubo = 'cc' LIMIT 1;
-
- SELECT c.Id_Entrada, a.Id_Article, a.Article, i.amount Cantidad, (0.6 * ( i.amount / c.packing ) * vn.buy_getVolume(Id_Compra))/vVolume buyed
- FROM tmp_item i
- JOIN vn2008.Articles a ON a.Id_Article = i.item_id
- JOIN vn2008.Tipos t ON a.tipo_id = t.tipo_id
- JOIN vn2008.reinos r ON r.id = t.reino_id
+
+ DECLARE vVolume DECIMAL(10,2);
+ DECLARE vWarehouse INT DEFAULT 7;
+ CALL stockTraslation(vDate);
+
+ SELECT Volumen INTO vVolume FROM vn2008.Cubos WHERE Id_Cubo = 'cc' LIMIT 1;
+
+ SELECT c.Id_Entrada, a.Id_Article, a.Article, i.amount Cantidad, (0.6 * ( i.amount / c.packing ) * vn.buy_getVolume(Id_Compra))/vVolume buyed
+ FROM tmp_item i
+ JOIN vn2008.Articles a ON a.Id_Article = i.item_id
+ JOIN vn2008.Tipos t ON a.tipo_id = t.tipo_id
+ JOIN vn2008.reinos r ON r.id = t.reino_id
JOIN vn2008.Trabajadores tr ON tr.Id_Trabajador = t.Id_Trabajador
- JOIN vn2008.t_item_last_buy ilb ON ilb.item_id = a.Id_Article AND ilb.warehouse_id = vWarehouse
- JOIN vn2008.Compres c ON c.Id_compra = ilb.buy_id
- WHERE r.display <> 0 AND tr.user_id = vWorker;
-
- DROP TEMPORARY TABLE
- vn2008.t_item_last_buy,
- tmp_item;
+ JOIN tmp.buyUltimate bu ON bu.itemFk = a.Id_Article AND bu.warehouseFk = vWarehouse
+ JOIN vn2008.Compres c ON c.Id_compra = bu.buyFk
+ WHERE r.display <> 0 AND tr.user_id = vWorker;
+
+ DROP TEMPORARY TABLE
+ tmp.buyUltimate,
+ tmp_item;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -77739,13 +78311,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stockBuyedByWorkerTest__`(vDate DATE, vWorker INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stockBuyedByWorkerTest__`(vDate DATE, vWorker INT)
BEGIN
DECLARE vVolume DECIMAL(10,2);
@@ -77774,47 +78346,46 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stockTraslation`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stockTraslation`(vDate DATE)
BEGIN
- /**
- * Calcula el stock del vWarehouse desde FechaInventario hasta v_date
- sin tener en cuenta las salidas del mismo dia vDate
- para ver el transporte a reservar
- **/
-
- DECLARE vWarehouse INT DEFAULT 7;
+ /**
+ * Calcula el stock del vWarehouse desde FechaInventario hasta v_date
+ sin tener en cuenta las salidas del mismo dia vDate
+ para ver el transporte a reservar
+ **/
- DELETE FROM stockBuyed WHERE `date` = vDate;
-
- DROP TEMPORARY TABLE IF EXISTS tmp_item;
- CREATE TEMPORARY TABLE tmp_item
- (UNIQUE INDEX i USING HASH (item_id))
- ENGINE = MEMORY
- SELECT item_id, SUM(amount) amount
- FROM vn2008.item_entry_in
- WHERE dat = vDate
- AND vDate >= CURDATE()
- AND warehouse_id = vWarehouse
+ DECLARE vWarehouse INT DEFAULT 7;
+
+ DELETE FROM stockBuyed WHERE `date` = vDate;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp_item;
+ CREATE TEMPORARY TABLE tmp_item
+ (UNIQUE INDEX i USING HASH (item_id))
+ ENGINE = MEMORY
+ SELECT item_id, SUM(amount) amount
+ FROM vn2008.item_entry_in
+ WHERE dat = vDate
+ AND vDate >= CURDATE()
+ AND warehouse_id = vWarehouse
AND isVirtualStock is FALSE
- GROUP BY item_id
- HAVING amount != 0;
+ GROUP BY item_id
+ HAVING amount != 0;
CALL `cache`.stock_refresh (FALSE);
- INSERT INTO tmp_item (item_id,amount)
- SELECT item_id,s.amount
- FROM `cache`.stock s
- WHERE warehouse_id = vWarehouse
- ON DUPLICATE KEY UPDATE
- amount = tmp_item.amount + VALUES(amount);
-
- CALL vn2008.item_last_buy_(vWarehouse,vDate);
+ INSERT INTO tmp_item (item_id,amount)
+ SELECT item_id,s.amount
+ FROM `cache`.stock s
+ WHERE warehouse_id = vWarehouse
+ ON DUPLICATE KEY UPDATE amount = tmp_item.amount + VALUES(amount);
+
+ CALL buyUltimate(vWarehouse,vDate);
END ;;
DELIMITER ;
@@ -77826,13 +78397,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stockTraslationTest__`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stockTraslationTest__`(vDate DATE)
BEGIN
/**
* Calcula el stock del vWarehouse desde FechaInventario hasta v_date
@@ -77882,11 +78453,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stowawayBoarding__`(IN vShipFk INT, IN vStowawayFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stowawayBoarding__`(IN vShipFk INT, IN vStowawayFk INT)
BEGIN
REPLACE stowaway(shipFk, id)
@@ -77906,17 +78477,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `stowawayControl` */;
+/*!50003 DROP PROCEDURE IF EXISTS `stowawayControl__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stowawayControl`(vDated DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stowawayControl__`(vDated DATE)
BEGIN
SELECT t.id ticketFV,
@@ -77947,17 +78518,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `stowaway_launchShip` */;
+/*!50003 DROP PROCEDURE IF EXISTS `stowaway_launchShip__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stowaway_launchShip`(vStowawayFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stowaway_launchShip__`(vStowawayFk INT)
BEGIN
DECLARE myShipFk INT;
@@ -77981,17 +78552,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `stowaway_unboarding` */;
+/*!50003 DROP PROCEDURE IF EXISTS `stowaway_unboarding__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `stowaway_unboarding`(vShipFk INT, vStowawayFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stowaway_unboarding__`(vShipFk INT, vStowawayFk INT)
BEGIN
DECLARE vWorker VARCHAR(255);
@@ -78022,13 +78593,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `subordinateGetList`(vBossFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `subordinateGetList`(vBossFk INT)
BEGIN
-- deprecated usar vn.worker_GetHierarch
@@ -78085,13 +78656,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `supplierExpenses`(vEnded DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `supplierExpenses`(vEnded DATE)
BEGIN
DROP TEMPORARY TABLE IF EXISTS openingBalance;
@@ -78179,11 +78750,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `supplierPackaging_ReportSource`(vFromDated DATE, vSupplierFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `supplierPackaging_ReportSource`(vFromDated DATE, vSupplierFk INT)
BEGIN
/**
@@ -78193,20 +78764,141 @@ BEGIN
* @param vSupplierFk Id del proveedor
*/
- SELECT * FROM (
- SELECT supplierFk, itemFk, longName, supplier, entryFk, landed, `out`, `in`, warehouse, buyingValue, (`in` - `out`) balance
- FROM supplierPackaging
- WHERE supplierFk = vSupplierFk
- AND landed >= vFromDated
- UNION ALL
- SELECT vSupplierFk, itemFk, longName, supplier, 'anterior', vFromDated, sum(`out`), sum(`in`), NULL, buyingValue, (`in` - `out`) balance
- FROM supplierPackaging
- WHERE supplierFk = vSupplierFk
- AND landed < vFromDated
- GROUP BY itemFk
- ) sub
- WHERE `out` OR `in`
- ORDER BY itemFk, landed;
+ DECLARE vCounter INT DEFAULT 0;
+ DECLARE vMaxRow INT DEFAULT 0;
+ DECLARE vItemFk INT DEFAULT 0;
+ SET @vRowNumber = 0;
+ SET @vBalance = 0;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.supplierPackagingList;
+ CREATE TEMPORARY TABLE tmp.supplierPackagingList
+ SELECT itemFk,
+ @vRowNumber:= @vRowNumber + 1 `row`
+ FROM (
+ SELECT *
+ FROM (
+ SELECT supplierFk,
+ itemFk,
+ longName,
+ supplier,
+ entryFk,
+ landed,
+ `out`,
+ `in`,
+ warehouse,
+ buyingValue
+ FROM supplierPackaging
+ WHERE supplierFk = vSupplierFk
+ AND landed >= vFromDated
+
+ UNION ALL
+
+ SELECT vSupplierFk,
+ itemFk,
+ longName,
+ supplier,
+ 'previous',
+ vFromDated,
+ SUM(`out`),
+ SUM(`in`),
+ NULL,
+ buyingValue
+ FROM supplierPackaging
+ WHERE supplierFk = vSupplierFk
+ AND landed < vFromDated
+ GROUP BY itemFk) i
+ GROUP BY itemFk
+ ORDER BY landed) i2;
+
+ SELECT MAX(`row`)
+ INTO vMaxRow
+ FROM tmp.supplierPackagingList;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.supplierPackaging;
+ CREATE TEMPORARY TABLE tmp.supplierPackaging(
+ supplierFk INT,
+ itemFk INT,
+ longName VARCHAR(50),
+ supplier VARCHAR(50),
+ entryFk VARCHAR(50),
+ landed DATE,
+ `in` VARCHAR(50),
+ `out` VARCHAR(50),
+ warehouse INT,
+ buyingValue INT,
+ balance INT);
+
+ l1: LOOP
+
+ IF vCounter = vMaxRow THEN
+ LEAVE l1;
+ ELSE
+ SET vCounter = vCounter + 1;
+ SET @vBalance = 0;
+ END IF;
+
+ SELECT itemFk
+ INTO vItemFk
+ FROM tmp.supplierPackagingList
+ WHERE `row` = vCounter;
+
+ INSERT INTO tmp.supplierPackaging
+ SELECT supplierFk,
+ itemFk,
+ longName,
+ supplier,
+ entryFk,
+ landed,
+ `in`,
+ `out`,
+ warehouse,
+ buyingValue,
+ @vBalance:= (`in` - `out` + @vBalance)
+ FROM (
+ SELECT supplierFk,
+ itemFk,
+ longName,
+ supplier,
+ entryFk,
+ landed,
+ `out`,
+ `in`,
+ warehouse,
+ buyingValue
+ FROM supplierPackaging
+ WHERE supplierFk = vSupplierFk
+ AND landed >= vFromDated
+ AND itemFk = vItemFk
+
+ UNION ALL
+
+ SELECT vSupplierFk,
+ itemFk,
+ longName,
+ supplier,
+ 'previous',
+ vFromDated,
+ SUM(`out`),
+ SUM(`in`),
+ NULL,
+ buyingValue
+ FROM supplierPackaging
+ WHERE supplierFk = vSupplierFk
+ AND landed < vFromDated
+ AND itemFk = vItemFk
+ GROUP BY itemFk
+ ) sub
+ WHERE `out` OR `in`
+ ORDER BY itemFk, landed;
+
+ END LOOP l1;
+
+ SELECT * FROM tmp.supplierPackaging;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.supplierPackagingList;
+ DROP TEMPORARY TABLE IF EXISTS tmp.supplierPackaging;
+ SET @vRowNumber = 0;
+ SET @vBalance = 0;
END ;;
DELIMITER ;
@@ -78220,11 +78912,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `supplier_checkBalance`(IN vDateTo DATETIME, IN vIsConciliated BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `supplier_checkBalance`(IN vDateTo DATETIME, IN vIsConciliated BOOL)
BEGIN
DECLARE vDateFrom DATE;
@@ -78269,7 +78961,7 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `test` */;
+/*!50003 DROP PROCEDURE IF EXISTS `supplier_disablePayMethodChecked` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -78279,7 +78971,43 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `test`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `supplier_disablePayMethodChecked`()
+BEGIN
+
+/*
+ * Deshabilita la comprobación de los datos bancarios de todos aquellos proveedores que tengan
+ * un número que no sea 0 en el campo graceMonthsDisableChecked de la tabla vn.payMethod
+ * y que no hayan recibido un pago desde el mes indicado
+ */
+
+ UPDATE vn.supplier s
+ JOIN ( SELECT p.supplierFk
+ FROM vn.payment p
+ LEFT JOIN vn.supplier s ON s.id = p.supplierFk
+ LEFT JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+ WHERE p.created < (CURDATE() - INTERVAL pm.graceMonthsDisableChecked MONTH)
+ AND pm.graceMonthsDisableChecked
+ AND s.isPayMethodChecked
+ GROUP BY p.supplierFk) sdpmc ON sdpmc.supplierFk = s.id
+ SET s.isPayMethodChecked = FALSE;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `test` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `test`()
BEGIN
select 'procedimiento ejecutado con éxito';
END ;;
@@ -78292,13 +79020,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketBoxesView`(IN vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketBoxesView`(IN vTicketFk INT)
BEGIN
SELECT s.id,
@@ -78330,13 +79058,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketBuiltTime`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketBuiltTime`(vDate DATE)
BEGIN
DECLARE vDateStart DATETIME DEFAULT DATE(vDate);
@@ -78382,11 +79110,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateClon`(IN vTicketNew INT, vTicketOld INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculateClon`(IN vTicketNew INT, vTicketOld INT)
BEGIN
/*
* Recalcula los componentes un ticket clonado,
@@ -78480,13 +79208,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateClon__`(IN vTicketNew INT, vTicketOld INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculateClon__`(IN vTicketNew INT, vTicketOld INT)
BEGIN
/*
* @vTicketNew id del nuevo ticket clonado
@@ -78576,13 +79304,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateFromType`( vLanded DATE,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculateFromType`( vLanded DATE,
vAddressFk INT,
vAgencyModeFk INT,
vTypeFk INT)
@@ -78607,13 +79335,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculatePurge`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculatePurge`()
BEGIN
DROP TEMPORARY TABLE
tmp.ticketCalculateItem,
@@ -78631,13 +79359,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSaleForcePrice2__`(IN vSale BIGINT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculateSaleForcePrice2__`(IN vSale BIGINT)
proc: BEGIN
DECLARE vShipped DATE;
@@ -78695,13 +79423,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSaleForcePrice__`(IN vSale BIGINT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculateSaleForcePrice__`(IN vSale BIGINT)
proc: BEGIN
DECLARE vShipped DATE;
@@ -78759,13 +79487,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSale__`(IN vSale BIGINT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculateSale__`(IN vSale BIGINT)
proc: BEGIN
-- OBSOLETO USAR: sale_calculateComponent(vSale, NULL)
DECLARE vShipped DATE;
@@ -78833,13 +79561,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculate__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculate__`(
vLanded DATE,
vAddressFk INT,
vAgencyModeFk INT)
@@ -78856,13 +79584,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketClon`(vTicketFk INT, vNewShipped DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketClon`(vTicketFk INT, vNewShipped DATE)
BEGIN
DECLARE done INT DEFAULT FALSE;
@@ -78924,13 +79652,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketClon_OneYear`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketClon_OneYear`(vTicketFk INT)
BEGIN
DECLARE vShipped DATE;
@@ -78959,13 +79687,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketClosureAgencyListAdd__`(vAgencyModeFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketClosureAgencyListAdd__`(vAgencyModeFk INT)
BEGIN
/**
* Prepara un listado de agencias sobre los que se realizará el cierre.
@@ -78990,11 +79718,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketClosureAgencyList__`(vWarehouseFk INT, vDateTo DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketClosureAgencyList__`(vWarehouseFk INT, vDateTo DATE)
BEGIN
/**
* Inserta los tickets de todos los almacenes en la tabla temporal
@@ -79037,11 +79765,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketClosureRoute__`( vRouteFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketClosureRoute__`( vRouteFk INT)
BEGIN
/**
* Inserta los tickets de la ruta en la tabla temporal
@@ -79081,11 +79809,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketClosureTicket__`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketClosureTicket__`(vTicketFk INT)
BEGIN
/**
@@ -79125,44 +79853,17 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCollection_get`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCollection_get`(vTicketFk INT)
BEGIN
SELECT tc.collectionFk
FROM vn.ticketCollection tc
WHERE ticketFk = vTicketFk;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketCollection_get__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCollection_get__`(vTicketFk INT)
-BEGIN
-
- SELECT tc.collectionFk
- FROM vn.ticketCollection tc
- JOIN vn.collection c ON c.id = tc.collectionFk
- JOIN tmp.workerPackingType wpt ON wpt.workerFk = account.myUser_getId()
- WHERE ticketFk = vTicketFk
- AND c.itemPackingTypeFk = wpt.itemPackingTypeFk
- ;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -79175,24 +79876,24 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCollection_setUsedShelves`(vTicketFk INT, vUsedShelves INT)
-BEGIN
-
- /*
- * Inserta número de baldas que ocupa un ticket
- *
- * @param vTicketFk Identificador de ticket
- * @param vUsedShelves Número de baldas
- */
-
- UPDATE ticketCollection tc
- SET tc.usedShelves = vUsedShelves
- WHERE tc.ticketFk = vTicketFk;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCollection_setUsedShelves`(vTicketFk INT, vUsedShelves INT)
+BEGIN
+
+ /*
+ * Inserta número de baldas que ocupa un ticket
+ *
+ * @param vTicketFk Identificador de ticket
+ * @param vUsedShelves Número de baldas
+ */
+
+ UPDATE ticketCollection tc
+ SET tc.usedShelves = vUsedShelves
+ WHERE tc.ticketFk = vTicketFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -79203,13 +79904,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketComponentUpdate`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketComponentUpdate`(
vTicketFk INT,
vClientFk INT,
vAgencyModeFk INT,
@@ -79281,13 +79982,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketComponentUpdateSale`(vOption INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketComponentUpdateSale`(vOption INT)
BEGIN
/**
* A partir de la tabla tmp.sale, crea los Movimientos_componentes
@@ -79478,13 +80179,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCreate`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCreate`(
vClientId INT
,vShipped DATE
,vWarehouseId INT
@@ -79512,7 +80213,7 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCreateWithUser`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCreateWithUser`(
vClientId INT
,vShipped DATE
,vWarehouseFk INT
@@ -79589,6 +80290,13 @@ BEGIN
FROM addressObservation ao
JOIN address a ON a.id = ao.addressFk
WHERE a.id = vAddressFk;
+
+ IF (SELECT COUNT(*) FROM bs.clientNewBorn cnb
+ WHERE cnb.clientFk = vClientId
+ AND NOT cnb.isRookie) = 0 THEN
+
+ CALL vn.ticketObservation_addNewBorn(vNewTicket);
+ END IF;
INSERT INTO vn.ticketLog
SET originFk = vNewTicket, userFk = vUserId, `action` = 'insert', description = CONCAT('Ha creado el ticket:', ' ', vNewTicket);
@@ -79609,13 +80317,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCreateWithUser__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCreateWithUser__`(
vClientId INT
,vShipped DATE
,vWarehouseFk INT
@@ -79712,13 +80420,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketDown_PrintableSelection`(vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketDown_PrintableSelection`(vSectorFk INT)
BEGIN
UPDATE vn.ticketDown td
@@ -79747,13 +80455,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketFilter__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketFilter__`()
BEGIN
/**
* Obtiene un listado de tickets
@@ -79786,13 +80494,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetProblems__`(IN vIsTodayRelative TINYINT(1))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetProblems__`(IN vIsTodayRelative TINYINT(1))
BEGIN
/**
* @deprecated Use ticket_getProblems() instead
@@ -79997,11 +80705,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetTaxAdd`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetTaxAdd`(vTicketFk INT)
BEGIN
/**
* Añade un ticket a la tabla tmp.ticket para calcular
@@ -80039,13 +80747,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetTax_new`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetTax_new`()
READS SQL DATA
BEGIN
/**
@@ -80120,11 +80828,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetTax__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetTax__`()
READS SQL DATA
BEGIN
/**
@@ -80227,11 +80935,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetTax__2`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetTax__2`()
READS SQL DATA
BEGIN
CALL ticket_getTax(NULL);
@@ -80247,11 +80955,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetTotal`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetTotal`()
BEGIN
/**
* Calcula el total con IVA para un conjunto de tickets.
@@ -80284,13 +80992,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetVisibleAvailable`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetVisibleAvailable`(
vTicket INT)
BEGIN
DECLARE vVisibleCalc INT;
@@ -80326,67 +81034,36 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketListCreate__` */;
+/*!50003 DROP PROCEDURE IF EXISTS `ticketManaToPromo` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketListCreate__`(
- vClientId INT
- ,vShipped DATE
- ,vWarehouseId INT
- ,vCompanyFk INT
- ,vAddressFk INT
- ,vAgencyType INT
- ,vRouteFk INT
- ,vlanded DATE)
-BEGIN
-
- DECLARE vNewTicket INT;
- CALL vn.ticketCreate(vClientId, vShipped, vWarehouseId, vCompanyFk, vAddressFk, vAgencyType, vRouteFk, vlanded,vNewTicket);
- SELECT vNewTicket;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketManaToPromo` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketManaToPromo`(vTicketFk INT)
-BEGIN
-
- DECLARE vManaComponent INT;
-
- DECLARE vPromoComponent INT;
-
- SELECT id INTO vManaComponent
- FROM vn.component c
- WHERE c.code = 'mana';
-
- SELECT id INTO vPromoComponent
- FROM vn.component c
- WHERE c.code = 'floramondoPromo';
-
- UPDATE vn.saleComponent sc
- JOIN vn.sale s ON s.id = sc.saleFk
- SET componentFk = vPromoComponent
- WHERE componentFk = vManaComponent
- AND s.ticketFk = vTicketFk;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketManaToPromo`(vTicketFk INT)
+BEGIN
+
+ DECLARE vManaComponent INT;
+
+ DECLARE vPromoComponent INT;
+
+ SELECT id INTO vManaComponent
+ FROM vn.component c
+ WHERE c.code = 'mana';
+
+ SELECT id INTO vPromoComponent
+ FROM vn.component c
+ WHERE c.code = 'floramondoPromo';
+
+ UPDATE vn.saleComponent sc
+ JOIN vn.sale s ON s.id = sc.saleFk
+ SET componentFk = vPromoComponent
+ WHERE componentFk = vManaComponent
+ AND s.ticketFk = vTicketFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -80399,11 +81076,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketMissed_List`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketMissed_List`(vTicketFk INT)
BEGIN
DECLARE vParkingFk INT;
@@ -80459,13 +81136,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketNotInvoicedByClient`(vClientFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketNotInvoicedByClient`(vClientFk INT)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
@@ -80498,7 +81175,40 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketPackagingRecovery` */;
+/*!50003 DROP PROCEDURE IF EXISTS `ticketObservation_addNewBorn` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketObservation_addNewBorn`(vTicketFk INT)
+BEGIN
+
+ /**
+ * Inserta observaciones para los tickets con clientes nuevos o recuperados
+ *
+ * @param vTicketFk Identificador de vn.ticket
+ */
+
+ DECLARE vDescription VARCHAR(20) DEFAULT '¡Cliente NUEVO! ';
+
+ INSERT INTO vn.ticketObservation(ticketFk, observationTypeFk, description)
+ SELECT vTicketFk, ot.id, vDescription
+ FROM vn.observationType ot
+ WHERE ot.hasNewBornMessage
+ ON DUPLICATE KEY UPDATE description = CONCAT(vDescription, ticketObservation.description);
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticketPackagingRecovery__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -80508,7 +81218,7 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketPackagingRecovery`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketPackagingRecovery__`()
BEGIN
/* Recupera los embalajes que han caido en el cliente 31 */
@@ -80562,73 +81272,73 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketParking_findSkipped`(vTicketFk INT, vItemPackingTypeFk VARCHAR(1))
-BEGIN
-
-/**
- * Averigua los tickets que se han saltado por un error en el proceso encajado
- * @param vTicketFk Ticket
- * @param vItemPackingTypeFk Modo de encajado
- * @return un select con los tickets afectados
- */
-
- DECLARE vParkingFk INT;
- DECLARE vParked DATETIME;
- DECLARE vLevel INT;
- DECLARE vWagon INT;
- DECLARE vCollectionFk INT;
-
- SELECT IFNULL(`level`,0), IFNULL(`wagon`,0),IFNULL(collectionFk,0)
- INTO vLevel, vWagon, vCollectionFk
- FROM vn.ticketCollection tc
- JOIN vn.collection c ON c.id = tc.collectionFk AND c.itemPackingTypeFk = vItemPackingTypeFk
- WHERE ticketFk = vTicketFk
- ORDER BY c.id DESC
- LIMIT 1;
-
- SELECT created, parkingFk
- INTO vParked, vParkingFk
- FROM vn.ticketParking tp
- JOIN vn.parking p ON p.id = tp.parkingFk
- JOIN vn.sector s ON s.id = p.sectorFk
- WHERE ticketFk = vTicketFk
- AND s.itemPackingTypeFk = vItemPackingTypeFk
- AND s.isPackagingArea ;
-
- SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' ', tc.wagon, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia
- FROM vn.ticketParking tp
- JOIN vn.parking p ON p.id = tp.parkingFk
- JOIN vn.sector sc ON sc.id = p.sectorFk
- LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = tp.ticketFk
- JOIN vn.ticketStateToday tst ON tst.ticket = tp.ticketFk
- JOIN vn.ticket t ON t.id = tp.ticketFk
- JOIN vn.zone z ON z.id = t.zoneFk
- JOIN vn.agencyMode am ON am.id = z.agencyModeFk
- JOIN vn.state s ON s.id = tst.state
- WHERE (s.alertLevel < 2
- AND tp.parkingFk = vParkingFk
- AND sc.isPackagingArea
- AND (
- ( IFNULL(tc.collectionFk,-1) != IFNULL(@vCollectionFk,0) AND tp.created < vParked )
- OR
- ( tc.collectionFk = vCollectionFk
- AND (LEFT(tc.wagon,1) < LEFT(vWagon,1)
- OR (LEFT(tc.wagon,1) = LEFT(vWagon,1) AND LEFT(tc.level,1) < LEFT(vLevel,1)))
- )
- )
- ) -- Etiquetas que no se han escaneado y ya estamos con una posterior
- OR
- (s.alertLevel > 1
- AND tp.parkingFk = vParkingFk
- AND sc.isPackagingArea
- AND tp.created < vParked
- AND t.packages <=> 0);
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketParking_findSkipped`(vTicketFk INT, vItemPackingTypeFk VARCHAR(1))
+BEGIN
+
+/**
+ * Averigua los tickets que se han saltado por un error en el proceso encajado
+ * @param vTicketFk Ticket
+ * @param vItemPackingTypeFk Modo de encajado
+ * @return un select con los tickets afectados
+ */
+
+ DECLARE vParkingFk INT;
+ DECLARE vParked DATETIME;
+ DECLARE vLevel INT;
+ DECLARE vWagon INT;
+ DECLARE vCollectionFk INT;
+
+ SELECT IFNULL(`level`,0), IFNULL(`wagon`,0),IFNULL(collectionFk,0)
+ INTO vLevel, vWagon, vCollectionFk
+ FROM vn.ticketCollection tc
+ JOIN vn.collection c ON c.id = tc.collectionFk AND c.itemPackingTypeFk = vItemPackingTypeFk
+ WHERE ticketFk = vTicketFk
+ ORDER BY c.id DESC
+ LIMIT 1;
+
+ SELECT created, parkingFk
+ INTO vParked, vParkingFk
+ FROM vn.ticketParking tp
+ JOIN vn.parking p ON p.id = tp.parkingFk
+ JOIN vn.sector s ON s.id = p.sectorFk
+ WHERE ticketFk = vTicketFk
+ AND s.itemPackingTypeFk = vItemPackingTypeFk
+ AND s.isPackagingArea ;
+
+ SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' ', tc.wagon, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia
+ FROM vn.ticketParking tp
+ JOIN vn.parking p ON p.id = tp.parkingFk
+ JOIN vn.sector sc ON sc.id = p.sectorFk
+ LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = tp.ticketFk
+ JOIN vn.ticketStateToday tst ON tst.ticket = tp.ticketFk
+ JOIN vn.ticket t ON t.id = tp.ticketFk
+ JOIN vn.zone z ON z.id = t.zoneFk
+ JOIN vn.agencyMode am ON am.id = z.agencyModeFk
+ JOIN vn.state s ON s.id = tst.state
+ WHERE (s.alertLevel < 2
+ AND tp.parkingFk = vParkingFk
+ AND sc.isPackagingArea
+ AND (
+ ( IFNULL(tc.collectionFk,-1) != IFNULL(@vCollectionFk,0) AND tp.created < vParked )
+ OR
+ ( tc.collectionFk = vCollectionFk
+ AND (LEFT(tc.wagon,1) < LEFT(vWagon,1)
+ OR (LEFT(tc.wagon,1) = LEFT(vWagon,1) AND LEFT(tc.level,1) < LEFT(vLevel,1)))
+ )
+ )
+ ) -- Etiquetas que no se han escaneado y ya estamos con una posterior
+ OR
+ (s.alertLevel > 1
+ AND tp.parkingFk = vParkingFk
+ AND sc.isPackagingArea
+ AND tp.created < vParked
+ AND t.packages <=> 0);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -80639,13 +81349,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketRequest_Add`(vDescription VARCHAR(255), vQuantity INT, vPrice DOUBLE, vTicketFk INT, vBuyerCode VARCHAR(3))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketRequest_Add`(vDescription VARCHAR(255), vQuantity INT, vPrice DOUBLE, vTicketFk INT, vBuyerCode VARCHAR(3))
BEGIN
INSERT INTO vn.ticketRequest(description,
@@ -80671,13 +81381,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketSplitCounter`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketSplitCounter`(vTicketFk INT)
BEGIN
SELECT CONCAT(OK,'/',Total, IF(OK = Total ,' LS',''))
@@ -80701,11 +81411,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketStatePrevious__`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketStatePrevious__`(vTicketFk INT)
BEGIN
DECLARE vControlFk INT;
@@ -80762,80 +81472,80 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketStateToday_setOnchecking` */;
+/*!50003 DROP PROCEDURE IF EXISTS `ticketStateToday_setOnchecking__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketStateToday_setOnchecking`(vParamFk INT)
-BEGIN
- /*
- * @deprecated:utilizar ticketStateToday_setState
- */
-
- DECLARE vAlertLevel INT;
-
- SELECT s.alertLevel INTO vAlertLevel
- FROM vn.state s
- JOIN vn.ticketStateToday tst ON tst.state = s.id
- WHERE tst.ticket = vParamFk
- LIMIT 1;
-
- IF vAlertLevel < 2 THEN
-
- CALL vn.ticketStateUpdate(vParamFk, 'ON_CHECKING');
-
- END IF;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketStateToday_setOnchecking__`(vParamFk INT)
+BEGIN
+ /*
+ * @deprecated:utilizar ticketStateToday_setState
+ */
+
+ DECLARE vAlertLevel INT;
+
+ SELECT s.alertLevel INTO vAlertLevel
+ FROM vn.state s
+ JOIN vn.ticketStateToday tst ON tst.state = s.id
+ WHERE tst.ticket = vParamFk
+ LIMIT 1;
+
+ IF vAlertLevel < 2 THEN
+
+ CALL vn.ticketStateUpdate(vParamFk, 'ON_CHECKING');
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketStateToday_setOnPreviousChecking` */;
+/*!50003 DROP PROCEDURE IF EXISTS `ticketStateToday_setOnPreviousChecking__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketStateToday_setOnPreviousChecking`(vParamFk INT)
-BEGIN
-
- /*
- * @deprecated:utilizar ticketStateToday_setState
- */
-
-
- /*
- * Cambia el estado del ticket al estado de "control previa"
- *
- * @param vParamFk ticket a cambiar el estado
- *
- */
- DECLARE vAlertLevel INT;
-
- SELECT s.alertLevel INTO vAlertLevel
- FROM state s
- JOIN ticketStateToday tst ON tst.state = s.id
- WHERE tst.ticket = vParamFk
- LIMIT 1;
-
- IF vAlertLevel < 2 THEN
-
- CALL ticketStateUpdate(vParamFk, 'PREVIOUS_CONTROL');
-
- END IF;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketStateToday_setOnPreviousChecking__`(vParamFk INT)
+BEGIN
+
+ /*
+ * @deprecated:utilizar ticketStateToday_setState
+ */
+
+
+ /*
+ * Cambia el estado del ticket al estado de "control previa"
+ *
+ * @param vParamFk ticket a cambiar el estado
+ *
+ */
+ DECLARE vAlertLevel INT;
+
+ SELECT s.alertLevel INTO vAlertLevel
+ FROM state s
+ JOIN ticketStateToday tst ON tst.state = s.id
+ WHERE tst.ticket = vParamFk
+ LIMIT 1;
+
+ IF vAlertLevel < 2 THEN
+
+ CALL ticketStateUpdate(vParamFk, 'PREVIOUS_CONTROL');
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -80848,34 +81558,34 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketStateToday_setState`(vTicketFk INT, vStateCode VARCHAR(45))
-BEGIN
-
- /* Modifica el estado de un ticket de hoy
- *
- * @param vTicketFk el id del ticket
- * @param vStateCode estado a modificar del ticket
- *
- */
-
- DECLARE vAlertLevel INT;
-
- SELECT s.alertLevel INTO vAlertLevel
- FROM state s
- JOIN ticketStateToday tst ON tst.state = s.id
- WHERE tst.ticket = vTicketFk
- LIMIT 1;
-
- IF vAlertLevel < 2 THEN
-
- CALL vn.ticket_setState(vTicketFk, vStateCode);
-
- END IF;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketStateToday_setState`(vTicketFk INT, vStateCode VARCHAR(45))
+BEGIN
+
+ /* Modifica el estado de un ticket de hoy
+ *
+ * @param vTicketFk el id del ticket
+ * @param vStateCode estado a modificar del ticket
+ *
+ */
+
+ DECLARE vAlertLevel INT;
+
+ SELECT s.alertLevel INTO vAlertLevel
+ FROM state s
+ JOIN ticketStateToday tst ON tst.state = s.id
+ WHERE tst.ticket = vTicketFk
+ LIMIT 1;
+
+ IF vAlertLevel < 2 THEN
+
+ CALL vn.ticket_setState(vTicketFk, vStateCode);
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -80888,11 +81598,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketStateUpdate`(vTicketFk INT, vStateCode VARCHAR(45))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketStateUpdate`(vTicketFk INT, vStateCode VARCHAR(45))
BEGIN
/*
@@ -80925,13 +81635,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketToInvoiceByAddress`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketToInvoiceByAddress`(
vStarted DATE,
vEnded DATETIME,
vAddress INT,
@@ -80957,53 +81667,17 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketToInvoiceByClient__` */;
+/*!50003 DROP PROCEDURE IF EXISTS `ticketToInvoiceByDate` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketToInvoiceByClient__`(
- vStarted DATE,
- vEnded DATETIME,
- vClient INT,
- vCompany INT
- )
-BEGIN
-
- SET vEnded = util.dayEnd(vEnded);
-
- DROP TEMPORARY TABLE IF EXISTS vn.ticketToInvoice;
-
- CREATE TEMPORARY TABLE vn.ticketToInvoice
- SELECT id
- FROM vn.ticket
- WHERE clientFk = vClient
- AND companyFk = vCompany
- AND shipped BETWEEN vStarted AND vEnded
- AND refFk IS NULL;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketToInvoiceByDate` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketToInvoiceByDate`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketToInvoiceByDate`(
vStarted DATE,
vEnded DATETIME,
vClient INT,
@@ -81033,13 +81707,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketToInvoiceByRef`(IN vInvoiceRef VARCHAR(15))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketToInvoiceByRef`(IN vInvoiceRef VARCHAR(15))
BEGIN
/* Para tickets ya facturados, vuelve a repetir el proceso de facturación.
@@ -81093,132 +81767,70 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketToPrePrepare`(IN vSaleGroupFk INT, IN vSectorFk INT)
-BEGIN
-
-/* Devuelve las lineas de vn.sale para preparación previa según el saleGroup
- *
- *
- * @param vSaleGroupFk Identificador de vn.saleGroup
-*/
- DECLARE vIsResetCode BOOLEAN;
-
- SELECT (vSaleGroupFk = 2000000) INTO vIsResetCode;
-
- IF vIsResetCode THEN
-
- UPDATE vn.saleTracking st
- JOIN vn.state s ON s.code = 'OK PREVIOUS'
- JOIN vn.state s2 ON s2.id = st.stateFk
- SET st.stateFk = s.id
- WHERE workerFk = vn.getUser()
- AND s2.code = 'PREVIOUS_PREPARATION';
-
- ELSE
-
- UPDATE vn.saleTracking st
- JOIN vn.saleGroupDetail sgd ON sgd.saleFk = st.saleFk
- SET workerFk = vn.getUser()
- WHERE sgd.saleGroupFk = vSaleGroupFk;
-
- UPDATE vn.saleGroup sg
- SET sg.userFk = vn.getUser()
- WHERE sg.id = vSaleGroupFk;
-
- SELECT s.ticketFk,
- s.itemFk,
- i.longName,
- IFNULL(i.itemPackingTypeFk,' ') itemPackingTypeFk,
- IFNULL(i.subName ,' ') subName,
- s.quantity originalQuantity ,
- s.quantity,
- w.code workerCode,
- sgd.saleFk,
- IFNULL(iss.quantity,0) pickedQuantity,
- vSectorFk
- FROM vn.sale s
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
- JOIN vn.saleTracking st ON st.saleFk = s.id
- JOIN vn.state stt ON stt.id = st.stateFk
- JOIN vn.worker w ON w.id = st.workerFk
- LEFT JOIN vn.itemShelvingSaleSum iss ON iss.saleFk = s.id
- WHERE st.workerFk = account.myUser_getId()
- AND stt.code = 'PREVIOUS_PREPARATION';
-
- END IF;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketToPrePrepare_BETA` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketToPrePrepare_BETA`()
-BEGIN
-
-/* Devuelve las lineas de vn.sale para preparación previa según el saleGroup
- *
- *
- * @param vSaleGroupFk Identificador de vn.saleGroup
-*/
- DECLARE vIsResetCode BOOLEAN;
-
-
-
- IF vIsResetCode THEN
-
- UPDATE vn.saleTracking st
- JOIN vn.state s ON s.code = 'OK PREVIOUS'
- JOIN vncontrol.accion a ON a.accion_id = st.actionFk
- JOIN vn.state s2 ON s2.id = st.stateFk
- SET st.stateFk = s.id
- WHERE workerFk = vn.getUser()
- AND a.accion = 'PRESACAR'
- AND s2.code != 'OK PREVIOUS';
-
- ELSE
-
-
-
- SELECT s.ticketFk,
- s.itemFk,
- i.longName,
- i.itemPackingTypeFk,
- i.subName,
- s.quantity originalQuantity ,
- s.quantity,
- w.code workerCode,
- sgd.saleFk,
- IFNULL(iss.quantity,0) pickedQuantity
- FROM vn.sale s
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
- JOIN vn.saleTracking st ON st.saleFk = s.id
- JOIN vn.state stt ON stt.id = st.stateFk
- JOIN vn.worker w ON w.id = st.workerFk
- LEFT JOIN vn.itemShelvingSaleSum iss ON iss.saleFk = s.id
- WHERE st.workerFk = 14348
- AND stt.code = 'PREVIOUS_PREPARATION';
-
- END IF;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketToPrePrepare`(IN vSaleGroupFk INT, IN vSectorFk INT)
+BEGIN
+
+/* Devuelve las lineas de vn.sale para preparación previa según el saleGroup
+ *
+ *
+ * @param vSaleGroupFk Identificador de vn.saleGroup
+*/
+ DECLARE vIsResetCode BOOLEAN;
+
+ SELECT (vSaleGroupFk = 2000000) INTO vIsResetCode;
+
+ IF vIsResetCode THEN
+
+ UPDATE vn.saleTracking st
+ JOIN vn.state s ON s.code = 'OK PREVIOUS'
+ JOIN vn.state s2 ON s2.id = st.stateFk
+ SET st.stateFk = s.id
+ WHERE workerFk = vn.getUser()
+ AND s2.code = 'PREVIOUS_PREPARATION';
+
+ ELSE
+
+ UPDATE vn.saleTracking st
+ JOIN vn.saleGroupDetail sgd ON sgd.saleFk = st.saleFk
+ SET workerFk = vn.getUser()
+ WHERE sgd.saleGroupFk = vSaleGroupFk;
+
+ UPDATE vn.saleGroup sg
+ SET sg.userFk = vn.getUser()
+ WHERE sg.id = vSaleGroupFk;
+
+ SELECT s.ticketFk,
+ s.itemFk,
+ i.longName,
+ IFNULL(i.itemPackingTypeFk,' ') itemPackingTypeFk,
+ IFNULL(i.subName ,' ') subName,
+ s.quantity originalQuantity ,
+ s.quantity,
+ w.code workerCode,
+ sgd.saleFk,
+ IFNULL(iss.quantity,0) pickedQuantity,
+ vSectorFk,
+ c.salesPersonFk
+ FROM vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
+ JOIN vn.saleTracking st ON st.saleFk = s.id
+ JOIN vn.state stt ON stt.id = st.stateFk
+ JOIN vn.worker w ON w.id = st.workerFk
+ LEFT JOIN vn.itemShelvingSaleSum iss ON iss.saleFk = s.id
+ JOIN vn.ticket t ON t.id= s.ticketFk
+ JOIN vn.client c ON c.id=t.clientFk
+ WHERE st.workerFk = account.myUser_getId()
+ AND stt.code = 'PREVIOUS_PREPARATION';
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -81229,13 +81841,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketToPrePrepare__`(IN vIdTicket INT, IN viewAll BOOL, IN vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketToPrePrepare__`(IN vIdTicket INT, IN viewAll BOOL, IN vSectorFk INT)
BEGIN
/* Tickets de preparacion previa (artificial) 21/03/2021 PAK
@@ -81319,13 +81931,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketTrackingAdd`(vTicketFk INT, vState VARCHAR(25) CHARSET UTF8, vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketTrackingAdd`(vTicketFk INT, vState VARCHAR(25) CHARSET UTF8, vWorkerFk INT)
BEGIN
/**
* Inserta un registro de cambios en un ticket.
@@ -81347,11 +81959,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketVolumeByDate_ventas_Artificial__`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketVolumeByDate_ventas_Artificial__`(vDate DATE)
BEGIN
DECLARE vDateStart DATETIME DEFAULT DATE(vDate);
@@ -81385,11 +81997,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketVolumeByDate_ventas__`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketVolumeByDate_ventas__`(vDate DATE)
BEGIN
DECLARE vDateStart DATETIME DEFAULT DATE(vDate);
@@ -81424,11 +82036,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketVolumeByDate__`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketVolumeByDate__`(vDate DATE)
BEGIN
DECLARE vDateStart DATETIME DEFAULT DATE(vDate);
@@ -81459,100 +82071,108 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_add`(
- vClientId INT
- ,vShipped DATE
- ,vWarehouseFk INT
- ,vCompanyFk INT
- ,vAddressFk INT
- ,vAgencyModeFk INT
- ,vRouteFk INT
- ,vlanded DATE
- ,vUserId INT
- ,vIsRequiredZone INT
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_add`(
+ vClientId INT
+ ,vShipped DATE
+ ,vWarehouseFk INT
+ ,vCompanyFk INT
+ ,vAddressFk INT
+ ,vAgencyModeFk INT
+ ,vRouteFk INT
+ ,vlanded DATE
+ ,vUserId INT
+ ,vIsRequiredZone INT
,OUT vNewTicket INT)
-BEGIN
-
- DECLARE vZoneFk INT;
- DECLARE vPrice DECIMAL(10,2);
- DECLARE vBonus DECIMAL(10,2);
-
- IF vClientId IS NULL THEN
- CALL util.throw ('CLIENT_NOT_ESPECIFIED');
- END IF;
-
- IF NOT vAddressFk OR vAddressFk IS NULL THEN
- SELECT id INTO vAddressFk
- FROM address
- WHERE clientFk = vClientId AND isDefaultAddress;
- END IF;
-
- IF vAgencyModeFk IS NOT NULL THEN
-
- CALL vn.zone_getShipped (vlanded, vAddressFk, vAgencyModeFk, TRUE);
-
- SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus
- FROM tmp.zoneGetShipped
- WHERE shipped = vShipped AND warehouseFk = vWarehouseFk LIMIT 1;
-
- IF (vZoneFk IS NULL OR vZoneFk = 0) AND vIsRequiredZone THEN
- CALL util.throw ('NOT_ZONE_WITH_THIS_PARAMETERS');
- END IF;
- END IF;
- INSERT INTO ticket (
- clientFk,
- shipped,
- addressFk,
- agencyModeFk,
- nickname,
- warehouseFk,
- routeFk,
- companyFk,
- landed,
- zoneFk,
- zonePrice,
- zoneBonus
- )
- SELECT
- vClientId,
- vShipped,
- a.id,
- vAgencyModeFk,
- a.nickname,
- vWarehouseFk,
- IF(vRouteFk,vRouteFk,NULL),
- vCompanyFk,
- vlanded,
- vZoneFk,
- vPrice,
- vBonus
- FROM address a
- JOIN agencyMode am ON am.id = a.agencyModeFk
- WHERE a.id = vAddressFk;
-
- SET vNewTicket = LAST_INSERT_ID();
-
- INSERT INTO ticketObservation(ticketFk, observationTypeFk, description)
- SELECT vNewTicket, ao.observationTypeFk, ao.description
- FROM addressObservation ao
- JOIN address a ON a.id = ao.addressFk
- WHERE a.id = vAddressFk;
-
- INSERT INTO vn.ticketLog
- SET originFk = vNewTicket, userFk = vUserId, `action` = 'insert', description = CONCAT('Ha creado el ticket:', ' ', vNewTicket);
-
- IF (SELECT ct.isCreatedAsServed FROM vn.clientType ct JOIN vn.client c ON c.typeFk = ct.code WHERE c.id = vClientId ) <> FALSE THEN
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT id, vNewTicket, account.myUser_getId()
- FROM state
- WHERE `code` = 'DELIVERED';
- END IF;
+BEGIN
+
+ DECLARE vZoneFk INT;
+ DECLARE vPrice DECIMAL(10,2);
+ DECLARE vBonus DECIMAL(10,2);
+
+ IF vClientId IS NULL THEN
+ CALL util.throw ('CLIENT_NOT_ESPECIFIED');
+ END IF;
+
+ IF NOT vAddressFk OR vAddressFk IS NULL THEN
+ SELECT id INTO vAddressFk
+ FROM address
+ WHERE clientFk = vClientId AND isDefaultAddress;
+ END IF;
+
+ IF vAgencyModeFk IS NOT NULL THEN
+
+ CALL vn.zone_getShipped (vlanded, vAddressFk, vAgencyModeFk, TRUE);
+
+ SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus
+ FROM tmp.zoneGetShipped
+ WHERE shipped = vShipped AND warehouseFk = vWarehouseFk LIMIT 1;
+
+ IF (vZoneFk IS NULL OR vZoneFk = 0) AND vIsRequiredZone THEN
+ CALL util.throw ('NOT_ZONE_WITH_THIS_PARAMETERS');
+ END IF;
+ END IF;
+ INSERT INTO ticket (
+ clientFk,
+ shipped,
+ addressFk,
+ agencyModeFk,
+ nickname,
+ warehouseFk,
+ routeFk,
+ companyFk,
+ landed,
+ zoneFk,
+ zonePrice,
+ zoneBonus
+ )
+ SELECT
+ vClientId,
+ vShipped,
+ a.id,
+ vAgencyModeFk,
+ a.nickname,
+ vWarehouseFk,
+ IF(vRouteFk,vRouteFk,NULL),
+ vCompanyFk,
+ vlanded,
+ vZoneFk,
+ vPrice,
+ vBonus
+ FROM address a
+ JOIN agencyMode am ON am.id = a.agencyModeFk
+ WHERE a.id = vAddressFk;
+
+ SET vNewTicket = LAST_INSERT_ID();
+
+ INSERT INTO ticketObservation(ticketFk, observationTypeFk, description)
+ SELECT vNewTicket, ao.observationTypeFk, ao.description
+ FROM addressObservation ao
+ JOIN address a ON a.id = ao.addressFk
+ WHERE a.id = vAddressFk;
+
+ IF (SELECT COUNT(*) FROM bs.clientNewBorn cnb
+ WHERE cnb.clientFk = vClientId
+ AND NOT cnb.isRookie) = 0 THEN
+
+ CALL vn.ticketObservation_addNewBorn(vNewTicket);
+
+ END IF;
+
+ INSERT INTO vn.ticketLog
+ SET originFk = vNewTicket, userFk = vUserId, `action` = 'insert', description = CONCAT('Ha creado el ticket:', ' ', vNewTicket);
+
+ IF (SELECT ct.isCreatedAsServed FROM vn.clientType ct JOIN vn.client c ON c.typeFk = ct.code WHERE c.id = vClientId ) <> FALSE THEN
+ INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
+ SELECT id, vNewTicket, account.myUser_getId()
+ FROM state
+ WHERE `code` = 'DELIVERED';
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -81563,28 +82183,28 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_administrativeCopy`(vOriginalTicket INT, OUT vNewTicket INT)
-BEGIN
-
- INSERT INTO vn.ticket(clientFk, addressFk, shipped, warehouseFk, companyFk, landed)
- SELECT t.clientFk , t.addressFk , t.shipped ,w.id, t.companyFk , t.landed
- FROM vn.ticket t
- JOIN vn.warehouse w ON w.name = 'INVENTARIO'
- WHERE t.id = vOriginalTicket;
-
- SELECT LAST_INSERT_ID() INTO vNewTicket;
-
- INSERT INTO vn.sale(ticketFk, itemFk, concept, quantity, price, discount)
- SELECT vNewTicket, s.itemFk , s.concept , s.quantity , s.price , s.discount
- FROM vn.sale s
- WHERE s.ticketFk = vOriginalTicket;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_administrativeCopy`(vOriginalTicket INT, OUT vNewTicket INT)
+BEGIN
+
+ INSERT INTO vn.ticket(clientFk, addressFk, shipped, warehouseFk, companyFk, landed)
+ SELECT t.clientFk , t.addressFk , t.shipped ,w.id, t.companyFk , t.landed
+ FROM vn.ticket t
+ JOIN vn.warehouse w ON w.name = 'INVENTARIO'
+ WHERE t.id = vOriginalTicket;
+
+ SELECT LAST_INSERT_ID() INTO vNewTicket;
+
+ INSERT INTO vn.sale(ticketFk, itemFk, concept, quantity, price, discount)
+ SELECT vNewTicket, s.itemFk , s.concept , s.quantity , s.price , s.discount
+ FROM vn.sale s
+ WHERE s.ticketFk = vOriginalTicket;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -81597,51 +82217,51 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_canMerge`(vDated DATE, vScopeDays INT, vLitersMax INT, vLinesMax INT, vWarehouseFk INT)
-BEGIN
-
- /* Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro
- *
- * @param vDated Fecha en cuestión
- * @param vScopeDays Dias en el futuro a sondear
- * @param vLitersMax Volumen máximo de los tickets a catapultar
- * @param vLinesMax Número máximo de lineas de los tickets a catapultar
- * @param vWarehouseFk Identificador de vn.warehouse
- */
-
- SELECT sv.ticketFk ,
- CAST(sum(litros) AS DECIMAL(10,0)) liters,
- CAST(count(*) AS DECIMAL(10,0)) `lines`,
- sub2.id ticketFuture,
- sub2.shipped
- FROM vn.saleVolume sv
- JOIN vn.ticket t ON t.id = sv.ticketFk
- JOIN vn.address a ON a.id = t.addressFk
- JOIN vn.province p ON p.id = a.provinceFk
- JOIN vn.country c ON c.id = p.countryFk
- JOIN vn.ticketState ts ON ts.ticketFk = t.id
- JOIN vn.alertLevel al ON al.id = ts.alertLevel
- LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
- LEFT JOIN (
- SELECT * FROM (
- SELECT t.addressFk , t.id, t.shipped
- FROM vn.ticket t
- WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, vScopeDays,vDated)
- AND util.dayend(TIMESTAMPADD(DAY, vScopeDays,vDated))
- AND t.warehouseFk = vWarehouseFk
- ) sub
- GROUP BY sub.addressFk
- ) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id
- WHERE t.shipped BETWEEN vDated AND util.dayend(vDated)
- AND t.warehouseFk = vWarehouseFk
- AND al.code = 'FREE'
- AND tp.ticketFk IS NULL
- GROUP BY sv.ticketFk
- HAVING liters <= vLitersMax AND `lines` <= vLinesMax AND ticketFuture;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_canMerge`(vDated DATE, vScopeDays INT, vLitersMax INT, vLinesMax INT, vWarehouseFk INT)
+BEGIN
+
+ /* Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro
+ *
+ * @param vDated Fecha en cuestión
+ * @param vScopeDays Dias en el futuro a sondear
+ * @param vLitersMax Volumen máximo de los tickets a catapultar
+ * @param vLinesMax Número máximo de lineas de los tickets a catapultar
+ * @param vWarehouseFk Identificador de vn.warehouse
+ */
+
+ SELECT sv.ticketFk ,
+ CAST(sum(litros) AS DECIMAL(10,0)) liters,
+ CAST(count(*) AS DECIMAL(10,0)) `lines`,
+ sub2.id ticketFuture,
+ sub2.shipped
+ FROM vn.saleVolume sv
+ JOIN vn.ticket t ON t.id = sv.ticketFk
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.province p ON p.id = a.provinceFk
+ JOIN vn.country c ON c.id = p.countryFk
+ JOIN vn.ticketState ts ON ts.ticketFk = t.id
+ JOIN vn.alertLevel al ON al.id = ts.alertLevel
+ LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+ LEFT JOIN (
+ SELECT * FROM (
+ SELECT t.addressFk , t.id, t.shipped
+ FROM vn.ticket t
+ WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, vScopeDays,vDated)
+ AND util.dayend(TIMESTAMPADD(DAY, vScopeDays,vDated))
+ AND t.warehouseFk = vWarehouseFk
+ ) sub
+ GROUP BY sub.addressFk
+ ) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id
+ WHERE t.shipped BETWEEN vDated AND util.dayend(vDated)
+ AND t.warehouseFk = vWarehouseFk
+ AND al.code = 'FREE'
+ AND tp.ticketFk IS NULL
+ GROUP BY sv.ticketFk
+ HAVING liters <= vLitersMax AND `lines` <= vLinesMax AND ticketFuture;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -81652,56 +82272,56 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_canMerge__`(vDated DATE, vScopeDays INT, vLitersMax INT, vLinesMax INT, vWarehouseFk INT)
-BEGIN
-
- /* Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro
- *
- * @param vDated Fecha en cuestión
- * @param vScopeDays Dias en el futuro a sondear
- * @param vLitersMax Volumen máximo de los tickets a catapultar
- * @param vLinesMax Número máximo de lineas de los tickets a catapultar
- * @param vWarehouseFk Identificador de vn.warehouse
- */
-
- SELECT sv.ticketFk ,
- CAST(sum(litros) AS DECIMAL(10,0)) liters,
- CAST(count(*) AS DECIMAL(10,0)) `lines`,
- sub2.id ticketFuture,
- sub2.shipped
- FROM vn.saleVolume sv
- JOIN vn.ticket t ON t.id = sv.ticketFk
- JOIN vn.address a ON a.id = t.addressFk
- JOIN vn.province p ON p.id = a.provinceFk
- JOIN vn.country c ON c.id = p.countryFk
- JOIN vn.ticketState ts ON ts.ticketFk = t.id
- JOIN vn.alertLevel al ON al.id = ts.alertLevel
- LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
- LEFT JOIN tmp.routeDayMove ra ON ra.routeFk = t.routeFk
- LEFT JOIN (
- SELECT * FROM (
- SELECT t.addressFk , t.id, t.shipped
- FROM vn.ticket t
- WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, vScopeDays,vDated)
- AND util.dayend(TIMESTAMPADD(DAY, vScopeDays,vDated))
- AND t.warehouseFk = vWarehouseFk
- ) sub
- GROUP BY sub.addressFk
- ) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id
- WHERE t.shipped BETWEEN vDated AND util.dayend(vDated)
- AND t.warehouseFk = vWarehouseFk
- AND al.code = 'FREE'
- AND tp.ticketFk IS NULL
- AND ra.routeFk IS NULL
- GROUP BY sv.ticketFk
- HAVING liters <= vLitersMax AND `lines` <= vLinesMax AND ticketFuture;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_canMerge__`(vDated DATE, vScopeDays INT, vLitersMax INT, vLinesMax INT, vWarehouseFk INT)
+BEGIN
+
+ /* Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro
+ *
+ * @param vDated Fecha en cuestión
+ * @param vScopeDays Dias en el futuro a sondear
+ * @param vLitersMax Volumen máximo de los tickets a catapultar
+ * @param vLinesMax Número máximo de lineas de los tickets a catapultar
+ * @param vWarehouseFk Identificador de vn.warehouse
+ */
+
+ SELECT sv.ticketFk ,
+ CAST(sum(litros) AS DECIMAL(10,0)) liters,
+ CAST(count(*) AS DECIMAL(10,0)) `lines`,
+ sub2.id ticketFuture,
+ sub2.shipped
+ FROM vn.saleVolume sv
+ JOIN vn.ticket t ON t.id = sv.ticketFk
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.province p ON p.id = a.provinceFk
+ JOIN vn.country c ON c.id = p.countryFk
+ JOIN vn.ticketState ts ON ts.ticketFk = t.id
+ JOIN vn.alertLevel al ON al.id = ts.alertLevel
+ LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+ LEFT JOIN tmp.routeDayMove ra ON ra.routeFk = t.routeFk
+ LEFT JOIN (
+ SELECT * FROM (
+ SELECT t.addressFk , t.id, t.shipped
+ FROM vn.ticket t
+ WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, vScopeDays,vDated)
+ AND util.dayend(TIMESTAMPADD(DAY, vScopeDays,vDated))
+ AND t.warehouseFk = vWarehouseFk
+ ) sub
+ GROUP BY sub.addressFk
+ ) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id
+ WHERE t.shipped BETWEEN vDated AND util.dayend(vDated)
+ AND t.warehouseFk = vWarehouseFk
+ AND al.code = 'FREE'
+ AND tp.ticketFk IS NULL
+ AND ra.routeFk IS NULL
+ GROUP BY sv.ticketFk
+ HAVING liters <= vLitersMax AND `lines` <= vLinesMax AND ticketFuture;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -81714,41 +82334,41 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_changeClient`(vNewClient INT, vUserFk INT)
-BEGIN
-
-/**
- * Dado un conjunto de tickets
- * cambia el cliente al nuevo cliente dado
- *
- * params @vNewClient nuevo cliente
- * params @vUserFk usuario que realiza el cambio
- *
- * table @tmp.ticket(ticketFk) conjunto de tickets
- */
-
- INSERT INTO ticketLog (originFk, userFk, `action`, changedModel, oldInstance, newInstance)
- SELECT t.id, vUserFk, 'update', 'Ticket', CONCAT('{"clientFk":',t.clientFk,'}'), CONCAT('{"clientFk":',vNewClient,'}')
- FROM ticket t
- JOIN tmp.ticket tt
- ON t.id = tt.ticketFk;
-
- UPDATE ticket t
- JOIN tmp.ticket tt
- ON t.id = tt.ticketFk
- SET t.clientFk = vNewClient;
-
- UPDATE ticket t
- JOIN tmp.ticket tt
- ON t.id = tt.ticketFk
- JOIN stowaway s
- ON s.shipFk = tt.ticketFk
- SET t.clientFk = vNewClient;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_changeClient`(vNewClient INT, vUserFk INT)
+BEGIN
+
+/**
+ * Dado un conjunto de tickets
+ * cambia el cliente al nuevo cliente dado
+ *
+ * params @vNewClient nuevo cliente
+ * params @vUserFk usuario que realiza el cambio
+ *
+ * table @tmp.ticket(ticketFk) conjunto de tickets
+ */
+
+ INSERT INTO ticketLog (originFk, userFk, `action`, changedModel, oldInstance, newInstance)
+ SELECT t.id, vUserFk, 'update', 'Ticket', CONCAT('{"clientFk":',t.clientFk,'}'), CONCAT('{"clientFk":',vNewClient,'}')
+ FROM ticket t
+ JOIN tmp.ticket tt
+ ON t.id = tt.ticketFk;
+
+ UPDATE ticket t
+ JOIN tmp.ticket tt
+ ON t.id = tt.ticketFk
+ SET t.clientFk = vNewClient;
+
+ UPDATE ticket t
+ JOIN tmp.ticket tt
+ ON t.id = tt.ticketFk
+ JOIN stowaway s
+ ON s.shipFk = tt.ticketFk
+ SET t.clientFk = vNewClient;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -81761,11 +82381,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_checkFullyControlled`(vWorkerFk INT, vTicketFk INT )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_checkFullyControlled`(vWorkerFk INT, vTicketFk INT )
BEGIN
/**
* Comprueba que no hay ningún ticket pendiente de revisar de alguna colección que haya revisado el trabajador
@@ -81809,11 +82429,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_checkNoComponents`(vShippedFrom DATETIME, vShippedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_checkNoComponents`(vShippedFrom DATETIME, vShippedTo DATETIME)
BEGIN
/**
@@ -81885,13 +82505,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_Clone`(vOriginalTicket INT, OUT vNewTicket INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_Clone`(vOriginalTicket INT, OUT vNewTicket INT)
BEGIN
/**
* Clona el contenido de un ticket en otro
@@ -81968,11 +82588,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_cloneWeekly`(IN vWeek INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_cloneWeekly`(IN vWeek INT)
BEGIN
DECLARE vIsDone BOOL;
DECLARE vLanding DATE;
@@ -82107,151 +82727,6 @@ BEGIN
CLOSE rsTicket;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticket_cloneWeekly__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_cloneWeekly__`(IN vWeek INT)
-BEGIN
- -- si se modifica algo avisad a jgallego
- DECLARE vIsDone BOOL;
- DECLARE vLanding DATE;
- DECLARE vShipment DATE;
- DECLARE vWarehouse INT;
- DECLARE vTicket INT;
- DECLARE vWeekDay INT;
- DECLARE vClient INT;
- DECLARE vEmpresa INT;
- DECLARE vConsignatario INT;
- DECLARE vAgencia INT;
- DECLARE vNewTicket INT;
- DECLARE vYear INT;
-
- DECLARE rsTicket CURSOR FOR
- SELECT tt.ticketFk, tt.weekDay, t.clientFk, t.warehouseFk, t.companyFk, t.addressFk, tt.agencyModeFk
- FROM vn.ticketWeekly tt
- JOIN vn.ticket t ON tt.ticketFk = t.id;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
-
- SET vYear = YEAR(CURDATE()) + IF(vWeek < WEEK(CURDATE()),1, 0);
-
- OPEN rsTicket;
- myLoop: LOOP
- BEGIN
- DECLARE vSalesPersonEmail VARCHAR(150);
- DECLARE vMailSent BOOL;
- DECLARE vSubject VARCHAR(150);
- DECLARE vMessage TEXT;
- /*DECLARE vError TEXT;
- DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
- BEGIN
- GET DIAGNOSTICS CONDITION 1
- vError = MESSAGE_TEXT;
-
- END;*/
-
- SET vIsDone = FALSE;
- FETCH rsTicket INTO vTicket, vWeekDay, vClient, vWarehouse, vEmpresa, vConsignatario, vAgencia;
-
- IF vIsDone THEN
-
- LEAVE myLoop;
- END IF;
- SELECT dated INTO vShipment
- FROM `time`
- WHERE `year` = vYear AND `week` = vWeek
- AND WEEKDAY(dated) = vWeekDay;
-
- -- busca si el ticket ya ha sido clonado
- IF (SELECT COUNT(*) FROM vn.ticket tOrig
- JOIN vn.sale saleOrig ON tOrig.id = saleOrig.ticketFk
- JOIN vn.saleCloned sc ON sc.saleOriginalFk = saleOrig.id
- JOIN vn.sale saleClon ON saleClon.id = sc.saleClonedFk
- JOIN vn.ticket tClon ON tClon.id = saleClon.ticketFk
- WHERE tOrig.id = vTicket AND tClon.isDeleted = FALSE AND DATE(tClon.shipped) = vShipment) > 0
- THEN
- ITERATE myLoop;
- END IF;
- CALL vn.zone_getLanded(vShipment, vConsignatario, vAgencia, vWarehouse,FALSE);
-
- SELECT landed INTO vLanding from tmp.zoneGetLanded LIMIT 1;
- IF (SELECT COUNT(*) FROM agencyMode WHERE id = vAgencia AND name LIKE '%turno%') THEN
- SET vAgencia = NULL;
- END IF;
-
- CALL vn.ticketCreateWithoutZone(vClient, vShipment, vWarehouse, vEmpresa, vConsignatario, vAgencia, NULL, vLanding,account.userGetId(), vNewTicket);
-
- IF (vLanding IS NULL) THEN
-
- SELECT e.email INTO vSalesPersonEmail
- FROM vn.client c
- JOIN vn.worker sp ON sp.id = c.salesPersonFk
- JOIN account.emailUser e ON e.userFk = sp.userFk
- WHERE c.id = vClient;
-
- SET vSubject = CONCAT('Turnos - No se ha podido clonar correctamente el ticket ', vTicket,
- ' para el dia: ', vShipment);
- SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicket,
- ' para el dia: ', vShipment,
- ' porque no hay una zona de envío disponible. Se ha creado el ticket: ', vNewTicket,
- ' pero ha que revisar las fechas y la agencia');
-
- SELECT COUNT(*) INTO vMailSent
- FROM vn.mail
- WHERE sender = vSalesPersonEmail
- AND subject = vSubject;
-
- IF NOT vMailSent THEN
- INSERT INTO vn.mail (`sender`,`subject`,`body`)
- VALUES (vSalesPersonEmail, vSubject, vMessage);
- END IF;
- CALL vn.ticketStateUpdate (vNewTicket, 'FIXING');
- END IF;
-
- INSERT INTO vn.sale (ticketFk, itemFk, concept, quantity, price, discount, priceFixed, isPriceFixed)
- SELECT vNewTicket, saleOrig.itemFk , saleOrig.concept , saleOrig.quantity, saleOrig.price , saleOrig.discount, saleOrig.priceFixed, saleOrig.isPriceFixed
- FROM vn.sale saleOrig
- WHERE saleOrig.ticketFk = vTicket;
-
- INSERT IGNORE INTO vn.saleCloned(saleOriginalFk, saleClonedFk)
- SELECT saleOriginal.id, saleClon.id
- FROM vn.sale saleOriginal
- JOIN vn.sale saleClon ON saleOriginal.itemFk = saleClon.itemFk AND saleOriginal.quantity = saleClon.quantity
- WHERE saleOriginal.ticketFk = vTicket AND saleClon.ticketFk = vNewTicket;
-
- INSERT INTO ticketRequest (description,ordered,shipped,salesPersonCode,buyerCode,quantity,price,itemFk,clientFk,response,
- total,buyed,saleFk)
- SELECT o.description,o.ordered,vShipment,o.salesPersonCode,o.buyerCode,o.quantity,o.price,o.itemFk,o.clientFk,o.response,
- o.total,o.buyed,s2.id
- FROM sale s JOIN ticketRequest o ON o.saleFk = s.id
- JOIN sale s2 ON s.concept = s2.concept AND s.quantity = s2.quantity AND s.itemFk = s2.itemFk
- WHERE s.ticketFk = vTicket AND s2.ticketFk = vNewTicket;
-
- INSERT INTO ticketObservation(ticketFk,observationTypeFk,description) VALUES(vNewTicket,4,CONCAT('turno desde ticket: ',vTicket))
- ON DUPLICATE KEY UPDATE description = CONCAT(ticketObservation.description,VALUES(description),' ');
-
- INSERT INTO ticketObservation(ticketFk,observationTypeFk,description) VALUES(vNewTicket,1,'ATENCION: Contiene lineas de TURNO')
- ON DUPLICATE KEY UPDATE description = CONCAT(ticketObservation.description,VALUES(description),' ');
-
- CALL vn.ticketCalculateClon(vNewTicket, vTicket);
- END;
- END LOOP;
-
- CLOSE rsTicket;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -82262,13 +82737,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_close`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_close`()
BEGIN
/**
* Realiza el cierre de todos los
@@ -82378,13 +82853,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_closeAll__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_closeAll__`()
BEGIN
/**
* Realiza el cierre de todos los
@@ -82505,13 +82980,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_closeByTicket`(IN vTicketFk int)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_closeByTicket`(IN vTicketFk int)
BEGIN
/**
@@ -82550,11 +83025,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentMakeUpdate`(IN vTicketFk INT, IN vClientFk INT,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_componentMakeUpdate`(IN vTicketFk INT, IN vClientFk INT,
IN vNickname VARCHAR(50), IN vAgencyModeFk INT,
IN vAddressFk INT, IN vZoneFk INT, IN vWarehouseFk TINYINT,
IN vCompanyFk SMALLINT, IN vShipped DATETIME,
@@ -82652,13 +83127,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentPreview`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_componentPreview`(
vTicketFk INT,
vLanded DATE,
vAddressFk INT,
@@ -82766,13 +83241,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentPreview__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_componentPreview__`(
vTicketFk INT,
vLanded DATE,
vAddressFk INT,
@@ -82884,13 +83359,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentUpdate__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_componentUpdate__`(
vTicketFk INT,
vClientFk INT,
vAgencyModeFk INT,
@@ -82973,48 +83448,48 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_DelayTruck`(vWarehouserFk INT, vHour INT, vMinute INT)
-BEGIN
-
- DECLARE done INT DEFAULT FALSE;
- DECLARE vTicketFk INT;
- DECLARE cur1 CURSOR FOR SELECT ticketFk FROM tmp.ticket;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-
- CALL vn.productionControl(vWarehouserFk,0) ;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- SELECT ticketFk
- FROM tmp.productionBuffer
- WHERE shipped = curdate()
- AND problem LIKE '%I:%'
- AND (HH <= vHour OR HH = vHour AND mm < vMinute)
- AND alertLevel = 0;
-
- OPEN cur1;
-
- read_loop: LOOP
-
- FETCH cur1 INTO vTicketFk;
-
- IF done THEN
- LEAVE read_loop;
- END IF;
-
- CALL vn.ticket_DelayTruckSplit(vTicketFk);
-
- END LOOP;
-
- CLOSE cur1;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_DelayTruck`(vWarehouserFk INT, vHour INT, vMinute INT)
+BEGIN
+
+ DECLARE done INT DEFAULT FALSE;
+ DECLARE vTicketFk INT;
+ DECLARE cur1 CURSOR FOR SELECT ticketFk FROM tmp.ticket;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+ CALL vn.productionControl(vWarehouserFk,0) ;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+ CREATE TEMPORARY TABLE tmp.ticket
+ SELECT ticketFk
+ FROM tmp.productionBuffer
+ WHERE shipped = curdate()
+ AND problem LIKE '%I:%'
+ AND (HH <= vHour OR HH = vHour AND mm < vMinute)
+ AND alertLevel = 0;
+
+ OPEN cur1;
+
+ read_loop: LOOP
+
+ FETCH cur1 INTO vTicketFk;
+
+ IF done THEN
+ LEAVE read_loop;
+ END IF;
+
+ CALL vn.ticket_DelayTruckSplit(vTicketFk);
+
+ END LOOP;
+
+ CLOSE cur1;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -83025,13 +83500,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_DelayTruckSplit`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_DelayTruckSplit`(vTicketFk INT)
BEGIN
/*
@@ -83097,51 +83572,331 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_doRecalc`()
-proc: BEGIN
-/**
- * Recalculates modified ticket.
- */
-
- DECLARE vDone BOOL;
- DECLARE vTicketFk INT;
-
- DECLARE cCur CURSOR FOR
- SELECT ticketFk FROM ticketRecalc;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND
- SET vDone = TRUE;
-
- DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
- BEGIN
- DO RELEASE_LOCK('vn.ticket_doRecalc');
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_doRecalc`()
+proc: BEGIN
+/**
+ * Recalculates modified ticket.
+ */
+
+ DECLARE vDone BOOL;
+ DECLARE vTicketFk INT;
+
+ DECLARE cCur CURSOR FOR
+ SELECT ticketFk FROM ticketRecalc;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND
+ SET vDone = TRUE;
+
+ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
+ BEGIN
+ DO RELEASE_LOCK('vn.ticket_doRecalc');
ROLLBACK;
- RESIGNAL;
- END;
-
- IF !GET_LOCK('vn.ticket_doRecalc', 0) THEN
- LEAVE proc;
- END IF;
-
- OPEN cCur;
-
- myLoop: LOOP
- SET vDone = FALSE;
- FETCH cCur INTO vTicketFk;
-
- IF vDone THEN
- LEAVE myLoop;
- END IF;
-
- START TRANSACTION;
+ GET DIAGNOSTICS CONDITION 2 @errno = MYSQL_ERRNO, @text = MESSAGE_TEXT;
+ CALL `vn`.`mail_insert`('robert@verdnatura.es',
+ NULL,
+ 'Problema al recalcular el total de ticket',
+ CONCAT('Se ha detectato un problema en ticket_doRecalc al calcular el total del ticket : ',
+ vTicketFk,' el error es el: ',
+ CONCAT('ERROR ', IFNULL(@errno, 0), ': ', ifnull(@text, '')))
+ );
+ RESIGNAL;
+ END;
+
+ IF !GET_LOCK('vn.ticket_doRecalc', 0) THEN
+ LEAVE proc;
+ END IF;
+
+ OPEN cCur;
+
+ myLoop: LOOP
+ SET vDone = FALSE;
+ FETCH cCur INTO vTicketFk;
+
+ IF vDone THEN
+ LEAVE myLoop;
+ END IF;
+
+ START TRANSACTION;
CALL ticket_recalc(vTicketFk);
- COMMIT;
-
+
DELETE FROM ticketRecalc WHERE ticketFk = vTicketFk;
- END LOOP;
+ COMMIT;
+ END LOOP;
+
+ CLOSE cCur;
+ DO RELEASE_LOCK('vn.ticket_doRecalc');
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticket_doRefund` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_doRefund`(IN vOriginTicket INT, OUT vNewTicket INT)
+BEGIN
+
+ DECLARE vDone BIT DEFAULT 0;
+ DECLARE vCustomer MEDIUMINT;
+ DECLARE vWarehouse TINYINT;
+ DECLARE vCompany MEDIUMINT;
+ DECLARE vAddress MEDIUMINT;
+ DECLARE vRefundAgencyMode INT;
+ DECLARE vItemFk INT;
+ DECLARE vQuantity DECIMAL (10,2);
+ DECLARE vConcept VARCHAR(50);
+ DECLARE vPrice DECIMAL (10,2);
+ DECLARE vDiscount TINYINT;
+ DECLARE vSaleNew INT;
+ DECLARE vSaleMain INT;
+ DECLARE vZoneFk INT;
+
+ DECLARE vRsMainTicket CURSOR FOR
+ SELECT *
+ FROM tmp.sale;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
+
+ SELECT id INTO vRefundAgencyMode
+ FROM agencyMode WHERE `name` = 'ABONO';
- CLOSE cCur;
- DO RELEASE_LOCK('vn.ticket_doRecalc');
+ SELECT clientFk, warehouseFk, companyFk, addressFk
+ INTO vCustomer, vWarehouse, vCompany, vAddress
+ FROM ticket
+ WHERE id = vOriginTicket;
+
+ SELECT id INTO vZoneFk
+ FROM zone WHERE agencyModeFk = vRefundAgencyMode
+ LIMIT 1;
+
+ INSERT INTO vn.ticket (
+ clientFk,
+ shipped,
+ addressFk,
+ agencyModeFk,
+ nickname,
+ warehouseFk,
+ companyFk,
+ landed,
+ zoneFk
+ )
+ SELECT
+ vCustomer,
+ CURDATE(),
+ vAddress,
+ vRefundAgencyMode,
+ a.nickname,
+ vWarehouse,
+ vCompany,
+ CURDATE(),
+ vZoneFk
+ FROM address a
+ WHERE a.id = vAddress;
+
+ SET vNewTicket = LAST_INSERT_ID();
+
+ SET vDone := 0;
+ OPEN vRsMainTicket ;
+ FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
+
+ WHILE NOT vDone DO
+
+ INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount)
+ VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount );
+
+ SET vSaleNew = LAST_INSERT_ID();
+
+ INSERT INTO vn.saleComponent(saleFk,componentFk,`value`)
+ SELECT vSaleNew,componentFk,`value`
+ FROM vn.saleComponent
+ WHERE saleFk = vSaleMain;
+
+ FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
+
+ END WHILE;
+ CLOSE vRsMainTicket;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticket_getFromFloramondo` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getFromFloramondo`(vDateFrom DATE, vDateTo DATE)
+BEGIN
+
+/**
+ * Genera una tabla con la lista de tickets de Floramondo para una fecha determinada
+ * @param vDated Fecha de preparación de los pedidos
+ * @return tmp.ticketFloramondo(ticketFk, clientName, agencyName, freight, expeditionCount, margin, trolleys, pallets)
+ */
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketFloramondo;
+ CREATE TEMPORARY TABLE tmp.ticketFloramondo
+ (ticketFk INT PRIMARY KEY,
+ clientName VARCHAR(50),
+ agencyName VARCHAR(50),
+ freight DECIMAL(10,2) DEFAULT 0,
+ expeditionCount INT,
+ margin DECIMAL(10,3) DEFAULT 0,
+ trolleys INT DEFAULT 0,
+ shipped DATE,
+ pallets INT DEFAULT 0)
+ ENGINE = MEMORY;
+
+ INSERT INTO tmp.ticketFloramondo(ticketFk, clientName, agencyName, shipped)
+ SELECT t.id ticketFk, t.nickname , am.name, t.shipped
+ FROM vn.ticket t
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ JOIN vn.warehouse w ON w.id = t.warehouseFk AND w.code IN ('VNH','FLM')
+ AND t.shipped BETWEEN vDateFrom AND TIMESTAMPADD(HOUR, 23, vDateTo);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+ CREATE TEMPORARY TABLE tmp.ticket
+ (ticketFk INT(11) PRIMARY KEY)
+ SELECT ticketFk
+ FROM tmp.ticketFloramondo;
+
+ -- Freight
+ UPDATE tmp.ticketFloramondo tf
+ JOIN (SELECT SUM(sc.value * s.quantity) freight, t.ticketFk
+ FROM vn.saleComponent sc
+ JOIN vn.component c ON c.id = sc.componentFk
+ JOIN vn.componentType ct ON ct.id = c.typeFk
+ JOIN vn.sale s ON s.id = sc.saleFk
+ JOIN tmp.ticket t ON t.ticketFk = s.ticketFk
+ WHERE ct.code = 'FREIGHT'
+ GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
+ SET tf.freight = sb.freight;
+
+ -- Freight service
+ UPDATE tmp.ticketFloramondo tf
+ JOIN (SELECT SUM(ts.price * ts.quantity) service, t.ticketFk
+ FROM vn.ticketService ts
+ JOIN tmp.ticket t ON t.ticketFk = ts.ticketFk
+ GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
+ SET tf.freight = tf.freight + sb.service;
+
+ -- Expedition Count
+ UPDATE tmp.ticketFloramondo tf
+ JOIN (SELECT COUNT(e.id) expeditionCount, t.ticketFk
+ FROM vn.expedition e
+ RIGHT JOIN tmp.ticket t ON t.ticketFk = e.ticketFk
+ GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
+ SET tf.expeditionCount = sb.expeditionCount;
+
+ -- Margin
+ UPDATE tmp.ticketFloramondo tf
+ JOIN (SELECT SUM(IF(ct.code = 'COST',sc.value, 0)) cost,
+ SUM(IF(ct.isMargin, sc.value, 0)) margin,
+ t.ticketFk
+ FROM vn.saleComponent sc
+ JOIN vn.component c ON c.id = sc.componentFk
+ JOIN vn.componentType ct ON ct.id = c.typeFk
+ JOIN vn.sale s ON s.id = sc.saleFk
+ JOIN tmp.ticket t ON t.ticketFk = s.ticketFk
+ GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
+ SET tf.margin = sb.margin / sb.cost;
+
+ -- Trolleys
+ UPDATE tmp.ticketFloramondo tf
+ JOIN (SELECT SUM(tp.quantity) trolleys, t.ticketFk
+ FROM vn.ticketPackaging tp
+ JOIN tmp.ticket t ON t.ticketFk = tp.ticketFk
+ JOIN vn.packaging p ON p.id = tp.packagingFk
+ WHERE p.isTrolley
+ GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
+ SET tf.trolleys = sb.trolleys;
+
+ -- Pallets
+ UPDATE tmp.ticketFloramondo tf
+ JOIN (SELECT SUM(tp.quantity) pallets, t.ticketFk
+ FROM vn.ticketPackaging tp
+ JOIN tmp.ticket t ON t.ticketFk = tp.ticketFk
+ JOIN vn.packaging p ON p.id = tp.packagingFk
+ WHERE p.isPallet
+ GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
+ SET tf.pallets = sb.pallets;
+
+ SELECT * FROM tmp.ticketFloramondo;
+
+ DROP TEMPORARY TABLE tmp.ticket;
+ DROP TEMPORARY TABLE tmp.ticketFloramondo;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticket_getMovable` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getMovable`(vTicketFk INT, vDatedNew DATETIME, vWarehouseFk INT)
+BEGIN
+/**
+ * Cálcula el stock movible para los artículos de un ticket
+ * vDatedNew debe ser menor que vDatedOld, en los otros casos se
+ * asume que siempre es posible
+ *
+ * @param vTicketFk -> Ticket
+ * @param vDatedNew -> Nueva fecha
+ * @return Sales con Movible
+*/
+ DECLARE vDatedOld DATETIME;
+ SET vDatedNew = DATE_ADD(vDatedNew, INTERVAL 1 DAY);
+
+ SELECT t.shipped INTO vDatedOld
+ FROM ticket t
+ WHERE t.id = vTicketFk;
+
+ CALL itemStock(vWarehouseFk, vDatedNew, NULL);
+ CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(DATE_SUB(vDatedOld, INTERVAL 1 DAY), vDatedNew), NULL);
+
+ SELECT s.id,
+ s.itemFk,
+ s.quantity,
+ s.concept,
+ s.price,
+ s.reserved,
+ s.discount,
+ i.image,
+ i.subName,
+ il.stock + IFNULL(im.amount, 0) AS movable
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk AND im.warehouseFk = vWarehouseFk
+ LEFT JOIN tmp.itemList il ON il.itemFk = s.itemFk
+ WHERE t.id = vTicketFk;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.itemList;
+ DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -83152,13 +83907,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_getProblems`(IN vIsTodayRelative tinyint(1))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getProblems`(IN vIsTodayRelative tinyint(1))
BEGIN
/**
* Calcula los problemas para un conjunto de tickets.
@@ -83213,13 +83968,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_getProblems__`(IN vIsTodayRelative tinyint(1))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getProblems__`(IN vIsTodayRelative tinyint(1))
BEGIN
/**
* Calcula los problemas para un conjunto de tickets.
@@ -83274,11 +84029,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_getShip`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getShip`(vTicketFk INT)
BEGIN
SELECT s.shipFk FROM vn.stowaway s
WHERE s.id = vTicketFk;
@@ -83296,9 +84051,9 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_getTax`(IN vTaxArea VARCHAR(25))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getTax`(IN vTaxArea VARCHAR(25))
BEGIN
/**
* Calcula la base imponible, el IVA y el recargo de equivalencia para
@@ -83410,11 +84165,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_getTax__`(vTaxArea VARCHAR(25))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getTax__`(vTaxArea VARCHAR(25))
READS SQL DATA
BEGIN
/**
@@ -83520,13 +84275,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_insertZone`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_insertZone`()
BEGIN
DECLARE vDone INT DEFAULT 0;
DECLARE vFechedTicket INT;
@@ -83563,30 +84318,31 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_merge`(vSelf INT, vTicketTargetFk INT)
-BEGIN
-
- /* Fusiona el primer ticket al segundo
- *
- * @param vSelf Número de ticket a fusionar
- * @param vTicketTargetFk Ticket destino
- *
- */
-
- UPDATE vn.sale s
- SET s.ticketFk = vTicketTargetFk
- WHERE s.ticketFk = vSelf;
-
- UPDATE vn.ticket t
- SET t.shipped = TIMESTAMPADD(YEAR, - YEAR(NOW()) MOD 2000, t.shipped )
- WHERE t.id = vSelf;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_merge`(vSelf INT, vTicketTargetFk INT)
+BEGIN
+
+ /**
+ * Fusiona el primer ticket al segundo
+ *
+ * @param vSelf Número de ticket a fusionar
+ * @param vTicketTargetFk Ticket destino
+ *
+ */
+
+ UPDATE vn.sale s
+ SET s.ticketFk = vTicketTargetFk
+ WHERE s.ticketFk = vSelf;
+
+ UPDATE vn.ticket t
+ SET t.shipped = TIMESTAMPADD(YEAR, - YEAR(NOW()) MOD 2000, t.shipped )
+ WHERE t.id = vSelf;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -83599,11 +84355,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_priceDifference`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_priceDifference`(
vTicketFk INT,
vLanded DATE,
vAddressFk INT,
@@ -83654,35 +84410,35 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalc`(vTicketId INT)
-BEGIN
-/**
- * Calcula y guarda el total con/sin IVA en un ticket.
- *
- * @param vTicketId Identificador del ticket
- */
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
- CREATE TEMPORARY TABLE tmp.ticket
- ENGINE = MEMORY
- SELECT vTicketId ticketFk;
-
- CALL ticketGetTotal;
-
- UPDATE ticket t
- JOIN tmp.ticketTotal tt ON tt.ticketFk = t.id
- SET t.totalWithVat = tt.total,
- t.totalWithoutVat = tt.totalWithoutVat;
-
- DROP TEMPORARY TABLE
- tmp.ticket,
- tmp.ticketTotal;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_recalc`(vTicketId INT)
+BEGIN
+/**
+ * Calcula y guarda el total con/sin IVA en un ticket.
+ *
+ * @param vTicketId Identificador del ticket
+ */
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+ CREATE TEMPORARY TABLE tmp.ticket
+ ENGINE = MEMORY
+ SELECT vTicketId ticketFk;
+
+ CALL ticketGetTotal;
+
+ UPDATE ticket t
+ JOIN tmp.ticketTotal tt ON tt.ticketFk = t.id
+ SET t.totalWithVat = tt.total,
+ t.totalWithoutVat = tt.totalWithoutVat;
+
+ DROP TEMPORARY TABLE
+ tmp.ticket,
+ tmp.ticketTotal;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -83693,98 +84449,98 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalcComponents`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN)
-proc: BEGIN
-
-/**
- * Este procedimiento recalcula los componentes de un ticket,
- * eliminando los componentes existentes e insertandolos de nuevo
- *
- * @param vTicketFk Id del ticket
- * @param vIsTicketEditable si no se quiere forzar llamar con NULL
- */
- DECLARE vShipped DATE;
- DECLARE vWarehouseFk SMALLINT;
- DECLARE vAgencyModeFk INT;
- DECLARE vAddressFk INT;
- DECLARE vLanded DATE;
- DECLARE vZoneFk INTEGER;
-
- IF vIsTicketEditable IS NULL THEN
- SELECT IFNULL(ts.alertLevel,0) = 0 AND IFNULL(t.refFk,'') = ''
- INTO vIsTicketEditable
- FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
- WHERE id = vTicketFk;
- END IF;
-
- SELECT t.warehouseFk,
- t.shipped,
- t.addressFk,
- t.agencyModeFk,
- t.landed,
- t.zoneFk
- INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded, vZoneFk
- FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
- WHERE t.id = vTicketFk;
-
- CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk, TRUE);
-
- IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) = 0 THEN
- CALL util.throw('There is no zone for these parameters');
- END IF;
-
- IF vLanded IS NULL OR vZoneFk IS NULL THEN
-
- UPDATE ticket t
- SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1)
- WHERE t.id = vTicketFk AND t.landed IS NULL;
-
- IF vZoneFk IS NULL THEN
- SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
- UPDATE ticket t
- SET t.zoneFk = vZoneFk
- WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
- END IF;
-
- END IF;
-
- DROP TEMPORARY TABLE tmp.zoneGetLanded;
-
- -- rellena la tabla buyUltimate con la ultima compra
- CALL buyUltimate (vWarehouseFk, vShipped);
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
- CREATE TEMPORARY TABLE tmp.ticketLot
- SELECT vWarehouseFk warehouseFk, NULL available,
- s.itemFk, bu.buyFk, vZoneFk zoneFk
- FROM sale s
- LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
- WHERE s.ticketFk = vTicketFk
- GROUP BY s.itemFk;
-
- CALL catalog_componentPrepare();
- CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale;
- CREATE TEMPORARY TABLE tmp.sale
- (PRIMARY KEY (saleFk)) ENGINE = MEMORY
- SELECT id saleFk, vWarehouseFk warehouseFk
- FROM sale s
- WHERE s.ticketFk = vTicketFk;
-
- -- si el ticket esta facturado, respeta los precios
- CALL ticketComponentUpdateSale(IF(vIsTicketEditable, 1, 6));
-
- CALL catalog_componentPurge();
- DROP TEMPORARY TABLE
- tmp.buyUltimate,
- tmp.sale;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_recalcComponents`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN)
+proc: BEGIN
+
+/**
+ * Este procedimiento recalcula los componentes de un ticket,
+ * eliminando los componentes existentes e insertandolos de nuevo
+ *
+ * @param vTicketFk Id del ticket
+ * @param vIsTicketEditable si no se quiere forzar llamar con NULL
+ */
+ DECLARE vShipped DATE;
+ DECLARE vWarehouseFk SMALLINT;
+ DECLARE vAgencyModeFk INT;
+ DECLARE vAddressFk INT;
+ DECLARE vLanded DATE;
+ DECLARE vZoneFk INTEGER;
+
+ IF vIsTicketEditable IS NULL THEN
+ SELECT IFNULL(ts.alertLevel,0) = 0 AND IFNULL(t.refFk,'') = ''
+ INTO vIsTicketEditable
+ FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
+ WHERE id = vTicketFk;
+ END IF;
+
+ SELECT t.warehouseFk,
+ t.shipped,
+ t.addressFk,
+ t.agencyModeFk,
+ t.landed,
+ t.zoneFk
+ INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded, vZoneFk
+ FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
+ WHERE t.id = vTicketFk;
+
+ CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk, TRUE);
+
+ IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) = 0 THEN
+ CALL util.throw('There is no zone for these parameters');
+ END IF;
+
+ IF vLanded IS NULL OR vZoneFk IS NULL THEN
+
+ UPDATE ticket t
+ SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1)
+ WHERE t.id = vTicketFk AND t.landed IS NULL;
+
+ IF vZoneFk IS NULL THEN
+ SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
+ UPDATE ticket t
+ SET t.zoneFk = vZoneFk
+ WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
+ END IF;
+
+ END IF;
+
+ DROP TEMPORARY TABLE tmp.zoneGetLanded;
+
+ -- rellena la tabla buyUltimate con la ultima compra
+ CALL buyUltimate (vWarehouseFk, vShipped);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+ CREATE TEMPORARY TABLE tmp.ticketLot
+ SELECT vWarehouseFk warehouseFk, NULL available,
+ s.itemFk, bu.buyFk, vZoneFk zoneFk
+ FROM sale s
+ LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
+ WHERE s.ticketFk = vTicketFk
+ GROUP BY s.itemFk;
+
+ CALL catalog_componentPrepare();
+ CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+ CREATE TEMPORARY TABLE tmp.sale
+ (PRIMARY KEY (saleFk)) ENGINE = MEMORY
+ SELECT id saleFk, vWarehouseFk warehouseFk
+ FROM sale s
+ WHERE s.ticketFk = vTicketFk;
+
+ -- si el ticket esta facturado, respeta los precios
+ CALL ticketComponentUpdateSale(IF(vIsTicketEditable, 1, 6));
+
+ CALL catalog_componentPurge();
+ DROP TEMPORARY TABLE
+ tmp.buyUltimate,
+ tmp.sale;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -83795,13 +84551,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalcComponentsForcePrice__`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN )
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_recalcComponentsForcePrice__`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN )
proc: BEGIN
/**
@@ -83879,13 +84635,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalcComponents__`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_recalcComponents__`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN)
proc: BEGIN
/**
@@ -83997,17 +84753,55 @@ DELIMITER ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_requestRecalc`(vSelf INT)
-proc: BEGIN
-/**
- * Adds a request to recalculate the ticket total.
- *
- * @param vSelf The ticket identifier
- */
- IF vSelf IS NULL THEN
- LEAVE proc;
- END IF;
-
- INSERT IGNORE INTO ticketRecalc SET ticketFk = vSelf;
+proc: BEGIN
+/**
+ * Adds a request to recalculate the ticket total.
+ *
+ * @param vSelf The ticket identifier
+ */
+ IF vSelf IS NULL THEN
+ LEAVE proc;
+ END IF;
+
+ INSERT IGNORE INTO ticketRecalc SET ticketFk = vSelf;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticket_setNextState` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setNextState`(vSelf INT)
+BEGIN
+/**
+ * Cambia el estado del ticket al siguiente estado según la tabla state
+ *
+ * @param vSelf id dle ticket
+ */
+ DECLARE vStateFk INT;
+ DECLARE vNewStateFk INT;
+
+ SELECT stateFk INTO vStateFk
+ FROM ticketState
+ WHERE ticketFk = vSelf;
+
+ SELECT nextStateFk INTO vNewStateFk
+ FROM state
+ WHERE id = vStateFk;
+
+ INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
+ VALUES (vNewStateFk, vSelf, account.myUser_getId());
+
+ SELECT TRUE AS IsUpdated;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -84020,45 +84814,45 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_setPreviousState`(vTicketFk INT)
-BEGIN
-
- DECLARE vControlFk INT;
-
- SELECT MAX(inter_id) INTO vControlFk
- FROM vncontrol.inter
- WHERE Id_Ticket = vTicketFk;
-
- IF (SELECT s.code
- FROM vn.state s
- JOIN vncontrol.inter i ON i.state_id = s.id
- WHERE i.inter_id = vControlFk)
- = 'PREVIOUS_PREPARATION' THEN
-
- SELECT inter_id
- INTO vControlFk
- FROM vncontrol.inter i
- JOIN vn.state s ON i.state_id = s.id
- WHERE Id_Ticket = vTicketFk
- AND inter_id < vControlFk
- AND s.code != 'PREVIOUS_PREPARATION'
- ORDER BY inter_id DESC
- LIMIT 1;
-
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT s.nextStateFk, i.Id_Ticket, account.myUser_getId()
- FROM vncontrol.inter i
- JOIN vn.state s ON i.state_id = s.id
- WHERE inter_id = vControlFk;
-
- END IF;
-
- SELECT TRUE AS IsUpdated;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setPreviousState`(vTicketFk INT)
+BEGIN
+
+ DECLARE vControlFk INT;
+
+ SELECT MAX(inter_id) INTO vControlFk
+ FROM vncontrol.inter
+ WHERE Id_Ticket = vTicketFk;
+
+ IF (SELECT s.code
+ FROM vn.state s
+ JOIN vncontrol.inter i ON i.state_id = s.id
+ WHERE i.inter_id = vControlFk)
+ = 'PREVIOUS_PREPARATION' THEN
+
+ SELECT inter_id
+ INTO vControlFk
+ FROM vncontrol.inter i
+ JOIN vn.state s ON i.state_id = s.id
+ WHERE Id_Ticket = vTicketFk
+ AND inter_id < vControlFk
+ AND s.code != 'PREVIOUS_PREPARATION'
+ ORDER BY inter_id DESC
+ LIMIT 1;
+
+ INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
+ SELECT s.nextStateFk, i.Id_Ticket, account.myUser_getId()
+ FROM vncontrol.inter i
+ JOIN vn.state s ON i.state_id = s.id
+ WHERE inter_id = vControlFk;
+
+ END IF;
+
+ SELECT TRUE AS IsUpdated;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -84071,35 +84865,35 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_setState`(vTicketFk INT, vStateCode VARCHAR(45))
-BEGIN
-
- /* Modifica el estado de un ticket
- *
- * @param vTicketFk el id del ticket
- * @param vStateCode estado a modificar del ticket
- *
- */
-
- DECLARE vAlertLevel INT;
-
- SELECT s.alertLevel INTO vAlertLevel
- FROM vn.state s
- JOIN vn.ticketState ts ON ts.stateFk = s.id
- WHERE ts.ticketFk = vTicketFk;
-
- IF !(vStateCode = 'ON_CHECKING' AND vAlertLevel > 1) THEN
-
- INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
- SELECT id, vTicketFk, account.myUser_getId()
- FROM vn.state
- WHERE `code` = vStateCode collate utf8_unicode_ci;
-
- END IF;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setState`(vTicketFk INT, vStateCode VARCHAR(45))
+BEGIN
+
+ /* Modifica el estado de un ticket
+ *
+ * @param vTicketFk el id del ticket
+ * @param vStateCode estado a modificar del ticket
+ *
+ */
+
+ DECLARE vAlertLevel INT;
+
+ SELECT s.alertLevel INTO vAlertLevel
+ FROM vn.state s
+ JOIN vn.ticketState ts ON ts.stateFk = s.id
+ WHERE ts.ticketFk = vTicketFk;
+
+ IF !(vStateCode = 'ON_CHECKING' AND vAlertLevel > 1) THEN
+
+ INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
+ SELECT id, vTicketFk, account.myUser_getId()
+ FROM vn.state
+ WHERE `code` = vStateCode collate utf8_unicode_ci;
+
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -84110,13 +84904,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_splitItemPackingType`(vTicketFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_splitItemPackingType`(vTicketFk INT)
proc:BEGIN
/*
@@ -84149,7 +84943,9 @@ proc:BEGIN
FROM vn.sale s
JOIN vn.item i ON i.id = s.itemFk
JOIN vn.saleVolume sv ON sv.saleFk = s.id
- WHERE s.ticketFk = vTicketFk;
+ LEFT JOIN vn.saleTracking st ON st.saleFk = s.id
+ WHERE s.ticketFk = vTicketFk
+ AND ISNULL(st.id);
DROP TEMPORARY TABLE IF EXISTS tmp.saleGroup;
CREATE TEMPORARY TABLE tmp.saleGroup
@@ -84237,13 +85033,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_splitPackingComplete`(vTicketFk INT, vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_splitPackingComplete`(vTicketFk INT, vSectorFk INT)
BEGIN
DECLARE vNeedToSplit BOOLEAN;
@@ -84292,13 +85088,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_WeightDeclaration`(vClientFk INT, vDated DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_WeightDeclaration`(vClientFk INT, vDated DATE)
BEGIN
DECLARE vTheorycalWeight DECIMAL(10,2);
@@ -84357,11 +85153,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeBusiness_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
@@ -84462,11 +85258,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeBusiness_calculateAll`(vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateAll`(vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
@@ -84496,13 +85292,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeBusiness_calculateByDepartment`(vDepartmentFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateByDepartment`(vDepartmentFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
@@ -84541,13 +85337,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeBusiness_calculateByUser`(vUserFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateByUser`(vUserFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
@@ -84576,13 +85372,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeBusiness_calculateByWorker`(vWorkerFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateByWorker`(vWorkerFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
@@ -84615,11 +85411,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeBusiness_calculate__`(vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculate__`(vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
@@ -84721,51 +85517,181 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeControl_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
+/*
+ * @param vDatedFrom
+ * @param vDatedTo
+ * Calculo de horas trabajadas por empleado y dia, sin tener encuenta los dias con fichadas incorrectas
+ * segun la tabla tmp.timeControlError
+ * @return tmp.timeControlCalculate (workerFk, dated, timeWorkSeconds, timeWorkSexagesimal, timeWorkDecimal, timed)
+ */
+ DECLARE vHourToSeconds INTEGER;
+ DECLARE vDatedFromYesterday DATETIME;
+ DECLARE vDatedToTomorrow DATETIME;
+ DECLARE vTimeToBreakTime INT;
+ DECLARE vBreakTime INT;
+
+ SELECT DATE_SUB(vDatedFrom, INTERVAL 1 DAY), DATE_ADD(vDatedTo, INTERVAL 1 DAY)
+ INTO vDatedFromYesterday, vDatedToTomorrow;
+
+ SELECT timeToBreakTime, breakTime INTO vTimeToBreakTime, vBreakTime
+ FROM workerTimeControlConfig LIMIT 1;
+
+ CALL timeControl_getError(vDatedFrom, vDatedTo);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControl;
+ CREATE TEMPORARY TABLE tmp.workerTimeControl
+ (INDEX (userFk), INDEX (timed))
+ ENGINE = MEMORY
+ SELECT DISTINCT(wtc.id),
+ wtc.userFk,
+ wtc.timed,
+ wtc.direction,
+ TRUE isReal
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` w ON w.userFk = wtc.userFk
+ LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
+ WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ AND tce.id IS NULL
+ ORDER BY wtc.userFk, wtc.timed ASC;
+
+ SELECT MAX(id) INTO @vCont
+ FROM tmp.workerTimeControl;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux;
+ CREATE TEMPORARY TABLE tmp.workerTimeControlAux (
+ `id` int(11) ,
+ `userFk` int(10) unsigned ,
+ `timed` datetime,
+ `direction` enum('in', 'out','middle')
+ ) ENGINE=MEMORY;
+
+
+ SET @counter := 0;
+ SET @vIsOdd := FALSE;
+
+ -- Cambio de dia en medio de un descanso
+ INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
+ SELECT @vCont:= @vCont + 1 id, userFk, util.dayEnd(dated) timed, 'middle' direction
+ FROM(SELECT wtc.userFk,
+ DATE(@lastTimed) dated,
+ (@vIsOdd := NOT @vIsOdd) isOdd,
+ IF(@vIsOdd AND wtc.direction = 'middle' AND DATE(timed) <> DATE(@lastTimed), TRUE, FALSE) hasBreak,
+ @lastTimed := wtc.timed
+ FROM tmp.workerTimeControl wtc
+ ORDER BY wtc.userFk, wtc.timed
+ )sub
+ WHERE hasBreak;
+
+ SET @counter := 0;
+ SET @vIsOdd := FALSE;
+
+ INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
+ SELECT @vCont:= @vCont + 1, userFk, DATE_ADD(sub.dated, INTERVAL 1 DAY), 'middle'
+ FROM(SELECT wtc.userFk,
+ DATE(@lastTimed) dated,
+ (@vIsOdd := NOT @vIsOdd) isOdd,
+ IF(@vIsOdd AND wtc.direction = 'middle' AND DATE(timed) <> DATE(@lastTimed), TRUE, FALSE) hasBreak,
+ @lastTimed := wtc.timed
+ FROM tmp.workerTimeControl wtc
+ ORDER BY wtc.userFk, wtc.timed
+ )sub
+ WHERE hasBreak;
+
+ -- Cambio de dia
+ INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
+ SELECT @vCont:= @vCont + 1 id, sub.userFk, util.dayEnd(sub.dated) timed, 'out' direction
+ FROM (SELECT MAX(wtc.timed) timed, wtc.userFk, date(wtc.timed) dated
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` w ON w.userFk = wtc.userFk
+ LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
+ WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ AND tce.id IS NULL
+ GROUP BY wtc.userFk, DATE(wtc.timed)
+ ) sub
+ JOIN tmp.workerTimeControl wtc ON wtc.timed = sub.timed AND wtc.userFk = sub.userFk
+ WHERE wtc.direction <> 'out';
+
+ INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
+ SELECT @vCont:= @vCont + 1, sub.userFk, DATE_ADD(sub.dated, INTERVAL 1 DAY), 'in'
+ FROM (SELECT MAX(wtc.timed) timed, wtc.userFk, date(wtc.timed) dated
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` w ON w.userFk = wtc.userFk
+ LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
+ WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ AND tce.id IS NULL
+ GROUP BY wtc.userFk, DATE(wtc.timed)
+ ) sub
+ JOIN tmp.workerTimeControl wtc ON wtc.timed = sub.timed AND wtc.userFk = sub.userFk
+ WHERE wtc.direction <> 'out';
+
+ INSERT INTO tmp.workerTimeControl (id, userFk, timed, direction, isReal)
+ SELECT id, userFk, timed, direction, FALSE FROM tmp.workerTimeControlAux;
+
+ SET vHourToSeconds = 3600;
SET @vIsOdd := TRUE;
- SET @vUser := NULL;
- SET @vDated := NULL;
-
+ SET @vDated := 0;
+ SET @vLastTimed := 0;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.workerBreakDays;
+ CREATE TEMPORARY TABLE tmp.workerBreakDays
+ (INDEX (userFk), INDEX (dated))
+ ENGINE = MEMORY
+ SELECT sub.userFk, sub.dated
+ FROM (SELECT (@vIsOdd := NOT @vIsOdd),
+ IF(wtc.direction = 'in', @vIsOdd := TRUE, NULL),
+ IF(@vIsOdd, @vLastTimed := UNIX_TIMESTAMP(wtc.timed), NULL),
+ IF(@vIsOdd, 0, UNIX_TIMESTAMP(wtc.timed) - @vLastTimed) timeWork,
+ IF(direction='in', @vDated := DATE(wtc.timed), @vDated) dated,
+ wtc.userFk
+ FROM tmp.workerTimeControl wtc
+ ORDER BY wtc.userFk, wtc.timed, wtc.id
+ )sub
+ GROUP BY sub.userFk, sub.dated
+ HAVING SUM(sub.timeWork) >= vTimeToBreakTime;
+
+ SET @vIsOdd := TRUE;
+ SET @vDated := 0;
+ SET @vLastTimed := 0;
+
DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
-
+
CREATE TEMPORARY TABLE tmp.timeControlCalculate
- SELECT
- userFk,
- dated,
- IF( timeWork >= 18000, @timeWork:=timeWork + 1200, @timeWork:=timeWork) timeWorkSeconds,
- SEC_TO_TIME(@timeWork ) timeWorkSexagesimal,
- @timeWork / 3600 timeWorkDecimal,
- timed
- FROM (SELECT SUM(timeWork) timeWork,
- userFk,
- dated,
- GROUP_CONCAT(DATE_FORMAT(sub.timed,"%H:%i") ORDER BY sub.timed ASC SEPARATOR ' - ') timed
- FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk),
- IF(@vIsOdd, @vIsOdd := FALSE, @vIsOdd := TRUE),
- IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd),
- IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed:=@vLastTimed),
- IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed)-@vLastTimed) timeWork,
- IF(direction='in', @vDated := DATE(wtc.timed), @vDated :=@vDated) dated,
- wtc.timed timed,
- wtc.userFk,
- direction
- FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction
- FROM workerTimeControl wtc
- JOIN tmp.`user` w ON w.userFk = wtc.userFk
- WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo
- ORDER BY userFk, timed ASC
- ) wtc
- WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo
- ) sub
- GROUP BY userFk, dated
- )sub2;
+ (INDEX (userFk, dated))
+ ENGINE = MEMORY
+ SELECT sub.userFk,
+ sub.dated,
+ IF(wb.userFk, vBreakTime, 0) + SUM(sub.timeWork) timeWorkSeconds,
+ SEC_TO_TIME(IF(wb.userFk, vBreakTime, 0) + SUM(sub.timeWork)) timeWorkSexagesimal,
+ (IF(wb.userFk, vBreakTime, 0) + SUM(sub.timeWork)) / vHourToSeconds timeWorkDecimal,
+ CAST(GROUP_CONCAT(DATE_FORMAT(sub.realTimed, "%H:%i") ORDER BY sub.timed ASC SEPARATOR ' - ') AS CHAR(256)) timed
+ FROM (SELECT (@vIsOdd := NOT @vIsOdd),
+ IF(direction='in', @vIsOdd := TRUE, 0),
+ IF(@vIsOdd, @vLastTimed := UNIX_TIMESTAMP(timed), 0),
+ IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed) - @vLastTimed) timeWork,
+ timed,
+ userFk,
+ DATE(timed) dated,
+ IF(isReal, timed, NULL) realTimed
+ FROM tmp.workerTimeControl
+ WHERE timed BETWEEN vDatedFromYesterday AND vDatedTo
+ ORDER BY userFk, timed, id
+ )sub
+ LEFT JOIN tmp.workerBreakDays wb ON wb.userFk = sub.userFk AND wb.dated = sub.dated
+ WHERE sub.timed BETWEEN vDatedFrom AND vDatedTo
+ GROUP BY sub.userFk, sub.dated;
+
+ DROP TEMPORARY TABLE tmp.workerBreakDays;
+ DROP TEMPORARY TABLE tmp.timeControlError;
+ DROP TEMPORARY TABLE tmp.workerTimeControlAux;
+ DROP TEMPORARY TABLE tmp.workerTimeControl;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -84776,13 +85702,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeControl_calculateAll`(vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateAll`(vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
@@ -84812,13 +85738,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeControl_calculateByDepartment`(vDepartmentFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateByDepartment`(vDepartmentFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
@@ -84857,13 +85783,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeControl_calculateByUser`(vUserFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateByUser`(vUserFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
@@ -84892,13 +85818,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeControl_calculateByWorker`(vWorkerFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateByWorker`(vWorkerFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
@@ -84919,6 +85845,138 @@ BEGIN
DROP TEMPORARY TABLE tmp.`user`;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `timeControl_calculate__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculate__`(vDatedFrom DATETIME, vDatedTo DATETIME)
+BEGIN
+ SET @vIsOdd := TRUE;
+ SET @vUser := NULL;
+ SET @vDated := NULL;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
+
+ CREATE TEMPORARY TABLE tmp.timeControlCalculate
+ SELECT
+ userFk,
+ dated,
+ IF( timeWork >= 18000, @timeWork:=timeWork + 1200, @timeWork:=timeWork) timeWorkSeconds,
+ SEC_TO_TIME(@timeWork ) timeWorkSexagesimal,
+ @timeWork / 3600 timeWorkDecimal,
+ timed
+ FROM (SELECT SUM(timeWork) timeWork,
+ userFk,
+ dated,
+ GROUP_CONCAT(DATE_FORMAT(sub.timed,"%H:%i") ORDER BY sub.timed ASC SEPARATOR ' - ') timed
+ FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk),
+ IF(@vIsOdd, @vIsOdd := FALSE, @vIsOdd := TRUE),
+ IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd),
+ IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed:=@vLastTimed),
+ IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed)-@vLastTimed) timeWork,
+ IF(direction='in', @vDated := DATE(wtc.timed), @vDated) dated,
+ wtc.timed timed,
+ wtc.userFk,
+ direction
+ FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` w ON w.userFk = wtc.userFk
+ WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo
+ ORDER BY userFk, timed ASC
+ ) wtc
+ WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo
+ ) sub
+ GROUP BY userFk, dated
+ )sub2;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `timeControl_getError` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_getError`(vDatedFrom DATETIME, vDatedTo DATETIME)
+BEGIN
+/*
+ * @param vDatedFrom
+ * @param vDatedTo
+ * @table tmp.`user`(userFk)
+ * Fichadas incorrectas de las cuales no se puede calcular horas trabajadas
+ * @return tmp.timeControlError (id)
+ */
+ DECLARE vDayMaxTime INTEGER;
+
+ SET @journeyCounter := 0;
+ SET @lastUserFk := NULL;
+
+ SELECT dayMaxTime INTO vDayMaxTime
+ FROM workerTimeControlConfig LIMIT 1;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControl;
+ CREATE TEMPORARY TABLE tmp.timeControl
+ (INDEX(id), INDEX(journeyCounter))
+ ENGINE = MEMORY
+ SELECT wtc.id,
+ wtc.direction,
+ wtc.timed,
+ IF(wtc.direction = 'in' OR @hasOut OR wtc.userFk <> @lastUserFk, @journeyCounter := @journeyCounter + 1, @journeyCounter) journeyCounter,
+ @lastUserFk := wtc.userFk workerFk,
+ IF(wtc.direction = 'out', @hasOut:= TRUE, @hasOut:= FALSE)
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` w ON w.userFk = wtc.userFk
+ WHERE wtc.timed BETWEEN DATE_SUB(vDatedFrom, INTERVAL 1 DAY) AND DATE_ADD(vDatedTo, INTERVAL 1 DAY)
+ ORDER BY wtc.userFk, wtc.timed;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux;
+ CREATE TEMPORARY TABLE tmp.timeControlAux
+ (INDEX(id), INDEX(journeyCounter))
+ ENGINE = MEMORY
+ SELECT * FROM tmp.timeControl;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControlError;
+ CREATE TEMPORARY TABLE tmp.timeControlError
+ (INDEX(id))
+ ENGINE = MEMORY
+ SELECT id
+ FROM tmp.timeControlAux tca
+ JOIN (SELECT journeyCounter,
+ UNIX_TIMESTAMP(MAX(timed)) - UNIX_TIMESTAMP(MIN(timed)) timeWork,
+ SUM(direction = 'in') totalIn,
+ SUM(direction = 'out') totalOut,
+ timed
+ FROM tmp.timeControl
+ GROUP BY journeyCounter
+ HAVING COUNT(*) MOD 2 = 1
+ OR totalIn <> 1
+ OR totalOut <> 1
+ OR timeWork >= vDayMaxTime
+ )sub ON sub.journeyCounter = tca.journeyCounter
+ WHERE sub.timed BETWEEN vDatedFrom AND vDatedTo;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControl;
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -84929,13 +85987,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `timeWorkerControl_check`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `timeWorkerControl_check`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
proc: BEGIN
/**
* deprecated call workerTimeControl_check
@@ -84954,32 +86012,32 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `tpvTransaction_checkStatus`()
-BEGIN
-/**
- *
- * Envia mail con los cobros web no
- * trasladados a la ficha del cliente.
- *
- */
- INSERT INTO mail (receiver,replyTo,subject,body)
- SELECT 'administracion@verdnatura.es',
- 'noreply@verdnatura.es',
- CONCAT('Cobro web no trasladado a la ficha del cliente ', t.clientFk),
- CONCAT('Hay un importe de ', t.amount/100, '€ del cliente ', t.clientFk, ' con fecha ', t.created,
- ', que no se ha trasladado a recibos. Si nos ha llegado el importe al banco confirme el pago en
-
- https://salix.verdnatura.es/#!/client/',t.clientFk,'/web-payment')
- FROM hedera.tpvTransaction t
- WHERE t.receiptFk IS NULL
- AND t.status = 'ok'
- AND t.created < DATE_ADD(NOW(),INTERVAL - 2 DAY)
- GROUP BY t.clientFk;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `tpvTransaction_checkStatus`()
+BEGIN
+/**
+ *
+ * Envia mail con los cobros web no
+ * trasladados a la ficha del cliente.
+ *
+ */
+ INSERT INTO mail (receiver,replyTo,subject,body)
+ SELECT 'administracion@verdnatura.es',
+ 'noreply@verdnatura.es',
+ CONCAT('Cobro web no trasladado a la ficha del cliente ', t.clientFk),
+ CONCAT('Hay un importe de ', t.amount/100, '€ del cliente ', t.clientFk, ' con fecha ', t.created,
+ ', que no se ha trasladado a recibos. Si nos ha llegado el importe al banco confirme el pago en
+
+ https://salix.verdnatura.es/#!/client/',t.clientFk,'/web-payment')
+ FROM hedera.tpvTransaction t
+ WHERE t.receiptFk IS NULL
+ AND t.status = 'ok'
+ AND t.created < DATE_ADD(NOW(),INTERVAL - 2 DAY)
+ GROUP BY t.clientFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -84992,11 +86050,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `travelVolume`(vTravelFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travelVolume`(vTravelFk INT)
BEGIN
SELECT w1.name AS ORI,
@@ -85033,28 +86091,28 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `travelVolume_get`(vFromDated DATE, vToDated DATE, vWarehouseFk INT)
-BEGIN
-
- SELECT tr.landed Fecha,
- a.name Agencia,
- count(DISTINCT e.id) numEntradas,
- FLOOR(sum(item_getVolume(b.itemFk, b.packageFk) * b.stickers / 1000000 )) AS m3
- FROM vn.travel tr
- JOIN vn.agencyMode a ON a.id = tr.agencyFk
- JOIN vn.entry e ON e.travelFk = tr.id
- JOIN vn.buy b ON b.entryFk = e.id
- WHERE tr.landed BETWEEN vFromDated AND vToDated
- AND e.isRaid = FALSE
- AND tr.warehouseInFk = vWarehouseFk
- GROUP BY tr.landed , a.name ;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travelVolume_get`(vFromDated DATE, vToDated DATE, vWarehouseFk INT)
+BEGIN
+
+ SELECT tr.landed Fecha,
+ a.name Agencia,
+ count(DISTINCT e.id) numEntradas,
+ FLOOR(sum(item_getVolume(b.itemFk, b.packageFk) * b.stickers / 1000000 )) AS m3
+ FROM vn.travel tr
+ JOIN vn.agencyMode a ON a.id = tr.agencyFk
+ JOIN vn.entry e ON e.travelFk = tr.id
+ JOIN vn.buy b ON b.entryFk = e.id
+ WHERE tr.landed BETWEEN vFromDated AND vToDated
+ AND e.isRaid = FALSE
+ AND tr.warehouseInFk = vWarehouseFk
+ GROUP BY tr.landed , a.name ;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -85065,13 +86123,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `travel_checkDates`(vShipped DATE, vLanded DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_checkDates`(vShipped DATE, vLanded DATE)
BEGIN
/**
* Checks the landing/shipment dates of travel, throws an error
@@ -85091,7 +86149,7 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `travel_cloneWithEntries` */;
+/*!50003 DROP PROCEDURE IF EXISTS `travel_clone` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -85101,146 +86159,211 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `travel_cloneWithEntries`(
- IN vTravelFk INT,
- IN vDateStart DATE,
- IN vDateEnd DATE,
- IN vWarehouseOutFk INT,
- IN vWarehouseInFk INT,
- IN vRef VARCHAR(255),
- IN vAgencyModeFk INT,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_clone`(vSelf INT, vDays INT, OUT vNewTravelFk INT)
+BEGIN
+
+ /**
+ * Clona un travel el número de dias indicado y devuelve su Id
+ *
+ * @param vSelf Identificador de vn.travel
+ * @param vDays Número de dias a futuro
+ *
+ * @return vNewTravelFk Nuevo número de travel
+ */
+
+ SELECT tr.id INTO vNewTravelFk
+ FROM vn.travel tr
+ JOIN vn.travel tr2 USING(shipped, warehouseInFk, warehouseOutFk, agencyFk, `ref`)
+ WHERE tr2.id = vSelf
+ AND tr.landed = TIMESTAMPADD(DAY, vDays, tr2.landed);
+
+ IF ISNULL(vNewTravelFk) THEN
+
+ START TRANSACTION;
+
+ INSERT INTO vn.travel( shipped,
+ shipmentHour,
+ landed,
+ landingHour,
+ warehouseInFk,
+ warehouseOutFk,
+ agencyFk,
+ `ref`,
+ cargoSupplierFk)
+ SELECT shipped,
+ shipmentHour,
+ TIMESTAMPADD(DAY, vDays, landed),
+ landingHour,
+ warehouseInFk,
+ warehouseOutFk,
+ agencyFk,
+ `ref`,
+ cargoSupplierFk
+ FROM vn.travel
+ WHERE id = vSelf;
+
+ SELECT LAST_INSERT_ID() INTO vNewTravelFk;
+
+ COMMIT;
+
+ END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `travel_cloneWithEntries` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_cloneWithEntries`(
+ IN vTravelFk INT,
+ IN vDateStart DATE,
+ IN vDateEnd DATE,
+ IN vWarehouseOutFk INT,
+ IN vWarehouseInFk INT,
+ IN vRef VARCHAR(255),
+ IN vAgencyModeFk INT,
OUT vNewTravelFk INT)
-BEGIN
-/**
- * Clona un travel junto con sus entradas y compras
- *
- * @param vTravelFk travel plantilla a clonar
- * @param vDateStart fecha del shipment del nuevo travel
- * @param vDateEnd fecha del landing del nuevo travel
- * @param vWarehouseOutFk fecha del salida del nuevo travel
- * @param vWarehouseInFk warehouse de landing del nuevo travel
- * @param vRef referencia del nuevo travel
- * @param vAgencyModeFk del nuevo travel
- * @param vNewTravelFk id del nuevo travel
- */
- DECLARE vEntryNew INT;
- DECLARE vDone BOOLEAN DEFAULT FALSE;
- DECLARE vAuxEntryFk INT;
- DECLARE vRsEntry CURSOR FOR
- SELECT e.id
- FROM entry e
- JOIN travel t
- ON t.id = e.travelFk
- WHERE e.travelFk = vTravelFk;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
- DECLARE EXIT HANDLER FOR SQLEXCEPTION/*, 1062 Duplicate key*/
- BEGIN
- ROLLBACK;
-
- END;
-
- START TRANSACTION;
- INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyFk, `ref`, isDelivered, isReceived, m3, kg)
- SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3, kg
- FROM travel
- WHERE id = vTravelFk;
-
- SET vNewTravelFk = LAST_INSERT_ID();
- CALL logAdd(vNewTravelFk, 'insert', 'travel', CONCAT('clona travel ',vTravelFk));
- SET vDone = FALSE;
- SET @isModeInventory = TRUE;
- OPEN vRsEntry ;
- FETCH vRsEntry INTO vAuxEntryFk;
-
- WHILE NOT vDone DO
- INSERT INTO entry (
- supplierFk,
- ref,
- isInventory,
- isConfirmed,
- isOrdered,
- isRaid,
- commission,
- created,
- evaNotes,
- travelFk,
- currencyFk,
- companyFk,
- gestDocFk,
- invoiceInFk)
- SELECT supplierFk,
- ref,
- isInventory,
- isConfirmed,
- isOrdered,
- isRaid,
- commission,
- created,
- evaNotes,
- vNewTravelFk,
- currencyFk,
- companyFk,
- gestDocFk,
- invoiceInFk
- FROM entry
- WHERE id = vAuxEntryFk;
-
- SET vEntryNew = LAST_INSERT_ID();
-
- CALL logAdd(vEntryNew, 'insert', 'entry', CONCAT('clona entrada ',vAuxEntryFk));
- INSERT INTO buy (
- entryFk,
- itemFk,
- quantity,
- buyingValue,
- packageFk,
- stickers,
- freightValue,
- packageValue,
- comissionValue,
- packing,
- `grouping`,
- groupingMode,
- location,
- price1,
- price2,
- price3,
- minPrice,
- producer,
- printedStickers,
- isChecked,
- weight)
- SELECT vEntryNew,
- itemFk,
- quantity,
- buyingValue,
- packageFk,
- stickers,
- freightValue,
- packageValue,
- comissionValue,
- packing,
- `grouping`,
- groupingMode,
- location,
- price1,
- price2,
- price3,
- minPrice,
- producer,
- printedStickers,
- isChecked,
- weight
- FROM buy
- WHERE entryFk = vAuxEntryFk;
-
- FETCH vRsEntry INTO vAuxEntryFk;
- END WHILE;
- SET @isModeInventory = FALSE;
- CLOSE vRsEntry;
- COMMIT;
+BEGIN
+/**
+ * Clona un travel junto con sus entradas y compras
+ *
+ * @param vTravelFk travel plantilla a clonar
+ * @param vDateStart fecha del shipment del nuevo travel
+ * @param vDateEnd fecha del landing del nuevo travel
+ * @param vWarehouseOutFk fecha del salida del nuevo travel
+ * @param vWarehouseInFk warehouse de landing del nuevo travel
+ * @param vRef referencia del nuevo travel
+ * @param vAgencyModeFk del nuevo travel
+ * @param vNewTravelFk id del nuevo travel
+ */
+ DECLARE vEntryNew INT;
+ DECLARE vDone BOOLEAN DEFAULT FALSE;
+ DECLARE vAuxEntryFk INT;
+ DECLARE vRsEntry CURSOR FOR
+ SELECT e.id
+ FROM entry e
+ JOIN travel t
+ ON t.id = e.travelFk
+ WHERE e.travelFk = vTravelFk;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION/*, 1062 Duplicate key*/
+ BEGIN
+ ROLLBACK;
+
+ END;
+
+ START TRANSACTION;
+ INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyFk, `ref`, isDelivered, isReceived, m3, kg)
+ SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3, kg
+ FROM travel
+ WHERE id = vTravelFk;
+
+ SET vNewTravelFk = LAST_INSERT_ID();
+ CALL logAdd(vNewTravelFk, 'insert', 'travel', CONCAT('clona travel ',vTravelFk));
+ SET vDone = FALSE;
+ SET @isModeInventory = TRUE;
+ OPEN vRsEntry ;
+ FETCH vRsEntry INTO vAuxEntryFk;
+
+ WHILE NOT vDone DO
+ INSERT INTO entry (
+ supplierFk,
+ ref,
+ isInventory,
+ isConfirmed,
+ isOrdered,
+ isRaid,
+ commission,
+ created,
+ evaNotes,
+ travelFk,
+ currencyFk,
+ companyFk,
+ gestDocFk,
+ invoiceInFk)
+ SELECT supplierFk,
+ ref,
+ isInventory,
+ isConfirmed,
+ isOrdered,
+ isRaid,
+ commission,
+ created,
+ evaNotes,
+ vNewTravelFk,
+ currencyFk,
+ companyFk,
+ gestDocFk,
+ invoiceInFk
+ FROM entry
+ WHERE id = vAuxEntryFk;
+
+ SET vEntryNew = LAST_INSERT_ID();
+
+ CALL logAdd(vEntryNew, 'insert', 'entry', CONCAT('clona entrada ',vAuxEntryFk));
+ INSERT INTO buy (
+ entryFk,
+ itemFk,
+ quantity,
+ buyingValue,
+ packageFk,
+ stickers,
+ freightValue,
+ packageValue,
+ comissionValue,
+ packing,
+ `grouping`,
+ groupingMode,
+ location,
+ price1,
+ price2,
+ price3,
+ minPrice,
+ producer,
+ printedStickers,
+ isChecked,
+ weight)
+ SELECT vEntryNew,
+ itemFk,
+ quantity,
+ buyingValue,
+ packageFk,
+ stickers,
+ freightValue,
+ packageValue,
+ comissionValue,
+ packing,
+ `grouping`,
+ groupingMode,
+ location,
+ price1,
+ price2,
+ price3,
+ minPrice,
+ producer,
+ printedStickers,
+ isChecked,
+ weight
+ FROM buy
+ WHERE entryFk = vAuxEntryFk;
+
+ FETCH vRsEntry INTO vAuxEntryFk;
+ END WHILE;
+ SET @isModeInventory = FALSE;
+ CLOSE vRsEntry;
+ COMMIT;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -85253,11 +86376,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `travel_cloneWithEntries__`(IN vTravelFk INT, IN vDateStart DATE, IN vDateEnd DATE,
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_cloneWithEntries__`(IN vTravelFk INT, IN vDateStart DATE, IN vDateEnd DATE,
IN vRef VARCHAR(255), OUT vNewTravelFk INT)
BEGIN
DECLARE vEntryNew INT;
@@ -85395,11 +86518,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `travel_doRecalc`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_doRecalc`()
BEGIN
/**
* Recounts the number of entries of changed travels.
@@ -85446,34 +86569,83 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `travel_moveRaids`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_moveRaids`()
BEGIN
-
- /*
- * Desplaza al dia siguiente los travels que contengan redadas y avisa a los compradores
- *
- */
+
+/*
+ * Desplaza al dia siguiente los travels que contengan redadas y avisa a los compradores
+ *
+ */
+ DECLARE vDone BOOL DEFAULT FALSE;
+ DECLARE vWorkerName VARCHAR(50);
+ DECLARE vRaid TEXT;
+ DECLARE vWorker VARCHAR(50) DEFAULT '';
+ DECLARE vMailBody TEXT DEFAULT '';
+
+ DECLARE vCur CURSOR FOR
+ SELECT GROUP_CONCAT( DISTINCT CONCAT('https://salix.verdnatura.es/#!/travel/', ttr.id, '/summary ') ORDER BY ttr.id SEPARATOR '\n\r'),
+ u.name
+ FROM tmp.travel ttr
+ JOIN entry e ON e.travelFk = ttr.id
+ JOIN buy b ON b.entryFk = e.id
+ JOIN item i ON i.id = b.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN account.user u ON u.id = it.workerFk
+ GROUP BY u.name;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND
+ SET vDone = TRUE;
+
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ ROLLBACK;
+ RESIGNAL;
+ END;
DROP TEMPORARY TABLE IF EXISTS tmp.travel;
-
CREATE TEMPORARY TABLE tmp.travel
- SELECT tr.id
- FROM vn.travel tr
- JOIN vn.entry e ON e.travelFk = tr.id
- WHERE tr.landed = util.tomorrow()
- AND e.isRaid;
-
- UPDATE vn.travel tr
+ SELECT tr.id,tr.landed
+ FROM travel tr
+ JOIN entry e ON e.travelFk = tr.id
+ WHERE tr.landed = util.tomorrow()
+ AND e.isRaid
+ GROUP BY tr.id;
+
+ START TRANSACTION;
+
+ UPDATE travel tr
JOIN tmp.travel ttr ON ttr.id = tr.id
- SET tr.landed = TIMESTAMPADD(DAY,1,util.tomorrow()),
- tr.`ref` = CONCAT(tr.`ref`,' ', tr.landed );
-
+ SET tr.landed = TIMESTAMPADD(DAY, 1, tr.landed);
+
+ INSERT INTO travelLog (originFk, userFk , action, description)
+ SELECT ttr.id, account.userGetId(), 'update', CONCAT('Se ha cambiado la fecha del travel al dia ', util.tomorrow())
+ FROM tmp.travel ttr;
+
+ OPEN vCur;
+
+ l: LOOP
+ SET vDone = FALSE;
+ FETCH vCur INTO vRaid, vWorkerName;
+
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+
+ CALL `vn`.`mail_insert`(CONCAT(vWorkerName, '@verdnatura.es'),
+ 'noreply@verdnatura.es',
+ 'Cambio de fecha en Redadas',
+ CONCAT('Se ha movido las siguientes redadas: \n\r ', vRaid)
+ );
+
+ END LOOP;
+ CLOSE vCur;
+ COMMIT;
DROP TEMPORARY TABLE tmp.travel;
END ;;
@@ -85488,11 +86660,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `travel_requestRecalc`(vSelf INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_requestRecalc`(vSelf INT)
proc: BEGIN
/**
* Adds a request to recount the number of entries for the travel.
@@ -85516,11 +86688,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `travel_weeklyClone`(vSinceWeek INT, vToWeek INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_weeklyClone`(vSinceWeek INT, vToWeek INT)
BEGIN
/**
* Clona los travels plantilla para las semanas pasadas por parámetros
@@ -85592,11 +86764,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `travel_weeklyClone__`(vSinceWeek INT, vToWeek INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_weeklyClone__`(vSinceWeek INT, vToWeek INT)
BEGIN
DECLARE vCounter INT;
@@ -85627,67 +86799,67 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `typeTagMake`(vTypeFk INT)
-BEGIN
-/*
- * Plantilla para modificar reemplazar todos los tags
- * por los valores que tienen los articulos
- *
- * @param vTypeFk tipo a modificar
- *
- */
- DELETE it.*
- FROM itemTag it
- JOIN item i ON i.id = it.itemFk
- WHERE i.typeFk = vTypeFk;
-
- INSERT INTO itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id, CONCAT(i.size,' cm'), 1
- FROM item i
- JOIN tag t ON t.name = 'Longitud' COLLATE utf8_general_ci
- WHERE i.typeFk = vTypeFk;
-
- INSERT INTO itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id, i.category, 5
- FROM item i
- JOIN tag t ON t.name = 'Categoria' COLLATE utf8_general_ci
- WHERE i.typeFk = vTypeFk;
-
- INSERT INTO itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id, ink.name, 2
- FROM item i
- JOIN tag t ON t.name = 'Color' COLLATE utf8_general_ci
- JOIN ink ON ink.id = i.inkFk
- WHERE i.typeFk = vTypeFk;
-
- INSERT INTO itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id, p.name, 3
- FROM item i
- JOIN tag t ON t.name = 'Productor' COLLATE utf8_general_ci
- JOIN producer p ON p.id = i.producerFk
- WHERE i.typeFk = vTypeFk;
-
- INSERT INTO itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id, o.name, 4
- FROM item i
- JOIN tag t ON t.name = 'Origen' COLLATE utf8_general_ci
- JOIN origin o ON o.id = i.originFk
- WHERE i.typeFk = vTypeFk;
- /*
- INSERT INTO itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id, i.stems, 6
- FROM item i
- JOIN tag t ON t.name = 'Tallos' COLLATE utf8_general_ci
- WHERE i.typeFk = vTypeFk;
- */
--- CALL itemTagArrangedUpdate(NULL);
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `typeTagMake`(vTypeFk INT)
+BEGIN
+/*
+ * Plantilla para modificar reemplazar todos los tags
+ * por los valores que tienen los articulos
+ *
+ * @param vTypeFk tipo a modificar
+ *
+ */
+ DELETE it.*
+ FROM itemTag it
+ JOIN item i ON i.id = it.itemFk
+ WHERE i.typeFk = vTypeFk;
+
+ INSERT INTO itemTag(itemFk, tagFk, value, priority)
+ SELECT i.id, t.id, CONCAT(i.size,' cm'), 1
+ FROM item i
+ JOIN tag t ON t.name = 'Longitud' COLLATE utf8_general_ci
+ WHERE i.typeFk = vTypeFk;
+
+ INSERT INTO itemTag(itemFk, tagFk, value, priority)
+ SELECT i.id, t.id, i.category, 5
+ FROM item i
+ JOIN tag t ON t.name = 'Categoria' COLLATE utf8_general_ci
+ WHERE i.typeFk = vTypeFk;
+
+ INSERT INTO itemTag(itemFk, tagFk, value, priority)
+ SELECT i.id, t.id, ink.name, 2
+ FROM item i
+ JOIN tag t ON t.name = 'Color' COLLATE utf8_general_ci
+ JOIN ink ON ink.id = i.inkFk
+ WHERE i.typeFk = vTypeFk;
+
+ INSERT INTO itemTag(itemFk, tagFk, value, priority)
+ SELECT i.id, t.id, p.name, 3
+ FROM item i
+ JOIN tag t ON t.name = 'Productor' COLLATE utf8_general_ci
+ JOIN producer p ON p.id = i.producerFk
+ WHERE i.typeFk = vTypeFk;
+
+ INSERT INTO itemTag(itemFk, tagFk, value, priority)
+ SELECT i.id, t.id, o.name, 4
+ FROM item i
+ JOIN tag t ON t.name = 'Origen' COLLATE utf8_general_ci
+ JOIN origin o ON o.id = i.originFk
+ WHERE i.typeFk = vTypeFk;
+ /*
+ INSERT INTO itemTag(itemFk, tagFk, value, priority)
+ SELECT i.id, t.id, i.stems, 6
+ FROM item i
+ JOIN tag t ON t.name = 'Tallos' COLLATE utf8_general_ci
+ WHERE i.typeFk = vTypeFk;
+ */
+-- CALL itemTagArrangedUpdate(NULL);
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -85698,13 +86870,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `updatePedidosInternos`(vItemFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `updatePedidosInternos`(vItemFk INT)
BEGIN
UPDATE vn.item SET upToDown = 0 WHERE item.id = vItemFk;
@@ -85720,13 +86892,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `visible_getMisfit`(vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `visible_getMisfit`(vSectorFk INT)
BEGIN
/* Devuelve una tabla temporal con los descuadres entre el visible teórico y lo ubicado en la práctica
@@ -85779,13 +86951,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `warehouseFitting`(IN vWhOrigin INT , IN vWhDestiny INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `warehouseFitting`(IN vWhOrigin INT , IN vWhDestiny INT)
BEGIN
DECLARE vCacheVisibleOriginFk INT;
DECLARE vCacheVisibleDestinyFk INT;
@@ -85817,13 +86989,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `warehouseFitting_byTravel`(IN vTravelFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `warehouseFitting_byTravel`(IN vTravelFk INT)
BEGIN
DECLARE vWhOrigin INT;
@@ -85845,13 +87017,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerCalculateBoss`(vWorker INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCalculateBoss`(vWorker INT)
BEGIN
/**
* Actualiza la tabla workerBosses
@@ -85888,11 +87060,84 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerCalendar_calculateBusiness`(vYear INT, vBusinessFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCalendar_calculateBusiness`(vYear INT, vBusinessFk INT)
+BEGIN
+
+/**
+ * Calcula los días y horas de vacaciones en función de un contrato y año
+ *
+ * @param vYear
+ * @param vBusinessFk
+ * @return tmp.workerCalendarCalculateBusiness (days, hours, daysEnjoyed, hoursEnjoyed)
+ */
+
+ DECLARE vStarted DATE;
+ DECLARE vEnded DATE;
+ DECLARE vDaysHoliday DECIMAL(5,2);
+ DECLARE vHoursWeek DECIMAL(5,2);
+ DECLARE vDaysToSubtract DECIMAL(5,2);
+ DECLARE vDaysHolidayEnjoyed DECIMAL(5,2);
+ DECLARE vDifDays INT;
+
+ SELECT IF(b.date_start < CONCAT(vYear,"-01-01"), CONCAT(vYear,"-01-01"),b.date_start),
+ IF(b.date_end IS NULL OR YEAR(b.date_end)>vYear , CONCAT(vYear,"-12-31"), b.date_end),
+ IF(wbt.hasHolidayEntitlement, w.days, 0),
+ c.hours_week
+ INTO vStarted,
+ vEnded,
+ vDaysHoliday,
+ vHoursWeek
+ FROM postgresql.business b
+ JOIN postgresql.business_labour_payroll blp ON blp.business_id = b.business_id
+ JOIN workerBusinessType wbt ON wbt.id = cod_contrato
+ JOIN postgresql.business_labour bl ON bl.business_id = b.business_id
+ JOIN workCenterHoliday w ON w.workcenterFk = bl.workcenter_id
+ LEFT JOIN postgresql.calendar_labour_type c ON c.calendar_labour_type_id=bl.calendar_labour_type_id
+ WHERE b.business_id = vBusinessFk
+ AND w.year = vYear;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.workerCalendarCalculateBusiness;
+
+ IF vStarted < vEnded THEN
+ SET vDifDays = DAYOFYEAR(vEnded) - DAYOFYEAR(vStarted) + 1;
+
+ SELECT IFNULL(SUM(holidayEntitlementRate), 0) ,
+ SUM(-(discountRate - 1))
+ INTO vDaysToSubtract,
+ vDaysHolidayEnjoyed
+ FROM workerCalendar w
+ JOIN absenceType a ON a.id = w.absenceTypeFk
+ WHERE w.businessFk = vBusinessFk
+ AND YEAR(dated) = vYear;
+ END IF;
+
+ CREATE TEMPORARY TABLE tmp.workerCalendarCalculateBusiness
+ ENGINE = MEMORY
+ SELECT @days := IFNULL(ROUND((vDaysHoliday * (vDifDays - vDaysToSubtract) / IF(util.isLeapYear(vYear) , 366, 365)), 1), 0) days,
+ @days * (vHoursWeek / 5) hours,
+ @daysEnjoyed := IFNULL(ROUND(vDaysHolidayEnjoyed, 1), 0) daysEnjoyed,
+ @daysEnjoyed * (vHoursWeek / 5) hoursEnjoyed;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `workerCalendar_calculateBusiness__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCalendar_calculateBusiness__`(vYear INT, vBusinessFk INT)
BEGIN
/**
@@ -85961,11 +87206,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerCalendar_calculateYear`(vYear INT, vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCalendar_calculateYear`(vYear INT, vWorkerFk INT)
BEGIN
/**
@@ -86036,11 +87281,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerCreate`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCreate`(
vFirstname VARCHAR(50),
vSurnames VARCHAR(50),
vWorkerCode CHAR(3),
@@ -86064,13 +87309,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerCreateExternal`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCreateExternal`(
vFirstName VARCHAR(50),
vSurname1 VARCHAR(50),
vSurname2 VARCHAR(50),
@@ -86114,11 +87359,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerCreate__`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCreate__`(
vFirstname VARCHAR(50),
vSurnames VARCHAR(50),
vFi VARCHAR(9),
@@ -86143,13 +87388,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerDepartmentByDate`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerDepartmentByDate`(vDate DATE)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.workerDepartmentByDate;
@@ -86189,9 +87434,9 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
@@ -86200,21 +87445,25 @@ mainLabel:BEGIN
IF (SELECT COUNT(*) FROM workerDisableExcluded WHERE workerFk = vUserId AND (dated > CURDATE() OR dated IS NULL)) > 0 THEN
LEAVE mainLabel;
- END IF;
+ END IF;
DELETE FROM account.account
WHERE id = vUserId;
- UPDATE account.user
+ UPDATE account.user
SET role = 2
WHERE id = vUserId;
-
+
DELETE FROM pbx.sip
WHERE user_id = vUserId;
UPDATE `client` c
JOIN payMethod p ON p.name = 'CONTADO'
SET c.credit = 0, c.payMethodFk = p.id, hasCoreVnl = FALSE
- WHERE c.id = vUserId;
+ WHERE c.id = vUserId;
+
+ UPDATE `client` c
+ SET c.salesPersonFk = null
+ WHERE c.salesPersonFk = vUserId;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -86225,13 +87474,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerDisableAll`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerDisableAll`()
BEGIN
DECLARE done BOOL DEFAULT FALSE;
DECLARE vUserFk INT;
@@ -86312,13 +87561,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerForAllCalculateBoss`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerForAllCalculateBoss`()
BEGIN
/**
* Actualiza la tabla workerBosses utilizando el procedimiento
@@ -86360,11 +87609,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerJourneyReplaceLauncher__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourneyReplaceLauncher__`()
BEGIN
DECLARE vDateStart DATE;
@@ -86387,11 +87636,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerJourneyReplace__`(vFromDate DATE, vToDate DATE, vUserFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourneyReplace__`(vFromDate DATE, vToDate DATE, vUserFk INT)
BEGIN
/* Actualiza la tabla workerJourney para que actue como caché permanente revisable de las jornadas laborales.
@@ -86680,7 +87929,206 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerJourney_replace`(vDatedFrom DATE, vDatedTo DATE, vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourney_replace`(vDatedFrom DATE, vDatedTo DATE, vWorkerFk INT)
+BEGIN
+/**
+ * Actualiza la tabla workerJourney para que actue como caché permanente revisable de las jornadas laborales.
+ * @param vDatedFrom workerTimeControl
+ * @param vDatedTo workerTimeControl
+ * @param vWorkerFk, en caso de pasar 0 ó NULL se aplica a todos
+ */
+
+ DECLARE vDatedTimeTo DATETIME;
+ DECLARE vMaxTimePerDay INT;
+ DECLARE vMinHoursToBreak DECIMAL(10,2);
+ DECLARE vBreakHours DECIMAL(10,2);
+ DECLARE vMonthByYear INT;
+ DECLARE vWeeksByYear INT DEFAULT 52;
+ DECLARE vMonthsByYear INT DEFAULT 12;
+ DECLARE vDaysByWeek INT DEFAULT 5;
+
+ SET vDatedTimeTo = util.dayEnd(vDatedTo);
+
+ SELECT minHoursToBreak, breakHours, maxTimePerDay
+ INTO vMinHoursToBreak, vBreakHours, vMaxTimePerDay
+ FROM workerTimeControlConfig;
+
+ DELETE FROM workerJourney
+ WHERE dated BETWEEN vDatedFrom AND vDatedTo
+ AND NOT isPaid
+ AND NOT isUpdated
+ AND (vWorkerFk IS NULL OR userFK = vWorkerFk);
+
+ -- Se inserta todos los días del periodo por worker y business en el rango de fechas.
+ INSERT IGNORE INTO workerJourney(userFk, dated, businessFk)
+ SELECT w.workerFk, t.dated, w.businessFk
+ FROM workerLabour w
+ JOIN time t ON t.dated BETWEEN w.started AND IFNULL(w.ended,CURDATE())
+ WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
+ AND (vWorkerFk IS NULL OR w.workerFk = vWorkerFk)
+ ORDER BY w.workerFk, t.dated, w.businessFk;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
+
+ IF vWorkerFk THEN
+ CALL timeControl_calculateByUser(vWorkerFk, vDatedFrom , vDatedTimeTo);
+ CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
+ SELECT vWorkerFk userFk;
+ ELSE
+ CALL timeControl_calculateAll(vDatedFrom, vDatedTimeTo);
+ CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
+ SELECT id userFk
+ FROM vn.worker w;
+ END IF;
+
+ UPDATE workerJourney wj
+ JOIN tmp.timeControlCalculate t ON wj.dated = t.dated AND wj.userFk = t.userFk
+ SET wj.total = CAST(IF(t.timeWorkDecimal >= vMinHoursToBreak, t.timeWorkDecimal - vBreakHours, t.timeWorkDecimal) AS DECIMAL (10,2)),
+ wj.lunch = IF(t.timeWorkDecimal >= vMinHoursToBreak , vBreakHours , 0)
+ WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
+ AND NOT wj.isPaid
+ AND NOT wj.isUpdated
+ AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk);
+
+ -- NOCTURNIDAD
+ CALL vn.timeControl_getError(vDatedFrom, vDatedTimeTo);
+
+ SET @vIsOdd := TRUE;
+ SET @vDated := NULL;
+
+
+ UPDATE workerJourney wj
+ JOIN (SELECT sub.dated, userFk, SUM(NigthlyHours) NigthlyHours
+ FROM(SELECT (@vIsOdd := NOT @vIsOdd) isOdd,
+ IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd),
+ IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed),
+ IF(direction='in', @vDated := DATE(wtc.timed), @vDated ) dated,
+ wtc.userFk,
+ IF(UNIX_TIMESTAMP(timed)- @vLastTimed < vMaxTimePerDay,
+ vn.workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed),
+ 0) NigthlyHours
+ FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction
+ FROM workerTimeControl wtc
+ LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
+ WHERE wtc.timed BETWEEN vDatedFrom AND util.dayEnd(DATE_ADD(vDatedTo, INTERVAL 1 DAY))
+ AND tce.id IS NULL
+ ORDER BY userFk, timed ASC
+ ) wtc
+ )sub
+
+
+ WHERE sub.dated BETWEEN vDatedFrom AND vDatedTo
+
+ GROUP BY userFk, sub.dated
+ )night ON night.userFk = wj.userFk AND night.dated = wj.dated
+ SET wj.nocturn = night.NigthlyHours
+ WHERE NOT wj.isPaid
+ AND NOT isUpdated
+ AND night.NigthlyHours <> 0;
+
+ -- Horas téoricas y precio de la hora ordinaria
+ UPDATE workerJourney wj
+ JOIN postgresql.business_labour_payroll blp ON blp.business_id = wj.businessFk
+ JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
+ JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
+ SET wj.priceOrdinaryHour = (vMonthsByYear * blp.importepactado) / (vWeeksByYear * cl.hours_week),
+ wj.contractJourney = cl.hours_week / vDaysByWeek
+ WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
+ AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
+ AND NOT wj.isPaid
+ AND NOT isUpdated;
+
+ -- Precio Extras, Vacaciones y Nocturnas
+ UPDATE workerJourney wj
+ JOIN(SELECT MAX(w.dated), t.dated, w.holidayInc, w.nightInc, w.extraInc
+ FROM time t
+ JOIN workerHourPrice w ON w.dated <= t.dated
+ WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
+ GROUP BY t.dated
+ ) sub ON sub.dated = wj.dated
+ SET wj.priceHolidayHour = wj.priceOrdinaryHour * sub.holidayInc,
+ wj.priceNocturnHour = wj.priceOrdinaryHour * sub.nightInc,
+ wj.priceExtraHour = wj.priceOrdinaryHour * sub.extraInc
+ WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
+ AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
+ AND NOT wj.isPaid
+ AND NOT wj.isUpdated;
+
+ -- Elimina el precio de las horas extras para los contratos parciales.
+ UPDATE workerJourney wj
+ JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
+ JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
+ SET wj.priceExtraHour = 0
+ WHERE cl.isPartial
+ AND wj.dated BETWEEN vDatedFrom AND vDatedTo
+ AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
+ AND NOT wj.isPaid
+ AND NOT wj.isUpdated;
+
+ -- Ausencias
+ UPDATE workerJourney wj
+ JOIN businessCalendar bc ON bc.businessFk = wj.businessFk AND bc.dated = wj.dated
+ JOIN absenceType ab ON ab.id = bc.absenceTypeFk
+ JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
+ SET wj.permission = ab.permissionRate * wj.contractJourney,
+ wj.contractJourney = IF(ab.permissionRate = 1, 0, ab.permissionRate) * wj.contractJourney
+ WHERE ab.permissionRate > 0
+ AND wj.dated BETWEEN vDatedFrom AND vDatedTo
+ AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
+ AND NOT wj.isPaid
+ AND NOT wj.isUpdated;
+
+ -- Sábados / Domingos
+ UPDATE workerJourney
+ SET holiday = IF(DAYNAME(dated)='sábado', 0, total),
+ contractJourney = 0
+ WHERE DAYNAME(dated) IN ('sábado', 'domingo')
+ AND dated BETWEEN vDatedFrom AND vDatedTo
+ AND (vWorkerFk IS NULL OR userFk = vWorkerFk)
+ AND NOT isPaid
+ AND NOT isUpdated;
+
+ -- Festivos por centro de trabajo
+ UPDATE workerJourney wj
+ JOIN calendarHolidays ch ON ch.dated = wj.dated
+ JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
+ AND bl.workcenter_id = ch.workcenterFk
+ SET wj.holiday = wj.total,
+ wj.permission = wj.contractJourney,
+ wj.contractJourney = 0
+ WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
+ AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
+ AND NOT wj.isPaid
+ AND NOT wj.isUpdated;
+
+ -- Horas extras
+ UPDATE workerJourney
+ SET extra = lunch + total - contractJourney
+ WHERE dated BETWEEN vDatedFrom AND vDatedTo
+ AND (vWorkerFk IS NULL OR userFk = vWorkerFk)
+ AND NOT isPaid
+ AND NOT isUpdated;
+
+ DROP TEMPORARY TABLE tmp.timeControlCalculate;
+ DROP TEMPORARY TABLE tmp.`user`;
+ DROP TEMPORARY TABLE tmp.timeControlError;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `workerJourney_replace__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourney_replace__`(vDatedFrom DATE, vDatedTo DATE, vWorkerFk INT)
BEGIN
/**
* Actualiza la tabla workerJourney para que actue como caché permanente revisable de las jornadas laborales.
@@ -86806,20 +88254,29 @@ BEGIN
AND NOT wj.isPaid
AND NOT wj.isUpdated;
- -- Bajas, vacaciones y festivos personales
+ -- Ausencias
UPDATE workerJourney wj
JOIN businessCalendar bc ON bc.businessFk = wj.businessFk AND bc.dated = wj.dated
JOIN absenceType ab ON ab.id = bc.absenceTypeFk
- JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
- SET wj.permission = ab.permissionRate * wj.contractJourney,
- wj.contractJourney = IF(ab.permissionRate = 1, 0, ab.permissionRate) * wj.contractJourney,
- wj.holiday = wj.total - IF(ab.permissionRate = 1, 0, ab.permissionRate) * wj.contractJourney
- WHERE ab.permissionRate > 0
+ JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
+ SET wj.permission = ab.permissionRate * wj.contractJourney,
+ wj.contractJourney = IF(ab.permissionRate = 1, 0, ab.permissionRate) * wj.contractJourney
+ WHERE ab.permissionRate > 0
AND wj.dated BETWEEN vDatedFrom AND vDatedTo
AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
- AND NOT wj.isPaid
+ AND NOT wj.isPaid
AND NOT wj.isUpdated;
+ -- Sábados / Domingos
+ UPDATE workerJourney
+ SET holiday = IF(DAYNAME(dated)='sábado', 0, total),
+ contractJourney = 0
+ WHERE DAYNAME(dated) IN ('sábado', 'domingo')
+ AND dated BETWEEN vDatedFrom AND vDatedTo
+ AND (vWorkerFk IS NULL OR userFk = vWorkerFk)
+ AND NOT isPaid
+ AND NOT isUpdated;
+
-- Festivos por centro de trabajo
UPDATE workerJourney wj
JOIN calendarHolidays ch ON ch.dated = wj.dated
@@ -86832,16 +88289,6 @@ BEGIN
AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
AND NOT wj.isPaid
AND NOT wj.isUpdated;
-
- -- Sábados / Domingos
- UPDATE workerJourney
- SET holiday = total,
- contractJourney = 0
- WHERE DAYNAME(dated) IN ('sábado', 'domingo')
- AND dated BETWEEN vDatedFrom AND vDatedTo
- AND (vWorkerFk IS NULL OR userFk = vWorkerFk)
- AND NOT isPaid
- AND NOT isUpdated;
-- Horas extras
UPDATE workerJourney
@@ -86859,212 +88306,65 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `workerJourney_replace__` */;
+/*!50003 DROP PROCEDURE IF EXISTS `workerMistakeType_get` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerJourney_replace__`(vDatedFrom DATE, vDatedTo DATE, vWorkerFk INT)
-BEGIN
-/**
- * Actualiza la tabla workerJourney para que actue como caché permanente revisable de las jornadas laborales.
- * @param vDatedFrom workerTimeControl
- * @param vDatedTo workerTimeControl
- * @param vWorkerFk, en caso de pasar 0 ó NULL se aplica a todos
- */
-
- DECLARE vDatedTimeTo DATETIME;
- DECLARE vMinHoursToBreak DECIMAL(10,2);
- DECLARE vBreakHours DECIMAL(10,2);
- DECLARE vMonthByYear INT;
- DECLARE vWeeksByYear INT DEFAULT 52;
- DECLARE vMonthsByYear INT DEFAULT 12;
- DECLARE vDaysByWeek INT DEFAULT 5;
-
- SET vDatedTimeTo = util.dayEnd(vDatedTo);
-
- SELECT minHoursToBreak, breakHours
- INTO vMinHoursToBreak, vBreakHours
- FROM workerTimeControlConfig;
-
- DELETE FROM workerJourney
- WHERE dated BETWEEN vDatedFrom AND vDatedTo
- AND NOT isPaid
- AND NOT isUpdated
- AND (vWorkerFk IS NULL OR userFK = vWorkerFk);
-
- -- Se inserta todos los días del periodo por worker y business en el rango de fechas.
- INSERT IGNORE INTO workerJourney(userFk, dated, businessFk)
- SELECT w.workerFk, t.dated, w.businessFk
- FROM workerLabour w
- JOIN time t ON t.dated BETWEEN w.started AND IFNULL(w.ended,CURDATE())
- WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
- AND (vWorkerFk IS NULL OR w.workerFk = vWorkerFk)
- ORDER BY w.workerFk, t.dated, w.businessFk;
-
- IF vWorkerFk THEN
- CALL timeControl_calculateByUser(vWorkerFk, vDatedFrom , vDatedTimeTo);
- ELSE
- CALL timeControl_calculateAll(vDatedFrom, vDatedTimeTo);
- END IF;
-
- UPDATE workerJourney wj
- JOIN tmp.timeControlCalculate t ON wj.dated = t.dated AND wj.userFk = t.userFk
- SET wj.total = CAST(IF(t.timeWorkDecimal >= vMinHoursToBreak, t.timeWorkDecimal - vBreakHours, t.timeWorkDecimal) AS DECIMAL (10,2)),
- wj.lunch = IF(t.timeWorkDecimal >= vMinHoursToBreak , vBreakHours , 0)
- WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
- AND NOT wj.isPaid
- AND NOT wj.isUpdated
- AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk);
-
- -- NOCTURNIDAD
- DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControl;
- CREATE TEMPORARY TABLE tmp.workerTimeControl
- SELECT sub.userFk, sub.timed, sub.order, 0 Non, FALSE manual
- FROM (SELECT w.userFk,
- IF(TIME(w.timed) IN ('06:00:00','22:00:00'), TIMESTAMPADD(SECOND, -1, w.timed), w.timed) timed, -- Regalamos un segundo para evitar que hayan fichadas en las horas claves de inicio y fin de la nocturnidad.
- w.`order`
- FROM workerTimeControl w
- WHERE w.timed BETWEEN vDatedFrom AND vDatedTo
- AND w.userFk = IFNULL(vWorkerFk, w.userFk)
- UNION ALL
- SELECT w.userFk,
- TIMESTAMPADD(HOUR, 6, DATE(w.timed)),
- w.`order`
- FROM workerTimeControl w
- WHERE w.timed BETWEEN vDatedFrom AND vDatedTo
- AND w.userFk = IFNULL(vWorkerFk, w.userFk)
- GROUP BY w.userFk, DATE(w.timed)
- UNION ALL
- SELECT w.userFk,
- TIMESTAMPADD(HOUR, 22, DATE(w.timed)),
- w.order
- FROM workerTimeControl w
- WHERE w.timed BETWEEN vDatedFrom AND vDatedTo
- AND w.userFk = IFNULL(vWorkerFk, w.userFk)
- GROUP BY w.userFk, DATE(w.timed)
- ) sub
- ORDER BY sub.userFk, sub.timed;
-
- -- Establece el orden en que se han de leer las fichadas
- CALL workerTimeControlSetOrder();
-
- -- Marca los impares para facilitar la consulta siguiente
- UPDATE tmp.workerTimeControl
- SET Non = 1
- WHERE `order` mod 2;
-
- -- Actualizamos la nocturnidad
- UPDATE workerJourney wj
- JOIN(SELECT userFk, Dia, sum(Nocturnidad) Nocturnidad FROM
- (SELECT userFk,
- date(timed) Dia,
- ((IF( TIME(timed) < '06:00:00' OR (TIME(timed) = '06:00:00' AND Non = FALSE ) , IF(Non,-1,1),0)
- +
- IF(TIME(timed) > '22:00:00' OR (TIME(timed) = '22:00:00' AND Non = TRUE), If(Non,-1,1),0))
- * (HOUR(`timed`) + MINUTE(`timed`) / 60)
- ) Nocturnidad
- FROM tmp.workerTimeControl
- ) sub
- GROUP BY userFk, Dia
- ) night ON night.userFk = wj.userFk AND night.Dia = wj.dated
- SET wj.nocturn = night.Nocturnidad
- WHERE NOT wj.isPaid
- AND NOT isUpdated
- AND night.Nocturnidad<>0;
-
-
- -- Horas téoricas y precio de la hora ordinaria
- UPDATE workerJourney wj
- JOIN postgresql.business_labour_payroll blp ON blp.business_id = wj.businessFk
- JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
- JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
- SET wj.priceOrdinaryHour = (vMonthsByYear * blp.importepactado) / (vWeeksByYear * cl.hours_week),
- wj.contractJourney = cl.hours_week / vDaysByWeek
- WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
- AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
- AND NOT wj.isPaid
- AND NOT isUpdated;
-
- -- Precio Extras, Vacaciones y Nocturnas
- UPDATE workerJourney wj
- JOIN(SELECT MAX(w.dated), t.dated, w.holidayInc, w.nightInc, w.extraInc
- FROM time t
- JOIN workerHourPrice w ON w.dated <= t.dated
- WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
- GROUP BY t.dated
- ) sub ON sub.dated = wj.dated
- SET wj.priceHolidayHour = wj.priceOrdinaryHour * sub.holidayInc,
- wj.priceNocturnHour = wj.priceOrdinaryHour * sub.nightInc,
- wj.priceExtraHour = wj.priceOrdinaryHour * sub.extraInc
- WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
- AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
- AND NOT wj.isPaid
- AND NOT wj.isUpdated;
-
- -- Elimina el precio de las horas extras para los contratos parciales.
- UPDATE workerJourney wj
- JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
- JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = bl.calendar_labour_type_id
- SET wj.priceExtraHour = 0
- WHERE cl.isPartial
- AND wj.dated BETWEEN vDatedFrom AND vDatedTo
- AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
- AND NOT wj.isPaid
- AND NOT wj.isUpdated;
-
- -- Bajas, vacaciones y festivos personales
- UPDATE workerJourney wj
- JOIN businessCalendar bc ON bc.businessFk = wj.businessFk AND bc.dated = wj.dated
- JOIN absenceType ab ON ab.id = bc.absenceTypeFk
- JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
- SET wj.permission = ab.permissionRate * wj.contractJourney,
- wj.contractJourney = IF(ab.permissionRate = 1, 0, ab.permissionRate) * wj.contractJourney,
- wj.holiday = wj.total - IF(ab.permissionRate = 1, 0, ab.permissionRate) * wj.contractJourney
- WHERE ab.permissionRate > 0
- AND wj.dated BETWEEN vDatedFrom AND vDatedTo
- AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
- AND NOT wj.isPaid
- AND NOT wj.isUpdated;
-
- -- Festivos por centro de trabajo
- UPDATE workerJourney wj
- JOIN calendarHolidays ch ON ch.dated = wj.dated
- JOIN postgresql.business_labour bl ON bl.business_id = wj.businessFk
- AND bl.workcenter_id = ch.workcenterFk
- SET wj.holiday = wj.total,
- wj.permission = wj.contractJourney,
- wj.contractJourney = 0
- WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
- AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
- AND NOT wj.isPaid
- AND NOT wj.isUpdated;
-
- -- Sábados / Domingos
- UPDATE workerJourney
- SET holiday = total,
- contractJourney = 0
- WHERE DAYNAME(dated) IN ('sábado', 'domingo')
- AND dated BETWEEN vDatedFrom AND vDatedTo
- AND (vWorkerFk IS NULL OR userFk = vWorkerFk)
- AND NOT isPaid
- AND NOT isUpdated;
-
- -- Horas extras
- UPDATE workerJourney
- SET extra = lunch + total - contractJourney
- WHERE dated BETWEEN vDatedFrom AND vDatedTo
- AND (vWorkerFk IS NULL OR userFk = vWorkerFk)
- AND NOT isPaid
- AND NOT isUpdated;
-
- DROP TEMPORARY TABLE tmp.timeControlCalculate;
- DROP TEMPORARY TABLE tmp.workerTimeControl;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerMistakeType_get`()
+BEGIN
+
+/**
+ * Obtiene los tipos de error para los trabajadores
+ */
+
+ SELECT code, description
+ FROM workerMistakeType
+ ORDER BY description;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `workerMistake_add` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerMistake_add`(vWorkerFk INT, vWorkerMistakeTypeFk VARCHAR(10), vUserFk INT )
+BEGIN
+
+/**
+ * Añade error al trabajador
+ *
+ * @param vWorkerFk id del trabajador al cual se le va a añadir error
+ * @param vWorkerMistakeTypeFk code del tipo de error
+ * @param vUserFk id del usuario que pone el error
+ *
+ */
+ DECLARE vWorkerName VARCHAR(255) DEFAULT account.user_getNameFromId(vUserFk);
+
+ IF(account.user_hasRole(vWorkerName,'coolerBoss'))
+ THEN
+ INSERT INTO vn.workerMistake(userFk, workerMistakeTypeFk)
+ VALUES(vWorkerFk, vWorkerMistakeTypeFk);
+ ELSE
+ CALL util.throw('No tienes permisos para realizar la acción');
+
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -87077,33 +88377,33 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerShelving_Add`(vWorkerFk INT, vBarcode VARCHAR(12))
-BEGIN
-/*
- * Inserta en workerShelving asociando los carros al trabajador
- * @Param vWorkerFk es id del trabajador
- * @Param vBarcode se puede pasar tanto el smarttag como el shelving
- */
- DECLARE vIsShelvingFk BOOL;
-
- SELECT COUNT(*) > 0 INTO vIsShelvingFk
- FROM vn.shelving s
- WHERE s.code = vBarcode COLLATE utf8_general_ci;
-
- IF NOT vIsShelvingFk THEN
-
- SELECT st.shelvingFk INTO vBarcode
- FROM vn.smartTag st
- WHERE st.code = vBarcode COLLATE utf8_general_ci;
-
- END IF;
-
- INSERT INTO vn.workerShelving (workerFk, shelvingFk)
- VALUES(vWorkerFk, vBarcode);
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerShelving_Add`(vWorkerFk INT, vBarcode VARCHAR(12))
+BEGIN
+/*
+ * Inserta en workerShelving asociando los carros al trabajador
+ * @Param vWorkerFk es id del trabajador
+ * @Param vBarcode se puede pasar tanto el smarttag como el shelving
+ */
+ DECLARE vIsShelvingFk BOOL;
+
+ SELECT COUNT(*) > 0 INTO vIsShelvingFk
+ FROM vn.shelving s
+ WHERE s.code = vBarcode COLLATE utf8_general_ci;
+
+ IF NOT vIsShelvingFk THEN
+
+ SELECT st.shelvingFk INTO vBarcode
+ FROM vn.smartTag st
+ WHERE st.code = vBarcode COLLATE utf8_general_ci;
+
+ END IF;
+
+ INSERT INTO vn.workerShelving (workerFk, shelvingFk)
+ VALUES(vWorkerFk, vBarcode);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -87116,37 +88416,37 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerShelving_delete`(vWorkerFk INT, vBarcode VARCHAR(12))
-BEGIN
-/*
- * Borra de workerShelving el carro o etiqueta insertado por el trabajador
- * @param vWorkerFk es id del trabajador
- * @param vBarcode se puede pasar tanto el smarttag como el shelving
- */
- DECLARE vIsShelvingFk BOOL;
-
-
- SELECT COUNT(*) > 0 INTO vIsShelvingFk
- FROM vn.shelving s
- WHERE s.code = vBarcode COLLATE utf8_general_ci;
-
-
- IF NOT vIsShelvingFk THEN
-
- SELECT st.shelvingFk INTO vBarcode
- FROM vn.smartTag st
- WHERE st.code = vBarcode COLLATE utf8_general_ci;
-
- END IF;
-
- DELETE FROM vn.workerShelving
- WHERE shelvingFk = vBarcode COLLATE utf8_general_ci
- AND workerFk = vWorkerFk ;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerShelving_delete`(vWorkerFk INT, vBarcode VARCHAR(12))
+BEGIN
+/*
+ * Borra de workerShelving el carro o etiqueta insertado por el trabajador
+ * @param vWorkerFk es id del trabajador
+ * @param vBarcode se puede pasar tanto el smarttag como el shelving
+ */
+ DECLARE vIsShelvingFk BOOL;
+
+
+ SELECT COUNT(*) > 0 INTO vIsShelvingFk
+ FROM vn.shelving s
+ WHERE s.code = vBarcode COLLATE utf8_general_ci;
+
+
+ IF NOT vIsShelvingFk THEN
+
+ SELECT st.shelvingFk INTO vBarcode
+ FROM vn.smartTag st
+ WHERE st.code = vBarcode COLLATE utf8_general_ci;
+
+ END IF;
+
+ DELETE FROM vn.workerShelving
+ WHERE shelvingFk = vBarcode COLLATE utf8_general_ci
+ AND workerFk = vWorkerFk ;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -87157,13 +88457,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControlAdd`(IN vUserFk INT, IN vWarehouseFk INT, IN vDated DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlAdd`(IN vUserFk INT, IN vWarehouseFk INT, IN vDated DATETIME)
BEGIN
/*INSERT INTO workerTimeControl(userFk, timed, manual, warehouseFk)
@@ -87184,13 +88484,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControlNonDays__`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlNonDays__`()
BEGIN
SET @cont := 0;
SELECT sub2.userFk, sub2.dated Fecha, CONCAT (w.firstName," ", w.lastName) worker, au.name Boss, d.name
@@ -87223,13 +88523,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControlPinGenerate`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlPinGenerate`(
vWorkerFk INT)
BEGIN
/**
@@ -87249,13 +88549,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControlSetOrder`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlSetOrder`()
BEGIN
SET @order := 1;
@@ -87278,13 +88578,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControlSetOrder_by_User_and_dateRange`(vUserFk INT, vStarted DATE, vFinished DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlSetOrder_by_User_and_dateRange`(vUserFk INT, vStarted DATE, vFinished DATE)
BEGIN
SET @order := 0;
@@ -87306,13 +88606,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControlSOWP`(IN vUserFk INT, IN vDated DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlSOWP`(IN vUserFk INT, IN vDated DATE)
BEGIN
SET @order := 0;
@@ -87332,13 +88632,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_add`(IN vUserFk INT, IN vWarehouseFk INT, IN vTimed DATETIME, IN vIsManual BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_add`(IN vUserFk INT, IN vWarehouseFk INT, IN vTimed DATETIME, IN vIsManual BOOL)
BEGIN
@@ -87355,11 +88655,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_add__`(IN vUserFk INT, IN vWarehouseFk INT, IN vTimed DATETIME, IN vIsManual BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_add__`(IN vUserFk INT, IN vWarehouseFk INT, IN vTimed DATETIME, IN vIsManual BOOL)
BEGIN
DECLARE vDirection VARCHAR(6);
@@ -87417,39 +88717,39 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_calculateOddDays`()
-BEGIN
-/*
- * Calculo de las fichadas impares por empleado y dia
- * @return tmp.workerTimeControlOddDays (userFk, dated)
- */
- SET @cont := FALSE;
- SET @lastUserFk:= NULL;
- DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlOddDays;
- CREATE TEMPORARY TABLE tmp.workerTimeControlOddDays
- SELECT sub2.userFk workerFk, sub2.dated
- FROM (SELECT userFk,
- dated,
- COUNT(*) cont2
- FROM (SELECT DATE(wtc.timed) dated,
- userFk,
- IFNULL(@cont, @cont := TRUE ),
- IF(direction = 'in' OR userFk <> @lastUserFk, @cont := @cont+1, TRUE),
- @cont cont,
- @lastUserFk := userFk
- FROM vn.workerTimeControl wtc
- WHERE wtc.timed BETWEEN TIMESTAMPADD(YEAR,-1,CURDATE()) AND CURDATE()
- ORDER BY userFk, timed)sub
- GROUP BY cont
- HAVING cont2 MOD 2 = 1)sub2
- JOIN worker w ON w.userFk = sub2.userFk;
-
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_calculateOddDays`()
+BEGIN
+/*
+ * Calculo de las fichadas impares por empleado y dia
+ * @return tmp.workerTimeControlOddDays (userFk, dated)
+ */
+ SET @cont := FALSE;
+ SET @lastUserFk:= NULL;
+ DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlOddDays;
+ CREATE TEMPORARY TABLE tmp.workerTimeControlOddDays
+ SELECT sub2.userFk workerFk, sub2.dated
+ FROM (SELECT userFk,
+ dated,
+ COUNT(*) cont2
+ FROM (SELECT DATE(wtc.timed) dated,
+ userFk,
+ IFNULL(@cont, @cont := TRUE ),
+ IF(direction = 'in' OR userFk <> @lastUserFk, @cont := @cont+1, TRUE),
+ @cont cont,
+ @lastUserFk := userFk
+ FROM workerTimeControl wtc
+ WHERE wtc.timed BETWEEN TIMESTAMPADD(YEAR,-1,CURDATE()) AND util.dayEnd(CURDATE())
+ ORDER BY userFk, timed)sub
+ GROUP BY cont
+ HAVING cont2 MOD 2 = 1)sub2
+ JOIN worker w ON w.userFk = sub2.userFk;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -87462,11 +88762,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_check`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_check`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
proc: BEGIN
/**
* Verifica si el empleado puede fichar en el momento actual, si puede fichar llama a workerTimeControlAdd
@@ -87650,11 +88950,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_checkTest`(vUserFk INT, vTimed DATETIME, vTabletFk VARCHAR(100))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_checkTest`(vUserFk INT, vTimed DATETIME, vTabletFk VARCHAR(100))
BEGIN
/**
@@ -87842,11 +89142,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_check__`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_check__`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
proc: BEGIN
/**
* Verifica si el empleado puede fichar en el momento actual, si puede fichar llama a workerTimeControlAdd
@@ -88030,319 +89330,319 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_clockIn`(vWorker INT, vTimed DATETIME, vDirection VARCHAR(10))
-BEGIN
-/**
- * Verifica si el empleado puede fichar
- * @param vWorker Identificador del trabajador
- * @param vTimed valor de la fichada, IF vTimed IS NULL vTimed = NOW()
- * @param vDirection solo se pueden pasa los valores del campo workerTimeControl.direction ENUM('in', 'out', 'middle')
- * @return Si todo es correcto, retorna el número de id la tabla workerTimeControl. Si hay algún problema, devuelve el mesaje a que se debe mostrar al usuario
- * Solo retorna el primer problema, en caso de no ocurrir ningún error se añadirá fichada a la tabla vn.workerTimeControl
- */
- DECLARE vLastIn DATETIME;
- DECLARE vLastOut DATETIME;
- DECLARE vNextIn DATETIME;
- DECLARE vLastDirection VARCHAR(6);
- DECLARE vNextDirection VARCHAR(6);
- DECLARE vDayBreak INT;
- DECLARE vShortWeekBreak INT;
- DECLARE vLongWeekBreak INT;
- DECLARE vWeekScope INT;
- DECLARE vGap INT;
- DECLARE vMailTo VARCHAR(50) DEFAULT NULL;
- DECLARE vUserName VARCHAR(50) DEFAULT NULL;
- DECLARE vIsError BOOLEAN DEFAULT FALSE;
- DECLARE vErrorMessage VARCHAR(255) DEFAULT NULL;
- DECLARE vErrorCode VARCHAR(50);
- DECLARE vDated DATE;
- DECLARE vIsAllowedToWork VARCHAR(50);
- DECLARE vDepartmentFk INT;
- DECLARE vTimedLoop INT;
- DECLARE vTimedLoopPrevious INT;
- DECLARE vHasBreakWeek BOOLEAN DEFAULT FALSE;
- DECLARE vManual BOOLEAN DEFAULT TRUE;
- DECLARE vDone INT DEFAULT FALSE;
-
- DECLARE vCursor CURSOR FOR
- SELECT UNIX_TIMESTAMP(NOW() - INTERVAL vGap SECOND)
- UNION
- SELECT UNIX_TIMESTAMP(NOW())
- UNION
- (SELECT UNIX_TIMESTAMP(timed)
- FROM workerTimeControl
- WHERE timed BETWEEN (vTimed - INTERVAL vGap SECOND) AND vTimed AND
- userFk = vWorker AND
- direction IN ('in', 'out')
- ORDER BY timed ASC);
-
- DECLARE vCursor2 CURSOR FOR
- SELECT UNIX_TIMESTAMP(NOW() - INTERVAL vGap SECOND)
- UNION
- SELECT UNIX_TIMESTAMP(NOW())
- UNION
- SELECT UNIX_TIMESTAMP(timed)
- FROM workerTimeControl
- WHERE timed BETWEEN vTimed AND (vTimed - INTERVAL vGap SECOND) AND
- userFk = vWorker AND
- direction IN ('in', 'out')
- ORDER BY timed ASC;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
- DECLARE EXIT HANDLER FOR SQLSTATE '45000'
- BEGIN
-
- SELECT CONCAT(u.name, '@verdnatura.es'), CONCAT(w.firstName, ' ', w.lastName)
- INTO vMailTo, vUserName
- FROM account.user u
- JOIN worker w ON w.bossFk = u.id
- WHERE w.id = vWorker;
-
- CASE vErrorCode
- WHEN 'IS_NOT_ALLOWED_FUTURE' THEN
- SELECT 'No se permite fichar a futuro' INTO vErrorMessage;
- WHEN 'INACTIVE_BUSINESS' THEN
- SELECT 'No hay un contrato en vigor' INTO vErrorMessage;
- WHEN 'IS_NOT_ALLOWED_WORK' THEN
- SELECT 'No está permitido trabajar' INTO vErrorMessage;
- WHEN 'ODD_WORKERTIMECONTROL' THEN
- SELECT 'Fichadas impares' INTO vErrorMessage;
- WHEN 'BREAK_DAY' THEN
- SELECT CONCAT('Descanso diario ', FORMAT(vDayBreak/3600, 0) , 'h.') INTO vErrorMessage;
- WHEN 'BREAK_WEEK' THEN
- SELECT CONCAT('Descanso semanal ',
- FORMAT(vShortWeekBreak / 3600,0) ,'h. / ',
- FORMAT(vLongWeekBreak / 3600, 0) ,'h.') INTO vErrorMessage;
- WHEN 'WRONG_DIRECTION' THEN
- SELECT 'Dirección incorrecta' INTO vErrorMessage;
- ELSE
- SELECT 'Error sin definir'INTO vErrorMessage;
- END CASE;
-
- SELECT vErrorMessage `error`;
- SELECT CONCAT(vUserName, ' no ha podido fichar por el siguiente problema: ', vErrorMessage) INTO vErrorMessage;
- CALL mail_insert( vMailTo, vMailTo, 'Error al fichar', vErrorMessage);
-
- END;
-
- IF (vTimed IS NULL) THEN
- SET vTimed = NOW();
- SET vManual = FALSE;
- END IF;
-
- SET vDated = DATE(vTimed);
-
- SELECT IF(pc.category_name = 'Conductor +3500kg', wc.dayBreakDriver, wc.dayBreak),
- wc.shortWeekBreak,
- wc.longWeekBreak,
- wc.weekScope
- INTO vDayBreak,
- vShortWeekBreak,
- vLongWeekBreak,
- vWeekScope
- FROM workerLabour w
- JOIN postgresql.business_labour bl ON bl.business_id = w.businessFk
- JOIN postgresql.professional_category pc ON pc.professional_category_id = bl.professional_category_id
- JOIN workerTimeControlConfig wc ON TRUE
- WHERE w.workerFk = vWorker
- AND vDated BETWEEN w.started AND IFNULL(w.ended, vDated);
-
- SELECT timed INTO vLastIn
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND direction = 'in'
- AND timed < vTimed
- ORDER BY timed DESC
- LIMIT 1;
-
- SELECT timed INTO vLastOut
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND direction = 'out'
- AND timed < vTimed
- ORDER BY timed DESC
- LIMIT 1;
-
- SELECT timed INTO vNextIn
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND direction = 'in'
- AND timed > vTimed
- ORDER BY timed ASC
- LIMIT 1;
-
- SELECT direction INTO vNextDirection
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND timed > vTimed
- ORDER BY timed ASC
- LIMIT 1;
-
- SELECT direction INTO vLastDirection
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND timed < vTimed
- ORDER BY timed DESC
- LIMIT 1;
-
- -- FICHADAS A FUTURO
- IF vTimed > DATE_ADD(NOW(), INTERVAL 60 SECOND) THEN
- SET vErrorCode = 'IS_NOT_ALLOWED_FUTURE';
- CALL util.throw(vErrorCode);
- END IF;
-
- -- CONTRATO EN VIGOR
- IF vDayBreak IS NULL THEN
- SET vErrorCode = 'INACTIVE_BUSINESS';
- CALL util.throw(vErrorCode);
- END IF;
-
- -- VERIFICAR SI ESTÁ PERMITIDO TRABAJAR
- CALL timeBusiness_calculateByWorker(vWorker, vDated, vDated);
- SELECT isAllowedToWork INTO vIsAllowedToWork
- FROM tmp.timeBusinessCalculate;
- DROP TEMPORARY TABLE tmp.timeBusinessCalculate;
-
- IF NOT vIsAllowedToWork THEN
- SET vErrorCode = 'IS_NOT_ALLOWED_WORK';
- CALL util.throw(vErrorCode);
- END IF;
-
- -- DIRECCION CORRECTA
- CALL vn.workerTimeControl_direction(vWorker, vTimed);
- IF (SELECT IF(IF(option1 IN ('inMiddle', 'outMiddle'), 'middle', option1) <> vDirection
- AND IF(option2 IN ('inMiddle', 'outMiddle'), 'middle', IFNULL(option2, '')) <> vDirection, TRUE , FALSE)
- FROM tmp.workerTimeControlDirection) THEN
- SET vIsError = TRUE;
- END IF;
-
- DROP TEMPORARY TABLE tmp.workerTimeControlDirection;
- IF vIsError = TRUE THEN
- SET vErrorCode = 'WRONG_DIRECTION';
- CALL util.throw(vErrorCode);
- END IF;
-
- -- FICHADAS IMPARES
- IF (SELECT IF(vDirection = 'in', MOD(COUNT(*), 2) , IF (vDirection = 'out', NOT MOD(COUNT(*), 2), FALSE))
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND timed BETWEEN vLastIn AND vTimed
- ) THEN
- SET vErrorCode = 'ODD_WORKERTIMECONTROL';
- CALL util.throw(vErrorCode);
- END IF;
-
- -- DESCANSO DIARIO
- CASE vDirection
- WHEN 'in' THEN
- IF UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(vLastOut) <= vDayBreak THEN
- SET vIsError = TRUE;
- END IF;
- WHEN 'out' THEN
- IF UNIX_TIMESTAMP(vNextIn) - UNIX_TIMESTAMP(vTimed) <= vDayBreak THEN
- SET vIsError = TRUE;
- END IF;
- ELSE BEGIN END;
- END CASE;
-
- IF vIsError THEN
- SET vErrorCode = 'BREAK_DAY';
- CALL util.throw(vErrorCode);
- END IF;
-
- -- VERIFICAR DESCANSO SEMANAL
- IF (vDirection IN('in', 'out')) THEN
- -- VERIFICA DESCANSO CORTO EN LA ÚLTIMA SEMANA
- SET vGap = vWeekScope;
- SET vTimedLoopPrevious = UNIX_TIMESTAMP((vTimed - INTERVAL vGap SECOND));
- SET vDone = FALSE;
- OPEN vCursor;
- l:LOOP
- FETCH vCursor INTO vTimedLoop;
- IF vDone THEN
- LEAVE l;
- END IF;
- IF vShortWeekBreak - (vTimedLoop - vTimedLoopPrevious) < 0 THEN
- SET vHasBreakWeek = TRUE;
- LEAVE l;
- END IF;
- SET vTimedLoopPrevious = vTimedLoop;
- END LOOP l;
- CLOSE vCursor;
- -- VERIFICA DESCANSO LARGO EN LA ÚLTIMAS 2 SEMANAS
- IF NOT vHasBreakWeek THEN
- SET vGap = vWeekScope * 2;
- SET vTimedLoopPrevious = UNIX_TIMESTAMP((vTimed - INTERVAL vGap SECOND));
- SET vDone = FALSE;
- OPEN vCursor;
- l:LOOP
- FETCH vCursor INTO vTimedLoop;
- IF vDone THEN
- LEAVE l;
- END IF;
- IF vLongWeekBreak - (vTimedLoop - vTimedLoopPrevious) < 0 THEN
- SET vHasBreakWeek = TRUE;
- LEAVE l;
- END IF;
- SET vTimedLoopPrevious = vTimedLoop;
- END LOOP l;
- CLOSE vCursor;
- END IF;
-
- IF vManual THEN
- -- VERIFICA DESCANSO CORTO EN LA PRÓXIMA SEMANA
- SET vGap = vWeekScope;
- SET vTimedLoopPrevious = vTimed;
- SET vDone = FALSE;
- OPEN vCursor;
- l:LOOP
- FETCH vCursor INTO vTimedLoop;
- IF vDone THEN
- LEAVE l;
- END IF;
- IF vShortWeekBreak - (vTimedLoop - vTimedLoopPrevious) < 0 THEN
- SET vHasBreakWeek = TRUE;
- LEAVE l;
- END IF;
- SET vTimedLoopPrevious = vTimedLoop;
- END LOOP l;
- CLOSE vCursor;
- -- VERIFICA DESCANSO LARGO EN LAS PRÓXIMAS 2 SEMANAS
- IF NOT vHasBreakWeek THEN
- SET vGap = vWeekScope * 2;
- SET vTimedLoopPrevious = vTimed;
- SET vDone = FALSE;
- OPEN vCursor;
- l:LOOP
- FETCH vCursor INTO vTimedLoop;
- IF vDone THEN
- LEAVE l;
- END IF;
- IF vShortWeekBreak - (vTimedLoop - vTimedLoopPrevious) < 0 THEN
- SET vHasBreakWeek = TRUE;
- LEAVE l;
- END IF;
- SET vTimedLoopPrevious = vTimedLoop;
- END LOOP l;
- CLOSE vCursor;
- END IF;
- END IF;
- IF NOT vHasBreakWeek THEN
- SET vErrorCode = 'BREAK_WEEK';
- CALL util.throw(vErrorCode);
- END IF;
- END IF;
-
- -- SE PERMITE FICHAR
- INSERT INTO workerTimeControl(userFk, timed, direction, manual)
- VALUES(vWorker, vTimed, vDirection, vManual);
-
- SELECT LAST_INSERT_ID() id;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_clockIn`(vWorker INT, vTimed DATETIME, vDirection VARCHAR(10))
+BEGIN
+/**
+ * Verifica si el empleado puede fichar
+ * @param vWorker Identificador del trabajador
+ * @param vTimed valor de la fichada, IF vTimed IS NULL vTimed = NOW()
+ * @param vDirection solo se pueden pasa los valores del campo workerTimeControl.direction ENUM('in', 'out', 'middle')
+ * @return Si todo es correcto, retorna el número de id la tabla workerTimeControl. Si hay algún problema, devuelve el mesaje a que se debe mostrar al usuario
+ * Solo retorna el primer problema, en caso de no ocurrir ningún error se añadirá fichada a la tabla vn.workerTimeControl
+ */
+ DECLARE vLastIn DATETIME;
+ DECLARE vLastOut DATETIME;
+ DECLARE vNextIn DATETIME;
+ DECLARE vLastDirection VARCHAR(6);
+ DECLARE vNextDirection VARCHAR(6);
+ DECLARE vDayBreak INT;
+ DECLARE vShortWeekBreak INT;
+ DECLARE vLongWeekBreak INT;
+ DECLARE vWeekScope INT;
+ DECLARE vGap INT;
+ DECLARE vMailTo VARCHAR(50) DEFAULT NULL;
+ DECLARE vUserName VARCHAR(50) DEFAULT NULL;
+ DECLARE vIsError BOOLEAN DEFAULT FALSE;
+ DECLARE vErrorMessage VARCHAR(255) DEFAULT NULL;
+ DECLARE vErrorCode VARCHAR(50);
+ DECLARE vDated DATE;
+ DECLARE vIsAllowedToWork VARCHAR(50);
+ DECLARE vDepartmentFk INT;
+ DECLARE vTimedLoop INT;
+ DECLARE vTimedLoopPrevious INT;
+ DECLARE vHasBreakWeek BOOLEAN DEFAULT FALSE;
+ DECLARE vManual BOOLEAN DEFAULT TRUE;
+ DECLARE vDone INT DEFAULT FALSE;
+
+ DECLARE vCursor CURSOR FOR
+ SELECT UNIX_TIMESTAMP(NOW() - INTERVAL vGap SECOND)
+ UNION
+ SELECT UNIX_TIMESTAMP(NOW())
+ UNION
+ (SELECT UNIX_TIMESTAMP(timed)
+ FROM workerTimeControl
+ WHERE timed BETWEEN (vTimed - INTERVAL vGap SECOND) AND vTimed AND
+ userFk = vWorker AND
+ direction IN ('in', 'out')
+ ORDER BY timed ASC);
+
+ DECLARE vCursor2 CURSOR FOR
+ SELECT UNIX_TIMESTAMP(NOW() - INTERVAL vGap SECOND)
+ UNION
+ SELECT UNIX_TIMESTAMP(NOW())
+ UNION
+ SELECT UNIX_TIMESTAMP(timed)
+ FROM workerTimeControl
+ WHERE timed BETWEEN vTimed AND (vTimed - INTERVAL vGap SECOND) AND
+ userFk = vWorker AND
+ direction IN ('in', 'out')
+ ORDER BY timed ASC;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+ BEGIN
+
+ SELECT CONCAT(u.name, '@verdnatura.es'), CONCAT(w.firstName, ' ', w.lastName)
+ INTO vMailTo, vUserName
+ FROM account.user u
+ JOIN worker w ON w.bossFk = u.id
+ WHERE w.id = vWorker;
+
+ CASE vErrorCode
+ WHEN 'IS_NOT_ALLOWED_FUTURE' THEN
+ SELECT 'No se permite fichar a futuro' INTO vErrorMessage;
+ WHEN 'INACTIVE_BUSINESS' THEN
+ SELECT 'No hay un contrato en vigor' INTO vErrorMessage;
+ WHEN 'IS_NOT_ALLOWED_WORK' THEN
+ SELECT 'No está permitido trabajar' INTO vErrorMessage;
+ WHEN 'ODD_WORKERTIMECONTROL' THEN
+ SELECT 'Fichadas impares' INTO vErrorMessage;
+ WHEN 'BREAK_DAY' THEN
+ SELECT CONCAT('Descanso diario ', FORMAT(vDayBreak/3600, 0) , 'h.') INTO vErrorMessage;
+ WHEN 'BREAK_WEEK' THEN
+ SELECT CONCAT('Descanso semanal ',
+ FORMAT(vShortWeekBreak / 3600,0) ,'h. / ',
+ FORMAT(vLongWeekBreak / 3600, 0) ,'h.') INTO vErrorMessage;
+ WHEN 'WRONG_DIRECTION' THEN
+ SELECT 'Dirección incorrecta' INTO vErrorMessage;
+ ELSE
+ SELECT 'Error sin definir'INTO vErrorMessage;
+ END CASE;
+
+ SELECT vErrorMessage `error`;
+ SELECT CONCAT(vUserName, ' no ha podido fichar por el siguiente problema: ', vErrorMessage) INTO vErrorMessage;
+ CALL mail_insert( vMailTo, vMailTo, 'Error al fichar', vErrorMessage);
+
+ END;
+
+ IF (vTimed IS NULL) THEN
+ SET vTimed = NOW();
+ SET vManual = FALSE;
+ END IF;
+
+ SET vDated = DATE(vTimed);
+
+ SELECT IF(pc.category_name = 'Conductor +3500kg', wc.dayBreakDriver, wc.dayBreak),
+ wc.shortWeekBreak,
+ wc.longWeekBreak,
+ wc.weekScope
+ INTO vDayBreak,
+ vShortWeekBreak,
+ vLongWeekBreak,
+ vWeekScope
+ FROM workerLabour w
+ JOIN postgresql.business_labour bl ON bl.business_id = w.businessFk
+ JOIN postgresql.professional_category pc ON pc.professional_category_id = bl.professional_category_id
+ JOIN workerTimeControlConfig wc ON TRUE
+ WHERE w.workerFk = vWorker
+ AND vDated BETWEEN w.started AND IFNULL(w.ended, vDated);
+
+ SELECT timed INTO vLastIn
+ FROM workerTimeControl
+ WHERE userFk = vWorker
+ AND direction = 'in'
+ AND timed < vTimed
+ ORDER BY timed DESC
+ LIMIT 1;
+
+ SELECT timed INTO vLastOut
+ FROM workerTimeControl
+ WHERE userFk = vWorker
+ AND direction = 'out'
+ AND timed < vTimed
+ ORDER BY timed DESC
+ LIMIT 1;
+
+ SELECT timed INTO vNextIn
+ FROM workerTimeControl
+ WHERE userFk = vWorker
+ AND direction = 'in'
+ AND timed > vTimed
+ ORDER BY timed ASC
+ LIMIT 1;
+
+ SELECT direction INTO vNextDirection
+ FROM workerTimeControl
+ WHERE userFk = vWorker
+ AND timed > vTimed
+ ORDER BY timed ASC
+ LIMIT 1;
+
+ SELECT direction INTO vLastDirection
+ FROM workerTimeControl
+ WHERE userFk = vWorker
+ AND timed < vTimed
+ ORDER BY timed DESC
+ LIMIT 1;
+
+ -- FICHADAS A FUTURO
+ IF vTimed > DATE_ADD(NOW(), INTERVAL 60 SECOND) THEN
+ SET vErrorCode = 'IS_NOT_ALLOWED_FUTURE';
+ CALL util.throw(vErrorCode);
+ END IF;
+
+ -- CONTRATO EN VIGOR
+ IF vDayBreak IS NULL THEN
+ SET vErrorCode = 'INACTIVE_BUSINESS';
+ CALL util.throw(vErrorCode);
+ END IF;
+
+ -- VERIFICAR SI ESTÁ PERMITIDO TRABAJAR
+ CALL timeBusiness_calculateByWorker(vWorker, vDated, vDated);
+ SELECT isAllowedToWork INTO vIsAllowedToWork
+ FROM tmp.timeBusinessCalculate;
+ DROP TEMPORARY TABLE tmp.timeBusinessCalculate;
+
+ IF NOT vIsAllowedToWork THEN
+ SET vErrorCode = 'IS_NOT_ALLOWED_WORK';
+ CALL util.throw(vErrorCode);
+ END IF;
+
+ -- DIRECCION CORRECTA
+ CALL vn.workerTimeControl_direction(vWorker, vTimed);
+ IF (SELECT IF(IF(option1 IN ('inMiddle', 'outMiddle'), 'middle', option1) <> vDirection
+ AND IF(option2 IN ('inMiddle', 'outMiddle'), 'middle', IFNULL(option2, '')) <> vDirection, TRUE , FALSE)
+ FROM tmp.workerTimeControlDirection) THEN
+ SET vIsError = TRUE;
+ END IF;
+
+ DROP TEMPORARY TABLE tmp.workerTimeControlDirection;
+ IF vIsError = TRUE THEN
+ SET vErrorCode = 'WRONG_DIRECTION';
+ CALL util.throw(vErrorCode);
+ END IF;
+
+ -- FICHADAS IMPARES
+ IF (SELECT IF(vDirection = 'in', MOD(COUNT(*), 2) , IF (vDirection = 'out', NOT MOD(COUNT(*), 2), FALSE))
+ FROM workerTimeControl
+ WHERE userFk = vWorker
+ AND timed BETWEEN vLastIn AND vTimed
+ ) THEN
+ SET vErrorCode = 'ODD_WORKERTIMECONTROL';
+ CALL util.throw(vErrorCode);
+ END IF;
+
+ -- DESCANSO DIARIO
+ CASE vDirection
+ WHEN 'in' THEN
+ IF UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(vLastOut) <= vDayBreak THEN
+ SET vIsError = TRUE;
+ END IF;
+ WHEN 'out' THEN
+ IF UNIX_TIMESTAMP(vNextIn) - UNIX_TIMESTAMP(vTimed) <= vDayBreak THEN
+ SET vIsError = TRUE;
+ END IF;
+ ELSE BEGIN END;
+ END CASE;
+
+ IF vIsError THEN
+ SET vErrorCode = 'BREAK_DAY';
+ CALL util.throw(vErrorCode);
+ END IF;
+
+ -- VERIFICAR DESCANSO SEMANAL
+ IF (vDirection IN('in', 'out')) THEN
+ -- VERIFICA DESCANSO CORTO EN LA ÚLTIMA SEMANA
+ SET vGap = vWeekScope;
+ SET vTimedLoopPrevious = UNIX_TIMESTAMP((vTimed - INTERVAL vGap SECOND));
+ SET vDone = FALSE;
+ OPEN vCursor;
+ l:LOOP
+ FETCH vCursor INTO vTimedLoop;
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+ IF vShortWeekBreak - (vTimedLoop - vTimedLoopPrevious) < 0 THEN
+ SET vHasBreakWeek = TRUE;
+ LEAVE l;
+ END IF;
+ SET vTimedLoopPrevious = vTimedLoop;
+ END LOOP l;
+ CLOSE vCursor;
+ -- VERIFICA DESCANSO LARGO EN LA ÚLTIMAS 2 SEMANAS
+ IF NOT vHasBreakWeek THEN
+ SET vGap = vWeekScope * 2;
+ SET vTimedLoopPrevious = UNIX_TIMESTAMP((vTimed - INTERVAL vGap SECOND));
+ SET vDone = FALSE;
+ OPEN vCursor;
+ l:LOOP
+ FETCH vCursor INTO vTimedLoop;
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+ IF vLongWeekBreak - (vTimedLoop - vTimedLoopPrevious) < 0 THEN
+ SET vHasBreakWeek = TRUE;
+ LEAVE l;
+ END IF;
+ SET vTimedLoopPrevious = vTimedLoop;
+ END LOOP l;
+ CLOSE vCursor;
+ END IF;
+
+ IF vManual THEN
+ -- VERIFICA DESCANSO CORTO EN LA PRÓXIMA SEMANA
+ SET vGap = vWeekScope;
+ SET vTimedLoopPrevious = vTimed;
+ SET vDone = FALSE;
+ OPEN vCursor;
+ l:LOOP
+ FETCH vCursor INTO vTimedLoop;
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+ IF vShortWeekBreak - (vTimedLoop - vTimedLoopPrevious) < 0 THEN
+ SET vHasBreakWeek = TRUE;
+ LEAVE l;
+ END IF;
+ SET vTimedLoopPrevious = vTimedLoop;
+ END LOOP l;
+ CLOSE vCursor;
+ -- VERIFICA DESCANSO LARGO EN LAS PRÓXIMAS 2 SEMANAS
+ IF NOT vHasBreakWeek THEN
+ SET vGap = vWeekScope * 2;
+ SET vTimedLoopPrevious = vTimed;
+ SET vDone = FALSE;
+ OPEN vCursor;
+ l:LOOP
+ FETCH vCursor INTO vTimedLoop;
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+ IF vShortWeekBreak - (vTimedLoop - vTimedLoopPrevious) < 0 THEN
+ SET vHasBreakWeek = TRUE;
+ LEAVE l;
+ END IF;
+ SET vTimedLoopPrevious = vTimedLoop;
+ END LOOP l;
+ CLOSE vCursor;
+ END IF;
+ END IF;
+ IF NOT vHasBreakWeek THEN
+ SET vErrorCode = 'BREAK_WEEK';
+ CALL util.throw(vErrorCode);
+ END IF;
+ END IF;
+
+ -- SE PERMITE FICHAR
+ INSERT INTO workerTimeControl(userFk, timed, direction, manual)
+ VALUES(vWorker, vTimed, vDirection, vManual);
+
+ SELECT LAST_INSERT_ID() id;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -88359,7 +89659,81 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_direction`(vWorkerFk VARCHAR(10), vTimed DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_direction`(vWorkerFk VARCHAR(10), vTimed DATETIME)
+BEGIN
+/**
+ * Devuelve que direcciones de fichadas son lógicas a partir de la anterior fichada
+ * @param vWorkerFk Identificador del trabajador
+ * @return (option1, option2)
+ * Los valores posibles de retorno son ('in', 'inMiddle', 'outMiddle', 'out')
+ */
+ DECLARE vLastIn DATETIME ;
+ DECLARE vIsMiddleOdd BOOLEAN ;
+
+ IF (vTimed IS NULL) THEN
+ SET vTimed = NOW();
+ END IF;
+
+ SELECT timed INTO vLastIn
+ FROM workerTimeControl
+ WHERE userFk = vWorkerFk
+ AND direction = 'in'
+ AND timed < vTimed
+ ORDER BY timed DESC
+ LIMIT 1;
+
+ SELECT (COUNT(*)mod 2 = 1) INTO vIsMiddleOdd
+ FROM workerTimeControl
+ WHERE userFk = vWorkerFk
+ AND direction = 'middle'
+ AND timed BETWEEN vLastIn AND NOW();
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlDirection;
+ CREATE TEMPORARY TABLE tmp.workerTimeControlDirection
+ SELECT IF(isCorrect, option1, NULL) option1,
+ IF(isCorrect, option2, NULL) option2
+ FROM( SELECT IF(w.direction <> 'out' AND (UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(w.timed) > wc.dayBreak), FALSE, TRUE) isCorrect,
+ CASE WHEN w.direction ='in' THEN 'inMiddle'
+ WHEN w.direction = 'out' THEN 'in'
+ WHEN w.direction = 'middle' AND vIsMiddleOdd THEN 'outMiddle'
+ WHEN w.direction IS NULL THEN 'in'
+ ELSE 'inMiddle'
+ END option1,
+ CASE WHEN w.direction ='in' THEN 'out'
+ WHEN w.direction = 'out' THEN NULL
+ WHEN w.direction = 'middle' AND vIsMiddleOdd THEN NULL
+ WHEN w.direction IS NULL THEN NULL
+ ELSE 'out'
+ END option2
+ FROM workerTimeControl w
+ JOIN workerTimeControlConfig wc ON TRUE
+ WHERE w.timed <= vTimed
+ AND w.userFk = vWorkerFk
+ ORDER BY w.timed DESC
+ LIMIT 1)sub;
+
+ IF (SELECT IF(COUNT(*)=0, TRUE, FALSE) FROM tmp.workerTimeControlDirection ) THEN
+ INSERT INTO tmp.workerTimeControlDirection (option1, option2)
+ VALUES('in', NULL);
+ END IF;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControl_direction__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_direction__`(vWorkerFk VARCHAR(10), vTimed DATETIME)
BEGIN
/**
* Devuelve que direcciones de fichadas son lógicas a partir de la anterior fichada
@@ -88426,11 +89800,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_getClockIn`(vUserFk INT, vDated DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_getClockIn`(vUserFk INT, vDated DATE)
BEGIN
/**
@@ -88529,11 +89903,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_login`(vWorkerFk VARCHAR(10))
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_login`(vWorkerFk VARCHAR(10))
BEGIN
/**
* Consulta la información del usuario y los botones que tiene que activar en la tablet tras hacer login
@@ -88568,11 +89942,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_remove`(IN vUserFk INT, IN vTimed DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_remove`(IN vUserFk INT, IN vTimed DATETIME)
BEGIN
DECLARE vDirectionRemove VARCHAR(6);
@@ -88628,13 +90002,13 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_repair`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_repair`()
proc: BEGIN
/**
* Corrige las fichadas
@@ -88682,11 +90056,11 @@ DELIMITER ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_sendMail`(vWeek INT, vYear INT, vWorkerFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_sendMail`(vWeek INT, vYear INT, vWorkerFk INT)
BEGIN
/**
* Inserta en la tabla vn.mail para notificar a los empleados que teletrabajan de las jornadas que se han registrado.
@@ -88964,11 +90338,11 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_sendMailByDepartment`(IN vWeek int, IN vYear int, IN vWorkerFk int)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_sendMailByDepartment`(IN vWeek int, IN vYear int, IN vWorkerFk int)
BEGIN
/**
- * Inserta el registro de horario semanalmente de PRODUCCION, CAMARA, TALLER NATURAL y TALLER ARTIFICIAL en vn.mail.
+ * Inserta el registro de horario semanalmente de PRODUCCION, CAMARA, REPARTO, TALLER NATURAL y TALLER ARTIFICIAL en vn.mail.
*
* @param vWeek
* @param vYear
@@ -89000,9 +90374,9 @@ BEGIN
CREATE TEMPORARY TABLE tmp.reportHours
SELECT t.dated,
IF (tm.hoursWeek IS NULL,'', GROUP_CONCAT(DATE_FORMAT(wtc.timed,'%H:%i') ORDER BY wtc.timed ASC SEPARATOR ' ') ) timeWorkDay,
- IFNULL(TIME_FORMAT(tm.timeWorkSexagesimal, '%H:%i'),0) tm,
- IFNULL(TIME_FORMAT(tc.timeWorkSexagesimal, '%H:%i'),0) tc,
- IFNULL(TIME_FORMAT(SUBTIME(TIME_FORMAT(tc.timeWorkSexagesimal, '%H:%i'), tm.timeWorkSexagesimal), '%H:%i'),0) balance,
+ SEC_TO_TIME(IFNULL(tm.timeWorkSeconds, 0)) tm,
+ SEC_TO_TIME(IFNULL(tc.timeWorkSeconds, 0)) tc,
+ SEC_TO_TIME(IFNULL(tc.timeWorkSeconds, 0) - IFNULL(tm.timeWorkSeconds, 0)) balance,
w.lastName,
w.firstname,
c.fi,
@@ -89027,12 +90401,12 @@ BEGIN
LEFT JOIN client c ON c.id = w.id
WHERE wc.name NOT IN ('VNH')
AND d.hasToSendMail
- AND wl.ended >= CURDATE()
+ AND (wl.ended >= CURDATE() OR wl.ended IS NULL)
GROUP BY tm.userFk,t.dated
ORDER BY tm.userFk,t.dated;
INSERT INTO vn.mail (receiver, replyTo, subject, body)
- SELECT eu.email, 'laboral@verdnatura.es', CONCAT('Registro de horas semana ', WEEK(CURDATE())-1, ' año ', YEAR(CURDATE())) ,
+ SELECT eu.email, 'laboral@verdnatura.es', CONCAT('Registro de horas semana ', vWeek, ' año ', vYear) ,
CONCAT('
@@ -89051,8 +90425,8 @@ BEGIN
- Según la información recogida en el sistema, adjuntamos tabla con los registros. Cualquier incidencia rogamos la comunique a laboral@verdnatura.es.
- + Según la información recogida en el sistema, adjuntamos la tabla con los registros. Cualquier incidencia rogamos la comunique a laboral@verdnatura.es. + De no recibir incidencia por su parte, se entenderá que el registro es correcto. |
||||
', CONCAT(UCASE(LEFT(DAYNAME(rh.dated), 1)), SUBSTRING(DAYNAME(rh.dated), 2)), ' | ', IFNULL(rh.timeWorkDay,' '),' ', IFNULL(rh.type,' '), ' | ', rh.tm, - ' | ', rh.tc, - ' | ', rh.balance, ' | ', SUBSTRING_INDEX(rh.tc, '.', 1), + ' | ', SUBSTRING_INDEX(rh.balance, '.', 1), ' | ' ORDER BY rh.dated SEPARATOR ''), 'Total horas trabajadas: | -', SUM(rh.tc),' | -', SUM(rh.balance),' | +', SUBSTRING_INDEX(SEC_TO_TIME(SUM(TIME_TO_SEC(rh.tc))), '.', 1),' | +', SUBSTRING_INDEX(SEC_TO_TIME(SUM(TIME_TO_SEC(rh.balance))), '.', 1),' |