diff --git a/db/changes/224701/00-ACL.sql b/db/.archive/224701/00-ACL.sql similarity index 100% rename from db/changes/224701/00-ACL.sql rename to db/.archive/224701/00-ACL.sql diff --git a/db/changes/224701/00-acl_receiptPdf.sql b/db/.archive/224701/00-acl_receiptPdf.sql similarity index 100% rename from db/changes/224701/00-acl_receiptPdf.sql rename to db/.archive/224701/00-acl_receiptPdf.sql diff --git a/db/changes/224701/00-clientConsumptionQueue.sql b/db/.archive/224701/00-clientConsumptionQueue.sql similarity index 100% rename from db/changes/224701/00-clientConsumptionQueue.sql rename to db/.archive/224701/00-clientConsumptionQueue.sql diff --git a/db/changes/224701/00-invoiceOutQueue.sql b/db/.archive/224701/00-invoiceOutQueue.sql similarity index 100% rename from db/changes/224701/00-invoiceOutQueue.sql rename to db/.archive/224701/00-invoiceOutQueue.sql diff --git a/db/changes/224701/00-itemConfig.sql b/db/.archive/224701/00-itemConfig.sql similarity index 100% rename from db/changes/224701/00-itemConfig.sql rename to db/.archive/224701/00-itemConfig.sql diff --git a/db/changes/224701/00-printConfig.sql b/db/.archive/224701/00-printConfig.sql similarity index 100% rename from db/changes/224701/00-printConfig.sql rename to db/.archive/224701/00-printConfig.sql diff --git a/db/changes/224701/00-sale_afterUpdate.sql b/db/.archive/224701/00-sale_afterUpdate.sql similarity index 100% rename from db/changes/224701/00-sale_afterUpdate.sql rename to db/.archive/224701/00-sale_afterUpdate.sql diff --git a/db/changes/224701/00-sample.sql b/db/.archive/224701/00-sample.sql similarity index 100% rename from db/changes/224701/00-sample.sql rename to db/.archive/224701/00-sample.sql diff --git a/db/changes/224701/00-user_hasGrant.sql b/db/.archive/224701/00-user_hasGrant.sql similarity index 100% rename from db/changes/224701/00-user_hasGrant.sql rename to db/.archive/224701/00-user_hasGrant.sql diff --git a/db/changes/224702/00-ACL_workerDisableExcluded.sql b/db/.archive/224702/00-ACL_workerDisableExcluded.sql similarity index 100% rename from db/changes/224702/00-ACL_workerDisableExcluded.sql rename to db/.archive/224702/00-ACL_workerDisableExcluded.sql diff --git a/db/changes/224702/00-aclBusiness.sql b/db/.archive/224702/00-aclBusiness.sql similarity index 100% rename from db/changes/224702/00-aclBusiness.sql rename to db/.archive/224702/00-aclBusiness.sql diff --git a/db/changes/224702/00-aclUsesMana.sql b/db/.archive/224702/00-aclUsesMana.sql similarity index 100% rename from db/changes/224702/00-aclUsesMana.sql rename to db/.archive/224702/00-aclUsesMana.sql diff --git a/db/changes/224702/00-defaultPayDem_sameAs_production.sql b/db/.archive/224702/00-defaultPayDem_sameAs_production.sql similarity index 100% rename from db/changes/224702/00-defaultPayDem_sameAs_production.sql rename to db/.archive/224702/00-defaultPayDem_sameAs_production.sql diff --git a/db/changes/224702/00-invoiceInPdf.sql b/db/.archive/224702/00-invoiceInPdf.sql similarity index 100% rename from db/changes/224702/00-invoiceInPdf.sql rename to db/.archive/224702/00-invoiceInPdf.sql diff --git a/db/changes/224702/00-newSupplier_ACL.sql b/db/.archive/224702/00-newSupplier_ACL.sql similarity index 100% rename from db/changes/224702/00-newSupplier_ACL.sql rename to db/.archive/224702/00-newSupplier_ACL.sql diff --git a/db/changes/224702/00-notificationProc.sql b/db/.archive/224702/00-notificationProc.sql similarity index 100% rename from db/changes/224702/00-notificationProc.sql rename to db/.archive/224702/00-notificationProc.sql diff --git a/db/changes/224702/00-notificationTables.sql b/db/.archive/224702/00-notificationTables.sql similarity index 100% rename from db/changes/224702/00-notificationTables.sql rename to db/.archive/224702/00-notificationTables.sql diff --git a/db/changes/224702/00-payMethodFk_Allow_Null.sql b/db/.archive/224702/00-payMethodFk_Allow_Null.sql similarity index 100% rename from db/changes/224702/00-payMethodFk_Allow_Null.sql rename to db/.archive/224702/00-payMethodFk_Allow_Null.sql diff --git a/db/changes/224702/00-supplierActivityFk_Allow_Null.sql b/db/.archive/224702/00-supplierActivityFk_Allow_Null.sql similarity index 100% rename from db/changes/224702/00-supplierActivityFk_Allow_Null.sql rename to db/.archive/224702/00-supplierActivityFk_Allow_Null.sql diff --git a/db/changes/224702/00-ticket_closeByTicket.sql b/db/.archive/224702/00-ticket_closeByTicket.sql similarity index 100% rename from db/changes/224702/00-ticket_closeByTicket.sql rename to db/.archive/224702/00-ticket_closeByTicket.sql diff --git a/db/changes/224702/00-zipConfig.sql b/db/.archive/224702/00-zipConfig.sql similarity index 100% rename from db/changes/224702/00-zipConfig.sql rename to db/.archive/224702/00-zipConfig.sql diff --git a/db/changes/224801/00-ACL.sql b/db/.archive/224801/00-ACL.sql similarity index 100% rename from db/changes/224801/00-ACL.sql rename to db/.archive/224801/00-ACL.sql diff --git a/db/changes/224801/00-claim.sql b/db/.archive/224801/00-claim.sql similarity index 100% rename from db/changes/224801/00-claim.sql rename to db/.archive/224801/00-claim.sql diff --git a/db/changes/224801/00-claimRma.sql b/db/.archive/224801/00-claimRma.sql similarity index 100% rename from db/changes/224801/00-claimRma.sql rename to db/.archive/224801/00-claimRma.sql diff --git a/db/changes/224901/00-aclNotification.sql b/db/.archive/224901/00-aclNotification.sql similarity index 100% rename from db/changes/224901/00-aclNotification.sql rename to db/.archive/224901/00-aclNotification.sql diff --git a/db/changes/224901/00-packingSiteConfig.sql b/db/.archive/224901/00-packingSiteConfig.sql similarity index 100% rename from db/changes/224901/00-packingSiteConfig.sql rename to db/.archive/224901/00-packingSiteConfig.sql diff --git a/db/changes/224901/00-packingSiteUpdate.sql b/db/.archive/224901/00-packingSiteUpdate.sql similarity index 100% rename from db/changes/224901/00-packingSiteUpdate.sql rename to db/.archive/224901/00-packingSiteUpdate.sql diff --git a/db/changes/224901/00-salix_url.sql b/db/.archive/224901/00-salix_url.sql similarity index 100% rename from db/changes/224901/00-salix_url.sql rename to db/.archive/224901/00-salix_url.sql diff --git a/db/changes/224902/00-aclUserPassword.sql b/db/.archive/224902/00-aclUserPassword.sql similarity index 100% rename from db/changes/224902/00-aclUserPassword.sql rename to db/.archive/224902/00-aclUserPassword.sql diff --git a/db/changes/224902/00-deletePickupContact.sql b/db/.archive/224902/00-deletePickupContact.sql similarity index 100% rename from db/changes/224902/00-deletePickupContact.sql rename to db/.archive/224902/00-deletePickupContact.sql diff --git a/db/changes/224902/00-itemShelvingACL.sql b/db/.archive/224902/00-itemShelvingACL.sql similarity index 100% rename from db/changes/224902/00-itemShelvingACL.sql rename to db/.archive/224902/00-itemShelvingACL.sql diff --git a/db/changes/224902/00-itemShelvingPlacementSupplyStockACL.sql b/db/.archive/224902/00-itemShelvingPlacementSupplyStockACL.sql similarity index 100% rename from db/changes/224902/00-itemShelvingPlacementSupplyStockACL.sql rename to db/.archive/224902/00-itemShelvingPlacementSupplyStockACL.sql diff --git a/db/changes/224902/00-workerTimeControlMail.sql b/db/.archive/224902/00-workerTimeControlMail.sql similarity index 100% rename from db/changes/224902/00-workerTimeControlMail.sql rename to db/.archive/224902/00-workerTimeControlMail.sql diff --git a/db/changes/224902/00-zone_getPostalCode.sql b/db/.archive/224902/00-zone_getPostalCode.sql similarity index 100% rename from db/changes/224902/00-zone_getPostalCode.sql rename to db/.archive/224902/00-zone_getPostalCode.sql diff --git a/db/changes/224903/00-ACL_notification_InvoiceE.sql b/db/.archive/224903/00-ACL_notification_InvoiceE.sql similarity index 100% rename from db/changes/224903/00-ACL_notification_InvoiceE.sql rename to db/.archive/224903/00-ACL_notification_InvoiceE.sql diff --git a/db/changes/224903/00-aclInvoiceOut.sql b/db/.archive/224903/00-aclInvoiceOut.sql similarity index 100% rename from db/changes/224903/00-aclInvoiceOut.sql rename to db/.archive/224903/00-aclInvoiceOut.sql diff --git a/db/changes/224903/00-alter_expedition_itemFk.sql b/db/.archive/224903/00-alter_expedition_itemFk.sql similarity index 100% rename from db/changes/224903/00-alter_expedition_itemFk.sql rename to db/.archive/224903/00-alter_expedition_itemFk.sql diff --git a/db/changes/224903/00-clientHasInvoiceElectronic.sql b/db/.archive/224903/00-clientHasInvoiceElectronic.sql similarity index 100% rename from db/changes/224903/00-clientHasInvoiceElectronic.sql rename to db/.archive/224903/00-clientHasInvoiceElectronic.sql diff --git a/db/changes/224903/00-collection_missingTrash.sql b/db/.archive/224903/00-collection_missingTrash.sql similarity index 100% rename from db/changes/224903/00-collection_missingTrash.sql rename to db/.archive/224903/00-collection_missingTrash.sql diff --git a/db/changes/224903/00-deleteInvoiceOutQueue.sql b/db/.archive/224903/00-deleteInvoiceOutQueue.sql similarity index 100% rename from db/changes/224903/00-deleteInvoiceOutQueue.sql rename to db/.archive/224903/00-deleteInvoiceOutQueue.sql diff --git a/db/changes/224903/00-editTrackedACL.sql b/db/.archive/224903/00-editTrackedACL.sql similarity index 100% rename from db/changes/224903/00-editTrackedACL.sql rename to db/.archive/224903/00-editTrackedACL.sql diff --git a/db/changes/224903/00-greuge.sql b/db/.archive/224903/00-greuge.sql similarity index 100% rename from db/changes/224903/00-greuge.sql rename to db/.archive/224903/00-greuge.sql diff --git a/db/changes/224903/00-isCompensationACL.sql b/db/.archive/224903/00-isCompensationACL.sql similarity index 100% rename from db/changes/224903/00-isCompensationACL.sql rename to db/.archive/224903/00-isCompensationACL.sql diff --git a/db/changes/224903/00-osTicketConfig.sql b/db/.archive/224903/00-osTicketConfig.sql similarity index 100% rename from db/changes/224903/00-osTicketConfig.sql rename to db/.archive/224903/00-osTicketConfig.sql diff --git a/db/changes/224903/00-ticket_canMerge.sql b/db/.archive/224903/00-ticket_canMerge.sql similarity index 100% rename from db/changes/224903/00-ticket_canMerge.sql rename to db/.archive/224903/00-ticket_canMerge.sql diff --git a/db/changes/224903/00-ticket_canbePostponed.sql b/db/.archive/224903/00-ticket_canbePostponed.sql similarity index 100% rename from db/changes/224903/00-ticket_canbePostponed.sql rename to db/.archive/224903/00-ticket_canbePostponed.sql diff --git a/db/changes/224903/00-timeBusiness_calculate.sql b/db/.archive/224903/00-timeBusiness_calculate.sql similarity index 100% rename from db/changes/224903/00-timeBusiness_calculate.sql rename to db/.archive/224903/00-timeBusiness_calculate.sql diff --git a/db/changes/224903/01-updateClientHasInvoiceElectronic.sql b/db/.archive/224903/01-updateClientHasInvoiceElectronic.sql similarity index 100% rename from db/changes/224903/01-updateClientHasInvoiceElectronic.sql rename to db/.archive/224903/01-updateClientHasInvoiceElectronic.sql diff --git a/db/changes/225001/00-aclMdbApp.sql b/db/.archive/225001/00-aclMdbApp.sql similarity index 100% rename from db/changes/225001/00-aclMdbApp.sql rename to db/.archive/225001/00-aclMdbApp.sql diff --git a/db/changes/225001/00-updateCollection.sql b/db/.archive/225001/00-updateCollection.sql similarity index 100% rename from db/changes/225001/00-updateCollection.sql rename to db/.archive/225001/00-updateCollection.sql diff --git a/db/changes/225201/00-ACL_saveSign.sql b/db/.archive/225201/00-ACL_saveSign.sql similarity index 100% rename from db/changes/225201/00-ACL_saveSign.sql rename to db/.archive/225201/00-ACL_saveSign.sql diff --git a/db/changes/225201/00-accountingMovements_add.sql b/db/.archive/225201/00-accountingMovements_add.sql similarity index 100% rename from db/changes/225201/00-accountingMovements_add.sql rename to db/.archive/225201/00-accountingMovements_add.sql diff --git a/db/changes/225201/00-aclTicketLog.sql b/db/.archive/225201/00-aclTicketLog.sql similarity index 100% rename from db/changes/225201/00-aclTicketLog.sql rename to db/.archive/225201/00-aclTicketLog.sql diff --git a/db/changes/225201/00-entryDeleteRef.sql b/db/.archive/225201/00-entryDeleteRef.sql similarity index 100% rename from db/changes/225201/00-entryDeleteRef.sql rename to db/.archive/225201/00-entryDeleteRef.sql diff --git a/db/changes/225201/00-invoiceInConfig.sql b/db/.archive/225201/00-invoiceInConfig.sql similarity index 100% rename from db/changes/225201/00-invoiceInConfig.sql rename to db/.archive/225201/00-invoiceInConfig.sql diff --git a/db/changes/225201/00-invoiceOut_new.sql b/db/.archive/225201/00-invoiceOut_new.sql similarity index 100% rename from db/changes/225201/00-invoiceOut_new.sql rename to db/.archive/225201/00-invoiceOut_new.sql diff --git a/db/changes/225201/00-mdbApp.sql b/db/.archive/225201/00-mdbApp.sql similarity index 100% rename from db/changes/225201/00-mdbApp.sql rename to db/.archive/225201/00-mdbApp.sql diff --git a/db/changes/225201/00-notification_send.sql b/db/.archive/225201/00-notification_send.sql similarity index 100% rename from db/changes/225201/00-notification_send.sql rename to db/.archive/225201/00-notification_send.sql diff --git a/db/changes/225201/00-supplier_beforeUpdate.sql b/db/.archive/225201/00-supplier_beforeUpdate.sql similarity index 100% rename from db/changes/225201/00-supplier_beforeUpdate.sql rename to db/.archive/225201/00-supplier_beforeUpdate.sql diff --git a/db/changes/225201/00-ticketSms.sql b/db/.archive/225201/00-ticketSms.sql similarity index 100% rename from db/changes/225201/00-ticketSms.sql rename to db/.archive/225201/00-ticketSms.sql diff --git a/db/changes/225201/00-ticket_canAdvance.sql b/db/.archive/225201/00-ticket_canAdvance.sql similarity index 100% rename from db/changes/225201/00-ticket_canAdvance.sql rename to db/.archive/225201/00-ticket_canAdvance.sql diff --git a/db/changes/225201/00-ticket_canbePostponed.sql b/db/.archive/225201/00-ticket_canbePostponed.sql similarity index 100% rename from db/changes/225201/00-ticket_canbePostponed.sql rename to db/.archive/225201/00-ticket_canbePostponed.sql diff --git a/db/changes/225201/00-ticket_split_merge.sql b/db/.archive/225201/00-ticket_split_merge.sql similarity index 100% rename from db/changes/225201/00-ticket_split_merge.sql rename to db/.archive/225201/00-ticket_split_merge.sql diff --git a/db/changes/225201/00-utilNotification.sql b/db/.archive/225201/00-utilNotification.sql similarity index 100% rename from db/changes/225201/00-utilNotification.sql rename to db/.archive/225201/00-utilNotification.sql diff --git a/db/changes/225201/01-create_stateI18n.sql b/db/.archive/225201/01-create_stateI18n.sql similarity index 100% rename from db/changes/225201/01-create_stateI18n.sql rename to db/.archive/225201/01-create_stateI18n.sql diff --git a/db/changes/225201/01-modules.sql b/db/.archive/225201/01-modules.sql similarity index 100% rename from db/changes/225201/01-modules.sql rename to db/.archive/225201/01-modules.sql diff --git a/db/changes/225201/02-insert_stateI18n.sql b/db/.archive/225201/02-insert_stateI18n.sql similarity index 100% rename from db/changes/225201/02-insert_stateI18n.sql rename to db/.archive/225201/02-insert_stateI18n.sql diff --git a/db/changes/225201/02-starredModule.sql b/db/.archive/225201/02-starredModule.sql similarity index 100% rename from db/changes/225201/02-starredModule.sql rename to db/.archive/225201/02-starredModule.sql diff --git a/db/changes/225202/00-mdbApp.sql b/db/.archive/225202/00-mdbApp.sql similarity index 100% rename from db/changes/225202/00-mdbApp.sql rename to db/.archive/225202/00-mdbApp.sql diff --git a/db/changes/225203/00-mdbApp.sql b/db/.archive/225203/00-mdbApp.sql similarity index 100% rename from db/changes/225203/00-mdbApp.sql rename to db/.archive/225203/00-mdbApp.sql diff --git a/db/changes/230201/00-ACL_ItemShelvingSale.sql b/db/.archive/230201/00-ACL_ItemShelvingSale.sql similarity index 100% rename from db/changes/230201/00-ACL_ItemShelvingSale.sql rename to db/.archive/230201/00-ACL_ItemShelvingSale.sql diff --git a/db/changes/230201/00-SupplierUniqueKey.sql b/db/.archive/230201/00-SupplierUniqueKey.sql similarity index 100% rename from db/changes/230201/00-SupplierUniqueKey.sql rename to db/.archive/230201/00-SupplierUniqueKey.sql diff --git a/db/changes/230201/00-autoincrement_VnReport_VnPrinter.sql b/db/.archive/230201/00-autoincrement_VnReport_VnPrinter.sql similarity index 100% rename from db/changes/230201/00-autoincrement_VnReport_VnPrinter.sql rename to db/.archive/230201/00-autoincrement_VnReport_VnPrinter.sql diff --git a/db/changes/230201/00-borradoLogicoIPT.sql b/db/.archive/230201/00-borradoLogicoIPT.sql similarity index 100% rename from db/changes/230201/00-borradoLogicoIPT.sql rename to db/.archive/230201/00-borradoLogicoIPT.sql diff --git a/db/changes/230201/00-docuwareStore.sql b/db/.archive/230201/00-docuwareStore.sql similarity index 100% rename from db/changes/230201/00-docuwareStore.sql rename to db/.archive/230201/00-docuwareStore.sql diff --git a/db/changes/230201/00-kkearSaleChecked.sql b/db/.archive/230201/00-kkearSaleChecked.sql similarity index 100% rename from db/changes/230201/00-kkearSaleChecked.sql rename to db/.archive/230201/00-kkearSaleChecked.sql diff --git a/db/changes/230201/00-priceFixed_getRate2.sql b/db/.archive/230201/00-priceFixed_getRate2.sql similarity index 100% rename from db/changes/230201/00-priceFixed_getRate2.sql rename to db/.archive/230201/00-priceFixed_getRate2.sql diff --git a/db/changes/230201/00-triggersXDiario.sql b/db/.archive/230201/00-triggersXDiario.sql similarity index 100% rename from db/changes/230201/00-triggersXDiario.sql rename to db/.archive/230201/00-triggersXDiario.sql diff --git a/db/changes/230201/00-validPriorities_ItemConfig.sql b/db/.archive/230201/00-validPriorities_ItemConfig.sql similarity index 100% rename from db/changes/230201/00-validPriorities_ItemConfig.sql rename to db/.archive/230201/00-validPriorities_ItemConfig.sql diff --git a/db/changes/230201/00-workerTimeControlConfig.sql b/db/.archive/230201/00-workerTimeControlConfig.sql similarity index 100% rename from db/changes/230201/00-workerTimeControlConfig.sql rename to db/.archive/230201/00-workerTimeControlConfig.sql diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql index 77dd8c1f7..2297964ce 100644 --- a/db/dump/dumpedFixtures.sql +++ b/db/dump/dumpedFixtures.sql @@ -1,6 +1,6 @@ USE `util`; --- MariaDB dump 10.19 Distrib 10.9.4-MariaDB, for Linux (x86_64) +-- MariaDB dump 10.19 Distrib 10.5.18-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: db.verdnatura.es Database: util -- ------------------------------------------------------ @@ -22,7 +22,7 @@ USE `util`; LOCK TABLES `config` WRITE; /*!40000 ALTER TABLE `config` DISABLE KEYS */; -INSERT INTO `config` VALUES (1,'224602',0,'production',NULL); +INSERT INTO `config` VALUES (1,'230201',0,'production',NULL); /*!40000 ALTER TABLE `config` ENABLE KEYS */; UNLOCK TABLES; @@ -32,9 +32,7 @@ UNLOCK TABLES; LOCK TABLES `version` WRITE; /*!40000 ALTER TABLE `version` DISABLE KEYS */; -INSERT INTO `version` VALUES -('salix','10230','53f69ae8e526a4a5d827c237a5b076d38507b392','2020-11-09 11:06:43',NULL), -('vn-database','10396','79ff2f97f529169a98ae52193298df320158ca11','2022-11-17 15:36:38','10399'); +INSERT INTO `version` VALUES ('salix','10230','53f69ae8e526a4a5d827c237a5b076d38507b392','2020-11-09 11:06:43',NULL),('vn-database','10463','73eedb3219170236acda72c64c3f61b2a9ec421e','2023-02-03 13:50:50','10466'); /*!40000 ALTER TABLE `version` ENABLE KEYS */; UNLOCK TABLES; @@ -44,257 +42,7 @@ UNLOCK TABLES; LOCK TABLES `versionLog` WRITE; /*!40000 ALTER TABLE `versionLog` DISABLE KEYS */; -INSERT INTO `versionLog` VALUES -('vn-database','00001','00-test.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL), -('vn-database','00003','00-sage.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL), -('vn-database','10008','00-alterRoleConfig.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL), -('vn-database','10014','00-rolePrefix.sql','jenkins@10.0.2.68','2022-02-11 00:13:25',NULL,NULL), -('vn-database','10017','01-firstScript.sql','jenkins@10.0.2.70','2022-03-09 11:36:54',NULL,NULL), -('vn-database','10021','00-bankAccount.sql','jenkins@10.0.2.69','2022-03-16 14:11:22',NULL,NULL), -('vn-database','10023','00-firstScript.sql','jenkins@10.0.2.69','2022-03-16 15:05:29',NULL,NULL), -('vn-database','10026','00-invoiceInIntrastat.sql','jenkins@10.0.2.69','2022-03-21 15:10:53',NULL,NULL), -('vn-database','10027','00-Clientes_cedidos.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL), -('vn-database','10028','00-item_last_buy_.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL), -('vn-database','10029','00-bankToViewAccountingToTable.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL), -('vn-database','10030','00-KkejarNiche.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL), -('vn-database','10036','00-updateBuyConfig.sql','jenkins@10.0.2.69','2022-03-29 12:36:54',NULL,NULL), -('vn-database','10037','00-firstScript.sql','jenkins@10.0.2.69','2022-03-28 11:14:26',NULL,NULL), -('vn-database','10038','00-printServerQueue.sql','jenkins@10.0.2.69','2022-03-29 08:13:24',NULL,NULL), -('vn-database','10048','00-firstScript.sql','jenkins@10.0.2.69','2022-03-30 12:29:06',NULL,NULL), -('vn-database','10058','00-vehicleAddFields.sql','jenkins@10.0.2.69','2022-04-06 08:48:34',NULL,NULL), -('vn-database','10060','00-firstScript.sql','jenkins@10.0.2.69','2022-04-07 08:50:11',NULL,NULL), -('vn-database','10062','00-firstScript.sql','jenkins@10.0.2.69','2022-04-06 10:51:45',NULL,NULL), -('vn-database','10064','00-firstScript.sql','jenkins@10.0.2.69','2022-04-06 13:57:11',NULL,NULL), -('vn-database','10066','00-firstScript.sql','jenkins@10.0.2.69','2022-04-07 08:50:12',NULL,NULL), -('vn-database','10067','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 10:18:20',NULL,NULL), -('vn-database','10071','00-packingSiteLog.sql','jenkins@10.0.2.69','2022-04-08 09:37:30',NULL,NULL), -('vn-database','10072','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 11:01:46',NULL,NULL), -('vn-database','10073','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 13:40:56',NULL,NULL), -('vn-database','10074','00-firstScript.sql','jenkins@10.0.2.69','2022-04-10 13:15:05',NULL,NULL), -('vn-database','10077','00-firstScript.sql','jenkins@10.0.2.69','2022-04-12 08:07:15',NULL,NULL), -('vn-database','10078','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 07:44:21',NULL,NULL), -('vn-database','10079','00-firstScript.sql','jenkins@10.0.2.69','2022-04-12 12:01:37',NULL,NULL), -('vn-database','10086','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 08:58:34',NULL,NULL), -('vn-database','10087','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 09:39:49',NULL,NULL), -('vn-database','10088','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 15:05:12',NULL,NULL), -('vn-database','10089','00-firstScript.sql','jenkins@10.0.2.69','2022-04-18 14:12:52',NULL,NULL), -('vn-database','10090','00-firstScript.sql','jenkins@10.0.2.69','2022-04-18 14:34:46',NULL,NULL), -('vn-database','10092','00-firstScript.sql','jenkins@10.0.2.69','2022-04-19 14:45:46',NULL,NULL), -('vn-database','10093','00-autoradioConfig.sql','jenkins@10.0.2.69','2022-05-03 09:16:47',NULL,NULL), -('vn-database','10094','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 10:57:30',NULL,NULL), -('vn-database','10097','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL), -('vn-database','10099','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 14:35:27',NULL,NULL), -('vn-database','10100','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 14:35:27',NULL,NULL), -('vn-database','10101','00-firstScript.sql','jenkins@10.0.2.69','2022-04-21 14:59:31',NULL,NULL), -('vn-database','10103','00-awbVolume.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL), -('vn-database','10104','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL), -('vn-database','10105','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL), -('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL), -('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL), -('vn-database','10113','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL), -('vn-database','10114','00-updateConfig.sql','jenkins@10.0.2.69','2022-04-27 13:37:25',NULL,NULL), -('vn-database','10116','00-firstScript.sql','jenkins@10.0.2.69','2022-04-28 11:10:14',NULL,NULL), -('vn-database','10118','00-firstScript.sql','jenkins@10.0.2.69','2022-04-29 08:10:15',NULL,NULL), -('vn-database','10119','00-AfegirFKPart1.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL), -('vn-database','10119','01-AfegirFkPart2.sql','jenkins@10.0.2.69','2022-05-05 10:22:25',NULL,NULL), -('vn-database','10125','00-firstScript.sql','jenkins@10.0.2.68','2022-05-18 18:44:30',NULL,NULL), -('vn-database','10127','00-firstScript.sql','jenkins@10.0.2.69','2022-05-02 11:04:46',NULL,NULL), -('vn-database','10128','00-firstScript.sql','jenkins@10.0.2.69','2022-05-02 13:04:31',NULL,NULL), -('vn-database','10129','00-firstScript.sql','jenkins@10.0.2.69','2022-05-03 08:21:01',NULL,NULL), -('vn-database','10132','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:22:25',NULL,NULL), -('vn-database','10133','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 14:32:30',NULL,NULL), -('vn-database','10134','00-firstScript.sql','jenkins@10.0.2.69','2022-05-06 07:45:25',NULL,NULL), -('vn-database','10135','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 08:46:17',NULL,NULL), -('vn-database','10136','00-workerTimeControl.sql','jenkins@10.0.2.69','2022-05-09 13:51:12',NULL,NULL), -('vn-database','10138','00-firstScript.sql','jenkins@10.0.2.69','2022-05-10 13:58:05',NULL,NULL), -('vn-database','10139','00-firstScript.sql','jenkins@10.0.2.68','2022-05-16 14:32:37',NULL,NULL), -('vn-database','10139','01-secondScript.sql','jenkins@10.0.2.68','2022-05-17 12:16:13',NULL,NULL), -('vn-database','10141','00-firstScript.sql','jenkins@10.0.2.70','2022-05-12 08:27:31',NULL,NULL), -('vn-database','10142','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:20:31',NULL,NULL), -('vn-database','10143','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:20:31',NULL,NULL), -('vn-database','10144','00-AfegirFKPArt1.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL), -('vn-database','10144','00-firstScript.sql','jenkins@10.0.2.68','2022-05-13 09:44:25',NULL,NULL), -('vn-database','10147','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL), -('vn-database','10149','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL), -('vn-database','10150','00-firstScript.sql','jenkins@10.0.2.68','2022-05-17 09:57:16',NULL,NULL), -('vn-database','10152','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL), -('vn-database','10153','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL), -('vn-database','10154','00-compressionKk.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL), -('vn-database','10157','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:35',NULL,NULL), -('vn-database','10158','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:21',NULL,NULL), -('vn-database','10160','00-firstScript.sql','jenkins@10.0.2.69','2022-06-30 09:30:50',NULL,NULL), -('vn-database','10163','00-firstScript.sql','jenkins@10.0.2.68','2022-05-23 08:17:14',NULL,NULL), -('vn-database','10164','00-borrarSectorsDesus.sql','jenkins@10.0.2.68','2022-06-02 12:47:21',NULL,NULL), -('vn-database','10165','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL), -('vn-database','10166','00-firstScript.sql','jenkins@10.0.2.68','2022-05-24 16:11:21',NULL,NULL), -('vn-database','10167','00-renameVnActiveContrat.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL), -('vn-database','10168','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL), -('vn-database','10169','00-createTableBankEntityConfig.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL), -('vn-database','10169','02-addNotNullToBankEntityBic.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL), -('vn-database','10171','00-volumeConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 14:11:11',NULL,NULL), -('vn-database','10171','01-itemWeight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 16:01:34',NULL,NULL), -('vn-database','10171','02-agencymode.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 16:01:34',NULL,NULL), -('vn-database','10172','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL), -('vn-database','10174','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 08:46:17',NULL,NULL), -('vn-database','10175','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL), -('vn-database','10177','00-crearTablaSpecialLabels.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL), -('vn-database','10178','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL), -('vn-database','10179','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL), -('vn-database','10183','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL), -('vn-database','10184','00-firstScript.sql','jenkins@10.0.2.68','2022-06-03 08:05:34',NULL,NULL), -('vn-database','10185','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 09:07:45',NULL,NULL), -('vn-database','10186','00-desactivar_trigger.sql','jenkins@10.0.2.68','2022-06-07 09:31:23',NULL,NULL), -('vn-database','10186','01-alter_Table_buy.sql','jenkins@10.0.2.68','2022-06-07 09:34:47',NULL,NULL), -('vn-database','10186','02-alter_table_entryConfig.sql','jenkins@10.0.2.68','2022-06-07 09:34:47',NULL,NULL), -('vn-database','10186','04-regularizar_Sticker_Inventario.sql','jenkins@10.0.2.68','2022-06-07 09:34:51',NULL,NULL), -('vn-database','10186','09-reactivar_trigger.sql','jenkins@10.0.2.68','2022-06-07 09:34:51',NULL,NULL), -('vn-database','10187','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 12:37:31',NULL,NULL), -('vn-database','10188','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 14:03:36',NULL,NULL), -('vn-database','10189','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL), -('vn-database','10191','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL), -('vn-database','10194','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL), -('vn-database','10195','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL), -('vn-database','10200','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL), -('vn-database','10201','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL), -('vn-database','10202','00-Remove_FK_to_ediGenus.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL), -('vn-database','10203','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:01',NULL,NULL), -('vn-database','10204','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:01',NULL,NULL), -('vn-database','10205','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:21',NULL,NULL), -('vn-database','10207','00-Alter_table_entry.sql','jenkins@10.0.2.69','2022-06-16 07:22:50',NULL,NULL), -('vn-database','10207','01-Update_invoiceAmount.sql','jenkins@10.0.2.69','2022-06-16 07:23:00',NULL,NULL), -('vn-database','10208','00-firstScript.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL), -('vn-database','10209','00-firstScript.sql','jenkins@10.0.2.69','2022-06-16 08:47:40',NULL,NULL), -('vn-database','10210','00-firstScript.sql','jenkins@10.0.2.69','2022-06-16 17:39:17',1046,'Base de datos no seleccionada'), -('vn-database','10211','01-firstScript.sql','jenkins@10.0.2.69','2022-06-17 07:11:27',NULL,NULL), -('vn-database','10215','00-renameIsInventory.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL), -('vn-database','10216','00-firstScript.sql','jenkins@10.0.2.69','2022-06-23 11:15:28',NULL,NULL), -('vn-database','10216','01-batchIndex.sql','jenkins@10.0.2.70','2022-06-27 18:10:55',NULL,NULL), -('vn-database','10219','00-AddCollectionFkOnPackingSite.sql','jenkins@10.0.2.70','2022-06-29 09:23:42',NULL,NULL), -('vn-database','10219','01-AddFkToCollectionFk.sql','jenkins@10.0.2.70','2022-06-29 09:23:43',NULL,NULL), -('vn-database','10220','00-createPersonalProtectionEquipment.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL), -('vn-database','10222','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:12:40',NULL,NULL), -('vn-database','10223','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:52',NULL,NULL), -('vn-database','10224','00-cosetes.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-21 12:03:45',NULL,NULL), -('vn-database','10229','00-firstScript.sql','jenkins@10.0.2.69','2022-07-01 11:59:34',NULL,NULL), -('vn-database','10231','01-tablaEktConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:25:39',NULL,NULL), -('vn-database','10233','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL), -('vn-database','10235','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL), -('vn-database','10236','00-firstScript.sql','jenkins@10.0.2.69','2022-07-05 12:11:40',NULL,NULL), -('vn-database','10237','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL), -('vn-database','10238','00-worker_mobileExtension.sql','jenkins@10.0.2.69','2022-07-14 09:14:09',NULL,NULL), -('vn-database','10239','00-firstScript.sql','jenkins@10.0.2.69','2022-07-07 21:51:58',NULL,NULL), -('vn-database','10241','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-29 08:14:01',NULL,NULL), -('vn-database','10242','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:14:32',NULL,NULL), -('vn-database','10243','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:14:32',NULL,NULL), -('vn-database','10245','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:34:51',NULL,NULL), -('vn-database','10247','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:34:51',NULL,NULL), -('vn-database','10248','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-20 17:27:51',NULL,NULL), -('vn-database','10250','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:36:40',NULL,NULL), -('vn-database','10253','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:36:57',NULL,NULL), -('vn-database','10254','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL), -('vn-database','10256','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL), -('vn-database','10259','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-02 08:54:56',NULL,NULL), -('vn-database','10261','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-22 08:42:20',NULL,NULL), -('vn-database','10262','00-createTablepackagingWithFreight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL), -('vn-database','10262','01-alterTablePackagingConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL), -('vn-database','10262','02-insertsInicials.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL), -('vn-database','10262','03-createTablepackingWithoutFreight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL), -('vn-database','10263','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL), -('vn-database','10265','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL), -('vn-database','10267','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL), -('vn-database','10267','01-fixMerge.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL), -('vn-database','10275','00-improvedGeneralLog.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-01 09:55:56',NULL,NULL), -('vn-database','10277','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:32',NULL,NULL), -('vn-database','10278','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-01 17:51:41',NULL,NULL), -('vn-database','10279','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL), -('vn-database','10281','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL), -('vn-database','10282','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL), -('vn-database','10283','00-alterTable.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL), -('vn-database','10284','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-04 16:59:08',NULL,NULL), -('vn-database','10285','00-firstScript.sql','jenkins@swarm-worker3.static.verdnatura.es','2022-08-05 09:19:33',NULL,NULL), -('vn-database','10287','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:35:24',NULL,NULL), -('vn-database','10288','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:35:24',NULL,NULL), -('vn-database','10289','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:36',NULL,NULL), -('vn-database','10291','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-10 14:19:34',NULL,NULL), -('vn-database','10293','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:32',NULL,NULL), -('vn-database','10297','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-16 12:43:36',NULL,NULL), -('vn-database','10298','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-13 21:04:13',NULL,NULL), -('vn-database','10299','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL), -('vn-database','10301','00-productionConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL), -('vn-database','10301','01-drop.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL), -('vn-database','10301','02-collection.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL), -('vn-database','10302','00-CreateTableEntryType.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL), -('vn-database','10302','01-insertDataEntryType.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL), -('vn-database','10302','02-alterTableEntry.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:22',NULL,NULL), -('vn-database','10303','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:23',NULL,NULL), -('vn-database','10304','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:23:48',NULL,NULL), -('vn-database','10304','01-altertableticket.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:23:51',NULL,NULL), -('vn-database','10305','00-ektAssign.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:24:52',NULL,NULL), -('vn-database','10306','00-deliveryInformation.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:25:25',NULL,NULL), -('vn-database','10307','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:25:26',NULL,NULL), -('vn-database','10308','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:26:43',NULL,NULL), -('vn-database','10309','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-06 11:37:54',NULL,NULL), -('vn-database','10310','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:33',NULL,NULL), -('vn-database','10311','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-06 11:37:55',NULL,NULL), -('vn-database','10312','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:33',NULL,NULL), -('vn-database','10313','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:27:21',NULL,NULL), -('vn-database','10314','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-20 12:37:19',NULL,NULL), -('vn-database','10315','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL), -('vn-database','10317','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL), -('vn-database','10318','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL), -('vn-database','10319','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-20 12:37:41',NULL,NULL), -('vn-database','10320','00-operator.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:37',NULL,NULL), -('vn-database','10320','01-collection.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:37',NULL,NULL), -('vn-database','10320','02-productionConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL), -('vn-database','10321','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 11:11:12',NULL,NULL), -('vn-database','10322','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-09 09:19:05',NULL,NULL), -('vn-database','10326','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL), -('vn-database','10328','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL), -('vn-database','10329','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL), -('vn-database','10330','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL), -('vn-database','10332','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL), -('vn-database','10334','00-collectionHotbed.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL), -('vn-database','10334','01-saleGroupDetail.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL), -('vn-database','10335','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL), -('vn-database','10336','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL), -('vn-database','10337','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL), -('vn-database','10339','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-19 09:41:19',NULL,NULL), -('vn-database','10340','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL), -('vn-database','10341','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL), -('vn-database','10342','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL), -('vn-database','10343','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:35:30',NULL,NULL), -('vn-database','10345','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:16',NULL,NULL), -('vn-database','10347','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL), -('vn-database','10347','01-addVirtualField.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL), -('vn-database','10349','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL), -('vn-database','10350','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-30 10:11:56',NULL,NULL), -('vn-database','10352','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:16',NULL,NULL), -('vn-database','10353','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL), -('vn-database','10354','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL), -('vn-database','10356','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL), -('vn-database','10356','01-orderConfigFk.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL), -('vn-database','10356','02-orderConfigDrop.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL), -('vn-database','10357','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL), -('vn-database','10359','00-improvedGeneralLog_collate.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:39',NULL,NULL), -('vn-database','10360','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:39',NULL,NULL), -('vn-database','10361','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 11:16:07',NULL,NULL), -('vn-database','10362','00-dropUdfs.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-10 11:01:15',NULL,NULL), -('vn-database','10363','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL), -('vn-database','10365','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-13 19:30:46',NULL,NULL), -('vn-database','10368','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL), -('vn-database','10369','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-14 13:38:06',NULL,NULL), -('vn-database','10370','00-deleteForeignKey.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:41',NULL,NULL), -('vn-database','10370','01-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:47',NULL,NULL), -('vn-database','10370','02-deleteTable.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:49',NULL,NULL), -('vn-database','10370','03-accion.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:49',NULL,NULL), -('vn-database','10370','04-inter.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:53',NULL,NULL), -('vn-database','10373','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-19 08:31:58',NULL,NULL), -('vn-database','10378','00-rename_routeUserPercentage.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL), -('vn-database','10383','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:53',NULL,NULL), -('vn-database','10385','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:54',NULL,NULL), -('vn-database','10386','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:54',NULL,NULL), -('vn-database','10387','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-16 14:05:33',NULL,NULL), -('vn-database','10396','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 15:36:38',NULL,NULL); +INSERT INTO `versionLog` VALUES ('vn-database','00001','00-test.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL),('vn-database','00003','00-sage.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL),('vn-database','10008','00-alterRoleConfig.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL),('vn-database','10014','00-rolePrefix.sql','jenkins@10.0.2.68','2022-02-11 00:13:25',NULL,NULL),('vn-database','10017','01-firstScript.sql','jenkins@10.0.2.70','2022-03-09 11:36:54',NULL,NULL),('vn-database','10021','00-bankAccount.sql','jenkins@10.0.2.69','2022-03-16 14:11:22',NULL,NULL),('vn-database','10023','00-firstScript.sql','jenkins@10.0.2.69','2022-03-16 15:05:29',NULL,NULL),('vn-database','10026','00-invoiceInIntrastat.sql','jenkins@10.0.2.69','2022-03-21 15:10:53',NULL,NULL),('vn-database','10027','00-Clientes_cedidos.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10028','00-item_last_buy_.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10029','00-bankToViewAccountingToTable.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10030','00-KkejarNiche.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10036','00-updateBuyConfig.sql','jenkins@10.0.2.69','2022-03-29 12:36:54',NULL,NULL),('vn-database','10037','00-firstScript.sql','jenkins@10.0.2.69','2022-03-28 11:14:26',NULL,NULL),('vn-database','10038','00-printServerQueue.sql','jenkins@10.0.2.69','2022-03-29 08:13:24',NULL,NULL),('vn-database','10048','00-firstScript.sql','jenkins@10.0.2.69','2022-03-30 12:29:06',NULL,NULL),('vn-database','10058','00-vehicleAddFields.sql','jenkins@10.0.2.69','2022-04-06 08:48:34',NULL,NULL),('vn-database','10060','00-firstScript.sql','jenkins@10.0.2.69','2022-04-07 08:50:11',NULL,NULL),('vn-database','10062','00-firstScript.sql','jenkins@10.0.2.69','2022-04-06 10:51:45',NULL,NULL),('vn-database','10064','00-firstScript.sql','jenkins@10.0.2.69','2022-04-06 13:57:11',NULL,NULL),('vn-database','10066','00-firstScript.sql','jenkins@10.0.2.69','2022-04-07 08:50:12',NULL,NULL),('vn-database','10067','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 10:18:20',NULL,NULL),('vn-database','10071','00-packingSiteLog.sql','jenkins@10.0.2.69','2022-04-08 09:37:30',NULL,NULL),('vn-database','10072','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 11:01:46',NULL,NULL),('vn-database','10073','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 13:40:56',NULL,NULL),('vn-database','10074','00-firstScript.sql','jenkins@10.0.2.69','2022-04-10 13:15:05',NULL,NULL),('vn-database','10077','00-firstScript.sql','jenkins@10.0.2.69','2022-04-12 08:07:15',NULL,NULL),('vn-database','10078','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 07:44:21',NULL,NULL),('vn-database','10079','00-firstScript.sql','jenkins@10.0.2.69','2022-04-12 12:01:37',NULL,NULL),('vn-database','10086','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 08:58:34',NULL,NULL),('vn-database','10087','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 09:39:49',NULL,NULL),('vn-database','10088','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 15:05:12',NULL,NULL),('vn-database','10089','00-firstScript.sql','jenkins@10.0.2.69','2022-04-18 14:12:52',NULL,NULL),('vn-database','10090','00-firstScript.sql','jenkins@10.0.2.69','2022-04-18 14:34:46',NULL,NULL),('vn-database','10092','00-firstScript.sql','jenkins@10.0.2.69','2022-04-19 14:45:46',NULL,NULL),('vn-database','10093','00-autoradioConfig.sql','jenkins@10.0.2.69','2022-05-03 09:16:47',NULL,NULL),('vn-database','10094','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 10:57:30',NULL,NULL),('vn-database','10097','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL),('vn-database','10099','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 14:35:27',NULL,NULL),('vn-database','10100','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 14:35:27',NULL,NULL),('vn-database','10101','00-firstScript.sql','jenkins@10.0.2.69','2022-04-21 14:59:31',NULL,NULL),('vn-database','10103','00-awbVolume.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL),('vn-database','10104','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL),('vn-database','10105','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL),('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL),('vn-database','10113','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10114','00-updateConfig.sql','jenkins@10.0.2.69','2022-04-27 13:37:25',NULL,NULL),('vn-database','10116','00-firstScript.sql','jenkins@10.0.2.69','2022-04-28 11:10:14',NULL,NULL),('vn-database','10118','00-firstScript.sql','jenkins@10.0.2.69','2022-04-29 08:10:15',NULL,NULL),('vn-database','10119','00-AfegirFKPart1.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10119','01-AfegirFkPart2.sql','jenkins@10.0.2.69','2022-05-05 10:22:25',NULL,NULL),('vn-database','10125','00-firstScript.sql','jenkins@10.0.2.68','2022-05-18 18:44:30',NULL,NULL),('vn-database','10127','00-firstScript.sql','jenkins@10.0.2.69','2022-05-02 11:04:46',NULL,NULL),('vn-database','10128','00-firstScript.sql','jenkins@10.0.2.69','2022-05-02 13:04:31',NULL,NULL),('vn-database','10129','00-firstScript.sql','jenkins@10.0.2.69','2022-05-03 08:21:01',NULL,NULL),('vn-database','10132','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:22:25',NULL,NULL),('vn-database','10133','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 14:32:30',NULL,NULL),('vn-database','10134','00-firstScript.sql','jenkins@10.0.2.69','2022-05-06 07:45:25',NULL,NULL),('vn-database','10135','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 08:46:17',NULL,NULL),('vn-database','10136','00-workerTimeControl.sql','jenkins@10.0.2.69','2022-05-09 13:51:12',NULL,NULL),('vn-database','10138','00-firstScript.sql','jenkins@10.0.2.69','2022-05-10 13:58:05',NULL,NULL),('vn-database','10139','00-firstScript.sql','jenkins@10.0.2.68','2022-05-16 14:32:37',NULL,NULL),('vn-database','10139','01-secondScript.sql','jenkins@10.0.2.68','2022-05-17 12:16:13',NULL,NULL),('vn-database','10141','00-firstScript.sql','jenkins@10.0.2.70','2022-05-12 08:27:31',NULL,NULL),('vn-database','10142','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:20:31',NULL,NULL),('vn-database','10143','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:20:31',NULL,NULL),('vn-database','10144','00-AfegirFKPArt1.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10144','00-firstScript.sql','jenkins@10.0.2.68','2022-05-13 09:44:25',NULL,NULL),('vn-database','10147','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10149','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10150','00-firstScript.sql','jenkins@10.0.2.68','2022-05-17 09:57:16',NULL,NULL),('vn-database','10152','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10153','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10154','00-compressionKk.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10157','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:35',NULL,NULL),('vn-database','10158','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:21',NULL,NULL),('vn-database','10160','00-firstScript.sql','jenkins@10.0.2.69','2022-06-30 09:30:50',NULL,NULL),('vn-database','10163','00-firstScript.sql','jenkins@10.0.2.68','2022-05-23 08:17:14',NULL,NULL),('vn-database','10164','00-borrarSectorsDesus.sql','jenkins@10.0.2.68','2022-06-02 12:47:21',NULL,NULL),('vn-database','10165','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10166','00-firstScript.sql','jenkins@10.0.2.68','2022-05-24 16:11:21',NULL,NULL),('vn-database','10167','00-renameVnActiveContrat.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10168','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10169','00-createTableBankEntityConfig.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10169','02-addNotNullToBankEntityBic.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10171','00-volumeConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 14:11:11',NULL,NULL),('vn-database','10171','01-itemWeight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 16:01:34',NULL,NULL),('vn-database','10171','02-agencymode.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 16:01:34',NULL,NULL),('vn-database','10172','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10174','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 08:46:17',NULL,NULL),('vn-database','10175','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10177','00-crearTablaSpecialLabels.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10178','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10179','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10183','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10184','00-firstScript.sql','jenkins@10.0.2.68','2022-06-03 08:05:34',NULL,NULL),('vn-database','10185','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 09:07:45',NULL,NULL),('vn-database','10186','00-desactivar_trigger.sql','jenkins@10.0.2.68','2022-06-07 09:31:23',NULL,NULL),('vn-database','10186','01-alter_Table_buy.sql','jenkins@10.0.2.68','2022-06-07 09:34:47',NULL,NULL),('vn-database','10186','02-alter_table_entryConfig.sql','jenkins@10.0.2.68','2022-06-07 09:34:47',NULL,NULL),('vn-database','10186','04-regularizar_Sticker_Inventario.sql','jenkins@10.0.2.68','2022-06-07 09:34:51',NULL,NULL),('vn-database','10186','09-reactivar_trigger.sql','jenkins@10.0.2.68','2022-06-07 09:34:51',NULL,NULL),('vn-database','10187','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 12:37:31',NULL,NULL),('vn-database','10188','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 14:03:36',NULL,NULL),('vn-database','10189','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10191','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10194','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10195','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10200','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10201','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10202','00-Remove_FK_to_ediGenus.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10203','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:01',NULL,NULL),('vn-database','10204','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:01',NULL,NULL),('vn-database','10205','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:21',NULL,NULL),('vn-database','10207','00-Alter_table_entry.sql','jenkins@10.0.2.69','2022-06-16 07:22:50',NULL,NULL),('vn-database','10207','01-Update_invoiceAmount.sql','jenkins@10.0.2.69','2022-06-16 07:23:00',NULL,NULL),('vn-database','10208','00-firstScript.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10209','00-firstScript.sql','jenkins@10.0.2.69','2022-06-16 08:47:40',NULL,NULL),('vn-database','10210','00-firstScript.sql','jenkins@10.0.2.69','2022-06-16 17:39:17',1046,'Base de datos no seleccionada'),('vn-database','10211','01-firstScript.sql','jenkins@10.0.2.69','2022-06-17 07:11:27',NULL,NULL),('vn-database','10215','00-renameIsInventory.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10216','00-firstScript.sql','jenkins@10.0.2.69','2022-06-23 11:15:28',NULL,NULL),('vn-database','10216','01-batchIndex.sql','jenkins@10.0.2.70','2022-06-27 18:10:55',NULL,NULL),('vn-database','10219','00-AddCollectionFkOnPackingSite.sql','jenkins@10.0.2.70','2022-06-29 09:23:42',NULL,NULL),('vn-database','10219','01-AddFkToCollectionFk.sql','jenkins@10.0.2.70','2022-06-29 09:23:43',NULL,NULL),('vn-database','10220','00-createPersonalProtectionEquipment.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10222','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:12:40',NULL,NULL),('vn-database','10223','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:52',NULL,NULL),('vn-database','10224','00-cosetes.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-21 12:03:45',NULL,NULL),('vn-database','10229','00-firstScript.sql','jenkins@10.0.2.69','2022-07-01 11:59:34',NULL,NULL),('vn-database','10231','01-tablaEktConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:25:39',NULL,NULL),('vn-database','10233','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10235','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10236','00-firstScript.sql','jenkins@10.0.2.69','2022-07-05 12:11:40',NULL,NULL),('vn-database','10237','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10238','00-worker_mobileExtension.sql','jenkins@10.0.2.69','2022-07-14 09:14:09',NULL,NULL),('vn-database','10239','00-firstScript.sql','jenkins@10.0.2.69','2022-07-07 21:51:58',NULL,NULL),('vn-database','10241','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-29 08:14:01',NULL,NULL),('vn-database','10242','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:14:32',NULL,NULL),('vn-database','10243','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:14:32',NULL,NULL),('vn-database','10245','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:34:51',NULL,NULL),('vn-database','10247','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:34:51',NULL,NULL),('vn-database','10248','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-20 17:27:51',NULL,NULL),('vn-database','10250','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:36:40',NULL,NULL),('vn-database','10253','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:36:57',NULL,NULL),('vn-database','10254','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10256','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10258','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:48',NULL,NULL),('vn-database','10259','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-02 08:54:56',NULL,NULL),('vn-database','10261','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-22 08:42:20',NULL,NULL),('vn-database','10262','00-createTablepackagingWithFreight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','01-alterTablePackagingConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','02-insertsInicials.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','03-createTablepackingWithoutFreight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10263','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10265','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10267','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10267','01-fixMerge.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10275','00-improvedGeneralLog.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-01 09:55:56',NULL,NULL),('vn-database','10277','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:32',NULL,NULL),('vn-database','10278','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-01 17:51:41',NULL,NULL),('vn-database','10279','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10281','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10282','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10283','00-alterTable.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10284','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-04 16:59:08',NULL,NULL),('vn-database','10285','00-firstScript.sql','jenkins@swarm-worker3.static.verdnatura.es','2022-08-05 09:19:33',NULL,NULL),('vn-database','10287','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:35:24',NULL,NULL),('vn-database','10288','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:35:24',NULL,NULL),('vn-database','10289','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:36',NULL,NULL),('vn-database','10291','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-10 14:19:34',NULL,NULL),('vn-database','10293','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:32',NULL,NULL),('vn-database','10297','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-16 12:43:36',NULL,NULL),('vn-database','10298','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-13 21:04:13',NULL,NULL),('vn-database','10299','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','00-productionConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','01-drop.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','02-collection.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','00-CreateTableEntryType.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','01-insertDataEntryType.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','02-alterTableEntry.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:22',NULL,NULL),('vn-database','10303','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:23',NULL,NULL),('vn-database','10304','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:23:48',NULL,NULL),('vn-database','10304','01-altertableticket.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:23:51',NULL,NULL),('vn-database','10305','00-ektAssign.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:24:52',NULL,NULL),('vn-database','10306','00-deliveryInformation.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:25:25',NULL,NULL),('vn-database','10307','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:25:26',NULL,NULL),('vn-database','10308','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:26:43',NULL,NULL),('vn-database','10309','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-06 11:37:54',NULL,NULL),('vn-database','10310','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:33',NULL,NULL),('vn-database','10311','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-06 11:37:55',NULL,NULL),('vn-database','10312','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:33',NULL,NULL),('vn-database','10313','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:27:21',NULL,NULL),('vn-database','10314','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-20 12:37:19',NULL,NULL),('vn-database','10315','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10317','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10318','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10319','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-20 12:37:41',NULL,NULL),('vn-database','10320','00-operator.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:37',NULL,NULL),('vn-database','10320','01-collection.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:37',NULL,NULL),('vn-database','10320','02-productionConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10321','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 11:11:12',NULL,NULL),('vn-database','10322','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-09 09:19:05',NULL,NULL),('vn-database','10326','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10328','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10329','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10330','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10332','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10334','00-collectionHotbed.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10334','01-saleGroupDetail.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10335','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10336','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10337','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10339','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-19 09:41:19',NULL,NULL),('vn-database','10340','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10341','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10342','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10343','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:35:30',NULL,NULL),('vn-database','10345','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:16',NULL,NULL),('vn-database','10347','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10347','01-addVirtualField.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10349','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10350','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-30 10:11:56',NULL,NULL),('vn-database','10352','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:16',NULL,NULL),('vn-database','10353','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10354','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10356','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10356','01-orderConfigFk.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10356','02-orderConfigDrop.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10357','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10359','00-improvedGeneralLog_collate.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:39',NULL,NULL),('vn-database','10360','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:39',NULL,NULL),('vn-database','10361','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 11:16:07',NULL,NULL),('vn-database','10362','00-dropUdfs.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-10 11:01:15',NULL,NULL),('vn-database','10363','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10365','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-13 19:30:46',NULL,NULL),('vn-database','10368','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10369','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-14 13:38:06',NULL,NULL),('vn-database','10370','00-deleteForeignKey.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:41',NULL,NULL),('vn-database','10370','01-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:47',NULL,NULL),('vn-database','10370','02-deleteTable.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:49',NULL,NULL),('vn-database','10370','03-accion.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:49',NULL,NULL),('vn-database','10370','04-inter.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:53',NULL,NULL),('vn-database','10371','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10372','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:48',NULL,NULL),('vn-database','10373','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-19 08:31:58',NULL,NULL),('vn-database','10378','00-rename_routeUserPercentage.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10382','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10383','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:53',NULL,NULL),('vn-database','10385','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:54',NULL,NULL),('vn-database','10386','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:54',NULL,NULL),('vn-database','10387','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-16 14:05:33',NULL,NULL),('vn-database','10388','00-resizeUtilVerionLogCode.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10388','01-resizeUtilVersionCode.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10390','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:16',NULL,NULL),('vn-database','10391','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10394','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:24',NULL,NULL),('vn-database','10395','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10396','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 15:36:38',NULL,NULL),('vn-database','10397','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10399','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10400','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10402','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-21 14:11:31',NULL,NULL),('vn-database','10404','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10407','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:49',NULL,NULL),('vn-database','10408','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10409','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:49',NULL,NULL),('vn-database','10412','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-30 12:45:44',NULL,NULL),('vn-database','10413','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:24',NULL,NULL),('vn-database','10416','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:24',NULL,NULL),('vn-database','10420','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:25',NULL,NULL),('vn-database','10421','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:26',NULL,NULL),('vn-database','10428','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10433','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10434','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10435','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-13 07:30:10',NULL,NULL),('vn-database','10450','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-27 08:28:04',NULL,NULL),('vn-database','10452','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10453','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 14:04:37',NULL,NULL),('vn-database','10454','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10455','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10456','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:00:30',NULL,NULL),('vn-database','10457','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:00:33',NULL,NULL),('vn-database','10463','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-03 12:59:26',NULL,NULL); /*!40000 ALTER TABLE `versionLog` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -306,9 +54,9 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-11-21 7:59:03 +-- Dump completed on 2023-02-03 14:47:08 USE `account`; --- MariaDB dump 10.19 Distrib 10.9.4-MariaDB, for Linux (x86_64) +-- MariaDB dump 10.19 Distrib 10.5.18-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: db.verdnatura.es Database: account -- ------------------------------------------------------ @@ -330,77 +78,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','Gerencia',1,'2017-06-01 14:57:02','2022-07-29 07:36:15'), -(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'), -(108,'system','System user',1,'2022-05-16 08:09:51','2022-05-16 08:09:51'), -(109,'salesTeamBoss','Jefe de equipo de comerciales',1,'2022-06-14 13:45:56','2022-06-14 13:45:56'); +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','Gerencia',1,'2017-06-01 14:57:02','2022-07-29 07:36:15'),(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'),(108,'system','System user',1,'2022-05-16 08:09:51','2022-05-16 08:09:51'),(109,'salesTeamBoss','Jefe de equipo de comerciales',1,'2022-06-14 13:45:56','2022-06-14 13:45:56'),(110,'palletizer','Paletizadores',1,'2022-12-02 12:56:22','2022-12-02 12:56:30'),(111,'entryEditor','Entry editor',1,'2023-01-13 11:21:55','2023-01-13 11:21:55'),(112,'maintenance','Personal de mantenimiento',1,'2023-01-19 06:23:35','2023-01-19 06:23:35'),(114,'maintenanceBos','Jefe de mantenimiento',1,'2023-01-19 06:31:16','2023-01-19 06:31:16'); /*!40000 ALTER TABLE `role` ENABLE KEYS */; UNLOCK TABLES; @@ -410,219 +88,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), -(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), -(253,48,49), -(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), -(251,51,21), -(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), -(105,72,18), -(106,73,5), -(108,73,19), -(107,73,64), -(148,101,13), -(147,101,35), -(154,102,1), -(248,102,13), -(246,102,35), -(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), -(247,108,1), -(250,109,13), -(249,109,18); +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),(261,5,111),(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),(260,35,111),(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),(258,43,111),(58,44,1),(59,45,13),(60,45,44),(61,47,1),(257,47,111),(62,48,13),(153,48,35),(63,48,47),(253,48,49),(256,48,69),(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),(251,51,21),(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),(105,72,18),(259,72,111),(106,73,5),(108,73,19),(107,73,64),(148,101,13),(147,101,35),(154,102,1),(248,102,13),(246,102,35),(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),(247,108,1),(250,109,13),(249,109,18),(254,110,1),(255,110,76),(262,112,1),(263,114,112); /*!40000 ALTER TABLE `roleInherit` ENABLE KEYS */; UNLOCK TABLES; @@ -632,1153 +98,7 @@ UNLOCK TABLES; LOCK TABLES `roleRole` WRITE; /*!40000 ALTER TABLE `roleRole` DISABLE KEYS */; -INSERT INTO `roleRole` VALUES -(113544,1,1), -(113545,1,2), -(113546,1,3), -(113549,1,6), -(113548,1,11), -(113547,1,70), -(113462,2,2), -(113464,2,6), -(113463,2,11), -(113344,3,3), -(113346,3,6), -(113345,3,11), -(113314,5,1), -(113321,5,2), -(113320,5,3), -(113313,5,5), -(113326,5,6), -(113325,5,11), -(113318,5,13), -(113322,5,18), -(113315,5,21), -(113316,5,33), -(113323,5,53), -(113319,5,70), -(113324,5,72), -(113317,5,76), -(113646,6,6), -(113485,9,1), -(113486,9,2), -(113487,9,3), -(113488,9,5), -(113489,9,6), -(113483,9,9), -(113490,9,11), -(113491,9,13), -(113492,9,15), -(113493,9,16), -(113494,9,17), -(113495,9,18), -(113496,9,19), -(113497,9,20), -(113498,9,21), -(113499,9,22), -(113500,9,30), -(113501,9,31), -(113502,9,32), -(113503,9,33), -(113504,9,34), -(113505,9,35), -(113506,9,36), -(113507,9,37), -(113508,9,38), -(113509,9,39), -(113510,9,40), -(113511,9,41), -(113512,9,42), -(113513,9,43), -(113514,9,44), -(113515,9,45), -(113516,9,47), -(113517,9,48), -(113518,9,49), -(113519,9,50), -(113520,9,51), -(113521,9,52), -(113522,9,53), -(113523,9,54), -(113524,9,55), -(113525,9,56), -(113526,9,57), -(113527,9,58), -(113528,9,59), -(113529,9,60), -(113530,9,61), -(113531,9,64), -(113532,9,65), -(113533,9,67), -(113534,9,69), -(113535,9,70), -(113536,9,71), -(113537,9,72), -(113538,9,73), -(113539,9,74), -(113540,9,75), -(113541,9,76), -(113542,9,101), -(113543,9,102), -(113484,9,103), -(113234,11,6), -(113233,11,11), -(114340,13,1), -(114341,13,2), -(114342,13,3), -(114345,13,6), -(114344,13,11), -(114339,13,13), -(114343,13,70), -(113860,15,1), -(113864,15,2), -(113863,15,3), -(113867,15,6), -(113866,15,11), -(113852,15,15), -(113853,15,35), -(113858,15,36), -(113861,15,44), -(113865,15,47), -(113854,15,49), -(113855,15,56), -(113857,15,58), -(113862,15,70), -(113859,15,75), -(113856,15,76), -(113874,16,1), -(113879,16,2), -(113878,16,3), -(113885,16,6), -(113884,16,11), -(113869,16,13), -(113870,16,15), -(113868,16,16), -(113873,16,35), -(113880,16,36), -(113883,16,44), -(113882,16,47), -(113872,16,49), -(113875,16,56), -(113881,16,58), -(113877,16,70), -(113876,16,75), -(113871,16,76), -(113260,17,1), -(113271,17,2), -(113270,17,3), -(113265,17,5), -(113293,17,6), -(113264,17,9), -(113292,17,11), -(113263,17,13), -(113275,17,15), -(113262,17,16), -(113252,17,17), -(113277,17,18), -(113274,17,19), -(113253,17,20), -(113266,17,21), -(113291,17,22), -(113290,17,30), -(113289,17,31), -(113288,17,32), -(113268,17,33), -(113287,17,34), -(113273,17,35), -(113286,17,36), -(113254,17,37), -(113285,17,38), -(113255,17,39), -(113284,17,40), -(113283,17,41), -(113282,17,42), -(113281,17,43), -(113294,17,44), -(113295,17,45), -(113296,17,47), -(113297,17,48), -(113298,17,49), -(113272,17,50), -(113299,17,51), -(113300,17,52), -(113278,17,53), -(113301,17,54), -(113302,17,55), -(113280,17,56), -(113267,17,57), -(113303,17,58), -(113304,17,59), -(113305,17,60), -(113306,17,61), -(113256,17,64), -(113261,17,65), -(113257,17,67), -(113307,17,69), -(113269,17,70), -(113308,17,71), -(113279,17,72), -(113309,17,73), -(113259,17,74), -(113310,17,75), -(113258,17,76), -(113311,17,101), -(113312,17,102), -(113276,17,103), -(114253,18,1), -(114256,18,2), -(114255,18,3), -(114259,18,6), -(114258,18,11), -(114252,18,18), -(114257,18,70), -(114254,18,76), -(114246,19,1), -(114249,19,2), -(114248,19,3), -(114251,19,6), -(114250,19,11), -(114241,19,13), -(114242,19,18), -(114239,19,19), -(114240,19,21), -(114243,19,53), -(114247,19,70), -(114244,19,72), -(114245,19,76), -(113895,20,1), -(113903,20,2), -(113902,20,3), -(113901,20,5), -(113900,20,6), -(113887,20,9), -(113899,20,11), -(113888,20,13), -(113894,20,15), -(113889,20,16), -(113898,20,17), -(113904,20,18), -(113893,20,19), -(113886,20,20), -(113905,20,21), -(113906,20,22), -(113907,20,30), -(113908,20,31), -(113909,20,32), -(113910,20,33), -(113911,20,34), -(113892,20,35), -(113912,20,36), -(113913,20,37), -(113914,20,38), -(113915,20,39), -(113916,20,40), -(113917,20,41), -(113918,20,42), -(113919,20,43), -(113920,20,44), -(113921,20,45), -(113922,20,47), -(113923,20,48), -(113924,20,49), -(113897,20,50), -(113925,20,51), -(113926,20,52), -(113927,20,53), -(113928,20,54), -(113929,20,55), -(113930,20,56), -(113931,20,57), -(113932,20,58), -(113933,20,59), -(113934,20,60), -(113935,20,61), -(113936,20,64), -(113890,20,65), -(113937,20,67), -(113938,20,69), -(113939,20,70), -(113940,20,71), -(113941,20,72), -(113942,20,73), -(113943,20,74), -(113944,20,75), -(113891,20,76), -(113945,20,101), -(113946,20,102), -(113896,20,103), -(114233,21,1), -(114236,21,2), -(114235,21,3), -(114238,21,6), -(114237,21,11), -(114228,21,13), -(114229,21,18), -(114227,21,21), -(114230,21,53), -(114234,21,70), -(114231,21,72), -(114232,21,76), -(114350,22,1), -(114356,22,2), -(114355,22,3), -(114358,22,6), -(114357,22,11), -(114347,22,13), -(114349,22,18), -(114348,22,21), -(114346,22,22), -(114351,22,53), -(114354,22,70), -(114352,22,72), -(114353,22,76), -(113589,30,1), -(113597,30,2), -(113596,30,3), -(113578,30,5), -(113609,30,6), -(113586,30,9), -(113610,30,11), -(113585,30,13), -(113591,30,15), -(113584,30,16), -(113608,30,17), -(113594,30,18), -(113598,30,19), -(113579,30,20), -(113588,30,21), -(113580,30,22), -(113577,30,30), -(113607,30,31), -(113606,30,32), -(113587,30,33), -(113605,30,34), -(113599,30,35), -(113604,30,36), -(113603,30,37), -(113602,30,38), -(113601,30,39), -(113611,30,40), -(113612,30,41), -(113613,30,42), -(113614,30,43), -(113615,30,44), -(113616,30,45), -(113617,30,47), -(113618,30,48), -(113619,30,49), -(113600,30,50), -(113620,30,51), -(113621,30,52), -(113581,30,53), -(113622,30,54), -(113623,30,55), -(113624,30,56), -(113625,30,57), -(113626,30,58), -(113627,30,59), -(113628,30,60), -(113629,30,61), -(113582,30,64), -(113590,30,65), -(113630,30,67), -(113631,30,69), -(113595,30,70), -(113632,30,71), -(113593,30,72), -(113633,30,73), -(113634,30,74), -(113635,30,75), -(113583,30,76), -(113636,30,101), -(113637,30,102), -(113592,30,103), -(113639,31,1), -(113640,31,2), -(113641,31,3), -(113644,31,6), -(113643,31,11), -(113638,31,31), -(113642,31,70), -(113551,32,1), -(113552,32,2), -(113553,32,3), -(113556,32,6), -(113555,32,11), -(113550,32,32), -(113554,32,70), -(113704,33,33), -(113348,34,1), -(113353,34,2), -(113352,34,3), -(113355,34,6), -(113354,34,11), -(113349,34,13), -(113350,34,33), -(113347,34,34), -(113351,34,70), -(113390,35,1), -(113395,35,2), -(113394,35,3), -(113397,35,6), -(113396,35,11), -(113389,35,35), -(113393,35,70), -(113391,35,75), -(113392,35,76), -(114140,36,1), -(114142,36,2), -(114141,36,3), -(114145,36,6), -(114144,36,11), -(114137,36,36), -(114138,36,44), -(114139,36,47), -(114143,36,70), -(113677,37,1), -(113682,37,2), -(113681,37,3), -(113684,37,6), -(113683,37,11), -(113676,37,37), -(113680,37,70), -(113678,37,74), -(113679,37,76), -(113691,38,1), -(113694,38,2), -(113693,38,3), -(113696,38,6), -(113695,38,11), -(113686,38,13), -(113687,38,37), -(113685,38,38), -(113688,38,64), -(113692,38,70), -(113690,38,74), -(113689,38,76), -(113243,39,1), -(113249,39,2), -(113248,39,3), -(113236,39,5), -(113251,39,6), -(113250,39,11), -(113241,39,13), -(113240,39,18), -(113237,39,21), -(113242,39,33), -(113235,39,39), -(113244,39,53), -(113246,39,56), -(113238,39,57), -(113247,39,70), -(113245,39,72), -(113239,39,76), -(113648,40,1), -(113651,40,2), -(113650,40,3), -(113658,40,6), -(113657,40,11), -(113653,40,36), -(113647,40,40), -(113656,40,44), -(113655,40,47), -(113649,40,49), -(113654,40,58), -(113652,40,70), -(113666,41,1), -(113670,41,2), -(113669,41,3), -(113675,41,6), -(113674,41,11), -(113660,41,13), -(113661,41,35), -(113667,41,36), -(113662,41,40), -(113659,41,41), -(113673,41,44), -(113672,41,47), -(113664,41,49), -(113671,41,58), -(113668,41,70), -(113665,41,75), -(113663,41,76), -(113362,42,1), -(113367,42,2), -(113366,42,3), -(113370,42,6), -(113369,42,11), -(113357,42,35), -(113360,42,36), -(113356,42,42), -(113364,42,44), -(113368,42,47), -(113358,42,49), -(113363,42,58), -(113365,42,70), -(113361,42,75), -(113359,42,76), -(113375,43,1), -(113381,43,2), -(113380,43,3), -(113387,43,6), -(113386,43,11), -(113372,43,13), -(113374,43,35), -(113382,43,36), -(113373,43,42), -(113371,43,43), -(113385,43,44), -(113384,43,47), -(113376,43,49), -(113383,43,58), -(113379,43,70), -(113378,43,75), -(113377,43,76), -(113218,44,1), -(113219,44,2), -(113220,44,3), -(113223,44,6), -(113222,44,11), -(113217,44,44), -(113221,44,70), -(113227,45,1), -(113229,45,2), -(113228,45,3), -(113232,45,6), -(113231,45,11), -(113225,45,13), -(113226,45,44), -(113224,45,45), -(113230,45,70), -(113429,47,1), -(113430,47,2), -(113431,47,3), -(113434,47,6), -(113433,47,11), -(113428,47,47), -(113432,47,70), -(113454,48,1), -(113459,48,2), -(113458,48,3), -(113461,48,6), -(113460,48,11), -(113447,48,13), -(113448,48,35), -(113451,48,36), -(113456,48,44), -(113449,48,47), -(113446,48,48), -(113450,48,49), -(113455,48,58), -(113457,48,70), -(113453,48,75), -(113452,48,76), -(114054,49,1), -(114057,49,2), -(114056,49,3), -(114059,49,6), -(114058,49,11), -(114050,49,36), -(114053,49,44), -(114052,49,47), -(114049,49,49), -(114051,49,58), -(114055,49,70), -(114100,50,1), -(114107,50,2), -(114106,50,3), -(114109,50,6), -(114108,50,11), -(114087,50,13), -(114099,50,18), -(114088,50,21), -(114101,50,33), -(114089,50,35), -(114095,50,36), -(114104,50,44), -(114103,50,47), -(114090,50,49), -(114086,50,50), -(114098,50,53), -(114102,50,56), -(114091,50,57), -(114094,50,58), -(114092,50,59), -(114105,50,70), -(114097,50,72), -(114096,50,75), -(114093,50,76), -(113948,51,1), -(113955,51,2), -(113954,51,3), -(113961,51,6), -(113960,51,11), -(113952,51,13), -(113956,51,18), -(113949,51,21), -(113947,51,51), -(113957,51,53), -(113953,51,70), -(113958,51,72), -(113950,51,74), -(113951,51,75), -(113959,51,76), -(113971,52,1), -(113976,52,2), -(113975,52,3), -(113979,52,6), -(113978,52,11), -(113963,52,13), -(113973,52,18), -(113964,52,19), -(113970,52,21), -(113965,52,35), -(113966,52,51), -(113962,52,52), -(113972,52,53), -(113974,52,70), -(113977,52,72), -(113968,52,74), -(113969,52,75), -(113967,52,76), -(113698,53,1), -(113699,53,2), -(113700,53,3), -(113703,53,6), -(113702,53,11), -(113697,53,53), -(113701,53,70), -(113837,54,1), -(113838,54,2), -(113839,54,3), -(113842,54,6), -(113841,54,11), -(113836,54,54), -(113840,54,70), -(113846,55,1), -(113848,55,2), -(113847,55,3), -(113851,55,6), -(113850,55,11), -(113844,55,13), -(113845,55,54), -(113843,55,55), -(113849,55,70), -(113466,56,1), -(113467,56,2), -(113468,56,3), -(113471,56,6), -(113470,56,11), -(113465,56,56), -(113469,56,70), -(113477,57,1), -(113480,57,2), -(113479,57,3), -(113482,57,6), -(113481,57,11), -(113473,57,13), -(113474,57,33), -(113475,57,56), -(113472,57,57), -(113478,57,70), -(113476,57,76), -(114008,58,1), -(114009,58,2), -(114010,58,3), -(114013,58,6), -(114012,58,11), -(114007,58,58), -(114011,58,70), -(114018,59,1), -(114028,59,2), -(114027,59,3), -(114037,59,6), -(114036,59,11), -(114015,59,13), -(114025,59,18), -(114017,59,21), -(114032,59,33), -(114019,59,35), -(114030,59,36), -(114035,59,44), -(114034,59,47), -(114020,59,49), -(114016,59,50), -(114024,59,53), -(114033,59,56), -(114021,59,57), -(114031,59,58), -(114014,59,59), -(114026,59,70), -(114023,59,72), -(114029,59,75), -(114022,59,76), -(114068,60,1), -(114080,60,2), -(114079,60,3), -(114061,60,5), -(114085,60,6), -(114084,60,11), -(114065,60,13), -(114077,60,18), -(114067,60,21), -(114066,60,33), -(114069,60,35), -(114073,60,36), -(114083,60,44), -(114082,60,47), -(114070,60,49), -(114062,60,50), -(114076,60,53), -(114072,60,56), -(114063,60,57), -(114081,60,58), -(114071,60,59), -(114060,60,60), -(114078,60,70), -(114075,60,72), -(114074,60,75), -(114064,60,76), -(114150,61,1), -(114154,61,2), -(114153,61,3), -(114156,61,6), -(114155,61,11), -(114147,61,13), -(114148,61,36), -(114149,61,44), -(114151,61,47), -(114146,61,61), -(114152,61,70), -(113980,62,62), -(113388,64,64), -(113988,65,1), -(113996,65,2), -(113995,65,3), -(114006,65,6), -(114005,65,11), -(113986,65,13), -(113999,65,18), -(113982,65,19), -(113989,65,21), -(114001,65,33), -(113983,65,35), -(113993,65,36), -(114004,65,44), -(114003,65,47), -(113990,65,49), -(113984,65,50), -(113998,65,53), -(114002,65,56), -(113991,65,57), -(114000,65,58), -(113992,65,59), -(113981,65,65), -(113994,65,70), -(113997,65,72), -(113987,65,75), -(113985,65,76), -(114274,66,1), -(114273,66,2), -(114275,66,3), -(114276,66,5), -(114277,66,6), -(114271,66,9), -(114278,66,11), -(114279,66,13), -(114280,66,15), -(114281,66,16), -(114282,66,17), -(114283,66,18), -(114284,66,19), -(114285,66,20), -(114286,66,21), -(114287,66,22), -(114288,66,30), -(114289,66,31), -(114290,66,32), -(114291,66,33), -(114292,66,34), -(114293,66,35), -(114294,66,36), -(114295,66,37), -(114296,66,38), -(114297,66,39), -(114298,66,40), -(114299,66,41), -(114300,66,42), -(114301,66,43), -(114302,66,44), -(114303,66,45), -(114304,66,47), -(114305,66,48), -(114306,66,49), -(114307,66,50), -(114308,66,51), -(114309,66,52), -(114310,66,53), -(114311,66,54), -(114312,66,55), -(114313,66,56), -(114314,66,57), -(114315,66,58), -(114316,66,59), -(114317,66,60), -(114318,66,61), -(114319,66,64), -(114320,66,65), -(114270,66,66), -(114321,66,67), -(114322,66,69), -(114323,66,70), -(114324,66,71), -(114325,66,72), -(114326,66,73), -(114327,66,74), -(114328,66,75), -(114329,66,76), -(114330,66,101), -(114331,66,102), -(114272,66,103), -(113331,67,1), -(113339,67,2), -(113338,67,3), -(113328,67,5), -(113343,67,6), -(113342,67,11), -(113336,67,13), -(113335,67,18), -(113330,67,21), -(113332,67,33), -(113329,67,37), -(113340,67,53), -(113327,67,67), -(113337,67,70), -(113341,67,72), -(113334,67,74), -(113333,67,76), -(113439,69,1), -(113443,69,2), -(113442,69,3), -(113445,69,6), -(113444,69,11), -(113436,69,35), -(113437,69,47), -(113435,69,69), -(113441,69,70), -(113438,69,75), -(113440,69,76), -(114361,70,6), -(114360,70,11), -(114359,70,70), -(113412,71,1), -(113415,71,2), -(113414,71,3), -(113418,71,6), -(113417,71,11), -(113413,71,58), -(113416,71,70), -(113411,71,71), -(113421,72,1), -(113424,72,2), -(113423,72,3), -(113427,72,6), -(113426,72,11), -(113420,72,18), -(113425,72,70), -(113419,72,72), -(113422,72,76), -(113566,73,1), -(113571,73,2), -(113570,73,3), -(113561,73,5), -(113576,73,6), -(113575,73,11), -(113568,73,13), -(113572,73,18), -(113562,73,19), -(113565,73,21), -(113564,73,33), -(113573,73,53), -(113563,73,64), -(113569,73,70), -(113574,73,72), -(113560,73,73), -(113567,73,76), -(114362,74,74), -(113409,75,75), -(113410,76,76), -(114183,100,1), -(114179,100,2), -(114165,100,3), -(114163,100,5), -(114190,100,6), -(114182,100,9), -(114160,100,11), -(114223,100,13), -(114201,100,15), -(114202,100,16), -(114162,100,17), -(114219,100,18), -(114218,100,19), -(114203,100,20), -(114217,100,21), -(114224,100,22), -(114187,100,30), -(114188,100,31), -(114184,100,32), -(114196,100,33), -(114166,100,34), -(114170,100,35), -(114215,100,36), -(114193,100,37), -(114194,100,38), -(114161,100,39), -(114191,100,40), -(114192,100,41), -(114167,100,42), -(114168,100,43), -(114158,100,44), -(114159,100,45), -(114176,100,47), -(114178,100,48), -(114211,100,49), -(114213,100,50), -(114204,100,51), -(114205,100,52), -(114195,100,53), -(114199,100,54), -(114200,100,55), -(114180,100,56), -(114181,100,57), -(114208,100,58), -(114209,100,59), -(114212,100,60), -(114216,100,61), -(114206,100,62), -(114169,100,64), -(114207,100,65), -(114221,100,66), -(114164,100,67), -(114177,100,69), -(114225,100,70), -(114174,100,71), -(114175,100,72), -(114186,100,73), -(114226,100,74), -(114172,100,75), -(114173,100,76), -(114157,100,100), -(114171,100,101), -(114210,100,102), -(114197,100,103), -(114198,100,104), -(114189,100,105), -(114185,100,106), -(114214,100,107), -(114222,100,108), -(114220,100,109), -(113402,101,1), -(113406,101,2), -(113405,101,3), -(113408,101,6), -(113407,101,11), -(113399,101,13), -(113400,101,35), -(113404,101,70), -(113401,101,75), -(113403,101,76), -(113398,101,101), -(114039,102,1), -(114044,102,2), -(114043,102,3), -(114048,102,6), -(114047,102,11), -(114040,102,13), -(114041,102,35), -(114042,102,70), -(114045,102,75), -(114046,102,76), -(114038,102,102), -(113706,103,1), -(113707,103,2), -(113708,103,3), -(113709,103,5), -(113710,103,6), -(113765,103,9), -(113711,103,11), -(113712,103,13), -(113713,103,15), -(113714,103,16), -(113715,103,17), -(113716,103,18), -(113717,103,19), -(113718,103,20), -(113719,103,21), -(113720,103,22), -(113721,103,30), -(113722,103,31), -(113723,103,32), -(113724,103,33), -(113725,103,34), -(113726,103,35), -(113727,103,36), -(113728,103,37), -(113729,103,38), -(113730,103,39), -(113731,103,40), -(113732,103,41), -(113733,103,42), -(113734,103,43), -(113735,103,44), -(113736,103,45), -(113737,103,47), -(113738,103,48), -(113739,103,49), -(113740,103,50), -(113741,103,51), -(113742,103,52), -(113743,103,53), -(113744,103,54), -(113745,103,55), -(113746,103,56), -(113747,103,57), -(113748,103,58), -(113749,103,59), -(113750,103,60), -(113751,103,61), -(113752,103,64), -(113753,103,65), -(113754,103,67), -(113755,103,69), -(113756,103,70), -(113757,103,71), -(113758,103,72), -(113759,103,73), -(113760,103,74), -(113761,103,75), -(113762,103,76), -(113763,103,101), -(113764,103,102), -(113705,103,103), -(113774,104,1), -(113773,104,2), -(113772,104,3), -(113771,104,5), -(113775,104,6), -(113767,104,9), -(113776,104,11), -(113777,104,13), -(113778,104,15), -(113779,104,16), -(113780,104,17), -(113781,104,18), -(113782,104,19), -(113783,104,20), -(113784,104,21), -(113785,104,22), -(113786,104,30), -(113787,104,31), -(113788,104,32), -(113789,104,33), -(113790,104,34), -(113791,104,35), -(113792,104,36), -(113793,104,37), -(113794,104,38), -(113795,104,39), -(113796,104,40), -(113797,104,41), -(113798,104,42), -(113799,104,43), -(113800,104,44), -(113801,104,45), -(113802,104,47), -(113803,104,48), -(113804,104,49), -(113805,104,50), -(113806,104,51), -(113807,104,52), -(113808,104,53), -(113809,104,54), -(113810,104,55), -(113811,104,56), -(113812,104,57), -(113813,104,58), -(113814,104,59), -(113815,104,60), -(113816,104,61), -(113832,104,62), -(113817,104,64), -(113818,104,65), -(113768,104,66), -(113819,104,67), -(113820,104,69), -(113821,104,70), -(113822,104,71), -(113823,104,72), -(113824,104,73), -(113825,104,74), -(113826,104,75), -(113827,104,76), -(113769,104,100), -(113828,104,101), -(113829,104,102), -(113770,104,103), -(113766,104,104), -(113831,104,105), -(113830,104,106), -(113833,104,107), -(113835,104,108), -(113834,104,109), -(113645,105,105), -(113559,106,6), -(113558,106,11), -(113557,106,106), -(114119,107,1), -(114131,107,2), -(114130,107,3), -(114112,107,5), -(114136,107,6), -(114135,107,11), -(114116,107,13), -(114128,107,18), -(114118,107,21), -(114117,107,33), -(114120,107,35), -(114124,107,36), -(114134,107,44), -(114133,107,47), -(114121,107,49), -(114113,107,50), -(114127,107,53), -(114123,107,56), -(114114,107,57), -(114132,107,58), -(114122,107,59), -(114111,107,60), -(114129,107,70), -(114126,107,72), -(114125,107,75), -(114115,107,76), -(114110,107,107), -(114333,108,1), -(114334,108,2), -(114335,108,3), -(114338,108,6), -(114337,108,11), -(114336,108,70), -(114332,108,108), -(114264,109,1), -(114266,109,2), -(114265,109,3), -(114269,109,6), -(114268,109,11), -(114261,109,13), -(114262,109,18), -(114267,109,70), -(114263,109,76), -(114260,109,109); +INSERT INTO `roleRole` VALUES (129299,1,1),(129300,1,2),(129301,1,3),(129304,1,6),(129303,1,11),(129302,1,70),(129216,2,2),(129218,2,6),(129217,2,11),(129089,3,3),(129091,3,6),(129090,3,11),(129057,5,1),(129066,5,2),(129065,5,3),(129056,5,5),(129070,5,6),(129069,5,11),(129063,5,13),(129062,5,18),(129058,5,21),(129059,5,33),(129067,5,53),(129064,5,70),(129068,5,72),(129060,5,76),(129061,5,111),(129404,6,6),(129239,9,1),(129240,9,2),(129241,9,3),(129242,9,5),(129243,9,6),(129237,9,9),(129244,9,11),(129245,9,13),(129246,9,15),(129247,9,16),(129248,9,17),(129249,9,18),(129250,9,19),(129251,9,20),(129252,9,21),(129253,9,22),(129254,9,30),(129255,9,31),(129256,9,32),(129257,9,33),(129258,9,34),(129259,9,35),(129260,9,36),(129261,9,37),(129262,9,38),(129263,9,39),(129264,9,40),(129265,9,41),(129266,9,42),(129267,9,43),(129268,9,44),(129269,9,45),(129270,9,47),(129271,9,48),(129272,9,49),(129273,9,50),(129274,9,51),(129275,9,52),(129276,9,53),(129277,9,54),(129278,9,55),(129279,9,56),(129280,9,57),(129281,9,58),(129282,9,59),(129283,9,60),(129284,9,61),(129285,9,64),(129286,9,65),(129287,9,67),(129288,9,69),(129289,9,70),(129290,9,71),(129291,9,72),(129292,9,73),(129293,9,74),(129294,9,75),(129295,9,76),(129296,9,101),(129297,9,102),(129238,9,103),(129298,9,111),(128975,11,6),(128974,11,11),(130149,13,1),(130150,13,2),(130151,13,3),(130154,13,6),(130153,13,11),(130148,13,13),(130152,13,70),(129625,15,1),(129631,15,2),(129630,15,3),(129633,15,6),(129632,15,11),(129617,15,15),(129618,15,35),(129622,15,36),(129628,15,44),(129627,15,47),(129619,15,49),(129620,15,56),(129626,15,58),(129629,15,70),(129624,15,75),(129621,15,76),(129623,15,111),(129640,16,1),(129645,16,2),(129644,16,3),(129652,16,6),(129651,16,11),(129635,16,13),(129636,16,15),(129634,16,16),(129639,16,35),(129647,16,36),(129650,16,44),(129649,16,47),(129638,16,49),(129641,16,56),(129648,16,58),(129643,16,70),(129642,16,75),(129637,16,76),(129646,16,111),(129002,17,1),(129013,17,2),(129012,17,3),(129007,17,5),(129037,17,6),(129006,17,9),(129036,17,11),(129005,17,13),(129017,17,15),(129004,17,16),(128994,17,17),(129020,17,18),(129016,17,19),(128995,17,20),(129008,17,21),(129035,17,22),(129034,17,30),(129033,17,31),(129032,17,32),(129010,17,33),(129031,17,34),(129015,17,35),(129030,17,36),(128996,17,37),(129029,17,38),(128997,17,39),(129028,17,40),(129027,17,41),(129026,17,42),(129025,17,43),(129024,17,44),(129038,17,45),(129039,17,47),(129040,17,48),(129041,17,49),(129014,17,50),(129042,17,51),(129043,17,52),(129021,17,53),(129044,17,54),(129045,17,55),(129023,17,56),(129009,17,57),(129046,17,58),(129047,17,59),(129048,17,60),(129049,17,61),(128998,17,64),(129003,17,65),(128999,17,67),(129050,17,69),(129011,17,70),(129051,17,71),(129022,17,72),(129052,17,73),(129001,17,74),(129053,17,75),(129000,17,76),(129054,17,101),(129055,17,102),(129018,17,103),(129019,17,111),(130061,18,1),(130064,18,2),(130063,18,3),(130067,18,6),(130066,18,11),(130060,18,18),(130065,18,70),(130062,18,76),(130054,19,1),(130057,19,2),(130056,19,3),(130059,19,6),(130058,19,11),(130048,19,13),(130049,19,18),(130046,19,19),(130047,19,21),(130050,19,53),(130055,19,70),(130051,19,72),(130052,19,76),(130053,19,111),(129677,20,1),(129685,20,2),(129684,20,3),(129683,20,5),(129682,20,6),(129669,20,9),(129681,20,11),(129670,20,13),(129676,20,15),(129671,20,16),(129680,20,17),(129686,20,18),(129675,20,19),(129668,20,20),(129687,20,21),(129688,20,22),(129689,20,30),(129690,20,31),(129691,20,32),(129692,20,33),(129693,20,34),(129674,20,35),(129694,20,36),(129695,20,37),(129696,20,38),(129697,20,39),(129698,20,40),(129699,20,41),(129700,20,42),(129701,20,43),(129702,20,44),(129703,20,45),(129704,20,47),(129705,20,48),(129706,20,49),(129679,20,50),(129707,20,51),(129708,20,52),(129709,20,53),(129710,20,54),(129711,20,55),(129712,20,56),(129713,20,57),(129714,20,58),(129715,20,59),(129716,20,60),(129717,20,61),(129718,20,64),(129672,20,65),(129719,20,67),(129720,20,69),(129721,20,70),(129722,20,71),(129723,20,72),(129724,20,73),(129725,20,74),(129726,20,75),(129673,20,76),(129727,20,101),(129728,20,102),(129678,20,103),(129729,20,111),(130040,21,1),(130043,21,2),(130042,21,3),(130045,21,6),(130044,21,11),(130034,21,13),(130035,21,18),(130033,21,21),(130036,21,53),(130041,21,70),(130037,21,72),(130038,21,76),(130039,21,111),(130159,22,1),(130166,22,2),(130165,22,3),(130168,22,6),(130167,22,11),(130156,22,13),(130158,22,18),(130157,22,21),(130155,22,22),(130160,22,53),(130164,22,70),(130161,22,72),(130162,22,76),(130163,22,111),(129346,30,1),(129356,30,2),(129355,30,3),(129335,30,5),(129367,30,6),(129342,30,9),(129368,30,11),(129341,30,13),(129350,30,15),(129347,30,16),(129366,30,17),(129353,30,18),(129349,30,19),(129336,30,20),(129345,30,21),(129337,30,22),(129334,30,30),(129365,30,31),(129364,30,32),(129344,30,33),(129363,30,34),(129357,30,35),(129362,30,36),(129361,30,37),(129360,30,38),(129359,30,39),(129369,30,40),(129370,30,41),(129371,30,42),(129372,30,43),(129373,30,44),(129374,30,45),(129375,30,47),(129376,30,48),(129377,30,49),(129358,30,50),(129378,30,51),(129379,30,52),(129338,30,53),(129380,30,54),(129381,30,55),(129382,30,56),(129383,30,57),(129384,30,58),(129385,30,59),(129386,30,60),(129387,30,61),(129339,30,64),(129348,30,65),(129388,30,67),(129389,30,69),(129354,30,70),(129390,30,71),(129352,30,72),(129391,30,73),(129392,30,74),(129393,30,75),(129340,30,76),(129394,30,101),(129395,30,102),(129351,30,103),(129343,30,111),(129397,31,1),(129398,31,2),(129399,31,3),(129402,31,6),(129401,31,11),(129396,31,31),(129400,31,70),(129307,32,1),(129308,32,2),(129309,32,3),(129312,32,6),(129311,32,11),(129306,32,32),(129310,32,70),(129464,33,33),(129093,34,1),(129098,34,2),(129097,34,3),(129100,34,6),(129099,34,11),(129094,34,13),(129095,34,33),(129092,34,34),(129096,34,70),(129137,35,1),(129143,35,2),(129142,35,3),(129145,35,6),(129144,35,11),(129136,35,35),(129141,35,70),(129138,35,75),(129139,35,76),(129140,35,111),(129941,36,1),(129943,36,2),(129942,36,3),(129946,36,6),(129945,36,11),(129937,36,36),(129938,36,44),(129939,36,47),(129944,36,70),(129940,36,111),(129437,37,1),(129442,37,2),(129441,37,3),(129444,37,6),(129443,37,11),(129436,37,37),(129440,37,70),(129438,37,74),(129439,37,76),(129451,38,1),(129454,38,2),(129453,38,3),(129456,38,6),(129455,38,11),(129446,38,13),(129447,38,37),(129445,38,38),(129448,38,64),(129452,38,70),(129450,38,74),(129449,38,76),(128984,39,1),(128991,39,2),(128990,39,3),(128977,39,5),(128993,39,6),(128992,39,11),(128981,39,13),(128985,39,18),(128978,39,21),(128983,39,33),(128976,39,39),(128986,39,53),(128988,39,56),(128979,39,57),(128989,39,70),(128987,39,72),(128980,39,76),(128982,39,111),(129406,40,1),(129409,40,2),(129408,40,3),(129417,40,6),(129415,40,11),(129411,40,36),(129405,40,40),(129414,40,44),(129413,40,47),(129407,40,49),(129412,40,58),(129410,40,70),(129416,40,111),(129426,41,1),(129430,41,2),(129429,41,3),(129435,41,6),(129434,41,11),(129419,41,13),(129420,41,35),(129427,41,36),(129421,41,40),(129418,41,41),(129433,41,44),(129432,41,47),(129423,41,49),(129431,41,58),(129428,41,70),(129425,41,75),(129422,41,76),(129424,41,111),(129107,42,1),(129114,42,2),(129113,42,3),(129116,42,6),(129115,42,11),(129102,42,35),(129108,42,36),(129101,42,42),(129111,42,44),(129110,42,47),(129103,42,49),(129109,42,58),(129112,42,70),(129106,42,75),(129104,42,76),(129105,42,111),(129123,43,1),(129128,43,2),(129127,43,3),(129134,43,6),(129133,43,11),(129118,43,13),(129122,43,35),(129129,43,36),(129119,43,42),(129117,43,43),(129132,43,44),(129131,43,47),(129121,43,49),(129130,43,58),(129126,43,70),(129125,43,75),(129124,43,76),(129120,43,111),(128959,44,1),(128960,44,2),(128961,44,3),(128964,44,6),(128963,44,11),(128958,44,44),(128962,44,70),(128968,45,1),(128970,45,2),(128969,45,3),(128973,45,6),(128972,45,11),(128966,45,13),(128967,45,44),(128965,45,45),(128971,45,70),(129179,47,1),(129182,47,2),(129181,47,3),(129185,47,6),(129184,47,11),(129178,47,47),(129183,47,70),(129180,47,111),(129208,48,1),(129213,48,2),(129212,48,3),(129215,48,6),(129214,48,11),(129199,48,13),(129200,48,35),(129204,48,36),(129210,48,44),(129201,48,47),(129198,48,48),(129202,48,49),(129209,48,58),(129203,48,69),(129211,48,70),(129207,48,75),(129206,48,76),(129205,48,111),(129850,49,1),(129852,49,2),(129851,49,3),(129856,49,6),(129855,49,11),(129846,49,36),(129849,49,44),(129848,49,47),(129845,49,49),(129847,49,58),(129854,49,70),(129853,49,111),(129898,50,1),(129906,50,2),(129905,50,3),(129908,50,6),(129907,50,11),(129885,50,13),(129897,50,18),(129886,50,21),(129900,50,33),(129887,50,35),(129892,50,36),(129903,50,44),(129902,50,47),(129888,50,49),(129884,50,50),(129896,50,53),(129901,50,56),(129889,50,57),(129899,50,58),(129890,50,59),(129904,50,70),(129895,50,72),(129894,50,75),(129891,50,76),(129893,50,111),(129731,51,1),(129738,51,2),(129737,51,3),(129745,51,6),(129744,51,11),(129735,51,13),(129739,51,18),(129732,51,21),(129730,51,51),(129740,51,53),(129736,51,70),(129741,51,72),(129733,51,74),(129734,51,75),(129742,51,76),(129743,51,111),(129756,52,1),(129761,52,2),(129760,52,3),(129764,52,6),(129763,52,11),(129747,52,13),(129758,52,18),(129748,52,19),(129755,52,21),(129749,52,35),(129750,52,51),(129746,52,52),(129757,52,53),(129759,52,70),(129762,52,72),(129752,52,74),(129754,52,75),(129751,52,76),(129753,52,111),(129458,53,1),(129459,53,2),(129460,53,3),(129463,53,6),(129462,53,11),(129457,53,53),(129461,53,70),(129602,54,1),(129603,54,2),(129604,54,3),(129607,54,6),(129606,54,11),(129601,54,54),(129605,54,70),(129611,55,1),(129613,55,2),(129612,55,3),(129616,55,6),(129615,55,11),(129609,55,13),(129610,55,54),(129608,55,55),(129614,55,70),(129220,56,1),(129221,56,2),(129222,56,3),(129225,56,6),(129224,56,11),(129219,56,56),(129223,56,70),(129231,57,1),(129234,57,2),(129233,57,3),(129236,57,6),(129235,57,11),(129227,57,13),(129228,57,33),(129229,57,56),(129226,57,57),(129232,57,70),(129230,57,76),(129794,58,1),(129795,58,2),(129796,58,3),(129799,58,6),(129798,58,11),(129793,58,58),(129797,58,70),(129804,59,1),(129814,59,2),(129813,59,3),(129824,59,6),(129823,59,11),(129801,59,13),(129811,59,18),(129803,59,21),(129819,59,33),(129805,59,35),(129817,59,36),(129822,59,44),(129821,59,47),(129806,59,49),(129802,59,50),(129810,59,53),(129820,59,56),(129807,59,57),(129818,59,58),(129800,59,59),(129812,59,70),(129809,59,72),(129815,59,75),(129808,59,76),(129816,59,111),(129865,60,1),(129879,60,2),(129878,60,3),(129858,60,5),(129883,60,6),(129882,60,11),(129866,60,13),(129876,60,18),(129864,60,21),(129863,60,33),(129867,60,35),(129872,60,36),(129881,60,44),(129880,60,47),(129868,60,49),(129859,60,50),(129875,60,53),(129870,60,56),(129860,60,57),(129871,60,58),(129869,60,59),(129857,60,60),(129877,60,70),(129874,60,72),(129873,60,75),(129861,60,76),(129862,60,111),(129951,61,1),(129955,61,2),(129954,61,3),(129958,61,6),(129957,61,11),(129948,61,13),(129949,61,36),(129950,61,44),(129952,61,47),(129947,61,61),(129953,61,70),(129956,61,111),(129765,62,62),(129135,64,64),(129773,65,1),(129783,65,2),(129782,65,3),(129792,65,6),(129791,65,11),(129775,65,13),(129786,65,18),(129767,65,19),(129774,65,21),(129787,65,33),(129768,65,35),(129780,65,36),(129790,65,44),(129789,65,47),(129776,65,49),(129769,65,50),(129785,65,53),(129788,65,56),(129777,65,57),(129779,65,58),(129778,65,59),(129766,65,65),(129781,65,70),(129784,65,72),(129772,65,75),(129770,65,76),(129771,65,111),(130082,66,1),(130081,66,2),(130083,66,3),(130084,66,5),(130085,66,6),(130079,66,9),(130086,66,11),(130087,66,13),(130088,66,15),(130089,66,16),(130090,66,17),(130091,66,18),(130092,66,19),(130093,66,20),(130094,66,21),(130095,66,22),(130096,66,30),(130097,66,31),(130098,66,32),(130099,66,33),(130100,66,34),(130101,66,35),(130102,66,36),(130103,66,37),(130104,66,38),(130105,66,39),(130106,66,40),(130107,66,41),(130108,66,42),(130109,66,43),(130110,66,44),(130111,66,45),(130112,66,47),(130113,66,48),(130114,66,49),(130115,66,50),(130116,66,51),(130117,66,52),(130118,66,53),(130119,66,54),(130120,66,55),(130121,66,56),(130122,66,57),(130123,66,58),(130124,66,59),(130125,66,60),(130126,66,61),(130127,66,64),(130128,66,65),(130078,66,66),(130129,66,67),(130130,66,69),(130131,66,70),(130132,66,71),(130133,66,72),(130134,66,73),(130135,66,74),(130136,66,75),(130137,66,76),(130138,66,101),(130139,66,102),(130080,66,103),(130140,66,111),(129075,67,1),(129085,67,2),(129084,67,3),(129072,67,5),(129088,67,6),(129087,67,11),(129082,67,13),(129081,67,18),(129074,67,21),(129076,67,33),(129073,67,37),(129080,67,53),(129071,67,67),(129083,67,70),(129086,67,72),(129079,67,74),(129077,67,76),(129078,67,111),(129190,69,1),(129195,69,2),(129194,69,3),(129197,69,6),(129196,69,11),(129187,69,35),(129188,69,47),(129186,69,69),(129193,69,70),(129189,69,75),(129191,69,76),(129192,69,111),(130171,70,6),(130170,70,11),(130169,70,70),(129161,71,1),(129164,71,2),(129163,71,3),(129167,71,6),(129166,71,11),(129162,71,58),(129165,71,70),(129160,71,71),(129172,72,1),(129174,72,2),(129173,72,3),(129177,72,6),(129176,72,11),(129169,72,18),(129175,72,70),(129168,72,72),(129171,72,76),(129170,72,111),(129322,73,1),(129329,73,2),(129328,73,3),(129317,73,5),(129333,73,6),(129332,73,11),(129326,73,13),(129325,73,18),(129318,73,19),(129321,73,21),(129320,73,33),(129330,73,53),(129319,73,64),(129327,73,70),(129331,73,72),(129316,73,73),(129323,73,76),(129324,73,111),(130172,74,74),(129158,75,75),(129159,76,76),(129985,100,1),(129981,100,2),(129967,100,3),(129965,100,5),(129993,100,6),(129984,100,9),(129962,100,11),(130029,100,13),(130004,100,15),(130005,100,16),(129964,100,17),(130025,100,18),(130024,100,19),(130008,100,20),(130023,100,21),(130030,100,22),(129990,100,30),(129991,100,31),(129987,100,32),(129999,100,33),(129968,100,34),(129972,100,35),(130021,100,36),(129996,100,37),(129997,100,38),(129963,100,39),(129994,100,40),(129995,100,41),(129969,100,42),(129970,100,43),(129960,100,44),(129961,100,45),(129978,100,47),(129980,100,48),(130017,100,49),(130019,100,50),(130009,100,51),(130010,100,52),(129998,100,53),(130002,100,54),(130003,100,55),(129982,100,56),(129983,100,57),(130013,100,58),(130014,100,59),(130018,100,60),(130022,100,61),(130011,100,62),(129971,100,64),(130012,100,65),(130027,100,66),(129966,100,67),(129979,100,69),(130031,100,70),(129976,100,71),(129977,100,72),(129989,100,73),(130032,100,74),(129974,100,75),(129975,100,76),(129959,100,100),(129973,100,101),(130016,100,102),(130000,100,103),(130001,100,104),(129992,100,105),(129988,100,106),(130020,100,107),(130028,100,108),(130026,100,109),(130015,100,110),(129986,100,111),(130006,100,112),(130007,100,114),(129150,101,1),(129155,101,2),(129154,101,3),(129157,101,6),(129156,101,11),(129147,101,13),(129148,101,35),(129153,101,70),(129149,101,75),(129151,101,76),(129146,101,101),(129152,101,111),(129834,102,1),(129839,102,2),(129838,102,3),(129844,102,6),(129843,102,11),(129835,102,13),(129836,102,35),(129837,102,70),(129840,102,75),(129841,102,76),(129833,102,102),(129842,102,111),(129466,103,1),(129467,103,2),(129468,103,3),(129469,103,5),(129470,103,6),(129525,103,9),(129471,103,11),(129472,103,13),(129473,103,15),(129474,103,16),(129475,103,17),(129476,103,18),(129477,103,19),(129478,103,20),(129479,103,21),(129480,103,22),(129481,103,30),(129482,103,31),(129483,103,32),(129484,103,33),(129485,103,34),(129486,103,35),(129487,103,36),(129488,103,37),(129489,103,38),(129490,103,39),(129491,103,40),(129492,103,41),(129493,103,42),(129494,103,43),(129495,103,44),(129496,103,45),(129497,103,47),(129498,103,48),(129499,103,49),(129500,103,50),(129501,103,51),(129502,103,52),(129503,103,53),(129504,103,54),(129505,103,55),(129506,103,56),(129507,103,57),(129508,103,58),(129509,103,59),(129510,103,60),(129511,103,61),(129512,103,64),(129513,103,65),(129514,103,67),(129515,103,69),(129516,103,70),(129517,103,71),(129518,103,72),(129519,103,73),(129520,103,74),(129521,103,75),(129522,103,76),(129523,103,101),(129524,103,102),(129465,103,103),(129526,103,111),(129535,104,1),(129534,104,2),(129533,104,3),(129532,104,5),(129536,104,6),(129528,104,9),(129537,104,11),(129538,104,13),(129539,104,15),(129540,104,16),(129541,104,17),(129542,104,18),(129543,104,19),(129544,104,20),(129545,104,21),(129546,104,22),(129547,104,30),(129548,104,31),(129549,104,32),(129550,104,33),(129551,104,34),(129552,104,35),(129553,104,36),(129554,104,37),(129555,104,38),(129556,104,39),(129557,104,40),(129558,104,41),(129559,104,42),(129560,104,43),(129561,104,44),(129562,104,45),(129563,104,47),(129564,104,48),(129565,104,49),(129566,104,50),(129567,104,51),(129568,104,52),(129569,104,53),(129570,104,54),(129571,104,55),(129572,104,56),(129573,104,57),(129574,104,58),(129575,104,59),(129576,104,60),(129577,104,61),(129596,104,62),(129578,104,64),(129579,104,65),(129529,104,66),(129580,104,67),(129581,104,69),(129582,104,70),(129583,104,71),(129584,104,72),(129585,104,73),(129586,104,74),(129587,104,75),(129588,104,76),(129530,104,100),(129589,104,101),(129590,104,102),(129531,104,103),(129527,104,104),(129593,104,105),(129592,104,106),(129598,104,107),(129600,104,108),(129599,104,109),(129597,104,110),(129591,104,111),(129594,104,112),(129595,104,114),(129403,105,105),(129315,106,6),(129314,106,11),(129313,106,106),(129918,107,1),(129932,107,2),(129931,107,3),(129911,107,5),(129936,107,6),(129935,107,11),(129919,107,13),(129929,107,18),(129917,107,21),(129916,107,33),(129920,107,35),(129925,107,36),(129934,107,44),(129933,107,47),(129921,107,49),(129912,107,50),(129928,107,53),(129923,107,56),(129913,107,57),(129924,107,58),(129922,107,59),(129910,107,60),(129930,107,70),(129927,107,72),(129926,107,75),(129914,107,76),(129909,107,107),(129915,107,111),(130142,108,1),(130143,108,2),(130144,108,3),(130147,108,6),(130146,108,11),(130145,108,70),(130141,108,108),(130072,109,1),(130074,109,2),(130073,109,3),(130077,109,6),(130076,109,11),(130069,109,13),(130070,109,18),(130075,109,70),(130071,109,76),(130068,109,109),(129826,110,1),(129829,110,2),(129828,110,3),(129832,110,6),(129831,110,11),(129830,110,70),(129827,110,76),(129825,110,110),(129305,111,111),(129654,112,1),(129655,112,2),(129656,112,3),(129659,112,6),(129658,112,11),(129657,112,70),(129653,112,112),(129662,114,1),(129663,114,2),(129664,114,3),(129667,114,6),(129666,114,11),(129665,114,70),(129661,114,112),(129660,114,114); /*!40000 ALTER TABLE `roleRole` ENABLE KEYS */; UNLOCK TABLES; @@ -1788,8 +108,7 @@ UNLOCK TABLES; LOCK TABLES `userPassword` WRITE; /*!40000 ALTER TABLE `userPassword` DISABLE KEYS */; -INSERT INTO `userPassword` VALUES -(1,7,1,0,2,1); +INSERT INTO `userPassword` VALUES (1,7,1,0,2,1); /*!40000 ALTER TABLE `userPassword` ENABLE KEYS */; UNLOCK TABLES; @@ -1799,8 +118,7 @@ UNLOCK TABLES; LOCK TABLES `accountConfig` WRITE; /*!40000 ALTER TABLE `accountConfig` DISABLE KEYS */; -INSERT INTO `accountConfig` VALUES -(1,'/mnt/homes','/bin/bash',10000,5,60,5,30); +INSERT INTO `accountConfig` VALUES (1,'/mnt/homes','/bin/bash',10000,5,60,5,30); /*!40000 ALTER TABLE `accountConfig` ENABLE KEYS */; UNLOCK TABLES; @@ -1810,8 +128,7 @@ UNLOCK TABLES; LOCK TABLES `mailConfig` WRITE; /*!40000 ALTER TABLE `mailConfig` DISABLE KEYS */; -INSERT INTO `mailConfig` VALUES -(1,'verdnatura.es'); +INSERT INTO `mailConfig` VALUES (1,'verdnatura.es'); /*!40000 ALTER TABLE `mailConfig` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -1823,9 +140,9 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-11-21 7:59:04 +-- Dump completed on 2023-02-03 14:47:08 USE `salix`; --- MariaDB dump 10.19 Distrib 10.9.4-MariaDB, for Linux (x86_64) +-- MariaDB dump 10.19 Distrib 10.5.18-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: db.verdnatura.es Database: salix -- ------------------------------------------------------ @@ -1847,359 +164,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'), -(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','refund','WRITE','ALLOW','ROLE','invoicing'), -(298,'InvoiceInDueDay','*','*','ALLOW','ROLE','administrative'), -(299,'Collection','setSaleQuantity','*','ALLOW','ROLE','employee'), -(300,'Docuware','*','*','ALLOW','ROLE','employee'), -(301,'Agency','*','READ','ALLOW','ROLE','employee'), -(302,'AgencyTerm','*','*','ALLOW','ROLE','administrative'), -(303,'ClaimLog','*','READ','ALLOW','ROLE','claimManager'), -(304,'Edi','updateData','WRITE','ALLOW','ROLE','employee'), -(305,'EducationLevel','*','*','ALLOW','ROLE','employee'), -(306,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'), -(307,'SupplierAgencyTerm','*','*','ALLOW','ROLE','administrative'), -(308,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'), -(309,'Zone','getZoneClosing','*','ALLOW','ROLE','employee'), -(310,'ExpeditionState','*','READ','ALLOW','ROLE','employee'), -(311,'Expense','*','READ','ALLOW','ROLE','employee'), -(312,'Expense','*','WRITE','ALLOW','ROLE','administrative'), -(314,'SupplierActivity','*','READ','ALLOW','ROLE','employee'), -(315,'SupplierActivity','*','WRITE','ALLOW','ROLE','administrative'), -(316,'Dms','deleteTrashFiles','WRITE','ALLOW','ROLE','employee'), -(317,'ClientUnpaid','*','*','ALLOW','ROLE','administrative'), -(318,'MdbVersion','*','*','ALLOW','ROLE','developer'), -(319,'ItemType','*','READ','ALLOW','ROLE','employee'), -(320,'ItemType','*','WRITE','ALLOW','ROLE','buyer'), -(321,'InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'), -(322,'InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'), -(323,'InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'), -(324,'Ticket','refund','WRITE','ALLOW','ROLE','invoicing'), -(325,'Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'), -(326,'Ticket','refund','WRITE','ALLOW','ROLE','claimManager'), -(327,'Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'), -(328,'Sale','refund','WRITE','ALLOW','ROLE','claimManager'), -(329,'TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'), -(330,'ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'), -(331,'ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'), -(332,'Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'), -(333,'Client','updateUser','WRITE','ALLOW','ROLE','salesPerson'), -(334,'ShelvingLog','*','READ','ALLOW','ROLE','employee'), -(335,'ZoneExclusionGeo','*','READ','ALLOW','ROLE','employee'), -(336,'ZoneExclusionGeo','*','WRITE','ALLOW','ROLE','deliveryBoss'), -(337,'Parking','*','*','ALLOW','ROLE','employee'), -(338,'Shelving','*','*','ALLOW','ROLE','employee'), -(339,'OsTicket','*','*','ALLOW','ROLE','employee'), -(340,'OsTicketConfig','*','*','ALLOW','ROLE','it'), -(341,'ClientConsumptionQueue','*','WRITE','ALLOW','ROLE','employee'), -(342,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','employee'), -(343,'Ticket','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'), -(344,'Ticket','deliveryNoteCsvPdf','READ','ALLOW','ROLE','employee'), -(345,'Ticket','deliveryNoteCsvEmail','WRITE','ALLOW','ROLE','employee'), -(346,'Client','campaignMetricsPdf','READ','ALLOW','ROLE','employee'), -(347,'Client','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'), -(348,'Client','clientWelcomeHtml','READ','ALLOW','ROLE','employee'), -(349,'Client','clientWelcomeEmail','WRITE','ALLOW','ROLE','employee'), -(350,'Client','creditRequestPdf','READ','ALLOW','ROLE','employee'), -(351,'Client','creditRequestHtml','READ','ALLOW','ROLE','employee'), -(352,'Client','creditRequestEmail','WRITE','ALLOW','ROLE','employee'), -(353,'Client','printerSetupHtml','READ','ALLOW','ROLE','employee'), -(354,'Client','printerSetupEmail','WRITE','ALLOW','ROLE','employee'), -(355,'Client','sepaCoreEmail','WRITE','ALLOW','ROLE','employee'), -(356,'Client','letterDebtorPdf','READ','ALLOW','ROLE','employee'), -(357,'Client','letterDebtorStHtml','READ','ALLOW','ROLE','employee'), -(358,'Client','letterDebtorStEmail','WRITE','ALLOW','ROLE','employee'), -(359,'Client','letterDebtorNdHtml','READ','ALLOW','ROLE','employee'), -(360,'Client','letterDebtorNdEmail','WRITE','ALLOW','ROLE','employee'), -(361,'Client','clientDebtStatementPdf','READ','ALLOW','ROLE','employee'), -(362,'Client','clientDebtStatementHtml','READ','ALLOW','ROLE','employee'), -(363,'Client','clientDebtStatementEmail','WRITE','ALLOW','ROLE','employee'), -(364,'Client','incotermsAuthorizationPdf','READ','ALLOW','ROLE','employee'), -(365,'Client','incotermsAuthorizationHtml','READ','ALLOW','ROLE','employee'), -(366,'Client','incotermsAuthorizationEmail','WRITE','ALLOW','ROLE','employee'), -(367,'Client','consumptionSendQueued','WRITE','ALLOW','ROLE','system'), -(368,'InvoiceOut','invoiceEmail','WRITE','ALLOW','ROLE','employee'), -(369,'InvoiceOut','exportationPdf','READ','ALLOW','ROLE','employee'), -(370,'InvoiceOut','sendQueued','WRITE','ALLOW','ROLE','system'), -(371,'Ticket','invoiceCsvPdf','READ','ALLOW','ROLE','employee'), -(372,'Ticket','invoiceCsvEmail','WRITE','ALLOW','ROLE','employee'), -(373,'Supplier','campaignMetricsPdf','READ','ALLOW','ROLE','employee'), -(374,'Supplier','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'), -(375,'Travel','extraCommunityPdf','READ','ALLOW','ROLE','employee'), -(376,'Travel','extraCommunityEmail','WRITE','ALLOW','ROLE','employee'), -(377,'Entry','entryOrderPdf','READ','ALLOW','ROLE','employee'), -(378,'OsTicket','osTicketReportEmail','WRITE','ALLOW','ROLE','system'), -(379,'Item','buyerWasteEmail','WRITE','ALLOW','ROLE','system'), -(380,'Claim','claimPickupPdf','READ','ALLOW','ROLE','employee'), -(381,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','claimManager'), -(382,'Item','labelPdf','READ','ALLOW','ROLE','employee'), -(383,'Sector','*','READ','ALLOW','ROLE','employee'), -(384,'Sector','*','WRITE','ALLOW','ROLE','employee'), -(385,'Route','driverRoutePdf','READ','ALLOW','ROLE','employee'), -(386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee'), -(387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer'), -(388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative'), -(389,'ClaimRma','*','READ','ALLOW','ROLE','claimManager'), -(390,'ClaimRma','*','WRITE','ALLOW','ROLE','claimManager'), -(391,'Notification','*','WRITE','ALLOW','ROLE','system'), -(392,'Boxing','*','*','ALLOW','ROLE','employee'), -(393,'Url','*','READ','ALLOW','ROLE','employee'), -(394,'Url','*','WRITE','ALLOW','ROLE','it'), -(395,'ItemShelving','*','READ','ALLOW','ROLE','employee'), -(396,'ItemShelving','*','WRITE','ALLOW','ROLE','production'), -(397,'ItemShelvingPlacementSupplyStock','*','READ','ALLOW','ROLE','employee'), -(407, 'ZipConfig', '*', '*', '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'),(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'),(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','refund','WRITE','ALLOW','ROLE','invoicing'),(298,'InvoiceInDueDay','*','*','ALLOW','ROLE','administrative'),(299,'Collection','setSaleQuantity','*','ALLOW','ROLE','employee'),(300,'Docuware','*','*','ALLOW','ROLE','employee'),(301,'Agency','*','READ','ALLOW','ROLE','employee'),(302,'AgencyTerm','*','*','ALLOW','ROLE','administrative'),(303,'ClaimLog','*','READ','ALLOW','ROLE','claimManager'),(304,'Edi','updateData','WRITE','ALLOW','ROLE','employee'),(305,'EducationLevel','*','*','ALLOW','ROLE','employee'),(306,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(307,'SupplierAgencyTerm','*','*','ALLOW','ROLE','administrative'),(308,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(309,'Zone','getZoneClosing','*','ALLOW','ROLE','employee'),(310,'ExpeditionState','*','READ','ALLOW','ROLE','employee'),(311,'Expense','*','READ','ALLOW','ROLE','employee'),(312,'Expense','*','WRITE','ALLOW','ROLE','administrative'),(314,'SupplierActivity','*','READ','ALLOW','ROLE','employee'),(315,'SupplierActivity','*','WRITE','ALLOW','ROLE','administrative'),(316,'Dms','deleteTrashFiles','WRITE','ALLOW','ROLE','employee'),(317,'ClientUnpaid','*','*','ALLOW','ROLE','administrative'),(318,'MdbVersion','*','*','ALLOW','ROLE','developer'),(319,'ItemType','*','READ','ALLOW','ROLE','employee'),(320,'ItemType','*','WRITE','ALLOW','ROLE','buyer'),(321,'InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'),(322,'InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'),(323,'InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'),(324,'Ticket','refund','WRITE','ALLOW','ROLE','invoicing'),(325,'Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'),(326,'Ticket','refund','WRITE','ALLOW','ROLE','claimManager'),(327,'Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'),(328,'Sale','refund','WRITE','ALLOW','ROLE','claimManager'),(329,'TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'),(330,'ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),(331,'ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),(332,'Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),(333,'Client','updateUser','WRITE','ALLOW','ROLE','salesPerson'),(334,'ShelvingLog','*','READ','ALLOW','ROLE','employee'),(335,'ZoneExclusionGeo','*','READ','ALLOW','ROLE','employee'),(336,'ZoneExclusionGeo','*','WRITE','ALLOW','ROLE','deliveryBoss'),(337,'Parking','*','*','ALLOW','ROLE','employee'),(338,'Shelving','*','*','ALLOW','ROLE','employee'),(339,'OsTicket','*','*','ALLOW','ROLE','employee'),(340,'OsTicketConfig','*','*','ALLOW','ROLE','it'),(341,'ClientConsumptionQueue','*','WRITE','ALLOW','ROLE','employee'),(342,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','employee'),(343,'Ticket','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(344,'Ticket','deliveryNoteCsvPdf','READ','ALLOW','ROLE','employee'),(345,'Ticket','deliveryNoteCsvEmail','WRITE','ALLOW','ROLE','employee'),(346,'Client','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(347,'Client','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(348,'Client','clientWelcomeHtml','READ','ALLOW','ROLE','employee'),(349,'Client','clientWelcomeEmail','WRITE','ALLOW','ROLE','employee'),(350,'Client','creditRequestPdf','READ','ALLOW','ROLE','employee'),(351,'Client','creditRequestHtml','READ','ALLOW','ROLE','employee'),(352,'Client','creditRequestEmail','WRITE','ALLOW','ROLE','employee'),(353,'Client','printerSetupHtml','READ','ALLOW','ROLE','employee'),(354,'Client','printerSetupEmail','WRITE','ALLOW','ROLE','employee'),(355,'Client','sepaCoreEmail','WRITE','ALLOW','ROLE','employee'),(356,'Client','letterDebtorPdf','READ','ALLOW','ROLE','employee'),(357,'Client','letterDebtorStHtml','READ','ALLOW','ROLE','employee'),(358,'Client','letterDebtorStEmail','WRITE','ALLOW','ROLE','employee'),(359,'Client','letterDebtorNdHtml','READ','ALLOW','ROLE','employee'),(360,'Client','letterDebtorNdEmail','WRITE','ALLOW','ROLE','employee'),(361,'Client','clientDebtStatementPdf','READ','ALLOW','ROLE','employee'),(362,'Client','clientDebtStatementHtml','READ','ALLOW','ROLE','employee'),(363,'Client','clientDebtStatementEmail','WRITE','ALLOW','ROLE','employee'),(364,'Client','incotermsAuthorizationPdf','READ','ALLOW','ROLE','employee'),(365,'Client','incotermsAuthorizationHtml','READ','ALLOW','ROLE','employee'),(366,'Client','incotermsAuthorizationEmail','WRITE','ALLOW','ROLE','employee'),(367,'Client','consumptionSendQueued','WRITE','ALLOW','ROLE','system'),(368,'InvoiceOut','invoiceEmail','WRITE','ALLOW','ROLE','employee'),(369,'InvoiceOut','exportationPdf','READ','ALLOW','ROLE','employee'),(370,'InvoiceOut','sendQueued','WRITE','ALLOW','ROLE','system'),(371,'Ticket','invoiceCsvPdf','READ','ALLOW','ROLE','employee'),(372,'Ticket','invoiceCsvEmail','WRITE','ALLOW','ROLE','employee'),(373,'Supplier','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(374,'Supplier','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(375,'Travel','extraCommunityPdf','READ','ALLOW','ROLE','employee'),(376,'Travel','extraCommunityEmail','WRITE','ALLOW','ROLE','employee'),(377,'Entry','entryOrderPdf','READ','ALLOW','ROLE','employee'),(378,'OsTicket','osTicketReportEmail','WRITE','ALLOW','ROLE','system'),(379,'Item','buyerWasteEmail','WRITE','ALLOW','ROLE','system'),(380,'Claim','claimPickupPdf','READ','ALLOW','ROLE','employee'),(381,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','claimManager'),(382,'Item','labelPdf','READ','ALLOW','ROLE','employee'),(383,'Sector','*','READ','ALLOW','ROLE','employee'),(384,'Sector','*','WRITE','ALLOW','ROLE','employee'),(385,'Route','driverRoutePdf','READ','ALLOW','ROLE','employee'),(386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee'),(387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer'),(388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative'),(389,'ClaimRma','*','READ','ALLOW','ROLE','claimManager'),(390,'ClaimRma','*','WRITE','ALLOW','ROLE','claimManager'),(391,'Notification','*','WRITE','ALLOW','ROLE','system'),(392,'Boxing','*','*','ALLOW','ROLE','employee'),(393,'Url','*','READ','ALLOW','ROLE','employee'),(394,'Url','*','WRITE','ALLOW','ROLE','it'),(395,'ItemShelving','*','READ','ALLOW','ROLE','employee'),(396,'ItemShelving','*','WRITE','ALLOW','ROLE','production'),(397,'ItemShelvingPlacementSupplyStock','*','READ','ALLOW','ROLE','employee'),(398,'NotificationQueue','*','*','ALLOW','ROLE','employee'),(399,'InvoiceOut','clientsToInvoice','WRITE','ALLOW','ROLE','invoicing'),(400,'InvoiceOut','invoiceClient','WRITE','ALLOW','ROLE','invoicing'),(401,'Sale','editTracked','WRITE','ALLOW','ROLE','production'),(402,'Sale','editFloramondo','WRITE','ALLOW','ROLE','salesAssistant'),(403,'Receipt','balanceCompensationEmail','WRITE','ALLOW','ROLE','employee'),(404,'Receipt','balanceCompensationPdf','READ','ALLOW','ROLE','employee'),(405,'Ticket','getTicketsFuture','READ','ALLOW','ROLE','employee'),(406,'Ticket','merge','WRITE','ALLOW','ROLE','employee'),(407,'Sale','editFloramondo','WRITE','ALLOW','ROLE','logistic'),(408,'ZipConfig','*','*','ALLOW','ROLE','employee'),(409,'Item','*','WRITE','ALLOW','ROLE','administrative'),(410,'Sale','editCloned','WRITE','ALLOW','ROLE','buyer'),(411,'Sale','editCloned','WRITE','ALLOW','ROLE','salesAssistant'),(414,'MdbVersion','*','READ','ALLOW','ROLE','$everyone'),(415,'Dms','saveSign','*','ALLOW','ROLE','employee'),(416,'TicketLog','getChanges','READ','ALLOW','ROLE','employee'),(417,'Ticket','getTicketsAdvance','READ','ALLOW','ROLE','employee'),(418,'EntryLog','*','READ','ALLOW','ROLE','administrative'),(419,'Sale','editTracked','WRITE','ALLOW','ROLE','buyer'),(420,'MdbBranch','*','READ','ALLOW','ROLE','$everyone'),(421,'ItemShelvingSale','*','*','ALLOW','ROLE','employee'),(422,'Docuware','checkFile','READ','ALLOW','ROLE','employee'),(423,'Docuware','download','READ','ALLOW','ROLE','salesPerson'),(424,'Docuware','upload','WRITE','ALLOW','ROLE','productionAssi'),(425,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','salesPerson'),(426,'TpvTransaction','confirm','WRITE','ALLOW','ROLE','$everyone'),(427,'TpvTransaction','start','WRITE','ALLOW','ROLE','$authenticated'),(428,'TpvTransaction','end','WRITE','ALLOW','ROLE','$authenticated'); /*!40000 ALTER TABLE `ACL` ENABLE KEYS */; UNLOCK TABLES; @@ -2209,71 +174,7 @@ UNLOCK TABLES; LOCK TABLES `fieldAcl` WRITE; /*!40000 ALTER TABLE `fieldAcl` DISABLE KEYS */; -INSERT INTO `fieldAcl` VALUES -(1,'Client','name','update','employee'), -(2,'Client','contact','update','employee'), -(3,'Client','email','update','employee'), -(4,'Client','phone','update','employee'), -(5,'Client','mobile','update','employee'), -(6,'Client','contactChannelFk','update','employee'), -(7,'Client','socialName','update','salesPerson'), -(8,'Client','fi','update','salesPerson'), -(9,'Client','street','update','salesPerson'), -(10,'Client','postcode','update','salesPerson'), -(11,'Client','city','update','salesPerson'), -(12,'Client','countryFk','update','salesPerson'), -(13,'Client','provinceFk','update','salesPerson'), -(14,'Client','isActive','update','salesPerson'), -(15,'Client','salesPersonFk','update','salesAssistant'), -(16,'Client','hasToInvoice','update','salesPerson'), -(17,'Client','isToBeMailed','update','salesPerson'), -(18,'Client','isEqualizated','update','salesPerson'), -(19,'Client','isFreezed','update','salesPerson'), -(20,'Client','isVies','update','salesPerson'), -(21,'Client','hasToInvoiceByAddress','update','salesPerson'), -(22,'Client','isTaxDataChecked','update','salesAssistant'), -(23,'Client','payMethodFk','update','salesAssistant'), -(24,'Client','dueDay','update','salesAssistant'), -(25,'Client','iban','update','salesAssistant'), -(26,'Client','bankEntityFk','update','salesAssistant'), -(27,'Client','hasLcr','update','salesAssistant'), -(28,'Client','hasCoreVnl','update','salesAssistant'), -(29,'Client','hasSepaVnl','update','salesAssistant'), -(30,'Client','credit','update','teamBoss'), -(31,'BankEntity','*','insert','salesAssistant'), -(32,'Address','isDefaultAddress','*','employee'), -(33,'Address','nickname','*','employee'), -(34,'Address','postalCode','*','employee'), -(35,'Address','provinceFk','*','employee'), -(36,'Address','agencyModeFk','*','employee'), -(37,'Address','phone','*','employee'), -(38,'Address','mobile','*','employee'), -(39,'Address','street','*','employee'), -(40,'Address','city','*','employee'), -(41,'Address','isActive','*','employee'), -(42,'Address','isEqualizated','*','salesAssistant'), -(43,'Address','clientFk','insert','employee'), -(44,'ClientObservation','*','insert','employee'), -(45,'Recovery','*','insert','administrative'), -(46,'Recovery','finished','update','administrative'), -(47,'CreditClassification','finished','update','creditInsurance'), -(48,'Account','*','update','employee'), -(49,'Greuge','*','insert','salesAssistant'), -(50,'ClientSample','*','insert','employee'), -(51,'Item','*','*','buyer'), -(52,'Item','*','*','marketingBoss'), -(53,'ItemBotanical','*','*','buyer'), -(54,'ClaimEnd','*','*','salesAssistant'), -(55,'Receipt','*','*','administrative'), -(56,'ClaimBeginning','*','*','salesAssistant'), -(57,'TicketRequest','*','*','salesPerson'), -(58,'ClaimBeginning','*','*','salesAssistant'), -(59,'TicketRequest','*','*','salesPerson'), -(60,'ClaimBeginning','*','*','salesAssistant'), -(61,'TicketRequest','*','*','salesPerson'), -(62,'ClaimBeginning','*','*','salesAssistant'), -(63,'TicketRequest','*','*','salesPerson'), -(64,'ClaimBeginning','*','*','salesAssistant'); +INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee'),(2,'Client','contact','update','employee'),(3,'Client','email','update','employee'),(4,'Client','phone','update','employee'),(5,'Client','mobile','update','employee'),(6,'Client','contactChannelFk','update','employee'),(7,'Client','socialName','update','salesPerson'),(8,'Client','fi','update','salesPerson'),(9,'Client','street','update','salesPerson'),(10,'Client','postcode','update','salesPerson'),(11,'Client','city','update','salesPerson'),(12,'Client','countryFk','update','salesPerson'),(13,'Client','provinceFk','update','salesPerson'),(14,'Client','isActive','update','salesPerson'),(15,'Client','salesPersonFk','update','salesAssistant'),(16,'Client','hasToInvoice','update','salesPerson'),(17,'Client','isToBeMailed','update','salesPerson'),(18,'Client','isEqualizated','update','salesPerson'),(19,'Client','isFreezed','update','salesPerson'),(20,'Client','isVies','update','salesPerson'),(21,'Client','hasToInvoiceByAddress','update','salesPerson'),(22,'Client','isTaxDataChecked','update','salesAssistant'),(23,'Client','payMethodFk','update','salesAssistant'),(24,'Client','dueDay','update','salesAssistant'),(25,'Client','iban','update','salesAssistant'),(26,'Client','bankEntityFk','update','salesAssistant'),(27,'Client','hasLcr','update','salesAssistant'),(28,'Client','hasCoreVnl','update','salesAssistant'),(29,'Client','hasSepaVnl','update','salesAssistant'),(30,'Client','credit','update','teamBoss'),(31,'BankEntity','*','insert','salesAssistant'),(32,'Address','isDefaultAddress','*','employee'),(33,'Address','nickname','*','employee'),(34,'Address','postalCode','*','employee'),(35,'Address','provinceFk','*','employee'),(36,'Address','agencyModeFk','*','employee'),(37,'Address','phone','*','employee'),(38,'Address','mobile','*','employee'),(39,'Address','street','*','employee'),(40,'Address','city','*','employee'),(41,'Address','isActive','*','employee'),(42,'Address','isEqualizated','*','salesAssistant'),(43,'Address','clientFk','insert','employee'),(44,'ClientObservation','*','insert','employee'),(45,'Recovery','*','insert','administrative'),(46,'Recovery','finished','update','administrative'),(47,'CreditClassification','finished','update','creditInsurance'),(48,'Account','*','update','employee'),(49,'Greuge','*','insert','salesAssistant'),(50,'ClientSample','*','insert','employee'),(51,'Item','*','*','buyer'),(52,'Item','*','*','marketingBoss'),(53,'ItemBotanical','*','*','buyer'),(54,'ClaimEnd','*','*','salesAssistant'),(55,'Receipt','*','*','administrative'),(56,'ClaimBeginning','*','*','salesAssistant'),(57,'TicketRequest','*','*','salesPerson'),(58,'ClaimBeginning','*','*','salesAssistant'),(59,'TicketRequest','*','*','salesPerson'),(60,'ClaimBeginning','*','*','salesAssistant'),(61,'TicketRequest','*','*','salesPerson'),(62,'ClaimBeginning','*','*','salesAssistant'),(63,'TicketRequest','*','*','salesPerson'),(64,'ClaimBeginning','*','*','salesAssistant'); /*!40000 ALTER TABLE `fieldAcl` ENABLE KEYS */; UNLOCK TABLES; @@ -2283,22 +184,7 @@ UNLOCK TABLES; LOCK TABLES `module` WRITE; /*!40000 ALTER TABLE `module` DISABLE KEYS */; -INSERT INTO `module` VALUES -('Claims'), -('Clients'), -('Entries'), -('Invoices in'), -('Invoices out'), -('Items'), -('Monitors'), -('Orders'), -('Routes'), -('Suppliers'), -('Tickets'), -('Travels'), -('Users'), -('Workers'), -('Zones'); +INSERT INTO `module` VALUES ('account'),('claim'),('customer'),('entry'),('invoiceIn'),('invoiceOut'),('item'),('monitor'),('order'),('route'),('shelving'),('supplier'),('ticket'),('travel'),('worker'),('zone'); /*!40000 ALTER TABLE `module` ENABLE KEYS */; UNLOCK TABLES; @@ -2308,11 +194,7 @@ UNLOCK TABLES; LOCK TABLES `defaultViewConfig` WRITE; /*!40000 ALTER TABLE `defaultViewConfig` DISABLE KEYS */; -INSERT INTO `defaultViewConfig` VALUES -('itemsIndex','{\"intrastat\":false,\"stemMultiplier\":false,\"landed\":false,\"producer\":false}'), -('latestBuys','{\"intrastat\":false,\"description\":false,\"density\":false,\"isActive\":false,\n \"freightValue\":false,\"packageValue\":false,\"isIgnored\":false,\"price2\":false,\"ektFk\":false,\"weight\":false,\n \"size\":false,\"comissionValue\":false,\"landing\":false}'), -('ticketsMonitor','{\"id\":false}'), -('clientsDetail','{\"id\":true,\"phone\":true,\"city\":true,\"socialName\":true,\"salesPersonFk\":true,\"email\":true,\"name\":false,\"fi\":false,\"credit\":false,\"creditInsurance\":false,\"mobile\":false,\"street\":false,\"countryFk\":false,\"provinceFk\":false,\"postcode\":false,\"created\":false,\"businessTypeFk\":false,\"payMethodFk\":false,\"sageTaxTypeFk\":false,\"sageTransactionTypeFk\":false,\"isActive\":false,\"isVies\":false,\"isTaxDataChecked\":false,\"isEqualizated\":false,\"isFreezed\":false,\"hasToInvoice\":false,\"hasToInvoiceByAddress\":false,\"isToBeMailed\":false,\"hasLcr\":false,\"hasCoreVnl\":false,\"hasSepaVnl\":false}'); +INSERT INTO `defaultViewConfig` VALUES ('itemsIndex','{\"intrastat\":false,\"stemMultiplier\":false,\"landed\":false,\"producer\":false}'),('latestBuys','{\"intrastat\":false,\"description\":false,\"density\":false,\"isActive\":false,\n \"freightValue\":false,\"packageValue\":false,\"isIgnored\":false,\"price2\":false,\"ektFk\":false,\"weight\":false,\n \"size\":false,\"comissionValue\":false,\"landing\":false}'),('ticketsMonitor','{\"id\":false}'),('clientsDetail','{\"id\":true,\"phone\":true,\"city\":true,\"socialName\":true,\"salesPersonFk\":true,\"email\":true,\"name\":false,\"fi\":false,\"credit\":false,\"creditInsurance\":false,\"mobile\":false,\"street\":false,\"countryFk\":false,\"provinceFk\":false,\"postcode\":false,\"created\":false,\"businessTypeFk\":false,\"payMethodFk\":false,\"sageTaxTypeFk\":false,\"sageTransactionTypeFk\":false,\"isActive\":false,\"isVies\":false,\"isTaxDataChecked\":false,\"isEqualizated\":false,\"isFreezed\":false,\"hasToInvoice\":false,\"hasToInvoiceByAddress\":false,\"isToBeMailed\":false,\"hasLcr\":false,\"hasCoreVnl\":false,\"hasSepaVnl\":false}'); /*!40000 ALTER TABLE `defaultViewConfig` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -2324,9 +206,9 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-11-21 7:59:04 +-- Dump completed on 2023-02-03 14:47:09 USE `vn`; --- MariaDB dump 10.19 Distrib 10.9.4-MariaDB, for Linux (x86_64) +-- MariaDB dump 10.19 Distrib 10.5.18-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: db.verdnatura.es Database: vn -- ------------------------------------------------------ @@ -2342,17 +224,23 @@ USE `vn`; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; +-- +-- Dumping data for table `agencyTermConfig` +-- + +LOCK TABLES `agencyTermConfig` WRITE; +/*!40000 ALTER TABLE `agencyTermConfig` DISABLE KEYS */; +INSERT INTO `agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios'); +/*!40000 ALTER TABLE `agencyTermConfig` ENABLE KEYS */; +UNLOCK TABLES; + -- -- Dumping data for table `alertLevel` -- LOCK TABLES `alertLevel` WRITE; /*!40000 ALTER TABLE `alertLevel` DISABLE KEYS */; -INSERT INTO `alertLevel` VALUES -('FREE',0), -('ON_PREPARATION',1), -('PACKED',2), -('DELIVERED',3); +INSERT INTO `alertLevel` VALUES ('FREE',0),('ON_PREPARATION',1),('PACKED',2),('DELIVERED',3); /*!40000 ALTER TABLE `alertLevel` ENABLE KEYS */; UNLOCK TABLES; @@ -2362,44 +250,7 @@ UNLOCK TABLES; LOCK TABLES `bookingPlanner` WRITE; /*!40000 ALTER TABLE `bookingPlanner` DISABLE KEYS */; -INSERT INTO `bookingPlanner` VALUES -(5,'2017-06-30 22:00:00','4770000002','WORLD',7,4,1), -(6,'2017-06-30 22:00:00','4770000010','NATIONAL',3,1,1), -(8,'2017-06-30 22:00:00','4770000021','NATIONAL',1,2,1), -(9,'2017-06-30 22:00:00','4770000101','EQU',3,1,1), -(11,'2017-06-30 22:00:00','4770000110','EQU',4,1,1), -(12,'2017-06-30 22:00:00','4770000215','EQU',1,2,1), -(13,'2017-06-30 22:00:00','4770000521','EQU',2,2,1), -(15,'2017-06-30 22:00:00','4771000000','CEE',3,1,1), -(16,'2017-06-30 22:00:00','4771000001','CEE',8,3,1), -(19,'2017-07-05 11:54:58','4770000020','NATIONAL',7,4,1), -(20,'2017-07-05 12:09:24','4771000000','CEE',1,2,1), -(21,'2017-07-05 12:09:24','4771000000','CEE',7,4,1), -(22,'2017-07-05 12:12:14','4770000002','WORLD',3,1,1), -(23,'2017-07-05 12:12:14','4770000002','WORLD',1,2,1), -(24,'2017-07-06 08:07:21','4770000002','WORLD',7,4,5), -(25,'2017-07-06 08:07:21','HolandaRED','NATIONAL',3,1,5), -(27,'2017-07-06 08:07:21','HolandaGEN','NATIONAL',1,2,5), -(32,'2017-07-06 08:07:21','4771000000','CEE',3,1,5), -(33,'2017-07-06 08:07:21','4771000001','CEE',8,3,5), -(34,'2017-07-06 08:07:21','4770000020','NATIONAL',7,4,5), -(35,'2017-07-06 08:07:21','4771000000','CEE',1,2,5), -(36,'2017-07-06 08:07:21','4771000000','CEE',7,4,5), -(37,'2017-07-06 08:07:21','4770000002','WORLD',3,1,5), -(38,'2017-07-06 08:07:21','4770000002','WORLD',1,2,5), -(70,'2017-07-06 08:08:48','4770000002','WORLD',7,4,30), -(71,'2017-07-06 08:08:48','IGIC reduc','NATIONAL',3,1,30), -(72,'2017-07-06 08:08:48','4770000020','NATIONAL',7,4,30), -(73,'2017-07-06 08:08:48','IGIC gener','NATIONAL',1,2,30), -(78,'2017-07-06 08:08:48','4770000020','NATIONAL',7,4,30), -(79,'2017-07-06 08:08:48','4770000002','WORLD',3,1,30), -(80,'2017-07-06 08:08:48','4770000002','WORLD',1,2,30), -(81,'2017-07-05 22:00:00','IGIC cero','NATIONAL',5,5,30), -(82,'2019-01-01 11:51:56','4770000504','EQU',5,5,1), -(83,'2019-09-11 10:54:03','4770000405','EQU',6,5,1), -(84,'2019-09-11 10:58:17','4770000004','NATIONAL',5,5,1), -(85,'2019-09-18 22:00:00','4771000000','CEE',5,5,1), -(86,'2021-10-13 22:00:00','4770000002','WORLD',5,5,1); +INSERT INTO `bookingPlanner` VALUES (5,'2017-06-30 22:00:00','4770000002','WORLD',7,4,1),(6,'2017-06-30 22:00:00','4770000010','NATIONAL',3,1,1),(8,'2017-06-30 22:00:00','4770000021','NATIONAL',1,2,1),(9,'2017-06-30 22:00:00','4770000101','EQU',3,1,1),(11,'2017-06-30 22:00:00','4770000110','EQU',4,1,1),(12,'2017-06-30 22:00:00','4770000215','EQU',1,2,1),(13,'2017-06-30 22:00:00','4770000521','EQU',2,2,1),(15,'2017-06-30 22:00:00','4771000000','CEE',3,1,1),(16,'2017-06-30 22:00:00','4771000001','CEE',8,3,1),(19,'2017-07-05 11:54:58','4770000020','NATIONAL',7,4,1),(20,'2017-07-05 12:09:24','4771000000','CEE',1,2,1),(21,'2017-07-05 12:09:24','4771000000','CEE',7,4,1),(22,'2017-07-05 12:12:14','4770000002','WORLD',3,1,1),(23,'2017-07-05 12:12:14','4770000002','WORLD',1,2,1),(24,'2017-07-06 08:07:21','4770000002','WORLD',7,4,5),(25,'2017-07-06 08:07:21','HolandaRED','NATIONAL',3,1,5),(27,'2017-07-06 08:07:21','HolandaGEN','NATIONAL',1,2,5),(32,'2017-07-06 08:07:21','4771000000','CEE',3,1,5),(33,'2017-07-06 08:07:21','4771000001','CEE',8,3,5),(34,'2017-07-06 08:07:21','4770000020','NATIONAL',7,4,5),(35,'2017-07-06 08:07:21','4771000000','CEE',1,2,5),(36,'2017-07-06 08:07:21','4771000000','CEE',7,4,5),(37,'2017-07-06 08:07:21','4770000002','WORLD',3,1,5),(38,'2017-07-06 08:07:21','4770000002','WORLD',1,2,5),(70,'2017-07-06 08:08:48','4770000002','WORLD',7,4,30),(71,'2017-07-06 08:08:48','IGIC reduc','NATIONAL',3,1,30),(72,'2017-07-06 08:08:48','4770000020','NATIONAL',7,4,30),(73,'2017-07-06 08:08:48','IGIC gener','NATIONAL',1,2,30),(78,'2017-07-06 08:08:48','4770000020','NATIONAL',7,4,30),(79,'2017-07-06 08:08:48','4770000002','WORLD',3,1,30),(80,'2017-07-06 08:08:48','4770000002','WORLD',1,2,30),(81,'2017-07-05 22:00:00','IGIC cero','NATIONAL',5,5,30),(82,'2019-01-01 11:51:56','4770000504','EQU',5,5,1),(83,'2019-09-11 10:54:03','4770000405','EQU',6,5,1),(84,'2019-09-11 10:58:17','4770000004','NATIONAL',5,5,1),(85,'2019-09-18 22:00:00','4771000000','CEE',5,5,1),(86,'2021-10-13 22:00:00','4770000002','WORLD',5,5,1); /*!40000 ALTER TABLE `bookingPlanner` ENABLE KEYS */; UNLOCK TABLES; @@ -2409,20 +260,7 @@ UNLOCK TABLES; LOCK TABLES `businessType` WRITE; /*!40000 ALTER TABLE `businessType` DISABLE KEYS */; -INSERT INTO `businessType` VALUES -('decoration','Decoración'), -('events','Eventos'), -('florist','Floristería'), -('gardenCentre','Vivero'), -('gardening','Jardinería'), -('individual','Particular'), -('mortuary','Funeraria'), -('officialOrganism','Organismo oficial'), -('others','Otros'), -('otherSector','Profesional de otro sector'), -('restoration','Restauración'), -('trainingCentre','Centro de formación'), -('wholesaler','Mayorista'); +INSERT INTO `businessType` VALUES ('decoration','Decoración'),('events','Eventos'),('florist','Floristería'),('gardenCentre','Vivero'),('gardening','Jardinería'),('individual','Particular'),('mortuary','Funeraria'),('officialOrganism','Organismo oficial'),('others','Otros'),('otherSector','Profesional de otro sector'),('restoration','Restauración'),('trainingCentre','Centro de formación'),('wholesaler','Mayorista'); /*!40000 ALTER TABLE `businessType` ENABLE KEYS */; UNLOCK TABLES; @@ -2432,18 +270,7 @@ UNLOCK TABLES; LOCK TABLES `cplusInvoiceType472` WRITE; /*!40000 ALTER TABLE `cplusInvoiceType472` DISABLE KEYS */; -INSERT INTO `cplusInvoiceType472` VALUES -(1,'F1 - Factura'), -(2,'F2 - Factura simplificada (ticket)'), -(3,'F3 - Factura emitida en sustitución de facturas simplificadas facturadas y declaradas'), -(4,'F4 - Asiento resumen de facturas'), -(5,'F5 - Importaciones (DUA)'), -(6,'F6 - Otros justificantes contables'), -(7,'R1 - Factura rectificativa (Art. 80.1, 80.2 y error fundado en derecho)'), -(8,'R2 - Factura rectificativa (Art. 80.3)'), -(9,'R3 - Factura rectificativa (Art. 80.4)'), -(10,'R4 - Factura rectificativa (Resto)'), -(11,'R5 - Factura rectificativa en facturas simplificadas'); +INSERT INTO `cplusInvoiceType472` VALUES (1,'F1 - Factura'),(2,'F2 - Factura simplificada (ticket)'),(3,'F3 - Factura emitida en sustitución de facturas simplificadas facturadas y declaradas'),(4,'F4 - Asiento resumen de facturas'),(5,'F5 - Importaciones (DUA)'),(6,'F6 - Otros justificantes contables'),(7,'R1 - Factura rectificativa (Art. 80.1, 80.2 y error fundado en derecho)'),(8,'R2 - Factura rectificativa (Art. 80.3)'),(9,'R3 - Factura rectificativa (Art. 80.4)'),(10,'R4 - Factura rectificativa (Resto)'),(11,'R5 - Factura rectificativa en facturas simplificadas'); /*!40000 ALTER TABLE `cplusInvoiceType472` ENABLE KEYS */; UNLOCK TABLES; @@ -2453,16 +280,7 @@ UNLOCK TABLES; LOCK TABLES `cplusInvoiceType477` WRITE; /*!40000 ALTER TABLE `cplusInvoiceType477` DISABLE KEYS */; -INSERT INTO `cplusInvoiceType477` VALUES -(1,'F1 - Factura'), -(2,'F2 - Factura simplificada (ticket)'), -(3,'F3 - Factura emitida en sustitución de facturas simplificadas facturadas y declaradas'), -(4,'F4 - Asiento resumen de facturas'), -(5,'R1 - Factura rectificativa (Art. 80.1, 80.2 y error fundado en derecho)'), -(6,'R2 - Factura rectificativa (Art. 80.3)'), -(7,'R3 - Factura rectificativa (Art. 80.4)'), -(8,'R4 - Factura rectificativa (Resto)'), -(9,'R5 - Factura rectificativa en facturas simplificadas'); +INSERT INTO `cplusInvoiceType477` VALUES (1,'F1 - Factura'),(2,'F2 - Factura simplificada (ticket)'),(3,'F3 - Factura emitida en sustitución de facturas simplificadas facturadas y declaradas'),(4,'F4 - Asiento resumen de facturas'),(5,'R1 - Factura rectificativa (Art. 80.1, 80.2 y error fundado en derecho)'),(6,'R2 - Factura rectificativa (Art. 80.3)'),(7,'R3 - Factura rectificativa (Art. 80.4)'),(8,'R4 - Factura rectificativa (Resto)'),(9,'R5 - Factura rectificativa en facturas simplificadas'); /*!40000 ALTER TABLE `cplusInvoiceType477` ENABLE KEYS */; UNLOCK TABLES; @@ -2472,10 +290,7 @@ UNLOCK TABLES; LOCK TABLES `cplusRectificationType` WRITE; /*!40000 ALTER TABLE `cplusRectificationType` DISABLE KEYS */; -INSERT INTO `cplusRectificationType` VALUES -(1,'Campo vacio'), -(2,'I – Por diferencias'), -(3,'S – Por sustitución'); +INSERT INTO `cplusRectificationType` VALUES (1,'Campo vacio'),(2,'I – Por diferencias'),(3,'S – Por sustitución'); /*!40000 ALTER TABLE `cplusRectificationType` ENABLE KEYS */; UNLOCK TABLES; @@ -2485,10 +300,7 @@ UNLOCK TABLES; LOCK TABLES `cplusSubjectOp` WRITE; /*!40000 ALTER TABLE `cplusSubjectOp` DISABLE KEYS */; -INSERT INTO `cplusSubjectOp` VALUES -(1,'Campo vacio'), -(2,'S1 – Sujeta – No exenta'), -(3,'S2 – Sujeta – No exenta – Inv. Suj. Pasivo'); +INSERT INTO `cplusSubjectOp` VALUES (1,'Campo vacio'),(2,'S1 – Sujeta – No exenta'),(3,'S2 – Sujeta – No exenta – Inv. Suj. Pasivo'); /*!40000 ALTER TABLE `cplusSubjectOp` ENABLE KEYS */; UNLOCK TABLES; @@ -2498,14 +310,7 @@ UNLOCK TABLES; LOCK TABLES `cplusTaxBreak` WRITE; /*!40000 ALTER TABLE `cplusTaxBreak` DISABLE KEYS */; -INSERT INTO `cplusTaxBreak` VALUES -(1,'Campo vacio'), -(2,'E1 - Exenta por el artículo 20'), -(3,'E2 - Exenta por el artículo 21'), -(4,'E3 - Exenta por el artículo 22'), -(5,'E4 - Exenta por el artículo 24'), -(6,'E5 - Exenta por el artículo 25'), -(7,'E6 - Exenta por otros'); +INSERT INTO `cplusTaxBreak` VALUES (1,'Campo vacio'),(2,'E1 - Exenta por el artículo 20'),(3,'E2 - Exenta por el artículo 21'),(4,'E3 - Exenta por el artículo 22'),(5,'E4 - Exenta por el artículo 24'),(6,'E5 - Exenta por el artículo 25'),(7,'E6 - Exenta por otros'); /*!40000 ALTER TABLE `cplusTaxBreak` ENABLE KEYS */; UNLOCK TABLES; @@ -2515,19 +320,7 @@ UNLOCK TABLES; LOCK TABLES `cplusTrascendency472` WRITE; /*!40000 ALTER TABLE `cplusTrascendency472` DISABLE KEYS */; -INSERT INTO `cplusTrascendency472` VALUES -(1,'01 - Operación de régimen general'), -(2,'02 - Operaciones por las que los empresarios satisfacen compensaciones REAGYP'), -(3,'03 - Operaciones a las que se aplique el régimen especial de bienes usados, objetos de arte, antigüedades y objetos de colección (135 - 139 de LIVA)'), -(4,'04 - Régimen especial oro de inversión'), -(5,'05 - Régimen especial agencias de viajes'), -(6,'06 - Régimen especial grupo de entidades en IVA (Nivel Avanzado)'), -(7,'07 - Régimen especial criterio de caja'), -(8,'08 - Operaciones sujetas al IPSI / IGIC'), -(9,'09 - Adquisiciones intracomunitarias de bienes y prestaciones de servicios'), -(10,'12 - Operaciones de arrendamiento de local de negocio'), -(11,'13 - Factura correspondiente a una importación (informada sin asociar a un DUA)'), -(12,'14 - Primer semestre 2017'); +INSERT INTO `cplusTrascendency472` VALUES (1,'01 - Operación de régimen general'),(2,'02 - Operaciones por las que los empresarios satisfacen compensaciones REAGYP'),(3,'03 - Operaciones a las que se aplique el régimen especial de bienes usados, objetos de arte, antigüedades y objetos de colección (135 - 139 de LIVA)'),(4,'04 - Régimen especial oro de inversión'),(5,'05 - Régimen especial agencias de viajes'),(6,'06 - Régimen especial grupo de entidades en IVA (Nivel Avanzado)'),(7,'07 - Régimen especial criterio de caja'),(8,'08 - Operaciones sujetas al IPSI / IGIC'),(9,'09 - Adquisiciones intracomunitarias de bienes y prestaciones de servicios'),(10,'12 - Operaciones de arrendamiento de local de negocio'),(11,'13 - Factura correspondiente a una importación (informada sin asociar a un DUA)'),(12,'14 - Primer semestre 2017'); /*!40000 ALTER TABLE `cplusTrascendency472` ENABLE KEYS */; UNLOCK TABLES; @@ -2537,30 +330,7 @@ UNLOCK TABLES; LOCK TABLES `claimResponsible` WRITE; /*!40000 ALTER TABLE `claimResponsible` DISABLE KEYS */; -INSERT INTO `claimResponsible` VALUES -(1,'Compradores',0), -(2,'Proveedor',0), -(3,'Entradores',0), -(4,'Camareros',0), -(6,'Sacadores',0), -(7,'Revisadores',0), -(8,'Calidad general',0), -(9,'Encajadores',0), -(10,'Clima',0), -(11,'Comerciales',1), -(12,'Clientes',1), -(13,'Administración',0), -(14,'Agencia',0), -(15,'Repartidores',0), -(16,'Informatica',0), -(17,'Transp.origen',0), -(18,'Confeccion',0), -(19,'OTROS',0), -(21,'Gerencia',0), -(22,'Paletizadores',0), -(23,'Preparación Previa',0), -(24,'Almacén PCA',0), -(25,'Huelga',0); +INSERT INTO `claimResponsible` VALUES (1,'Compradores',0),(2,'Proveedor',0),(3,'Entradores',0),(4,'Camareros',0),(6,'Sacadores',0),(7,'Revisadores',0),(8,'Calidad general',0),(9,'Encajadores',0),(10,'Clima',0),(11,'Comerciales',1),(12,'Clientes',1),(13,'Administración',0),(14,'Agencia',0),(15,'Repartidores',0),(16,'Informatica',0),(17,'Transp.origen',0),(18,'Confeccion',0),(19,'OTROS',0),(21,'Gerencia',0),(22,'Paletizadores',0),(23,'Preparación Previa',0),(24,'Almacén PCA',0),(25,'Huelga',0); /*!40000 ALTER TABLE `claimResponsible` ENABLE KEYS */; UNLOCK TABLES; @@ -2570,44 +340,7 @@ UNLOCK TABLES; LOCK TABLES `claimReason` WRITE; /*!40000 ALTER TABLE `claimReason` DISABLE KEYS */; -INSERT INTO `claimReason` VALUES -(1,'Prisas',0), -(2,'Novato',0), -(3,'Exceso de confianza',0), -(4,'Exceso de celo',0), -(5,'Indiferencia',0), -(6,'Extraviado o Hurto',0), -(7,'Incompetencia',0), -(8,'Ubicación erronea',0), -(9,'Dat.Inctos/Pak.conf',0), -(10,'Datos duplicados',0), -(11,'Fallo stock',0), -(12,'Innovación',0), -(13,'Distracción',1), -(15,'Portes indebidos',0), -(16,'Baja calidad',0), -(17,'Defectuoso',0), -(19,'Endiñado',0), -(20,'Calor',0), -(21,'Frio',0), -(22,'Cambiado',0), -(24,'Cansancio',1), -(25,'Mal etiquetado',1), -(26,'Cantidad malentendido',0), -(30,'No revisado',1), -(34,'Error fotografia',0), -(40,'Fallo Personal VN',0), -(41,'Fallo Personal Cliente',0), -(42,'Otros',0), -(43,'Precio alto',0), -(44,'Abuso de confianza',0), -(45,'Retraso Agencia',0), -(46,'Delicado',0), -(47,'Seco',0), -(48,'Retraso Reparto',0), -(49,'Mal Embalado',0), -(50,'Tumbado',0), -(51,'Enfermo/Plaga',0); +INSERT INTO `claimReason` VALUES (1,'Prisas',0),(2,'Novato',0),(3,'Exceso de confianza',0),(4,'Exceso de celo',0),(5,'Indiferencia',0),(6,'Extraviado o Hurto',0),(7,'Incompetencia',0),(8,'Ubicación erronea',0),(9,'Dat.Inctos/Pak.conf',0),(10,'Datos duplicados',0),(11,'Fallo stock',0),(12,'Innovación',0),(13,'Distracción',1),(15,'Portes indebidos',0),(16,'Baja calidad',0),(17,'Defectuoso',0),(19,'Endiñado',0),(20,'Calor',0),(21,'Frio',0),(22,'Cambiado',0),(24,'Cansancio',1),(25,'Mal etiquetado',1),(26,'Cantidad malentendido',0),(30,'No revisado',1),(34,'Error fotografia',0),(40,'Fallo Personal VN',0),(41,'Fallo Personal Cliente',0),(42,'Otros',0),(43,'Precio alto',0),(44,'Abuso de confianza',0),(45,'Retraso Agencia',0),(46,'Delicado',0),(47,'Seco',0),(48,'Retraso Reparto',0),(49,'Mal Embalado',0),(50,'Tumbado',0),(51,'Enfermo/Plaga',0),(52,'Mala gestión comercial',0),(53,'Mala gestión comprador',0),(54,'A2',0); /*!40000 ALTER TABLE `claimReason` ENABLE KEYS */; UNLOCK TABLES; @@ -2617,13 +350,7 @@ UNLOCK TABLES; LOCK TABLES `claimRedelivery` WRITE; /*!40000 ALTER TABLE `claimRedelivery` DISABLE KEYS */; -INSERT INTO `claimRedelivery` VALUES -(1,'Cliente'), -(2,'No dev./No especif.'), -(3,'Reparto'), -(4,'Agencia'), -(5,'Tour'), -(6,'Fuera Peninsula'); +INSERT INTO `claimRedelivery` VALUES (1,'Cliente'),(2,'No dev./No especif.'),(3,'Reparto'),(4,'Agencia'),(5,'Tour'),(6,'Fuera Peninsula'); /*!40000 ALTER TABLE `claimRedelivery` ENABLE KEYS */; UNLOCK TABLES; @@ -2633,36 +360,7 @@ UNLOCK TABLES; LOCK TABLES `claimResult` WRITE; /*!40000 ALTER TABLE `claimResult` DISABLE KEYS */; -INSERT INTO `claimResult` VALUES -(1,'Otros daños'), -(2,'Roces'), -(3,'Humedad'), -(4,'Deshidratacion'), -(5,'Error identidad'), -(6,'Incompleto (Faltas)'), -(7,'Error packing'), -(8,'Error color'), -(9,'Error medida'), -(10,'Error origen'), -(11,'Envejecido'), -(12,'Venta Perdida'), -(13,'Duplicacion'), -(14,'Rechazado'), -(15,'Rotura'), -(16,'Deterioro/Estropeado'), -(17,'Podrido'), -(18,'Baboso'), -(19,'Cocido'), -(20,'Congelado'), -(21,'Machacado'), -(22,'Error precio'), -(23,'Manchado'), -(24,'No entregado'), -(25,'Cobro indebido'), -(26,'Decepcion/Esperaba mas'), -(27,'Otros'), -(28,'Baboso/Cocido'), -(29,'Video Camara'); +INSERT INTO `claimResult` VALUES (1,'Otros daños'),(2,'Roces'),(3,'Humedad'),(4,'Deshidratacion'),(5,'Error identidad'),(6,'Incompleto (Faltas)'),(7,'Error packing'),(8,'Error color'),(9,'Error medida'),(10,'Error origen'),(11,'Envejecido'),(12,'Venta Perdida'),(13,'Duplicacion'),(14,'Rechazado'),(15,'Rotura'),(16,'Deterioro/Estropeado'),(17,'Podrido'),(18,'Baboso'),(19,'Cocido'),(20,'Congelado'),(21,'Machacado'),(22,'Error precio'),(23,'Manchado'),(24,'No entregado'),(25,'Cobro indebido'),(26,'Decepcion/Esperaba mas'),(27,'Otros'),(28,'Baboso/Cocido'),(29,'Video Camara'); /*!40000 ALTER TABLE `claimResult` ENABLE KEYS */; UNLOCK TABLES; @@ -2672,31 +370,7 @@ UNLOCK TABLES; LOCK TABLES `component` WRITE; /*!40000 ALTER TABLE `component` DISABLE KEYS */; -INSERT INTO `component` VALUES -(10,'Precios Especiales',4,NULL,NULL,1,'specialPrices',0), -(14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay',0), -(15,'reparto',6,NULL,NULL,1,'delivery',1), -(17,'recobro',5,NULL,NULL,1,'debtCollection',0), -(21,'ajuste',11,NULL,NULL,1,'adjustment',0), -(22,'venta por paquete',9,1,NULL,0,'salePerPackage',0), -(23,'venta por caja',9,2,NULL,0,'salePerBox',0), -(28,'valor de compra',1,NULL,NULL,1,'purchaseValue',1), -(29,'margen',4,NULL,NULL,1,'margin',1), -(32,'descuento ultimas unidades',9,3,-0.05,0,'lastUnitsDiscount',0), -(33,'venta por caja',9,1,NULL,0,'salePerBox',0), -(34,'descuento comprador',4,NULL,NULL,1,'buyerDiscount',0), -(35,'cartera comprador',10,NULL,NULL,1,NULL,0), -(36,'descuadre',12,NULL,NULL,1,'imbalance',0), -(37,'maná',7,4,NULL,0,'mana',0), -(38,'embolsado',9,NULL,NULL,1,'bagged',0), -(39,'maná auto',7,NULL,NULL,1,'autoMana',0), -(40,'cambios Santos 2016',4,NULL,NULL,1,NULL,0), -(41,'bonificacion porte',6,NULL,NULL,1,'freightCharge',0), -(42,'promocion Francia',4,NULL,NULL,1,'frenchOffer',0), -(43,'promocion Floramondo',4,NULL,NULL,1,'floramondoPromo',0), -(44,'rappel cadena',2,NULL,NULL,1,'rappel',0), -(45,'maná reclamacion',7,4,NULL,0,'manaClaim',0), -(46,'recargo a particular',2,NULL,0.25,0,'individual',0); +INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices',0),(14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay',0),(15,'reparto',6,NULL,NULL,1,'delivery',1),(17,'recobro',5,NULL,NULL,1,'debtCollection',0),(21,'ajuste',4,NULL,NULL,1,'adjustment',0),(22,'venta por paquete',9,1,NULL,0,'salePerPackage',0),(23,'venta por caja',9,2,NULL,0,'salePerBox',0),(28,'valor de compra',1,NULL,NULL,1,'purchaseValue',1),(29,'margen',4,NULL,NULL,1,'margin',1),(32,'descuento ultimas unidades',9,3,-0.05,0,'lastUnitsDiscount',0),(33,'venta por caja',9,1,NULL,0,'salePerBox',0),(34,'descuento comprador',4,NULL,NULL,1,'buyerDiscount',0),(35,'cartera comprador',10,NULL,NULL,1,NULL,0),(36,'descuadre',4,NULL,NULL,1,'imbalance',0),(37,'maná',7,4,NULL,0,'mana',0),(38,'embolsado',9,NULL,NULL,1,'bagged',0),(39,'maná auto',7,NULL,NULL,1,'autoMana',0),(40,'cambios Santos 2016',4,NULL,NULL,1,NULL,0),(41,'bonificacion porte',6,NULL,NULL,1,'freightCharge',0),(42,'promocion Francia',4,NULL,NULL,1,'frenchOffer',0),(43,'promocion Floramondo',4,NULL,NULL,1,'floramondoPromo',0),(44,'rappel cadena',2,NULL,NULL,1,'rappel',0),(45,'maná reclamacion',7,4,NULL,0,'manaClaim',0),(46,'recargo a particular',2,NULL,0.25,0,'individual',0),(47,'promocion Italia',4,NULL,NULL,1,'italianOffer',0),(48,'fusión de lineas',4,NULL,NULL,1,'lineFusion',0); /*!40000 ALTER TABLE `component` ENABLE KEYS */; UNLOCK TABLES; @@ -2706,19 +380,7 @@ UNLOCK TABLES; LOCK TABLES `componentType` WRITE; /*!40000 ALTER TABLE `componentType` DISABLE KEYS */; -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,'MARGIN'), -(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); +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,'MARGIN'),(5,'cliente',0,0,NULL),(6,'agencia',0,0,'FREIGHT'),(7,'cartera_comercial',0,0,'MANA'),(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; @@ -2728,12 +390,7 @@ UNLOCK TABLES; LOCK TABLES `continent` WRITE; /*!40000 ALTER TABLE `continent` DISABLE KEYS */; -INSERT INTO `continent` VALUES -(1,'Asia','AS'), -(2,'América','AM'), -(3,'África','AF'), -(4,'Europa','EU'), -(5,'Oceanía','OC'); +INSERT INTO `continent` VALUES (1,'Asia','AS'),(2,'América','AM'),(3,'África','AF'),(4,'Europa','EU'),(5,'Oceanía','OC'); /*!40000 ALTER TABLE `continent` ENABLE KEYS */; UNLOCK TABLES; @@ -2743,69 +400,27 @@ UNLOCK TABLES; LOCK TABLES `department` WRITE; /*!40000 ALTER TABLE `department` DISABLE KEYS */; -INSERT INTO `department` VALUES -(1,NULL,'VERDNATURA',1,96,763,0,0,0,0,29,NULL,'/',NULL,0,NULL,0,0,0,0,NULL), -(22,NULL,'COMPRAS',2,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL), -(23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL), -(31,'IT','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL), -(34,NULL,'CONTABILIDAD',6,7,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL), -(35,NULL,'FINANZAS',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL), -(36,NULL,'LABORAL',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL), -(37,'PROD','PRODUCCION',12,27,NULL,72,1,1,1,7,1,'/1/',NULL,0,NULL,0,1,1,1,NULL), -(38,NULL,'SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL), -(39,NULL,'ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL), -(41,NULL,'ADMINISTRACION',28,29,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL), -(43,'VT','VENTAS',30,49,NULL,0,0,0,1,9,1,'/1/',NULL,1,'',1,0,0,0,NULL), -(44,NULL,'GERENCIA',50,51,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(45,NULL,'LOGISTICA',52,53,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL), -(46,NULL,'REPARTO',54,55,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL), -(48,NULL,'ALMACENAJE',56,57,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(49,NULL,'PROPIEDAD',58,59,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(52,NULL,'CARGA AEREA',60,61,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(53,NULL,'MARKETING Y COMUNICACIÓN',62,63,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL), -(54,NULL,'ORNAMENTALES',64,65,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(55,NULL,'TALLER NATURAL',66,69,3366,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,1,1,0,1118), -(56,NULL,'TALLER ARTIFICIAL',67,68,8470,72,0,0,2,0,55,'/1/55/',NULL,0,NULL,0,1,1,0,1927), -(58,'CMP','CAMPOS',70,73,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(59,NULL,'MANTENIMIENTO',74,75,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(60,NULL,'RECLAMACIONES',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL), -(61,NULL,'VNH',78,79,NULL,73,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(63,NULL,'VENTAS FRANCIA',31,32,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,0,0,0,NULL), -(66,NULL,'VERDNAMADRID',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(68,NULL,'COMPLEMENTOS',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL), -(69,NULL,'VERDNABARNA',82,83,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(80,NULL,'EQUIPO J VALLES',33,34,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL), -(86,NULL,'LIMPIEZA',84,85,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(89,NULL,'COORDINACION',86,87,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(90,NULL,'TRAILER',88,89,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL), -(91,NULL,'ARTIFICIAL',21,22,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL), -(92,NULL,'EQUIPO SILVERIO',35,36,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL), -(93,NULL,'CONFECCION',90,91,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,1,0,NULL), -(94,NULL,'EQUIPO J BROCAL',37,38,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL), -(95,NULL,'EQUIPO C ZAMBRANO',39,40,4667,0,0,0,2,0,43,'/1/43/','czg_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL), -(96,NULL,'EQUIPO C LOPEZ',41,42,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL), -(115,NULL,'EQUIPO CLAUDI',43,44,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL), -(123,NULL,'EQUIPO ELENA BASCUÑANA',45,46,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL), -(124,NULL,'CONTROL INTERNO',92,93,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL), -(125,NULL,'EQUIPO MIRIAM MAR',47,48,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL), -(126,NULL,'PRESERVADO',94,95,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,1,0,NULL), -(128,NULL,'PALETIZADO',23,24,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL), -(130,NULL,'REVISION',25,26,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL), -(131,NULL,'INVERNADERO',71,72,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,0,0,0,NULL); +INSERT INTO `department` VALUES (1,NULL,'VERDNATURA',1,96,763,0,0,0,0,29,NULL,'/',NULL,0,NULL,0,0,0,0,NULL),(22,NULL,'COMPRAS',2,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL),(23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL),(31,'IT','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL),(34,NULL,'CONTABILIDAD',6,7,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL),(35,NULL,'FINANZAS',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL),(36,NULL,'LABORAL',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL),(37,'PROD','PRODUCCION',12,27,NULL,72,1,1,1,7,1,'/1/',NULL,0,NULL,0,1,1,1,NULL),(38,NULL,'SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL),(39,NULL,'ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL),(41,NULL,'ADMINISTRACION',28,29,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL),(43,'VT','VENTAS',30,49,NULL,0,0,0,1,9,1,'/1/',NULL,1,'',1,0,0,0,NULL),(44,NULL,'GERENCIA',50,51,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(45,NULL,'LOGISTICA',52,53,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL),(46,NULL,'REPARTO',54,55,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL),(48,NULL,'ALMACENAJE',56,57,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(49,NULL,'PROPIEDAD',58,59,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(52,NULL,'CARGA AEREA',60,61,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(53,NULL,'MARKETING Y COMUNICACIÓN',62,63,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL),(54,NULL,'ORNAMENTALES',64,65,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(55,NULL,'TALLER NATURAL',66,69,3366,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,1,1,0,1118),(56,NULL,'TALLER ARTIFICIAL',67,68,8470,72,0,0,2,0,55,'/1/55/',NULL,0,NULL,0,1,1,0,1927),(58,'CMP','CAMPOS',70,73,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(59,NULL,'MANTENIMIENTO',74,75,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(60,NULL,'RECLAMACIONES',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL),(61,NULL,'VNH',78,79,NULL,73,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(63,NULL,'VENTAS FRANCIA',31,32,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,0,0,0,NULL),(66,NULL,'VERDNAMADRID',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(68,NULL,'COMPLEMENTOS',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL),(69,NULL,'VERDNABARNA',82,83,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(80,NULL,'EQUIPO J VALLES',33,34,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL),(86,NULL,'LIMPIEZA',84,85,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(89,NULL,'COORDINACION',86,87,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(90,NULL,'TRAILER',88,89,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL),(91,NULL,'ARTIFICIAL',21,22,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL),(92,NULL,'EQUIPO SILVERIO',35,36,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL),(93,NULL,'CONFECCION',90,91,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,1,0,NULL),(94,NULL,'EQUIPO J BROCAL',37,38,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL),(95,NULL,'EQUIPO C ZAMBRANO',39,40,4667,0,0,0,2,0,43,'/1/43/','czg_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL),(96,NULL,'EQUIPO C LOPEZ',41,42,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL),(115,NULL,'EQUIPO CLAUDI',43,44,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL),(123,NULL,'EQUIPO ELENA BASCUÑANA',45,46,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL),(124,NULL,'CONTROL INTERNO',92,93,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL),(125,NULL,'EQUIPO MIRIAM MAR',47,48,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL),(126,NULL,'PRESERVADO',94,95,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,1,0,NULL),(128,NULL,'PALETIZADO',23,24,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL),(130,NULL,'REVISION',25,26,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL),(131,NULL,'INVERNADERO',71,72,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,0,0,0,NULL); /*!40000 ALTER TABLE `department` ENABLE KEYS */; UNLOCK TABLES; +-- +-- Dumping data for table `docuware` +-- + +LOCK TABLES `docuware` WRITE; +/*!40000 ALTER TABLE `docuware` DISABLE KEYS */; +INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N'),(2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N'); +/*!40000 ALTER TABLE `docuware` ENABLE KEYS */; +UNLOCK TABLES; + -- -- Dumping data for table `itemPackingType` -- LOCK TABLES `itemPackingType` WRITE; /*!40000 ALTER TABLE `itemPackingType` DISABLE KEYS */; -INSERT INTO `itemPackingType` VALUES -('F','Fruta y Verdura'), -('H','Horizontal'), -('P','Pienso'), -('V','Vertical'); +INSERT INTO `itemPackingType` VALUES ('F','Fruta y Verdura',0),('H','Horizontal',1),('P','Pienso',0),('V','Vertical',1); /*!40000 ALTER TABLE `itemPackingType` ENABLE KEYS */; UNLOCK TABLES; @@ -2815,31 +430,7 @@ UNLOCK TABLES; LOCK TABLES `pgc` WRITE; /*!40000 ALTER TABLE `pgc` DISABLE KEYS */; -INSERT INTO `pgc` VALUES -('4722000000',0.00,'Importación Exento ',1,0,0,1,0), -('4722000010',10.00,'Importación Reducido ',1,0,0,1,0), -('4722000021',21.00,'Importación General ',1,0,0,1,0), -('4770000001',8.00,'Reducido',1,1,1,1,0), -('4770000002',0.00,'Extra-Community supply',3,1,0,2,0), -('4770000004',4.00,'Super reducido',1,1,1,1,0), -('4770000010',10.00,'Reducido',1,1,1,1,0), -('4770000020',0.00,'Exento',7,1,1,1,0), -('4770000021',21.00,'General',1,1,1,1,0), -('4770000101',10.00,'Reducido ',1,1,1,1,0), -('4770000108',8.00,'Reducido',1,1,1,1,0), -('4770000110',1.40,'Rec. Eq. Reducido',1,0,0,1,1), -('4770000215',21.00,'General',1,1,1,1,0), -('4770000405',0.50,'Rec. Eq. Super Reducido',1,0,0,1,1), -('4770000504',4.00,'Super reducido',1,1,1,1,0), -('4770000521',5.20,'Rec. Eq. General',1,0,0,1,1), -('4770000701',1.00,'Rec. Eq. Reducido',1,0,0,1,1), -('4771000000',0.00,'Intra-Community supply',6,1,1,1,0), -('4771000001',0.00,'Intra-Community services',7,1,1,1,0), -('HolandaGEN',21.00,'General',1,0,0,1,0), -('HolandaRED',9.00,'Reducido',1,0,0,1,0), -('IGIC cero',0.00,'Cero',1,0,0,1,0), -('IGIC gener',6.50,'General',1,0,0,1,0), -('IGIC reduc',3.00,'Reducido',1,0,0,1,0); +INSERT INTO `pgc` VALUES ('4722000000',0.00,'Importación Exento ',1,0,0,1,0),('4722000010',10.00,'Importación Reducido ',1,0,0,1,0),('4722000021',21.00,'Importación General ',1,0,0,1,0),('4770000001',8.00,'Reducido',1,1,1,1,0),('4770000002',0.00,'Extra-Community supply',3,1,0,2,0),('4770000004',4.00,'Super reducido',1,1,1,1,0),('4770000010',10.00,'Reducido',1,1,1,1,0),('4770000020',0.00,'Exento',7,1,1,1,0),('4770000021',21.00,'General',1,1,1,1,0),('4770000101',10.00,'Reducido ',1,1,1,1,0),('4770000108',8.00,'Reducido',1,1,1,1,0),('4770000110',1.40,'Rec. Eq. Reducido',1,0,0,1,1),('4770000215',21.00,'General',1,1,1,1,0),('4770000405',0.50,'Rec. Eq. Super Reducido',1,0,0,1,1),('4770000504',4.00,'Super reducido',1,1,1,1,0),('4770000521',5.20,'Rec. Eq. General',1,0,0,1,1),('4770000701',1.00,'Rec. Eq. Reducido',1,0,0,1,1),('4771000000',0.00,'Intra-Community supply',6,1,1,1,0),('4771000001',0.00,'Intra-Community services',7,1,1,1,0),('HolandaGEN',21.00,'General',1,0,0,1,0),('HolandaRED',9.00,'Reducido',1,0,0,1,0),('IGIC cero',0.00,'Cero',1,0,0,1,0),('IGIC gener',6.50,'General',1,0,0,1,0),('IGIC reduc',3.00,'Reducido',1,0,0,1,0); /*!40000 ALTER TABLE `pgc` ENABLE KEYS */; UNLOCK TABLES; @@ -2849,27 +440,7 @@ UNLOCK TABLES; LOCK TABLES `sample` WRITE; /*!40000 ALTER TABLE `sample` DISABLE KEYS */; -INSERT INTO `sample` VALUES -(1,'Carta_1','Aviso inicial por saldo deudor',0,0,1,0,NULL), -(2,'Carta_2','Reiteracion de aviso por saldo deudor',0,0,1,0,NULL), -(3,'Cred_Up','Notificación de aumento de crédito',0,0,1,0,NULL), -(4,'Cred_down','Notificación de reducción de crédito',0,0,1,0,NULL), -(5,'Pet_CC','Petición de datos bancarios B2B',0,0,1,0,NULL), -(6,'SolCredito','Solicitud de crédito',0,0,1,0,NULL), -(7,'LeyPago','Ley de pagos',0,0,1,0,NULL), -(8,'Pet_CC_Core','Petición de datos bancarios CORE',0,0,1,0,NULL), -(9,'nueva_alta','Documento de nueva alta de cliente',0,0,1,0,NULL), -(10,'client_welcome','Email de bienvenida para nuevo cliente',0,0,1,0,NULL), -(11,'setup_printer','Email de instalación de impresora',0,0,1,0,NULL), -(12,'client-welcome','Bienvenida como nuevo cliente',1,0,1,0,'Clients'), -(13,'printer-setup','Instalación y configuración de impresora de coronas',1,0,1,0,'Clients'), -(14,'sepa-core','Solicitud de domiciliación bancaria',1,1,0,0,'Clients'), -(15,'letter-debtor-st','Aviso inicial por saldo deudor',1,1,1,0,'Clients'), -(16,'letter-debtor-nd','Aviso reiterado por saldo deudor',1,1,1,0,'Clients'), -(17,'client-lcr','Email de solicitud de datos bancarios LCR',0,1,1,0,NULL), -(18,'client-debt-statement','Extracto del cliente',1,0,1,1,'Clients'), -(19,'credit-request','Solicitud de crédito',1,1,1,0,'Clients'), -(20,'incoterms-authorization','Autorización de incoterms',1,1,1,0,'Clients'); +INSERT INTO `sample` VALUES (1,'Carta_1','Aviso inicial por saldo deudor',0,0,1,0,NULL),(2,'Carta_2','Reiteracion de aviso por saldo deudor',0,0,1,0,NULL),(3,'Cred_Up','Notificación de aumento de crédito',0,0,1,0,NULL),(4,'Cred_down','Notificación de reducción de crédito',0,0,1,0,NULL),(5,'Pet_CC','Petición de datos bancarios B2B',0,0,1,0,NULL),(6,'SolCredito','Solicitud de crédito',0,0,1,0,NULL),(7,'LeyPago','Ley de pagos',0,0,1,0,NULL),(8,'Pet_CC_Core','Petición de datos bancarios CORE',0,0,1,0,NULL),(9,'nueva_alta','Documento de nueva alta de cliente',0,0,1,0,NULL),(10,'client_welcome','Email de bienvenida para nuevo cliente',0,0,1,0,NULL),(11,'setup_printer','Email de instalación de impresora',0,0,1,0,NULL),(12,'client-welcome','Bienvenida como nuevo cliente',1,0,1,0,'Clients'),(13,'printer-setup','Instalación y configuración de impresora de coronas',1,0,1,0,'Clients'),(14,'sepa-core','Solicitud de domiciliación bancaria',1,1,0,0,'Clients'),(15,'letter-debtor-st','Aviso inicial por saldo deudor',1,1,1,0,'Clients'),(16,'letter-debtor-nd','Aviso reiterado por saldo deudor',1,1,1,0,'Clients'),(17,'client-lcr','Email de solicitud de datos bancarios LCR',0,1,1,0,NULL),(18,'client-debt-statement','Extracto del cliente',1,0,1,1,'Clients'),(19,'credit-request','Solicitud de crédito',1,1,1,0,'Clients'),(20,'incoterms-authorization','Autorización de incoterms',1,1,1,0,'Clients'); /*!40000 ALTER TABLE `sample` ENABLE KEYS */; UNLOCK TABLES; @@ -2879,42 +450,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,'alert'), -(2,'Libre',2,0,'FREE',NULL,2,1,0,0,0,1,0,4,1,'notice'), -(3,'OK',3,0,'OK',3,28,1,0,0,0,1,1,3,0,'success'), -(4,'Impreso',4,0,'PRINTED',2,29,1,0,1,0,0,1,2,0,'success'), -(5,'Preparación',6,1,'ON_PREPARATION',7,14,0,0,0,2,0,0,2,0,'warning'), -(6,'En Revisión',7,1,'ON_CHECKING',NULL,6,0,1,0,3,0,0,1,0,'warning'), -(7,'Sin Acabar',1,0,'NOT_READY',NULL,7,0,0,0,0,0,0,4,1,'alert'), -(8,'Revisado',8,1,'CHECKED',NULL,8,0,1,0,3,0,0,1,0,'warning'), -(9,'Encajando',9,2,'PACKING',NULL,9,0,1,0,0,0,0,1,0,NULL), -(10,'Encajado',10,2,'PACKED',NULL,10,0,1,0,0,0,0,0,0,NULL), -(11,'Facturado',0,3,'INVOICED',NULL,11,0,1,0,0,0,0,0,0,NULL), -(12,'Bloqueado',0,0,'BLOCKED',NULL,12,0,0,0,0,0,0,4,1,'alert'), -(13,'En Reparto',11,3,'ON_DELIVERY',NULL,13,0,1,0,0,0,0,0,0,NULL), -(14,'Preparado',6,1,'PREPARED',NULL,14,0,1,0,2,0,0,1,0,'warning'), -(15,'Pte Recogida',12,3,'WAITING_FOR_PICKUP',NULL,15,0,1,0,0,0,0,0,0,NULL), -(16,'Entregado',13,3,'DELIVERED',NULL,16,0,1,0,0,0,0,0,0,NULL), -(20,'Asignado',4,0,'PICKER_DESIGNED',NULL,20,1,0,0,0,0,0,2,0,'success'), -(21,'Retornado',4,1,'PRINTED_BACK',6,21,0,0,0,0,0,0,2,0,'success'), -(22,'Pte. Ampliar',2,0,'EXPANDABLE',NULL,22,0,0,0,0,0,0,4,1,'alert'), -(23,'URGENTE',5,1,'LAST_CALL',NULL,23,1,0,1,0,0,0,4,1,'success'), -(24,'Encadenado',4,0,'CHAINED',4,24,0,0,0,0,0,0,3,1,'success'), -(25,'Embarcando',3,0,'BOARDING',5,25,1,0,0,0,0,0,3,0,'alert'), -(26,'Prep Previa',5,1,'PREVIOUS_PREPARATION',1,28,1,0,0,1,0,0,2,0,'warning'), -(27,'Prep Asistida',5,1,'ASSISTED_PREPARATION',7,27,0,0,0,0,0,0,2,0,'success'), -(28,'Previa OK',3,0,'OK PREVIOUS',3,28,1,0,1,1,1,1,3,0,'warning'), -(29,'Previa Impreso',4,0,'PRINTED PREVIOUS',2,29,1,0,1,0,0,1,2,0,'success'), -(30,'Embarcado',4,1,'BOARD',5,30,0,0,0,2,0,0,3,0,'success'), -(31,'Polizon Impreso',4,1,'PRINTED STOWAWAY',2,29,1,0,1,0,0,1,2,0,'success'), -(32,'Polizon OK',3,1,'OK STOWAWAY',3,31,1,0,0,1,1,1,3,0,'warning'), -(33,'Auto_Impreso',4,0,'PRINTED_AUTO',2,29,1,0,1,0,0,1,2,0,'success'), -(34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',NULL,34,0,0,0,0,0,0,4,1,'alert'), -(35,'Semi-Encajado',9,2,'HALF_PACKED',NULL,10,0,1,0,0,0,0,1,0,NULL), -(36,'Previa Revisando',3,0,'PREVIOUS_CONTROL',2,37,1,0,0,4,0,1,2,0,'warning'), -(37,'Previa Revisado',3,0,'PREVIOUS_CONTROLLED',2,29,1,0,1,0,0,1,2,0,'warning'), -(38,'Prep Cámara',6,1,'COOLER_PREPARATION',7,14,0,0,0,2,0,0,2,0,'warning'); +INSERT INTO `state` VALUES (1,'Arreglar',2,0,'FIXING',NULL,1,0,0,0,0,0,0,4,1,'alert'),(2,'Libre',2,0,'FREE',NULL,2,0,0,0,0,0,0,4,1,'notice'),(3,'OK',3,0,'OK',3,28,1,0,0,0,1,1,3,0,'success'),(4,'Impreso',4,0,'PRINTED',2,29,1,0,1,0,0,1,2,0,'success'),(5,'Preparación',6,1,'ON_PREPARATION',7,14,0,0,0,2,0,0,2,0,'warning'),(6,'En Revisión',7,1,'ON_CHECKING',NULL,6,0,1,0,3,0,0,1,0,'warning'),(7,'Sin Acabar',1,0,'NOT_READY',NULL,7,0,0,0,0,0,0,4,1,'alert'),(8,'Revisado',8,1,'CHECKED',NULL,8,0,1,0,3,0,0,1,0,'warning'),(9,'Encajando',9,2,'PACKING',NULL,9,0,1,0,0,0,0,1,0,NULL),(10,'Encajado',10,2,'PACKED',NULL,10,0,1,0,0,0,0,0,0,NULL),(11,'Facturado',0,3,'INVOICED',NULL,11,0,1,0,0,0,0,0,0,NULL),(12,'Bloqueado',0,0,'BLOCKED',NULL,12,0,0,0,0,0,0,4,1,'alert'),(13,'En Reparto',11,3,'ON_DELIVERY',NULL,13,0,1,0,0,0,0,0,0,NULL),(14,'Preparado',6,1,'PREPARED',NULL,14,0,1,0,2,0,0,1,0,'warning'),(15,'Pte Recogida',12,3,'WAITING_FOR_PICKUP',NULL,15,0,1,0,0,0,0,0,0,NULL),(16,'Entregado',13,3,'DELIVERED',NULL,16,0,1,0,0,0,0,0,0,NULL),(20,'Asignado',4,0,'PICKER_DESIGNED',NULL,20,1,0,0,0,0,0,2,0,'success'),(21,'Retornado',4,1,'PRINTED_BACK',6,21,0,0,0,0,0,0,2,0,'success'),(22,'Pte. Ampliar',2,0,'EXPANDABLE',NULL,22,0,0,0,0,0,0,4,1,'alert'),(23,'URGENTE',5,1,'LAST_CALL',NULL,23,1,0,1,0,0,0,4,1,'success'),(24,'Encadenado',4,0,'CHAINED',4,24,0,0,0,0,0,0,3,1,'success'),(25,'Embarcando',3,0,'BOARDING',5,25,1,0,0,0,0,0,3,0,'alert'),(26,'Prep Previa',5,1,'PREVIOUS_PREPARATION',1,28,1,0,0,1,0,0,2,0,'warning'),(27,'Prep Asistida',5,1,'ASSISTED_PREPARATION',7,27,0,0,0,0,0,0,2,0,'success'),(28,'Previa OK',3,0,'OK PREVIOUS',3,28,1,0,1,1,1,1,3,0,'warning'),(29,'Previa Impreso',4,0,'PRINTED PREVIOUS',2,29,1,0,1,0,0,1,2,0,'success'),(30,'Embarcado',4,1,'BOARD',5,30,0,0,0,2,0,0,3,0,'success'),(31,'Polizon Impreso',4,1,'PRINTED STOWAWAY',2,29,1,0,1,0,0,1,2,0,'success'),(32,'Polizon OK',3,1,'OK STOWAWAY',3,31,1,0,0,1,1,1,3,0,'warning'),(33,'Auto_Impreso',4,0,'PRINTED_AUTO',2,29,1,0,1,0,0,1,2,0,'success'),(34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',NULL,34,0,0,0,0,0,0,4,1,'alert'),(35,'Semi-Encajado',9,2,'HALF_PACKED',NULL,10,0,1,0,0,0,0,1,0,NULL),(36,'Previa Revisando',3,0,'PREVIOUS_CONTROL',2,37,1,0,0,4,0,1,2,0,'warning'),(37,'Previa Revisado',3,0,'PREVIOUS_CONTROLLED',2,29,1,0,1,0,0,1,2,0,'warning'),(38,'Prep Cámara',6,1,'COOLER_PREPARATION',7,14,0,0,0,2,0,0,2,0,'warning'); /*!40000 ALTER TABLE `state` ENABLE KEYS */; UNLOCK TABLES; @@ -2924,9 +460,7 @@ UNLOCK TABLES; LOCK TABLES `ticketUpdateAction` WRITE; /*!40000 ALTER TABLE `ticketUpdateAction` DISABLE KEYS */; -INSERT INTO `ticketUpdateAction` VALUES -(1,'Cambiar los precios en el ticket','changePrice'), -(3,'Convertir en maná','turnInMana'); +INSERT INTO `ticketUpdateAction` VALUES (1,'Cambiar los precios en el ticket','changePrice'),(3,'Convertir en maná','turnInMana'); /*!40000 ALTER TABLE `ticketUpdateAction` ENABLE KEYS */; UNLOCK TABLES; @@ -2936,10600 +470,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,12,2018,30,1,201812,2019), -('2018-12-31',201901,12,2018,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',202152,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,2018,30,1,201812,2019),('2018-12-31',201901,12,2018,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',202152,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',202301,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,53,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; @@ -13539,8 +480,7 @@ UNLOCK TABLES; LOCK TABLES `volumeConfig` WRITE; /*!40000 ALTER TABLE `volumeConfig` DISABLE KEYS */; -INSERT INTO `volumeConfig` VALUES -(2.67,1.60,0.8,150,0.30,120,57,2.0,0,200,0,167.0); +INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57,2.0,0,200,0,167.0); /*!40000 ALTER TABLE `volumeConfig` ENABLE KEYS */; UNLOCK TABLES; @@ -13550,16 +490,7 @@ UNLOCK TABLES; LOCK TABLES `workCenter` WRITE; /*!40000 ALTER TABLE `workCenter` DISABLE KEYS */; -INSERT INTO `workCenter` VALUES -(1,'Silla',20,859,1,'Av espioca 100',552703,NULL), -(2,'Mercaflor',19,NULL,NULL,NULL,NULL,NULL), -(3,'Marjales',26,20008,NULL,NULL,NULL,NULL), -(4,'VNH',NULL,NULL,NULL,NULL,NULL,NULL), -(5,'Madrid',28,2869,5,'Av constitución 3',554145,0.50), -(6,'Vilassar',88,88038,NULL,'Cami del Crist, 33',556412,NULL), -(7,'Tenerife',NULL,NULL,NULL,NULL,NULL,NULL), -(8,'Silla-Agrario',26,NULL,NULL,NULL,NULL,NULL), -(9,'Algemesi',20,1354,60,'Fenollars, 2',523549,NULL); +INSERT INTO `workCenter` VALUES (1,'Silla',20,859,1,'Av espioca 100',552703,NULL),(2,'Mercaflor',19,NULL,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL,NULL),(4,'VNH',NULL,NULL,NULL,NULL,NULL,NULL),(5,'Madrid',28,2869,5,'Av constitución 3',554145,0.50),(6,'Vilassar',88,88038,NULL,'Cami del Crist, 33',556412,NULL),(7,'Tenerife',NULL,NULL,NULL,NULL,NULL,NULL),(8,'Silla-Agrario',26,NULL,NULL,NULL,NULL,NULL),(9,'Algemesi',20,1354,60,'Fenollars, 2',523549,NULL); /*!40000 ALTER TABLE `workCenter` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -13571,9 +502,9 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-11-21 7:59:05 +-- Dump completed on 2023-02-03 14:47:10 USE `cache`; --- MariaDB dump 10.19 Distrib 10.9.4-MariaDB, for Linux (x86_64) +-- MariaDB dump 10.19 Distrib 10.5.18-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: db.verdnatura.es Database: cache -- ------------------------------------------------------ @@ -13595,21 +526,7 @@ USE `cache`; LOCK TABLES `cache` WRITE; /*!40000 ALTER TABLE `cache` DISABLE KEYS */; -INSERT INTO `cache` VALUES -(1,'equalizator','00:19:00'), -(2,'available','00:06:00'), -(3,'stock','00:30:00'), -(4,'last_buy','23:59:00'), -(5,'weekly_sales','12:00:00'), -(6,'bionic','00:06:00'), -(7,'sales','00:04:00'), -(8,'visible','00:04:00'), -(9,'item_range','00:03:00'), -(10,'barcodes','01:00:00'), -(11,'prod_graphic','00:17:00'), -(12,'ticketShipping','00:01:00'), -(13,'availableNoRaids','00:06:00'), -(14,'lastBuy','23:59:00'); +INSERT INTO `cache` VALUES (1,'equalizator','00:19:00'),(2,'available','00:06:00'),(3,'stock','00:30:00'),(4,'last_buy','23:59:00'),(5,'weekly_sales','12:00:00'),(6,'bionic','00:06:00'),(7,'sales','00:04:00'),(8,'visible','00:04:00'),(9,'item_range','00:03:00'),(10,'barcodes','01:00:00'),(11,'prod_graphic','00:17:00'),(12,'ticketShipping','00:01:00'),(13,'availableNoRaids','00:06:00'),(14,'lastBuy','23:59:00'); /*!40000 ALTER TABLE `cache` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -13621,9 +538,9 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-11-21 7:59:06 +-- Dump completed on 2023-02-03 14:47:10 USE `hedera`; --- MariaDB dump 10.19 Distrib 10.9.4-MariaDB, for Linux (x86_64) +-- MariaDB dump 10.19 Distrib 10.5.18-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: db.verdnatura.es Database: hedera -- ------------------------------------------------------ @@ -13645,12 +562,7 @@ USE `hedera`; LOCK TABLES `browser` WRITE; /*!40000 ALTER TABLE `browser` DISABLE KEYS */; -INSERT INTO `browser` VALUES -('Chrome',49), -('Edge',79), -('Firefox',69), -('Opera',36), -('Safari',11); +INSERT INTO `browser` VALUES ('Chrome',49),('Edge',79),('Firefox',69),('Opera',36),('Safari',11); /*!40000 ALTER TABLE `browser` ENABLE KEYS */; UNLOCK TABLES; @@ -13660,11 +572,7 @@ UNLOCK TABLES; LOCK TABLES `imageCollection` WRITE; /*!40000 ALTER TABLE `imageCollection` DISABLE KEYS */; -INSERT INTO `imageCollection` VALUES -(1,'catalog','Artículo',3840,2160,'Item','image','vn','item','image',1,75), -(4,'link','Enlace',200,200,'Link','image','hedera','link','image',1,9), -(5,'news','Noticias',800,1200,'New','image','hedera','news','image',1,9), -(6,'user','Usuario',800,1200,'Account','image','account','user','image',1,74); +INSERT INTO `imageCollection` VALUES (1,'catalog','Artículo',3840,2160,'Item','image','vn','item','image',1,75),(4,'link','Enlace',200,200,'Link','image','hedera','link','image',1,9),(5,'news','Noticias',800,1200,'New','image','hedera','news','image',1,9),(6,'user','Usuario',800,1200,'Account','image','account','user','image',1,74); /*!40000 ALTER TABLE `imageCollection` ENABLE KEYS */; UNLOCK TABLES; @@ -13674,17 +582,7 @@ UNLOCK TABLES; LOCK TABLES `imageCollectionSize` WRITE; /*!40000 ALTER TABLE `imageCollectionSize` DISABLE KEYS */; -INSERT INTO `imageCollectionSize` VALUES -(2,1,50,50,1), -(3,1,200,200,1), -(5,5,200,200,1), -(6,1,70,70,1), -(8,5,50,50,1), -(9,1,1600,900,0), -(13,6,160,160,1), -(14,6,520,520,1), -(15,6,1600,1600,1), -(16,1,500,500,1); +INSERT INTO `imageCollectionSize` VALUES (2,1,50,50,1),(3,1,200,200,1),(5,5,200,200,1),(6,1,70,70,1),(8,5,50,50,1),(9,1,1600,900,0),(13,6,160,160,1),(14,6,520,520,1),(15,6,1600,1600,1),(16,1,500,500,1); /*!40000 ALTER TABLE `imageCollectionSize` ENABLE KEYS */; UNLOCK TABLES; @@ -13694,13 +592,7 @@ UNLOCK TABLES; LOCK TABLES `language` WRITE; /*!40000 ALTER TABLE `language` DISABLE KEYS */; -INSERT INTO `language` VALUES -('ca','Català','Catalan',1), -('en','English','English',1), -('es','Español','Spanish',1), -('fr','Français','French',1), -('mn','Португалий','Mongolian',1), -('pt','Português','Portuguese',1); +INSERT INTO `language` VALUES ('ca','Català','Catalan',1),('en','English','English',1),('es','Español','Spanish',1),('fr','Français','French',1),('mn','Португалий','Mongolian',1),('pt','Português','Portuguese',1); /*!40000 ALTER TABLE `language` ENABLE KEYS */; UNLOCK TABLES; @@ -13710,43 +602,17 @@ UNLOCK TABLES; LOCK TABLES `link` WRITE; /*!40000 ALTER TABLE `link` DISABLE KEYS */; -INSERT INTO `link` VALUES -(16,'Printing server','Manage the CUPS printing server','http://server.verdnatura.es:631','printer'), -(20,'Webmail','Verdnatura webmail','https://webmail.verdnatura.es/','mail'), -(23,'Verdnatura Beta','Trial version of the web page','https://test.verdnatura.es/','vn'), -(25,'Shared folder','Shared folder','/share','backup'), -(29,'phpMyAdmin','Manage MySQL database','https://pma.verdnatura.es/','pma'), -(30,'Nagios','Monitoring system','https://nagios.verdnatura.es/','nagios'), -(33,'Gitea','Version control system','https://gitea.verdnatura.es/','git'), -(34,'Wiknatura','Verdnatura wiki page','https://wiki.verdnatura.es/','wiki'), -(35,'phpLDAPadmin','Manage the LDAP database','https://pla.verdnatura.es/','pla'), -(36,'Applications','Access applications repository','/vn-access','backup'); +INSERT INTO `link` VALUES (16,'Printing server','Manage the CUPS printing server','http://printnatura.verdnatura.es','printer'),(20,'Webmail','Verdnatura webmail','https://webmail.verdnatura.es/','mail'),(23,'Verdnatura Beta','Trial version of the web page','https://test-shop.verdnatura.es/','vn'),(25,'Shared folder','Shared folder','https://cdn.verdnatura.es/share','backup'),(29,'phpMyAdmin','Manage MySQL database','https://pma.verdnatura.es/','pma'),(30,'Nagios','Monitoring system','https://nagios.verdnatura.es/','nagios'),(33,'Gitea','Version control system','https://gitea.verdnatura.es/','git'),(34,'Wiknatura','Verdnatura wiki page','https://wiki.verdnatura.es/','wiki'),(35,'phpLDAPadmin','Manage the LDAP database','https://pla.verdnatura.es/','pla'),(36,'Applications','Access applications repository','https://cdn.verdnatura.es/vn-access','access'),(37,'Jenkins','CI and CD system','https://jenkins.verdnatura.es','jenkins'),(38,'osTicket','User service center','https://cau.verdnatura.es','osticket'),(39,'Redmine','Flexible project management','https://redmine.verdnatura.es','redmine'),(40,'Grafana','Analytics & monitoring solution','https://grafana.verdnatura.es','grafana'),(41,'Rocket.Chat','Communications platform','https://chat.verdnatura.es','rocketchat'),(42,'Salix','ERP software','https://salix.verdnatura.es','salix'),(43,'Docker','Container management','https://docker.verdnatura.es','docker'),(44,'Proxmox','Virtual environment','https://proxmox.verdnatura.es','proxmox'),(45,'Shinobi','Network video recorder','https://shinobi.verdnatura.es','shinobi'),(46,'DokuWiki','Internal documentation','https://doku.verdnatura.es','dokuwiki'); /*!40000 ALTER TABLE `link` ENABLE KEYS */; UNLOCK TABLES; --- --- Manual Dumping data for table `agencyTermConfig` --- -LOCK TABLES `agencyTermConfig` WRITE; -/*!40000 ALTER TABLE `agencyTermConfig` DISABLE KEYS */; -INSERT INTO `vn`.`agencyTermConfig` (`expenceFk`, `vatAccountSupported`, `vatPercentage`, `transaction`) - VALUES - ('6240000000', '4721000015', 21.0000000000, 'Adquisiciones intracomunitarias de servicios'); -/*!40000 ALTER TABLE `agencyTermConfig` ENABLE KEYS */; -UNLOCK TABLES; - -- -- Dumping data for table `location` -- LOCK TABLES `location` WRITE; /*!40000 ALTER TABLE `location` DISABLE KEYS */; -INSERT INTO `location` VALUES -(2,'39.2095886','-0.4173501','Valencia','Calle Fenollar, 2','46680','Algemesi','Valencia','963 242 100','es'), -(3,'40.4564969','-3.4875829','Madrid','Avenida de la Constitución, 3 - Nave E','28850','Torrejón de Ardoz','Madrid','963 242 100',NULL), -(4,'41.4962045','2.3765504','Barcelona','Camí del crist, 33','08340','Vilassar de Mar','Barcelona','607 562 391','ca'), -(5,'52.2612312','4.7818154','Holland','Aalsmeer Flower Auction','1430 BA','Legmeerdijk 313','Aalsmeer','Nederland','nl'), -(6,'43.4375416','5.2261456','Marseille','ruben@verdnatura.es','13054','Marigname','Marseille','+33 781 533 900','fr'); +INSERT INTO `location` VALUES (2,'39.2095886','-0.4173501','Valencia','Calle Fenollar, 2','46680','Algemesi','Valencia','963 242 100','es'),(3,'40.4564969','-3.4875829','Madrid','Avenida de la Constitución, 3 - Nave E','28850','Torrejón de Ardoz','Madrid','963 242 100',NULL),(4,'41.4962045','2.3765504','Barcelona','Camí del crist, 33','08340','Vilassar de Mar','Barcelona','607 562 391','ca'),(5,'52.2612312','4.7818154','Holland','Aalsmeer Flower Auction','1430 BA','Legmeerdijk 313','Aalsmeer','Nederland','nl'),(6,'43.4375416','5.2261456','Marseille','ruben@verdnatura.es','13054','Marigname','Marseille','+33 781 533 900','fr'); /*!40000 ALTER TABLE `location` ENABLE KEYS */; UNLOCK TABLES; @@ -13756,27 +622,7 @@ UNLOCK TABLES; LOCK TABLES `menu` WRITE; /*!40000 ALTER TABLE `menu` DISABLE KEYS */; -INSERT INTO `menu` VALUES -(1,'Home','cms/home',6,NULL,1), -(2,'Orders',NULL,11,NULL,1), -(3,'Catalog','ecomerce/catalog',6,NULL,2), -(7,'Administration',NULL,1,NULL,2), -(8,'Users','admin/users',1,7,2), -(9,'Connections','admin/connections',1,7,2), -(11,'Agencies','agencies/packages',3,NULL,2), -(12,'News','news/news',1,7,3), -(15,'Photos','admin/photos',1,7,3), -(17,'Configuration',NULL,11,NULL,3), -(19,'Control panel','admin/links',1,7,1), -(21,'Basket','ecomerce/basket',11,NULL,1), -(22,'Last orders','ecomerce/orders',11,2,2), -(23,'Invoices','ecomerce/invoices',11,2,2), -(24,'Account','account/conf',11,17,1), -(25,'Addresses','account/address-list',11,17,2), -(26,'Shelves','reports/shelves',1,29,1), -(28,'Visits','admin/visits',1,7,2), -(29,'Reports',NULL,1,NULL,2), -(30,'Items','admin/items',1,7,3); +INSERT INTO `menu` VALUES (1,'Home','cms/home',6,NULL,1),(2,'Orders',NULL,11,NULL,1),(3,'Catalog','ecomerce/catalog',6,NULL,2),(7,'Administration',NULL,1,NULL,2),(8,'Users','admin/users',1,7,2),(9,'Connections','admin/connections',1,7,2),(11,'Agencies','agencies/packages',3,NULL,2),(12,'News','news/news',1,7,3),(15,'Photos','admin/photos',1,7,3),(17,'Configuration',NULL,11,NULL,3),(19,'Control panel','admin/links',1,7,1),(21,'Basket','ecomerce/basket',11,NULL,1),(22,'Last orders','ecomerce/orders',11,2,2),(23,'Invoices','ecomerce/invoices',11,2,2),(24,'Account','account/conf',11,17,1),(25,'Addresses','account/address-list',11,17,2),(26,'Shelves','reports/shelves',1,29,1),(28,'Visits','admin/visits',1,7,2),(29,'Reports',NULL,1,NULL,2),(30,'Items','admin/items',1,7,3); /*!40000 ALTER TABLE `menu` ENABLE KEYS */; UNLOCK TABLES; @@ -13786,23 +632,7 @@ UNLOCK TABLES; LOCK TABLES `message` WRITE; /*!40000 ALTER TABLE `message` DISABLE KEYS */; -INSERT INTO `message` VALUES -(1,'ORDER_DATE_HOLIDAY','No es posible realizar pedidos para días festivos'), -(2,'ORDER_EMPTY','El pedido esta vacío'), -(3,'ORDER_UNAVAILABLE','Algunos artículos ya no están disponibles, verifica las cantidades resaltadas en rojo'), -(4,'SURVEY_MAX_ONE_VOTE','Solo es posible realizar un voto por encuesta'), -(5,'ORDER_MAX_EXCEEDED','Has excedido el número máximo de pedidos por confirmar, por favor elimina o confirma los pedidos iniciados'), -(6,'LOGIN_INCORRECT','Usuario o contraseña incorrectos. Recuerda que se hace distinción entre mayúsculas y minúsculas.'), -(7,'ORDER_DATE_PAST','La fecha de su pedido debe ser mayor o igual al día de hoy'), -(8,'ORDER_DATE_LAST','No es posible realizar más para hoy, por favor atrasa la fecha de tu pedido a mañana o días posteriores'), -(9,'ORDER_DATE_SUNDAY','No es posible confirmar pedidos para Domingo'), -(10,'ORDER_DATE_SATURATED','Estamos saturados de pedidos, por favor selecciona otra fecha de envío o recogida '), -(11,'USER_DISCONNECTED','Has sido desconectado del servidor, por favor vuelve a iniciar sesión'), -(12,'UNAUTH_ACTION','Acción no permitida'), -(13,'ORDER_INVALID_AGENCY','La agencia de envío no es válida'), -(14,'ORDER_EMPTY_ADDRESS','Selecciona una dirección de envío'), -(15,'ORDER_AMOUNT_ROUNDED','Este artículo se vende agrupado y la cantidad ha sido redondeada'), -(16,'ORDER_ALREADY_CONFIRMED','Este pedido ya estaba confirmado'); +INSERT INTO `message` VALUES (1,'ORDER_DATE_HOLIDAY','No es posible realizar pedidos para días festivos'),(2,'ORDER_EMPTY','El pedido esta vacío'),(3,'ORDER_UNAVAILABLE','Algunos artículos ya no están disponibles, verifica las cantidades resaltadas en rojo'),(4,'SURVEY_MAX_ONE_VOTE','Solo es posible realizar un voto por encuesta'),(5,'ORDER_MAX_EXCEEDED','Has excedido el número máximo de pedidos por confirmar, por favor elimina o confirma los pedidos iniciados'),(6,'LOGIN_INCORRECT','Usuario o contraseña incorrectos. Recuerda que se hace distinción entre mayúsculas y minúsculas.'),(7,'ORDER_DATE_PAST','La fecha de su pedido debe ser mayor o igual al día de hoy'),(8,'ORDER_DATE_LAST','No es posible realizar más para hoy, por favor atrasa la fecha de tu pedido a mañana o días posteriores'),(9,'ORDER_DATE_SUNDAY','No es posible confirmar pedidos para Domingo'),(10,'ORDER_DATE_SATURATED','Estamos saturados de pedidos, por favor selecciona otra fecha de envío o recogida '),(11,'USER_DISCONNECTED','Has sido desconectado del servidor, por favor vuelve a iniciar sesión'),(12,'UNAUTH_ACTION','Acción no permitida'),(13,'ORDER_INVALID_AGENCY','La agencia de envío no es válida'),(14,'ORDER_EMPTY_ADDRESS','Selecciona una dirección de envío'),(15,'ORDER_AMOUNT_ROUNDED','Este artículo se vende agrupado y la cantidad ha sido redondeada'),(16,'ORDER_ALREADY_CONFIRMED','Este pedido ya estaba confirmado'); /*!40000 ALTER TABLE `message` ENABLE KEYS */; UNLOCK TABLES; @@ -13812,15 +642,7 @@ UNLOCK TABLES; LOCK TABLES `metatag` WRITE; /*!40000 ALTER TABLE `metatag` DISABLE KEYS */; -INSERT INTO `metatag` VALUES -(2,'title','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración'), -(3,'description','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración. Envío a toda España, pedidos por internet o por teléfono.'), -(4,'keywords','verdnatura, mayorista, floristería, flores, verdes, plantas, ramos, complementos, artificial, natural, decoración, rosas, helecho, fern, clavel, lilium, orquídea, tulipan, crisantemo, cala, gerbera, hiedra, eucaliptus, cinerea, aralia'), -(6,'revisit-after','15 days'), -(7,'rating','general'), -(8,'author','Juan Ferrer Toribio'), -(9,'owner','Verdnatura Levante S.L.'), -(10,'robots','index, follow'); +INSERT INTO `metatag` VALUES (2,'title','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración'),(3,'description','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración. Envío a toda España, pedidos por internet o por teléfono.'),(4,'keywords','verdnatura, mayorista, floristería, flores, verdes, plantas, ramos, complementos, artificial, natural, decoración, rosas, helecho, fern, clavel, lilium, orquídea, tulipan, crisantemo, cala, gerbera, hiedra, eucaliptus, cinerea, aralia'),(6,'revisit-after','15 days'),(7,'rating','general'),(8,'author','Juan Ferrer Toribio'),(9,'owner','Verdnatura Levante S.L.'),(10,'robots','index, follow'); /*!40000 ALTER TABLE `metatag` ENABLE KEYS */; UNLOCK TABLES; @@ -13830,10 +652,7 @@ UNLOCK TABLES; LOCK TABLES `newsTag` WRITE; /*!40000 ALTER TABLE `newsTag` DISABLE KEYS */; -INSERT INTO `newsTag` VALUES -('course','Curso'), -('new','Noticia'), -('offer','Oferta'); +INSERT INTO `newsTag` VALUES ('course','Curso'),('new','Noticia'),('offer','Oferta'); /*!40000 ALTER TABLE `newsTag` ENABLE KEYS */; UNLOCK TABLES; @@ -13843,23 +662,7 @@ UNLOCK TABLES; LOCK TABLES `restPriv` WRITE; /*!40000 ALTER TABLE `restPriv` DISABLE KEYS */; -INSERT INTO `restPriv` VALUES -(1,'tpv/transaction',2), -(3,'image/upload',1), -(5,'user/supplant',104), -(10,'misc/captcha',NULL), -(11,'core/log',NULL), -(14,'core/query',NULL), -(15,'user/recover-password',NULL), -(16,'user/restore-password',NULL), -(17,'dms/invoice',2), -(18,'image/thumb',NULL), -(19,'misc/contact',NULL), -(20,'misc/production',NULL), -(21,'tpv/confirm-post',NULL), -(22,'tpv/confirm-soap',NULL), -(23,'client/supplant',18), -(24,'client/supplant',35); +INSERT INTO `restPriv` VALUES (1,'tpv/transaction',2),(3,'image/upload',1),(5,'user/supplant',104),(10,'misc/captcha',NULL),(11,'core/log',NULL),(14,'core/query',NULL),(15,'user/recover-password',NULL),(16,'user/restore-password',NULL),(17,'dms/invoice',2),(18,'image/thumb',NULL),(19,'misc/contact',NULL),(20,'misc/production',NULL),(21,'tpv/confirm-post',NULL),(22,'tpv/confirm-soap',NULL),(23,'client/supplant',18),(24,'client/supplant',35); /*!40000 ALTER TABLE `restPriv` ENABLE KEYS */; UNLOCK TABLES; @@ -13869,14 +672,7 @@ UNLOCK TABLES; LOCK TABLES `social` WRITE; /*!40000 ALTER TABLE `social` DISABLE KEYS */; -INSERT INTO `social` VALUES -(1,'Blog','https://blog.verdnatura.es/','blog.svg',0), -(3,'Facebook','http://www.facebook.com/verdnatura','facebook.svg',2), -(4,'YouTube','http://www.youtube.com/user/verdnatura','youtube.svg',2), -(5,'Twitter','https://twitter.com/Verdnatura','twitter.svg',1), -(6,'Instagram','https://www.instagram.com/verdnatura','instagram.svg',2), -(7,'Linkedin','https://www.linkedin.com/company/verdnatura','linkedin.svg',1), -(8,'Pinterest','https://es.pinterest.com/verdnatura/','pinterest.svg',1); +INSERT INTO `social` VALUES (1,'Blog','https://blog.verdnatura.es/','blog.svg',0),(3,'Facebook','http://www.facebook.com/verdnatura','facebook.svg',2),(4,'YouTube','http://www.youtube.com/user/verdnatura','youtube.svg',2),(5,'Twitter','https://twitter.com/Verdnatura','twitter.svg',1),(6,'Instagram','https://www.instagram.com/verdnatura','instagram.svg',2),(7,'Linkedin','https://www.linkedin.com/company/verdnatura','linkedin.svg',1),(8,'Pinterest','https://es.pinterest.com/verdnatura/','pinterest.svg',1); /*!40000 ALTER TABLE `social` ENABLE KEYS */; UNLOCK TABLES; @@ -13886,89 +682,7 @@ UNLOCK TABLES; LOCK TABLES `tpvError` WRITE; /*!40000 ALTER TABLE `tpvError` DISABLE KEYS */; -INSERT INTO `tpvError` VALUES -('SIS0007','Error al desmontar el XML de entrada'), -('SIS0008','Error falta Ds_Merchant_MerchantCode'), -('SIS0009','Error de formato en Ds_Merchant_MerchantCode'), -('SIS0010','Error falta Ds_Merchant_Terminal'), -('SIS0011','Error de formato en Ds_Merchant_Terminal'), -('SIS0014','Error de formato en Ds_Merchant_Order'), -('SIS0015','Error falta Ds_Merchant_Currency'), -('SIS0016','Error de formato en Ds_Merchant_Currency'), -('SIS0017','Error no se admite operaciones en pesetas'), -('SIS0018','Error falta Ds_Merchant_Amount'), -('SIS0019','Error de formato en Ds_Merchant_Amount'), -('SIS0020','Error falta Ds_Merchant_MerchantSignature'), -('SIS0021','Error la Ds_Merchant_MerchantSignature viene vacía'), -('SIS0022','Error de formato en Ds_Merchant_TransactionType'), -('SIS0023','Error Ds_Merchant_TransactionType desconocido'), -('SIS0024','Error Ds_Merchant_ConsumerLanguage tiene más de 3 posiciones'), -('SIS0026','Error No existe el comercio / terminal enviado'), -('SIS0027','Error Moneda enviada por el comercio es diferente a la que tiene asignada para ese terminal'), -('SIS0028','Error Comercio / terminal está dado de baja'), -('SIS0030','Error en un pago con tarjeta ha llegado un tipo de operación no valido'), -('SIS0031','Método de pago no definido'), -('SIS0034','Error de acceso a la Base de Datos'), -('SIS0038','Error en java'), -('SIS0040','Error el comercio / terminal no tiene ningún método de pago asignado'), -('SIS0041','Error en el cálculo de la firma de datos del comercio'), -('SIS0042','La firma enviada no es correcta'), -('SIS0046','El BIN de la tarjeta no está dado de alta'), -('SIS0051','Error número de pedido repetido'), -('SIS0054','Error no existe operación sobre la que realizar la devolución'), -('SIS0055','Error no existe más de un pago con el mismo número de pedido'), -('SIS0056','La operación sobre la que se desea devolver no está autorizada'), -('SIS0057','El importe a devolver supera el permitido'), -('SIS0058','Inconsistencia de datos, en la validación de una confirmación'), -('SIS0059','Error no existe operación sobre la que realizar la devolución'), -('SIS0060','Ya existe una confirmación asociada a la preautorización'), -('SIS0061','La preautorización sobre la que se desea confirmar no está autorizada'), -('SIS0062','El importe a confirmar supera el permitido'), -('SIS0063','Error. Número de tarjeta no disponible'), -('SIS0064','Error. El número de tarjeta no puede tener más de 19 posiciones'), -('SIS0065','Error. El número de tarjeta no es numérico'), -('SIS0066','Error. Mes de caducidad no disponible'), -('SIS0067','Error. El mes de la caducidad no es numérico'), -('SIS0068','Error. El mes de la caducidad no es válido'), -('SIS0069','Error. Año de caducidad no disponible'), -('SIS0070','Error. El Año de la caducidad no es numérico'), -('SIS0071','Tarjeta caducada'), -('SIS0072','Operación no anulable'), -('SIS0074','Error falta Ds_Merchant_Order'), -('SIS0075','Error el Ds_Merchant_Order tiene menos de 4 posiciones o más de 12'), -('SIS0076','Error el Ds_Merchant_Order no tiene las cuatro primeras posiciones numéricas'), -('SIS0078','Método de pago no disponible'), -('SIS0079','Error al realizar el pago con tarjeta'), -('SIS0081','La sesión es nueva, se han perdido los datos almacenados'), -('SIS0089','El valor de Ds_Merchant_ExpiryDate no ocupa 4 posiciones'), -('SIS0092','El valor de Ds_Merchant_ExpiryDate es nulo'), -('SIS0093','Tarjeta no encontrada en la tabla de rangos'), -('SIS0112','Error. El tipo de transacción especificado en Ds_Merchant_Transaction_Type no esta permitido'), -('SIS0115','Error no existe operación sobre la que realizar el pago de la cuota'), -('SIS0116','La operación sobre la que se desea pagar una cuota no es una operación válida'), -('SIS0117','La operación sobre la que se desea pagar una cuota no está autorizada'), -('SIS0118','Se ha excedido el importe total de las cuotas'), -('SIS0119','Valor del campo Ds_Merchant_DateFrecuency no válido'), -('SIS0120','Valor del campo Ds_Merchant_CargeExpiryDate no válido'), -('SIS0121','Valor del campo Ds_Merchant_SumTotal no válido'), -('SIS0122','Valor del campo Ds_merchant_DateFrecuency o Ds_Merchant_SumTotal tiene formato incorrecto'), -('SIS0123','Se ha excedido la fecha tope para realizar transacciones'), -('SIS0124','No ha transcurrido la frecuencia mínima en un pago recurrente sucesivo'), -('SIS0132','La fecha de Confirmación de Autorización no puede superar en más de 7 días a la de Preautorización'), -('SIS0139','Error el pago recurrente inicial está duplicado SIS0142 Tiempo excedido para el pago'), -('SIS0216','Error Ds_Merchant_CVV2 tiene mas de 3/4 posiciones'), -('SIS0217','Error de formato en Ds_Merchant_CVV2'), -('SIS0221','Error el CVV2 es obligatorio'), -('SIS0222','Ya existe una anulación asociada a la preautorización'), -('SIS0223','La preautorización que se desea anular no está autorizada'), -('SIS0225','Error no existe operación sobre la que realizar la anulación'), -('SIS0226','Inconsistencia de datos, en la validación de una anulación'), -('SIS0227','Valor del campo Ds_Merchan_TransactionDate no válido'), -('SIS0252','El comercio no permite el envío de tarjeta'), -('SIS0253','La tarjeta no cumple el check-digit'), -('SIS0261','Operación detenida por superar el control de restricciones en la entrada al SIS'), -('SIS0274','Tipo de operación desconocida o no permitida por esta entrada al SIS'), -('SIS9915','A petición del usuario se ha cancelado el pago'); +INSERT INTO `tpvError` VALUES ('SIS0007','Error al desmontar el XML de entrada'),('SIS0008','Error falta Ds_Merchant_MerchantCode'),('SIS0009','Error de formato en Ds_Merchant_MerchantCode'),('SIS0010','Error falta Ds_Merchant_Terminal'),('SIS0011','Error de formato en Ds_Merchant_Terminal'),('SIS0014','Error de formato en Ds_Merchant_Order'),('SIS0015','Error falta Ds_Merchant_Currency'),('SIS0016','Error de formato en Ds_Merchant_Currency'),('SIS0017','Error no se admite operaciones en pesetas'),('SIS0018','Error falta Ds_Merchant_Amount'),('SIS0019','Error de formato en Ds_Merchant_Amount'),('SIS0020','Error falta Ds_Merchant_MerchantSignature'),('SIS0021','Error la Ds_Merchant_MerchantSignature viene vacía'),('SIS0022','Error de formato en Ds_Merchant_TransactionType'),('SIS0023','Error Ds_Merchant_TransactionType desconocido'),('SIS0024','Error Ds_Merchant_ConsumerLanguage tiene más de 3 posiciones'),('SIS0026','Error No existe el comercio / terminal enviado'),('SIS0027','Error Moneda enviada por el comercio es diferente a la que tiene asignada para ese terminal'),('SIS0028','Error Comercio / terminal está dado de baja'),('SIS0030','Error en un pago con tarjeta ha llegado un tipo de operación no valido'),('SIS0031','Método de pago no definido'),('SIS0034','Error de acceso a la Base de Datos'),('SIS0038','Error en java'),('SIS0040','Error el comercio / terminal no tiene ningún método de pago asignado'),('SIS0041','Error en el cálculo de la firma de datos del comercio'),('SIS0042','La firma enviada no es correcta'),('SIS0046','El BIN de la tarjeta no está dado de alta'),('SIS0051','Error número de pedido repetido'),('SIS0054','Error no existe operación sobre la que realizar la devolución'),('SIS0055','Error no existe más de un pago con el mismo número de pedido'),('SIS0056','La operación sobre la que se desea devolver no está autorizada'),('SIS0057','El importe a devolver supera el permitido'),('SIS0058','Inconsistencia de datos, en la validación de una confirmación'),('SIS0059','Error no existe operación sobre la que realizar la devolución'),('SIS0060','Ya existe una confirmación asociada a la preautorización'),('SIS0061','La preautorización sobre la que se desea confirmar no está autorizada'),('SIS0062','El importe a confirmar supera el permitido'),('SIS0063','Error. Número de tarjeta no disponible'),('SIS0064','Error. El número de tarjeta no puede tener más de 19 posiciones'),('SIS0065','Error. El número de tarjeta no es numérico'),('SIS0066','Error. Mes de caducidad no disponible'),('SIS0067','Error. El mes de la caducidad no es numérico'),('SIS0068','Error. El mes de la caducidad no es válido'),('SIS0069','Error. Año de caducidad no disponible'),('SIS0070','Error. El Año de la caducidad no es numérico'),('SIS0071','Tarjeta caducada'),('SIS0072','Operación no anulable'),('SIS0074','Error falta Ds_Merchant_Order'),('SIS0075','Error el Ds_Merchant_Order tiene menos de 4 posiciones o más de 12'),('SIS0076','Error el Ds_Merchant_Order no tiene las cuatro primeras posiciones numéricas'),('SIS0078','Método de pago no disponible'),('SIS0079','Error al realizar el pago con tarjeta'),('SIS0081','La sesión es nueva, se han perdido los datos almacenados'),('SIS0089','El valor de Ds_Merchant_ExpiryDate no ocupa 4 posiciones'),('SIS0092','El valor de Ds_Merchant_ExpiryDate es nulo'),('SIS0093','Tarjeta no encontrada en la tabla de rangos'),('SIS0112','Error. El tipo de transacción especificado en Ds_Merchant_Transaction_Type no esta permitido'),('SIS0115','Error no existe operación sobre la que realizar el pago de la cuota'),('SIS0116','La operación sobre la que se desea pagar una cuota no es una operación válida'),('SIS0117','La operación sobre la que se desea pagar una cuota no está autorizada'),('SIS0118','Se ha excedido el importe total de las cuotas'),('SIS0119','Valor del campo Ds_Merchant_DateFrecuency no válido'),('SIS0120','Valor del campo Ds_Merchant_CargeExpiryDate no válido'),('SIS0121','Valor del campo Ds_Merchant_SumTotal no válido'),('SIS0122','Valor del campo Ds_merchant_DateFrecuency o Ds_Merchant_SumTotal tiene formato incorrecto'),('SIS0123','Se ha excedido la fecha tope para realizar transacciones'),('SIS0124','No ha transcurrido la frecuencia mínima en un pago recurrente sucesivo'),('SIS0132','La fecha de Confirmación de Autorización no puede superar en más de 7 días a la de Preautorización'),('SIS0139','Error el pago recurrente inicial está duplicado SIS0142 Tiempo excedido para el pago'),('SIS0216','Error Ds_Merchant_CVV2 tiene mas de 3/4 posiciones'),('SIS0217','Error de formato en Ds_Merchant_CVV2'),('SIS0221','Error el CVV2 es obligatorio'),('SIS0222','Ya existe una anulación asociada a la preautorización'),('SIS0223','La preautorización que se desea anular no está autorizada'),('SIS0225','Error no existe operación sobre la que realizar la anulación'),('SIS0226','Inconsistencia de datos, en la validación de una anulación'),('SIS0227','Valor del campo Ds_Merchan_TransactionDate no válido'),('SIS0252','El comercio no permite el envío de tarjeta'),('SIS0253','La tarjeta no cumple el check-digit'),('SIS0261','Operación detenida por superar el control de restricciones en la entrada al SIS'),('SIS0274','Tipo de operación desconocida o no permitida por esta entrada al SIS'),('SIS9915','A petición del usuario se ha cancelado el pago'); /*!40000 ALTER TABLE `tpvError` ENABLE KEYS */; UNLOCK TABLES; @@ -13978,44 +692,7 @@ UNLOCK TABLES; LOCK TABLES `tpvResponse` WRITE; /*!40000 ALTER TABLE `tpvResponse` DISABLE KEYS */; -INSERT INTO `tpvResponse` VALUES -(101,'Tarjeta Caducada'), -(102,'Tarjeta en excepción transitoria o bajo sospecha de fraude'), -(104,'Operación no permitida para esa tarjeta o terminal'), -(106,'Intentos de PIN excedidos'), -(116,'Disponible Insuficiente'), -(118,'Tarjeta no Registrada'), -(125,'Tarjeta no efectiva'), -(129,'Código de seguridad (CVV2/CVC2) incorrecto'), -(180,'Tarjeta ajena al servicio'), -(184,'Error en la autenticación del titular'), -(190,'Denegación sin especificar motivo'), -(191,'Fecha de caducidad errónea'), -(202,'Tarjeta en excepción transitoria o bajo sospecha de fraude con retirada de tarjeta'), -(904,'Comercio no registrado en FUC'), -(909,'Error de sistema'), -(912,'Emisor no Disponible'), -(913,'Pedido repetido'), -(944,'Sesión Incorrecta'), -(950,'Operación de devolución no permitida'), -(9064,'Número de posiciones de la tarjeta incorrecto'), -(9078,'No existe método de pago válido para esa tarjeta'), -(9093,'Tarjeta no existente'), -(9094,'Rechazo servidores internacionales'), -(9104,'A petición del usuario se ha cancelado el pago'), -(9218,'El comercio no permite op. seguras por entrada /operaciones'), -(9253,'Tarjeta no cumple el check-digit'), -(9256,'El comercio no puede realizar preautorizaciones'), -(9257,'Esta tarjeta no permite operativa de preautorizaciones'), -(9261,'Operación detenida por superar el control de restricciones en la entrada al SIS'), -(9912,'Emisor no Disponible'), -(9913,'Error en la confirmación que el comercio envía al TPV Virtual (solo aplicable en la opción de sincronización SOAP)'), -(9914,'Confirmación “KO” del comercio (solo aplicable en la opción de sincronización SOAP)'), -(9915,'A petición del usuario se ha cancelado el pago'), -(9928,'Anulación de autorización en diferido realizada por el SIS (proceso batch)'), -(9929,'Anulación de autorización en diferido realizada por el comercio'), -(9998,'Operación en proceso de solicitud de datos de tarjeta'), -(9999,'Operación que ha sido redirigida al emisora autenticar'); +INSERT INTO `tpvResponse` VALUES (101,'Tarjeta Caducada'),(102,'Tarjeta en excepción transitoria o bajo sospecha de fraude'),(104,'Operación no permitida para esa tarjeta o terminal'),(106,'Intentos de PIN excedidos'),(116,'Disponible Insuficiente'),(118,'Tarjeta no Registrada'),(125,'Tarjeta no efectiva'),(129,'Código de seguridad (CVV2/CVC2) incorrecto'),(180,'Tarjeta ajena al servicio'),(184,'Error en la autenticación del titular'),(190,'Denegación sin especificar motivo'),(191,'Fecha de caducidad errónea'),(202,'Tarjeta en excepción transitoria o bajo sospecha de fraude con retirada de tarjeta'),(904,'Comercio no registrado en FUC'),(909,'Error de sistema'),(912,'Emisor no Disponible'),(913,'Pedido repetido'),(944,'Sesión Incorrecta'),(950,'Operación de devolución no permitida'),(9064,'Número de posiciones de la tarjeta incorrecto'),(9078,'No existe método de pago válido para esa tarjeta'),(9093,'Tarjeta no existente'),(9094,'Rechazo servidores internacionales'),(9104,'A petición del usuario se ha cancelado el pago'),(9218,'El comercio no permite op. seguras por entrada /operaciones'),(9253,'Tarjeta no cumple el check-digit'),(9256,'El comercio no puede realizar preautorizaciones'),(9257,'Esta tarjeta no permite operativa de preautorizaciones'),(9261,'Operación detenida por superar el control de restricciones en la entrada al SIS'),(9912,'Emisor no Disponible'),(9913,'Error en la confirmación que el comercio envía al TPV Virtual (solo aplicable en la opción de sincronización SOAP)'),(9914,'Confirmación “KO” del comercio (solo aplicable en la opción de sincronización SOAP)'),(9915,'A petición del usuario se ha cancelado el pago'),(9928,'Anulación de autorización en diferido realizada por el SIS (proceso batch)'),(9929,'Anulación de autorización en diferido realizada por el comercio'),(9998,'Operación en proceso de solicitud de datos de tarjeta'),(9999,'Operación que ha sido redirigida al emisora autenticar'); /*!40000 ALTER TABLE `tpvResponse` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -14027,9 +704,9 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-11-21 7:59:06 +-- Dump completed on 2023-02-03 14:47:11 USE `postgresql`; --- MariaDB dump 10.19 Distrib 10.9.4-MariaDB, for Linux (x86_64) +-- MariaDB dump 10.19 Distrib 10.5.18-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: db.verdnatura.es Database: postgresql -- ------------------------------------------------------ @@ -14051,39 +728,7 @@ USE `postgresql`; LOCK TABLES `calendar_labour_type` WRITE; /*!40000 ALTER TABLE `calendar_labour_type` DISABLE KEYS */; -INSERT INTO `calendar_labour_type` VALUES -(1,'Horario general','00:20:00',40,0), -(2,'Horario 35h/semana','00:20:00',35,1), -(3,'Horario 20h/semana','00:00:00',20,1), -(4,'Festivo y Fin de semana','00:00:00',0,1), -(5,'Horario 30h/semana','00:20:00',30,1), -(6,'Horario 25h/semana','00:20:00',25,1), -(7,'Vacaciones trabajadas','00:00:00',0,1), -(8,'Vacaciones','00:00:00',0,1), -(9,'Horario 26h/semana','00:20:00',26,1), -(10,'Horario 28h/semana','00:20:00',28,1), -(11,'Horario 8h/semana','00:00:00',8,1), -(12,'Horario 16h/semana','00:00:00',16,1), -(13,'Horario 32h/semana','00:20:00',32,1), -(14,'Horario 24h/semana','00:20:00',24,1), -(15,'Horario 10h/semana','00:00:00',10,1), -(16,'Horario 27,5h/semana','00:20:00',28,1), -(17,'Horario 13,5h/semana','00:20:00',14,1), -(18,'Horario 31h/semana',NULL,31,1), -(19,'Horario 21,5h/semana',NULL,22,1), -(20,'Horario 34h/semana',NULL,34,1), -(21,'Horario 17h/semana',NULL,17,1), -(22,'Horario 18h/semana',NULL,18,1), -(23,'Horario 37,5 h/semana',NULL,38,1), -(24,'Horario 29 h/semana',NULL,29,1), -(25,'Horario 12h/semana',NULL,12,1), -(26,'Horario 10h/semana',NULL,10,1), -(27,'Horario 15h/semana',NULL,15,1), -(28,'Horario 9h/semana',NULL,9,1), -(29,'Horario 23h/semana',NULL,23,1), -(30,'Horario 21h/semana',NULL,21,1), -(31,'Horario 39h/semana',NULL,39,1), -(32,'Horario 22/semana',NULL,22,1); +INSERT INTO `calendar_labour_type` VALUES (1,'Horario general','00:20:00',40,0),(2,'Horario 35h/semana','00:20:00',35,1),(3,'Horario 20h/semana','00:00:00',20,1),(4,'Festivo y Fin de semana','00:00:00',0,1),(5,'Horario 30h/semana','00:20:00',30,1),(6,'Horario 25h/semana','00:20:00',25,1),(7,'Vacaciones trabajadas','00:00:00',0,1),(8,'Vacaciones','00:00:00',0,1),(9,'Horario 26h/semana','00:20:00',26,1),(10,'Horario 28h/semana','00:20:00',28,1),(11,'Horario 8h/semana','00:00:00',8,1),(12,'Horario 16h/semana','00:00:00',16,1),(13,'Horario 32h/semana','00:20:00',32,1),(14,'Horario 24h/semana','00:20:00',24,1),(15,'Horario 10h/semana','00:00:00',10,1),(16,'Horario 27,5h/semana','00:20:00',28,1),(17,'Horario 13,5h/semana','00:20:00',14,1),(18,'Horario 31h/semana',NULL,31,1),(19,'Horario 21,5h/semana',NULL,22,1),(20,'Horario 34h/semana',NULL,34,1),(21,'Horario 17h/semana',NULL,17,1),(22,'Horario 18h/semana',NULL,18,1),(23,'Horario 37,5 h/semana',NULL,38,1),(24,'Horario 29 h/semana',NULL,29,1),(25,'Horario 12h/semana',NULL,12,1),(26,'Horario 10h/semana',NULL,10,1),(27,'Horario 15h/semana',NULL,15,1),(28,'Horario 9h/semana',NULL,9,1),(29,'Horario 23h/semana',NULL,23,1),(30,'Horario 21h/semana',NULL,21,1),(31,'Horario 39h/semana',NULL,39,1),(32,'Horario 22/semana',NULL,22,1); /*!40000 ALTER TABLE `calendar_labour_type` ENABLE KEYS */; UNLOCK TABLES; @@ -14093,8 +738,7 @@ UNLOCK TABLES; LOCK TABLES `labour_agreement` WRITE; /*!40000 ALTER TABLE `labour_agreement` DISABLE KEYS */; -INSERT INTO `labour_agreement` VALUES -(1,2.5,1830,'Flores y Plantas','2012-01-01',NULL); +INSERT INTO `labour_agreement` VALUES (1,2.5,1830,'Flores y Plantas','2012-01-01',NULL); /*!40000 ALTER TABLE `labour_agreement` ENABLE KEYS */; UNLOCK TABLES; @@ -14104,18 +748,7 @@ UNLOCK TABLES; LOCK TABLES `media_type` WRITE; /*!40000 ALTER TABLE `media_type` DISABLE KEYS */; -INSERT INTO `media_type` VALUES -(3,'email'), -(12,'extension movil'), -(6,'facebook'), -(2,'fijo'), -(11,'material'), -(10,'movil empresa'), -(1,'movil personal'), -(5,'msn'), -(9,'seg social'), -(4,'skype'), -(7,'web'); +INSERT INTO `media_type` VALUES (3,'email'),(12,'extension movil'),(6,'facebook'),(2,'fijo'),(11,'material'),(10,'movil empresa'),(1,'movil personal'),(5,'msn'),(9,'seg social'),(4,'skype'),(7,'web'); /*!40000 ALTER TABLE `media_type` ENABLE KEYS */; UNLOCK TABLES; @@ -14125,50 +758,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), -(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); +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; @@ -14178,13 +768,7 @@ UNLOCK TABLES; LOCK TABLES `profile_type` WRITE; /*!40000 ALTER TABLE `profile_type` DISABLE KEYS */; -INSERT INTO `profile_type` VALUES -(1,'Laboral'), -(2,'Personal'), -(3,'Cliente'), -(4,'Proveedor'), -(5,'Banco'), -(6,'Patronal'); +INSERT INTO `profile_type` VALUES (1,'Laboral'),(2,'Personal'),(3,'Cliente'),(4,'Proveedor'),(5,'Banco'),(6,'Patronal'); /*!40000 ALTER TABLE `profile_type` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -14196,9 +780,9 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-11-21 7:59:07 +-- Dump completed on 2023-02-03 14:47:12 USE `sage`; --- MariaDB dump 10.19 Distrib 10.9.4-MariaDB, for Linux (x86_64) +-- MariaDB dump 10.19 Distrib 10.5.18-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: db.verdnatura.es Database: sage -- ------------------------------------------------------ @@ -14220,34 +804,7 @@ USE `sage`; LOCK TABLES `TiposIva` WRITE; /*!40000 ALTER TABLE `TiposIva` DISABLE KEYS */; -INSERT INTO `TiposIva` VALUES -(2,0,'Operaciones no sujetas',0.0000000000,0.0000000000,0.0000000000,'','4770000020','','','','','','','95B21A93-5910-489D-83BB-C32788C9B19D','','','','','','','','','',0,0), -(4,0,'I.V.A. 4%',0.0000000000,4.0000000000,0.0000000000,'4720000004','4770000004','','6310000000','','','','','9E6160D5-984E-4643-ACBC-1EBC3BF73360','','','','','','','','','',0,0), -(5,0,'I.V.A. 4% y R.E. 0.5%',0.0000000000,4.0000000000,0.5000000000,'','4770000504','4770000405','','','','','','DBEFA562-63FB-4FFC-8171-64F0C6F065FF','','','','','','','','','',0,0), -(6,0,'H.P. IVA 4% CEE',0.0000000000,4.0000000000,0.0000000000,'4721000004','4771000004','','','','','','','DD0ECBA8-2EF5-425E-911B-623580BADA77','','','','','','','','','',0,1), -(7,0,'H.P. IVA 10% CEE',0.0000000000,10.0000000000,0.0000000000,'4721000011','4771000010','','','','','','','593208CD-6F28-4489-B6EC-907AD689EAC9','','','','','','','','','',0,1), -(8,0,'H.P. IVA 21% CEE',0.0000000000,21.0000000000,0.0000000000,'4721000021','4771000021','','','','','','','27061852-9BC1-4C4F-9B6E-69970E208F23','','','','','','','','','',0,1), -(10,0,'I.V.A. 10% Nacional',0.0000000000,10.0000000000,0.0000000000,'4720000011','4770000010','','6290000553','','','','','828A9D6F-5C01-4C3A-918A-B2E4482830D3','','','','','','','','','',0,0), -(11,0,'I.V.A. 10% y R.E. 1,4%',0.0000000000,10.0000000000,1.4000000000,'','4770000101','4770000110','','','','','','C1F2D910-83A1-4191-A76C-8B3D7AB98348','','','','','','','','','',0,0), -(16,0,'I.V.A. Adqui. servicios CEE',0.0000000000,21.0000000000,0.0000000000,'4721000015','4771000016','','','','','','','E3EDE961-CE8F-41D4-9E6C-D8BCD32275A1','','','','','','','','','',0,1), -(18,0,'H.P. Iva Importación 0% ISP',0.0000000000,0.0000000000,0.0000000000,'4720000005','4770000005','','','','','','','27AD4158-2349-49C2-B53A-A4E0EFAC5D09','','','','','','','','','',0,0), -(20,0,'I.V.A 0% Nacional',0.0000000000,0.0000000000,0.0000000000,'4720000000','','','','','','','','B90B0FBD-E513-4F04-9721-C873504E08DF','','','','','','','','','',0,0), -(21,0,'I.V.A. 21%',0.0000000000,21.0000000000,0.0000000000,'4720000021','4770000021','4770000000','','','','','','BA8C4E28-DCFA-4F7B-AE4F-CA044626B55E','','','','','','','','','',0,0), -(22,0,'IVA 10% importaciones',0.0000000000,10.0000000000,0.0000000000,'4722000010','','','','','','','','540450A8-4B41-4607-96D1-E7F296FB6933','','','','','','','','','',0,0), -(26,0,'I.V.A. 21% y R.E. 5,2%',0.0000000000,21.0000000000,5.2000000000,'4720000021','4770000215','4770000521','631000000','','','','','2BC0765F-7739-49AE-A5F0-28B648B81677','','','','','','','','','',0,0), -(90,0,'IVA 21% importaciones',0.0000000000,21.0000000000,0.0000000000,'4722000021','','','','','','','','EB675F91-5FF2-4E26-A31E-EEB674125945','','','','','','','','','',0,0), -(91,0,'IVA 0% importaciones',0.0000000000,0.0000000000,0.0000000000,'4723000000','','','','','','','','5E5EFA56-2A99-4D54-A16B-5D818274CA18','','','','','','','','','',0,0), -(92,0,'8.5% comp. ganadera o pesquera',0.0000000000,8.5000000000,0.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0,0), -(93,0,'12% com. agrícola o forestal',0.0000000000,12.0000000000,0.0000000000,'4720000012','','','','','','','','267B1DDB-247F-4A71-AB95-3349FEFC5F92','','','','','','','','','',0,0), -(94,0,'10,5% com. ganadera o pesquera',0.0000000000,10.5000000000,0.0000000000,'4770000000','4720000000','631000000','477000000','','','','','','','','','','','','','','',0,0), -(108,0,'I.V.A. 8%',0.0000000000,8.0000000000,0.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0,0), -(109,0,'I.V.A. 8% y R.E. 1%',0.0000000000,8.0000000000,1.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0,0), -(110,0,'HP IVA Devengado Exento CEE',0.0000000000,0.0000000000,0.0000000000,'','4771000000','','','','','','','C605BC32-E161-42FD-83F3-3A66B1FBE399','','','','','','','','','',0,1), -(111,0,'H.P. Iva Devengado Exento Ser',0.0000000000,0.0000000000,0.0000000000,'','4771000001','','','','','','','F1AEC4DC-AFE5-498E-A713-2648FFB6DA32','','','','','','','','','',0,0), -(112,0,'H.P. IVA Devengado en exportac',0.0000000000,0.0000000000,0.0000000000,'','4770000002','','','','','','','F980AE74-BF75-4F4C-927F-0CCCE0DB8D15','','','','','','','','','',0,0), -(113,0,'HP DEVENGADO 21 ISP ',0.0000000000,21.0000000000,0.0000000000,'4720000006','4770000006','','','','','','','728D7A76-E936-438C-AF05-3CA38FE16EA5','','','','','','','','','',0,0), -(114,0,'HP.IVA NO DEDUCIBLE 10%',0.0000000000,0.0000000000,0.0000000000,'4720000026','','','','','','','','','','','','','','','','','',0,0), -(115,0,'H.P. IVA Soportado Impor 4% ',0.0000000000,4.0000000000,0.0000000000,'4722000004','','','','','','','','','','','','','','','','','',0,0); +INSERT INTO `TiposIva` VALUES (2,0,'Operaciones no sujetas',0.0000000000,0.0000000000,0.0000000000,'','4770000020','','','','','','','95B21A93-5910-489D-83BB-C32788C9B19D','','','','','','','','','',0,0),(4,0,'I.V.A. 4%',0.0000000000,4.0000000000,0.0000000000,'4720000004','4770000004','','6310000000','','','','','9E6160D5-984E-4643-ACBC-1EBC3BF73360','','','','','','','','','',0,0),(5,0,'I.V.A. 4% y R.E. 0.5%',0.0000000000,4.0000000000,0.5000000000,'','4770000504','4770000405','','','','','','DBEFA562-63FB-4FFC-8171-64F0C6F065FF','','','','','','','','','',0,0),(6,0,'H.P. IVA 4% CEE',0.0000000000,4.0000000000,0.0000000000,'4721000004','4771000004','','','','','','','DD0ECBA8-2EF5-425E-911B-623580BADA77','','','','','','','','','',0,1),(7,0,'H.P. IVA 10% CEE',0.0000000000,10.0000000000,0.0000000000,'4721000011','4771000010','','','','','','','593208CD-6F28-4489-B6EC-907AD689EAC9','','','','','','','','','',0,1),(8,0,'H.P. IVA 21% CEE',0.0000000000,21.0000000000,0.0000000000,'4721000021','4771000021','','','','','','','27061852-9BC1-4C4F-9B6E-69970E208F23','','','','','','','','','',0,1),(10,0,'I.V.A. 10% Nacional',0.0000000000,10.0000000000,0.0000000000,'4720000011','4770000010','','6290000553','','','','','828A9D6F-5C01-4C3A-918A-B2E4482830D3','','','','','','','','','',0,0),(11,0,'I.V.A. 10% y R.E. 1,4%',0.0000000000,10.0000000000,1.4000000000,'','4770000101','4770000110','','','','','','C1F2D910-83A1-4191-A76C-8B3D7AB98348','','','','','','','','','',0,0),(16,0,'I.V.A. Adqui. servicios CEE',0.0000000000,21.0000000000,0.0000000000,'4721000015','4771000016','','','','','','','E3EDE961-CE8F-41D4-9E6C-D8BCD32275A1','','','','','','','','','',0,1),(18,0,'H.P. Iva Importación 0% ISP',0.0000000000,0.0000000000,0.0000000000,'4720000005','4770000005','','','','','','','27AD4158-2349-49C2-B53A-A4E0EFAC5D09','','','','','','','','','',0,0),(20,0,'I.V.A 0% Nacional',0.0000000000,0.0000000000,0.0000000000,'4720000000','','','','','','','','B90B0FBD-E513-4F04-9721-C873504E08DF','','','','','','','','','',0,0),(21,0,'I.V.A. 21%',0.0000000000,21.0000000000,0.0000000000,'4720000021','4770000021','4770000000','','','','','','BA8C4E28-DCFA-4F7B-AE4F-CA044626B55E','','','','','','','','','',0,0),(22,0,'IVA 10% importaciones',0.0000000000,10.0000000000,0.0000000000,'4722000010','','','','','','','','540450A8-4B41-4607-96D1-E7F296FB6933','','','','','','','','','',0,0),(26,0,'I.V.A. 21% y R.E. 5,2%',0.0000000000,21.0000000000,5.2000000000,'4720000021','4770000215','4770000521','631000000','','','','','2BC0765F-7739-49AE-A5F0-28B648B81677','','','','','','','','','',0,0),(90,0,'IVA 21% importaciones',0.0000000000,21.0000000000,0.0000000000,'4722000021','','','','','','','','EB675F91-5FF2-4E26-A31E-EEB674125945','','','','','','','','','',0,0),(91,0,'IVA 0% importaciones',0.0000000000,0.0000000000,0.0000000000,'4723000000','','','','','','','','5E5EFA56-2A99-4D54-A16B-5D818274CA18','','','','','','','','','',0,0),(92,0,'8.5% comp. ganadera o pesquera',0.0000000000,8.5000000000,0.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0,0),(93,0,'12% com. agrícola o forestal',0.0000000000,12.0000000000,0.0000000000,'4720000012','','','','','','','','267B1DDB-247F-4A71-AB95-3349FEFC5F92','','','','','','','','','',0,0),(94,0,'10,5% com. ganadera o pesquera',0.0000000000,10.5000000000,0.0000000000,'4770000000','4720000000','631000000','477000000','','','','','','','','','','','','','','',0,0),(100,0,'HP IVA SOPORTADO 5%',0.0000000000,5.0000000000,0.0000000000,'4720000055','','','','','','','','3AD36CB2-4172-4CC9-9F87-2BF2B56AAC80','','','','','','','','','',0,0),(108,0,'I.V.A. 8%',0.0000000000,8.0000000000,0.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0,0),(109,0,'I.V.A. 8% y R.E. 1%',0.0000000000,8.0000000000,1.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0,0),(110,0,'HP IVA Devengado Exento CEE',0.0000000000,0.0000000000,0.0000000000,'','4771000000','','','','','','','C605BC32-E161-42FD-83F3-3A66B1FBE399','','','','','','','','','',0,1),(111,0,'H.P. Iva Devengado Exento Ser',0.0000000000,0.0000000000,0.0000000000,'','4771000001','','','','','','','F1AEC4DC-AFE5-498E-A713-2648FFB6DA32','','','','','','','','','',0,0),(112,0,'H.P. IVA Devengado en exportac',0.0000000000,0.0000000000,0.0000000000,'','4770000002','','','','','','','F980AE74-BF75-4F4C-927F-0CCCE0DB8D15','','','','','','','','','',0,0),(113,0,'HP DEVENGADO 21 ISP ',0.0000000000,21.0000000000,0.0000000000,'4720000006','4770000006','','','','','','','728D7A76-E936-438C-AF05-3CA38FE16EA5','','','','','','','','','',0,0),(114,0,'HP.IVA NO DEDUCIBLE 10%',0.0000000000,0.0000000000,0.0000000000,'4720000026','','','','','','','','','','','','','','','','','',0,0),(115,0,'H.P. IVA Soportado Impor 4% ',0.0000000000,4.0000000000,0.0000000000,'4722000004','','','','','','','','','','','','','','','','','',0,0); /*!40000 ALTER TABLE `TiposIva` ENABLE KEYS */; UNLOCK TABLES; @@ -14257,66 +814,7 @@ UNLOCK TABLES; LOCK TABLES `TiposTransacciones` WRITE; /*!40000 ALTER TABLE `TiposTransacciones` DISABLE KEYS */; -INSERT INTO `TiposTransacciones` VALUES -(1,'Rég.general/Oper.interiores bienes y serv.corrien.','',0,''), -(2,'Régimen especial de bienes usados','E',0,''), -(3,'Régimen especial de obj. de arte y antigüedades','E',0,''), -(4,'Régimen especial agencias de viaje','',0,''), -(5,'Régimen especial determinación proporcional','E',0,''), -(6,'Oper.en rég.simplificado art.37.1.2º Rgto.IVA','E',0,''), -(7,'Oper.en rég.simplificado art.37.1.1º Rgto.IVA','E',0,''), -(8,'Oper.en rég.de agricultura, ganadería y pesca','E',0,''), -(9,'Oper.en rég.especial de recargo de equivalencia','E',0,''), -(10,'Entregas intracomunitarias','E',0,''), -(11,'Entregas intermediarias intracomunitarias','E',0,''), -(12,'Operaciones sujetas con derecho a devolución','E',0,''), -(13,'Prest. Serv. No sujetas derecho devolución','E',0,''), -(14,'Exportaciones definitivas','E',0,''), -(15,'Envíos definitivos a Canarias, Ceuta y Melilla','E',0,''), -(16,'Devoluciones en régimen de viajeros','E',0,''), -(17,'Operaciones con áreas exentas','E',0,''), -(18,'Operaciones exentas con derecho a deducción','E',0,''), -(19,'Operaciones exentas sin derecho a deducción','E',0,''), -(20,'Adquisic.intracomunitarias de bienes y serv.corr.','',-1,'P'), -(21,'Adquisic.intracomunitarias de bienes de inversión','',-1,'P'), -(22,'Adquisic.intermediarias intracomunitarias','',-1,'P'), -(23,'Modif.autorizadas en quiebras y susp.de pagos','',0,''), -(24,'Entrega de bienes inmuebles no habituales','E',0,''), -(25,'Entrega de bienes de inversión','E',0,''), -(26,'Op.finan. y Entregas oro inversión, no habituales','E',0,''), -(27,'Inversión sujeto pasivo','',-1,'I'), -(28,'Prestaciones intracomunitarias de servicios','E',0,''), -(29,'Adquisiciones intracomunitarias de servicios','',-1,'I'), -(30,'Operaciones interiores de bienes de inversión','R',0,''), -(31,'Importaciones de bienes y servicios corrientes','R',0,''), -(32,'Importaciones de bienes de inversión','R',0,''), -(33,'Operaciones que generan inversión sujeto pasivo','E',0,''), -(35,'Compensaciones en rég.de agricultura, gan.y pesca','R',0,''), -(36,'Regularización de inversiones','R',0,''), -(37,'Operaciones exentas','R',0,''), -(38,'Operaciones no sujetas','',0,''), -(39,'Gastos devengados op interiores (País Vasco)','R',0,''), -(40,'Gastos Adq.intracom. bienes (País Vasco)','',-1,'P'), -(42,'Gastos Adq.intermediarias intracom. (País Vasco)','',-1,'P'), -(47,'Gastos Inversión sujeto pasivo (País Vasco)','',-1,'I'), -(49,'Gastos Adq. intracom. servicios (País Vasco)','',-1,'I'), -(51,'Gastos Importaciones (País Vasco)','R',0,''), -(53,'Adquisiciones a agencias de viajes en rég.especial','R',0,''), -(54,'Entregas intrac.posteriores a importaciones','E',0,''), -(55,'Entregas intrac.post.impor.con representante','E',0,''), -(56,'Import. bienes y serv. corrientes pdte. liquidar','R',0,''), -(57,'Import. bienes de inversión pdte. liquidar','R',0,''), -(58,'Servicios prestados por Internet desde España','E',0,''), -(59,'Servicios prestados por Internet fuera de España','E',0,''), -(60,'Régimen depósito distinto al aduanero','',0,''), -(61,'Adquisición de bienes de inversión con ISP','',-1,'I'), -(62,'Prest. Serv. Interiores clientes comunit./extranj.','',0,''), -(63,'Prest. Serv. Ex. con derecho a deducc. comu./extr.','E',0,''), -(64,'Prest. Serv. Ex. sin derecho a deducc. comu./extr.','E',0,''), -(65,'Entregas No sujetas derecho devolución','E',0,''), -(66,'Operaciones exentas art. 25 ley 19/1994 (Canarias)','',0,''), -(67,'Entrega de bienes exenta \"Zona Especial Canaria\"','',0,''), -(68,'Prestac. servicios exenta \"Zona Especial Canaria\"','',0,''); +INSERT INTO `TiposTransacciones` VALUES (1,'Rég.general/Oper.interiores bienes y serv.corrien.','',0,''),(2,'Régimen especial de bienes usados','E',0,''),(3,'Régimen especial de obj. de arte y antigüedades','E',0,''),(4,'Régimen especial agencias de viaje','',0,''),(5,'Régimen especial determinación proporcional','E',0,''),(6,'Oper.en rég.simplificado art.37.1.2º Rgto.IVA','E',0,''),(7,'Oper.en rég.simplificado art.37.1.1º Rgto.IVA','E',0,''),(8,'Oper.en rég.de agricultura, ganadería y pesca','E',0,''),(9,'Oper.en rég.especial de recargo de equivalencia','E',0,''),(10,'Entregas intracomunitarias','E',0,''),(11,'Entregas intermediarias intracomunitarias','E',0,''),(12,'Operaciones sujetas con derecho a devolución','E',0,''),(13,'Prest. Serv. No sujetas derecho devolución','E',0,''),(14,'Exportaciones definitivas','E',0,''),(15,'Envíos definitivos a Canarias, Ceuta y Melilla','E',0,''),(16,'Devoluciones en régimen de viajeros','E',0,''),(17,'Operaciones con áreas exentas','E',0,''),(18,'Operaciones exentas con derecho a deducción','E',0,''),(19,'Operaciones exentas sin derecho a deducción','E',0,''),(20,'Adquisic.intracomunitarias de bienes y serv.corr.','',-1,'P'),(21,'Adquisic.intracomunitarias de bienes de inversión','',-1,'P'),(22,'Adquisic.intermediarias intracomunitarias','',-1,'P'),(23,'Modif.autorizadas en quiebras y susp.de pagos','',0,''),(24,'Entrega de bienes inmuebles no habituales','E',0,''),(25,'Entrega de bienes de inversión','E',0,''),(26,'Op.finan. y Entregas oro inversión, no habituales','E',0,''),(27,'Inversión sujeto pasivo','',-1,'I'),(28,'Prestaciones intracomunitarias de servicios','E',0,''),(29,'Adquisiciones intracomunitarias de servicios','',-1,'I'),(30,'Operaciones interiores de bienes de inversión','R',0,''),(31,'Importaciones de bienes y servicios corrientes','R',0,''),(32,'Importaciones de bienes de inversión','R',0,''),(33,'Operaciones que generan inversión sujeto pasivo','E',0,''),(35,'Compensaciones en rég.de agricultura, gan.y pesca','R',0,''),(36,'Regularización de inversiones','R',0,''),(37,'Operaciones exentas','R',0,''),(38,'Operaciones no sujetas','',0,''),(39,'Gastos devengados op interiores (País Vasco)','R',0,''),(40,'Gastos Adq.intracom. bienes (País Vasco)','',-1,'P'),(42,'Gastos Adq.intermediarias intracom. (País Vasco)','',-1,'P'),(47,'Gastos Inversión sujeto pasivo (País Vasco)','',-1,'I'),(49,'Gastos Adq. intracom. servicios (País Vasco)','',-1,'I'),(51,'Gastos Importaciones (País Vasco)','R',0,''),(53,'Adquisiciones a agencias de viajes en rég.especial','R',0,''),(54,'Entregas intrac.posteriores a importaciones','E',0,''),(55,'Entregas intrac.post.impor.con representante','E',0,''),(56,'Import. bienes y serv. corrientes pdte. liquidar','R',0,''),(57,'Import. bienes de inversión pdte. liquidar','R',0,''),(58,'Servicios prestados por Internet desde España','E',0,''),(59,'Servicios prestados por Internet fuera de España','E',0,''),(60,'Régimen depósito distinto al aduanero','',0,''),(61,'Adquisición de bienes de inversión con ISP','',-1,'I'),(62,'Prest. Serv. Interiores clientes comunit./extranj.','',0,''),(63,'Prest. Serv. Ex. con derecho a deducc. comu./extr.','E',0,''),(64,'Prest. Serv. Ex. sin derecho a deducc. comu./extr.','E',0,''),(65,'Entregas No sujetas derecho devolución','E',0,''),(66,'Operaciones exentas art. 25 ley 19/1994 (Canarias)','',0,''),(67,'Entrega de bienes exenta \"Zona Especial Canaria\"','',0,''),(68,'Prestac. servicios exenta \"Zona Especial Canaria\"','',0,''); /*!40000 ALTER TABLE `TiposTransacciones` ENABLE KEYS */; UNLOCK TABLES; @@ -14326,12 +824,7 @@ UNLOCK TABLES; LOCK TABLES `TiposRetencion` WRITE; /*!40000 ALTER TABLE `TiposRetencion` DISABLE KEYS */; -INSERT INTO `TiposRetencion` VALUES -(1,'RETENCION ESTIMACION OBJETIVA',1.0000000000,'4730000000','4751000000',NULL,NULL,NULL,'03811652-0F3A-44A1-AE1C-B19624525D7F'), -(2,'ACTIVIDADES AGRICOLAS O GANADERAS',2.0000000000,'4730000000','4751000000',NULL,NULL,NULL,'F3F91EF3-FED6-444D-B03C-75B639D13FB4'), -(9,'ACTIVIDADES PROFESIONALES 2 PRIMEROS AÑOS',9.0000000000,'4730000000','4751000000',NULL,NULL,NULL,'73F95642-E951-4C91-970A-60C503A4792B'), -(15,'ACTIVIDADES PROFESIONALES',15.0000000000,'4730000000','4751000000','6',NULL,NULL,'F6BDE0EE-3B01-4023-8FFF-A73AE9AC50D7'), -(19,'ARRENDAMIENTO Y SUBARRENDAMIENTO',19.0000000000,'4730000000','4751000000','8',NULL,NULL,'09B033AE-16E5-4057-8D4A-A7710C8A4FB9'); +INSERT INTO `TiposRetencion` VALUES (1,'RETENCION ESTIMACION OBJETIVA',1.0000000000,'4730000000','4751000000',NULL,NULL,NULL,'03811652-0F3A-44A1-AE1C-B19624525D7F'),(2,'ACTIVIDADES AGRICOLAS O GANADERAS',2.0000000000,'4730000000','4751000000',NULL,NULL,NULL,'F3F91EF3-FED6-444D-B03C-75B639D13FB4'),(9,'ACTIVIDADES PROFESIONALES 2 PRIMEROS AÑOS',9.0000000000,'4730000000','4751000000',NULL,NULL,NULL,'73F95642-E951-4C91-970A-60C503A4792B'),(15,'ACTIVIDADES PROFESIONALES',15.0000000000,'4730000000','4751000000','6',NULL,NULL,'F6BDE0EE-3B01-4023-8FFF-A73AE9AC50D7'),(19,'ARRENDAMIENTO Y SUBARRENDAMIENTO',19.0000000000,'4730000000','4751000000','8',NULL,NULL,'09B033AE-16E5-4057-8D4A-A7710C8A4FB9'); /*!40000 ALTER TABLE `TiposRetencion` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -14343,4 +836,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-11-21 7:59:07 +-- Dump completed on 2023-02-03 14:47:12 diff --git a/db/dump/structure.sql b/db/dump/structure.sql index 4626279e4..9fb64264e 100644 --- a/db/dump/structure.sql +++ b/db/dump/structure.sql @@ -1,4 +1,4 @@ --- MariaDB dump 10.19 Distrib 10.9.4-MariaDB, for Linux (x86_64) +-- MariaDB dump 10.19 Distrib 10.5.18-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: db.verdnatura.es Database: account -- ------------------------------------------------------ @@ -19,7 +19,6 @@ -- Current Database: `account` -- - CREATE DATABASE /*!32312 IF NOT EXISTS*/ `account` /*!40100 DEFAULT CHARACTER SET utf8mb3 */; USE `account`; @@ -500,7 +499,7 @@ DELIMITER ;; FOR EACH ROW BEGIN CALL hedera.image_ref('user', NEW.image); - + INSERT IGNORE INTO userSync SET `name` = NEW.`name`; END */;; DELIMITER ; @@ -565,7 +564,7 @@ BEGIN 'jgallego@verdnatura.es', 'Rol modificado', CONCAT( - myUser_getName(), + myUser_getName(), ' ha modificado el rol del usuario ', NEW.`name`, ' de ', OLD.role, ' a ', NEW.role) ); @@ -681,7 +680,7 @@ BEGIN SET vSignature = util.hmacSha2(256, CONCAT_WS('/', @userId, @userName), vKey); RETURN vSignature = @userSignature; END IF; - + RETURN FALSE; END ;; @@ -710,7 +709,7 @@ BEGIN * @return The user id */ DECLARE vUser INT DEFAULT NULL; - + IF myUser_checkLogin() THEN SET vUser = @userId; @@ -718,7 +717,7 @@ BEGIN SELECT id INTO vUser FROM user WHERE name = LEFT(USER(), INSTR(USER(), '@') - 1); END IF; - + RETURN vUser; END ;; DELIMITER ; @@ -753,7 +752,7 @@ BEGIN ELSE SET vUser = LEFT(USER(), INSTR(USER(), '@') - 1); END IF; - + RETURN vUser; END ;; DELIMITER ; @@ -825,52 +824,52 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -915,23 +914,23 @@ DELIMITER ; DELIMITER ;; 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, 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; +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 */ ; @@ -950,20 +949,20 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -1034,7 +1033,7 @@ BEGIN JOIN role r ON r.id = rr.inheritsFrom WHERE u.`name` = vUser AND r.id = vRoleId; - + RETURN vHasRole; END ;; DELIMITER ; @@ -1093,7 +1092,7 @@ BEGIN AND password = MD5(vPassword) AND active; - IF vAuthIsOk + IF vAuthIsOk THEN CALL myUser_loginWithName (vUserName); ELSE @@ -1154,7 +1153,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `myUser_loginWithName`(vUserName VAR BEGIN /** * Logs in using only the user name. This procedure is intended to be executed - * by users with a high level of privileges so that normal users should not have + * by users with a high level of privileges so that normal users should not have * execute permissions on it. * * @param vUserName The user name @@ -1190,7 +1189,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `myUser_logout`() BEGIN /** * Logouts the user. - */ + */ SET @userId = NULL; SET @userName = NULL; SET @userSignature = NULL; @@ -1313,9 +1312,9 @@ BEGIN SELECT COUNT(*) > 0 INTO vIsRoot FROM tmp.role t - JOIN role r ON r.id = t.id + JOIN role r ON r.id = t.id WHERE r.`name` = 'root'; - + IF vIsRoot THEN INSERT IGNORE INTO tmp.role (id) SELECT id FROM role; @@ -1998,7 +1997,7 @@ BEGIN SELECT `password` = MD5(vOldPassword), `name` INTO vPasswordOk, vUserName FROM user WHERE id = vSelf; - + IF NOT vPasswordOk THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'Invalid password'; @@ -2072,7 +2071,7 @@ BEGIN IF vChr REGEXP '[[:alpha:]]' THEN SET vNAlpha = vNAlpha+1; - + IF vChr REGEXP '[A-Z]' THEN SET vNUpper = vNUpper+1; @@ -2132,7 +2131,7 @@ BEGIN SELECT verificationToken = vVerificationToken, `name` INTO vTokenVerified, vUserName FROM user WHERE id = vSelf; - + IF NOT vTokenVerified THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'Invalid verification token'; @@ -2559,7 +2558,7 @@ BEGIN IF NOT (NEW.`schema`REGEXP '^[0-9a-zA-Z_]+$') OR NOT (NEW.`procedure`REGEXP '^[0-9a-zA-Z_]+$') THEN CALL util.throw('ONLY_ALPHANUMERICS_ALLOWED'); - + END IF; END */;; @@ -2585,7 +2584,7 @@ BEGIN IF NOT (NEW.`schema`REGEXP '^[0-9a-zA-Z_]+$') OR NOT (NEW.`procedure`REGEXP '^[0-9a-zA-Z_]+$') THEN CALL util.throw('ONLY_ALPHANUMERICS_ALLOWED'); - + END IF; END */;; @@ -2801,13 +2800,13 @@ CREATE TABLE `salesByclientSalesPerson` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `salesMonthlySnapshot` +-- Table structure for table `salesMonthlySnapshot___` -- -DROP TABLE IF EXISTS `salesMonthlySnapshot`; +DROP TABLE IF EXISTS `salesMonthlySnapshot___`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `salesMonthlySnapshot` ( +CREATE TABLE `salesMonthlySnapshot___` ( `id` int(11) NOT NULL AUTO_INCREMENT, `salesPersonName` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT '', `teamName` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL, @@ -2822,32 +2821,7 @@ CREATE TABLE `salesMonthlySnapshot` ( `newClientScore` decimal(10,3) DEFAULT NULL, `teamBossPlus` decimal(10,3) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `salesPerson` --- - -DROP TABLE IF EXISTS `salesPerson`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -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=utf8mb3 COLLATE=utf8mb3_unicode_ci; +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='@deprecated 2022-11'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2871,43 +2845,45 @@ CREATE TABLE `salesPersonEvolution` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Temporary table structure for view `vendedores` +-- Table structure for table `salesPerson__` -- -DROP TABLE IF EXISTS `vendedores`; -/*!50001 DROP VIEW IF EXISTS `vendedores`*/; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -/*!50001 CREATE VIEW `vendedores` AS SELECT - 1 AS `Id_Trabajador`, - 1 AS `año`, - 1 AS `mes`, - 1 AS `importe`, - 1 AS `comision`, - 1 AS `comisionArrendada`, - 1 AS `comisionCedida`, - 1 AS `comisionNuevos`, - 1 AS `sustitucionArrendada`, - 1 AS `itemTypeBorrowed`, - 1 AS `portfolioWeight`, - 1 AS `updated` */; -SET character_set_client = @saved_cs_client; - --- --- Table structure for table `vendedores_evolution` --- - -DROP TABLE IF EXISTS `vendedores_evolution`; +DROP TABLE IF EXISTS `salesPerson__`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `vendedores_evolution` ( +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=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='@deprecated 2022-11'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `vendedores_evolution__` +-- + +DROP TABLE IF EXISTS `vendedores_evolution__`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `vendedores_evolution__` ( `workerFk` int(10) unsigned NOT NULL, `year` int(11) NOT NULL, `sales` decimal(10,2) DEFAULT NULL, `month` int(11) NOT NULL, PRIMARY KEY (`workerFk`,`year`,`month`), CONSTRAINT `evo_vendedor_trabajador` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='@deprecated 2022-11'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -3077,11 +3053,11 @@ BEGIN DECLARE vTramo VARCHAR(20); DECLARE vHour INT; - + SET vHour = HOUR(vDateTime) ; - + SET vTramo = - CASE + CASE WHEN vHour BETWEEN 0 AND 14 THEN 'Mañana' WHEN vHour BETWEEN 15 AND 24 THEN 'Tarde' END ; @@ -3109,7 +3085,7 @@ BEGIN * Inserta en la tabla bancos_evolution los saldos acumulados de cada banco * * @param vStartingDate Fecha desde la cual se recalculan la tabla bs.bancos_evolution - */ + */ DECLARE vCurrentDate DATE; DECLARE vMaxDate DATE DEFAULT TIMESTAMPADD(MONTH, 7, util.VN_CURDATE()); IF IFNULL(vStartingDate,0) < TIMESTAMPADD(YEAR, -5, util.VN_CURDATE()) THEN @@ -3123,49 +3099,49 @@ BEGIN SELECT vCurrentDate, Id_Banco, deuda FROM bs.bancos_evolution WHERE Fecha = TIMESTAMPADD(DAY,-1,vCurrentDate); - + WHILE vCurrentDate < vMaxDate DO -- insertar solo el dia de ayer INSERT INTO bs.bancos_evolution(Fecha ,Id_Banco, saldo) - SELECT vCurrentDate, Id_Banco, SUM(saldo) + SELECT vCurrentDate, Id_Banco, SUM(saldo) FROM ( SELECT Id_Banco ,saldo FROM bs.bancos_evolution WHERE Fecha = TIMESTAMPADD(DAY,-1,vCurrentDate) -- los saldos acumulados del dia anterior UNION ALL - + SELECT c.Id_Banco, IFNULL(SUM(Entrada),0) - IFNULL(SUM(Salida),0) as saldo FROM vn2008.Cajas c JOIN vn2008.Bancos b using(Id_Banco) -- saldos de las cajas - JOIN vn.accountingType at2 ON at2.id = b.cash + JOIN vn.accountingType at2 ON at2.id = b.cash WHERE at2.code IN ('wireTransfer','fundingLine') AND Cajafecha = vCurrentDate AND (Serie = 'MB' OR at2.code = 'fundingLine') GROUP BY Id_Banco - )sub + )sub GROUP BY Id_Banco ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo); - + SET vCurrentDate = TIMESTAMPADD(DAY,1,vCurrentDate); END WHILE; - -- Ahora actualizamos la quilla + -- Ahora actualizamos la quilla UPDATE bs.bancos_evolution be JOIN ( SELECT bp.Id_Banco, - sum(bp.importe) as quilla, t.dated - FROM vn.time t + FROM vn.time t JOIN vn2008.Bancos_poliza bp ON t.dated between apertura AND IFNULL(cierre, t.dated) WHERE t.dated BETWEEN vStartingDate AND vMaxDate GROUP BY Id_Banco, t.dated ) sub ON be.Id_Banco = sub.Id_Banco AND sub.dated = be.Fecha - SET be.quilla = sub.quilla; + SET be.quilla = sub.quilla; -- pagos futuros no concilidados INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo) SELECT t.dated, p.id_banco, - importe - FROM vn.time t + FROM vn.time t join vn2008.pago p ON p.fecha <= t.dated WHERE t.dated BETWEEN util.VN_CURDATE() AND vMaxDate AND p.fecha BETWEEN util.VN_CURDATE() AND vMaxDate @@ -3175,7 +3151,7 @@ BEGIN -- cobros futuros INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo) SELECT t.dated, r.Id_Banco, SUM(Entregado) - FROM vn.time t + FROM vn.time t JOIN vn2008.Recibos r ON r.Fechacobro <= t.dated WHERE r.Fechacobro > util.VN_CURDATE() AND r.Fechacobro <= vMaxDate AND t.dated BETWEEN util.VN_CURDATE() AND vMaxDate @@ -3185,10 +3161,10 @@ BEGIN -- saldos de la tabla prevision INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo) SELECT t.dated, sp.Id_Banco, SUM(Importe) - FROM vn.time t + FROM vn.time t JOIN vn2008.Saldos_Prevision sp ON sp.Fecha <= t.dated JOIN vn2008.Bancos b ON sp.Id_Banco = b.Id_Banco - JOIN vn.accountingType at2 ON at2.id = b.cash + JOIN vn.accountingType at2 ON at2.id = b.cash WHERE at2.code IN ('wireTransfer','fundingLine') AND t.dated BETWEEN vStartingDate AND vMaxDate GROUP BY t.dated, sp.Id_Banco @@ -3202,12 +3178,12 @@ BEGIN -- Deuda UPDATE bs.bancos_evolution be JOIN vn2008.Bancos b using(Id_Banco) - JOIN vn.accountingType at2 ON at2.id = b.cash + JOIN vn.accountingType at2 ON at2.id = b.cash SET be.deuda = IF(at2.code = 'fundingLine', be.saldo_aux, 0) , be.saldo = IF(at2.code = 'fundingLine', 0, be.saldo_aux) WHERE Fecha >= vStartingDate; - -- Liquidez + -- Liquidez update bs.bancos_evolution set liquidez = saldo - quilla + deuda WHERE Fecha >= vStartingDate; -- Disponibilidad update bs.bancos_evolution set `disponibilidad ajena` = - quilla + deuda WHERE Fecha >= vStartingDate; @@ -3230,14 +3206,14 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `campaignComparative`(vDateFrom DATE, vDateTo DATE) BEGIN - SELECT - workerName, - id, - name, - CAST(SUM(previousAmmount) AS DECIMAL(10, 0)) AS previousAmmount, - CAST(SUM(currentAmmount) AS DECIMAL(10, 0)) AS currentAmmount + SELECT + workerName, + id, + name, + CAST(SUM(previousAmmount) AS DECIMAL(10, 0)) AS previousAmmount, + CAST(SUM(currentAmmount) AS DECIMAL(10, 0)) AS currentAmmount FROM ( - (SELECT + (SELECT CONCAT(w.firstname, ' ', w.lastName) AS workerName, c.id, c.name, @@ -3246,11 +3222,11 @@ BEGIN FROM bs.ventas v INNER JOIN vn.`client` c ON v.Id_Cliente = c.id INNER JOIN vn.worker w ON c.salesPersonFk = w.id - WHERE v.fecha BETWEEN DATE_ADD(vDateFrom, INTERVAL - 1 YEAR) + WHERE v.fecha BETWEEN DATE_ADD(vDateFrom, INTERVAL - 1 YEAR) AND DATE_ADD(vDateTo, INTERVAL - 1 YEAR) GROUP BY w.id, v.Id_Cliente) UNION ALL - (SELECT + (SELECT CONCAT(w.firstname, ' ', w.lastName) AS workerName, c.id, c.name, @@ -3284,21 +3260,21 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `carteras_add`() -BEGIN -/** - * Inserta en @bs.carteras. - */ - DELETE FROM bs.carteras - WHERE Año >= YEAR(util.VN_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(util.VN_CURDATE()) - 1 - GROUP BY w.code, t.year , t.month; +BEGIN +/** + * Inserta en @bs.carteras. + */ + DELETE FROM bs.carteras + WHERE Año >= YEAR(util.VN_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(util.VN_CURDATE()) - 1 + GROUP BY w.code, t.year , t.month; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -3330,24 +3306,24 @@ BEGIN DELETE FROM bs.clientNewBorn WHERE lastShipped < vOneYearAgo; - + DELETE FROM ventas WHERE fecha < vFourYearsAgo; - + DELETE FROM payMethodClient WHERE dated < vOneYearAgo; DELETE FROM payMethodClientEvolution WHERE dated < vFourYearsAgo; - DELETE FROM bs.salesByclientSalesPerson + DELETE FROM bs.salesByclientSalesPerson WHERE dated < vFourYearsAgo; - - DELETE FROM bs.m3 + + DELETE FROM bs.m3 WHERE fecha < vTwoYearAgo; DELETE FROM salesByItemTypeDay - WHERE dated < vThreeYearAgo; + WHERE dated < vThreeYearAgo; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -3415,16 +3391,16 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `clientNewBorn_recalc`() BLOCK1: BEGIN DECLARE vClientFk INT; - DECLARE vShipped DATE; + 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; + 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; DELETE FROM bs.clientNewBorn WHERE isModified = FALSE; @@ -3436,7 +3412,7 @@ BLOCK1: BEGIN WHERE t.shipped BETWEEN TIMESTAMPADD(YEAR, -1, util.VN_CURDATE()) AND util.VN_CURDATE() AND cb.isModified is null GROUP BY c.id; OPEN cur; - + LOOP1: LOOP SET vDone := FALSE; FETCH cur INTO vClientFk, vShipped; @@ -3447,37 +3423,37 @@ BLOCK1: BEGIN END IF; BLOCK2: BEGIN - DECLARE vCurrentShipped DATE; - DECLARE vDone2 boolean; + DECLARE vCurrentShipped DATE; + DECLARE vDone2 boolean; DECLARE cur2 CURSOR FOR - SELECT shipped - FROM vn.ticket + SELECT shipped + FROM vn.ticket WHERE clientFk = vClientFk AND shipped <= util.VN_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 + UPDATE bs.clientNewBorn + SET firstShipped = vPreviousShipped WHERE clientFk= vClientFk; - + CLOSE cur2; - LEAVE LOOP2; + LEAVE LOOP2; END IF; - + SET vPreviousShipped := vCurrentShipped; IF vDone2 THEN - UPDATE bs.clientNewBorn - SET firstShipped = vCurrentShipped + UPDATE bs.clientNewBorn + SET firstShipped = vCurrentShipped WHERE clientFk= vClientFk; CLOSE cur2; LEAVE LOOP2; @@ -3487,14 +3463,14 @@ BLOCK1: BEGIN END BLOCK2; END LOOP LOOP1; - UPDATE bs.clientNewBorn cnb + UPDATE bs.clientNewBorn cnb LEFT JOIN (SELECT DISTINCT t.clientFk FROM vn.ticket t JOIN vn.productionConfig pc WHERE t.shipped BETWEEN util.VN_CURDATE() + INTERVAL -(`notBuyingMonths`) MONTH AND util.VN_CURDATE() + INTERVAL -(`pc`.`rookieDays`) DAY) notRookie ON notRookie.clientFk = cnb.clientFk - SET cnd.isRookie = ISNULL(notRookie.clientFk); - + SET cnd.isRookie = ISNULL(notRookie.clientFk); + END BLOCK1 ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -3515,16 +3491,16 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `comercialesCompleto`(IN vWorker INT BEGIN DECLARE vAYearAgoStarted DATE DEFAULT DATE_FORMAT(TIMESTAMPADD(YEAR, - 1, vDate), '%Y-%m-01'); DECLARE vAYearAgoEnded DATE DEFAULT TIMESTAMPADD(YEAR, - 1, LAST_DAY(vDate)); - + CALL vn.worker_GetHierarchy(vWorker); - + INSERT IGNORE INTO tmp.workerHierarchyList (workerFk) SELECT wd2.workerFk FROM vn.workerDepartment wd2 WHERE wd2.workerFk = vWorker; - + -- Falta que en algunos casos solo tenga en cuenta los tipos afectados. - SELECT + SELECT c.Id_Cliente id_cliente, c.calidad, c.Cliente cliente, @@ -3550,7 +3526,7 @@ BEGIN FROM vn2008.Clientes c LEFT JOIN - (SELECT g.Id_Cliente, CAST( SUM(Importe) as DECIMAL(12,2)) AS Greuge + (SELECT g.Id_Cliente, CAST( SUM(Importe) as DECIMAL(12,2)) AS Greuge FROM vn2008.Greuges g JOIN vn.`client` c ON c.id = g.Id_Cliente LEFT JOIN vn.worker w ON c.salesPersonFk = w.id @@ -3572,14 +3548,14 @@ BEGIN WHERE v.fecha BETWEEN TIMESTAMPADD(YEAR, - 1, vDate) AND vDate GROUP BY v.Id_Cliente) c365 ON c365.Id_Cliente = c.Id_Cliente LEFT JOIN - (SELECT + (SELECT Id_Cliente, SUM(importe) consumo FROM bs.ventas v INNER JOIN vn2008.Clientes c USING (Id_Cliente) LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador WHERE - (c.Id_Trabajador = vWorker OR tr.boss = vWorker) + (c.Id_Trabajador = vWorker OR tr.boss = vWorker) AND (v.fecha BETWEEN TIMESTAMPADD(DAY, - DAY(vDate) + 1, vDate) AND TIMESTAMPADD(DAY, - 1, vDate)) GROUP BY Id_Cliente) mes_actual ON mes_actual.Id_Cliente = c.Id_Cliente LEFT JOIN @@ -3640,17 +3616,17 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `compradores_add`(IN vYear INT, IN v BEGIN /** * Sustituye los registros de "bs.compradores". - * + * * @param vYear: año ventas * @param vWeekFrom: semana desde * @param vWeekTo: semana hasta */ REPLACE bs.compradores - SELECT it.workerFk AS Id_Trabajador, vYear AS año, tm.week AS semana, SUM(importe) AS importe, 0 AS comision + SELECT it.workerFk AS Id_Trabajador, vYear AS año, tm.week AS semana, SUM(importe) AS importe, 0 AS comision FROM bs.ventas v JOIN vn.time tm ON tm.dated = v.fecha - JOIN vn.itemType it ON it.id = v.tipo_id - WHERE tm.year = vYear + JOIN vn.itemType it ON it.id = v.tipo_id + WHERE tm.year = vYear AND tm.week BETWEEN vWeekFrom AND vWeekTo AND it.categoryFk != 6 GROUP BY it.workerFk, tm.week; @@ -3676,22 +3652,22 @@ BEGIN DECLARE vYear INT; DECLARE vWeek INT; DECLARE done BOOL DEFAULT FALSE; - + DECLARE rs CURSOR FOR SELECT year, week FROM vn.time - WHERE dated <= util.VN_CURDATE() - AND year = vYear + WHERE dated <= util.VN_CURDATE() + AND year = vYear AND week >= vWeek; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; - - SELECT MAX(año) INTO vYear + + SELECT MAX(año) INTO vYear FROM compradores; - + SELECT MAX(semana) INTO vWeek - FROM compradores - WHERE año = vYear; + FROM compradores + WHERE año = vYear; OPEN rs; @@ -3700,7 +3676,7 @@ BEGIN WHILE NOT done DO CALL compradores_add(vYear, vWeek, vWeek); - + FETCH rs INTO vYear, vWeek; END WHILE; @@ -3708,7 +3684,7 @@ BEGIN CLOSE rs; CALL compradores_evolution_add; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -3740,10 +3716,10 @@ DECLARE i INT DEFAULT 1; SELECT TIMESTAMPADD(DAY,1,MAX(fecha)) INTO datFEC FROM bs.compradores_evolution; IF ISNULL(datFEC) THEN - - SELECT min(fecha) INTO datFEC + + SELECT min(fecha) INTO datFEC FROM bs.ventas; - + INSERT INTO bs.compradores_evolution( Id_Trabajador , fecha , importe) @@ -3752,19 +3728,19 @@ SELECT TIMESTAMPADD(DAY,1,MAX(fecha)) INTO datFEC FROM bs.compradores_evolution; JOIN vn2008.Tipos tp using(tipo_id) WHERE fecha = datFEC GROUP BY Id_Trabajador; - + SET datFEC = TIMESTAMPADD(DAY, 1, datFEC); - + END IF; WHILE datFEC < util.VN_CURDATE() DO - - IF i mod 150 = 0 THEN + + IF i mod 150 = 0 THEN SELECT datFEC; END IF; - + SET i = i + 1; - + REPLACE bs.compradores_evolution( Id_Trabajador , fecha , importe) @@ -3772,7 +3748,7 @@ SELECT TIMESTAMPADD(DAY,1,MAX(fecha)) INTO datFEC FROM bs.compradores_evolution; SELECT Id_Trabajador , datFEC as fecha , sum(importe) as importe - + FROM ( @@ -3780,17 +3756,17 @@ SELECT TIMESTAMPADD(DAY,1,MAX(fecha)) INTO datFEC FROM bs.compradores_evolution; , importe FROM bs.compradores_evolution WHERE fecha = TIMESTAMPADD(DAY,-1,datFEC) -- las ventas acumuladas del dia anterior - + UNION ALL - + SELECT Id_Trabajador , importe * IF(v.fecha < datFEC,-1,1) -- se restan las ventas del año anterior y se suman las del actual FROM bs.ventas v JOIN vn2008.Tipos tp using(tipo_id) WHERE fecha IN (datFEC, TIMESTAMPADD(DAY,-365,datFEC)) AND reino_id != 6 - - )sub + + )sub GROUP BY Id_Trabajador; SET datFEC = TIMESTAMPADD(DAY,1,datFEC); @@ -3820,49 +3796,49 @@ BEGIN * Inserta en la tabla fondo_maniobra los saldos acumulados en los ultimos 365 dias */ DECLARE datFEC DATE DEFAULT '2015-01-01'; - - SELECT TIMESTAMPADD(DAY,1,MAX(fecha)) - INTO datFEC + + SELECT TIMESTAMPADD(DAY,1,MAX(fecha)) + INTO datFEC FROM bs.fondo_maniobra; - + WHILE datFEC < util.VN_CURDATE() DO - + IF DAY(datFEC) MOD 28 = 0 THEN -- esto solo sirve para no aburrirse mientras esperamos... SELECT datFEC; END IF; - + REPLACE bs.fondo_maniobra(Fecha, clientes_facturas, clientes_cobros,proveedores_facturas,proveedores_pagos, fondo) SELECT datFEC AS Fecha, Facturas, Cobros,Recibidas,Pagos, Facturas + Cobros + Recibidas + Pagos FROM ( SELECT SUM(io.amount) AS Facturas FROM vn.invoiceOut io - JOIN vn.client c ON io.clientFk = c.id + JOIN vn.client c ON io.clientFk = c.id WHERE c.isRelevant - AND io.companyFk <> 1381 + AND io.companyFk <> 1381 AND io.issued BETWEEN '2011-01-01' AND datFEC ) fac JOIN ( SELECT - SUM(r.amountPaid) AS Cobros - FROM vn.receipt r - JOIN vn.client c ON r.clientFk = c.id - WHERE c.isRelevant + FROM vn.receipt r + JOIN vn.client c ON r.clientFk = c.id + WHERE c.isRelevant AND r.companyFk <> 1381 AND r.payed BETWEEN '2011-01-01' AND datFEC ) cob JOIN ( SELECT - SUM(id.amount) AS Recibidas - FROM vn.invoiceIn ii - JOIN vn.invoiceInDueDay id ON ii.id = id.invoiceInFk + FROM vn.invoiceIn ii + JOIN vn.invoiceInDueDay id ON ii.id = id.invoiceInFk WHERE ii.companyFk <> 1381 AND ii.issued BETWEEN '2015-01-01' AND datFEC ) rec JOIN ( SELECT SUM(p.amount) AS Pagos - FROM vn.payment p - WHERE p.companyFk <>1381 + FROM vn.payment p + WHERE p.companyFk <>1381 AND p.received BETWEEN '2015-01-01' AND datFEC ) pag; - + UPDATE bs.fondo_maniobra JOIN ( SELECT AVG(fondo) AS media @@ -3870,7 +3846,7 @@ BEGIN WHERE fecha <= datFEC ) sub SET fondo_medio = media WHERE fecha = datFEC; - + SET datFEC = TIMESTAMPADD(DAY,1,datFEC); END WHILE; @@ -3894,7 +3870,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `fruitsEvolution`() BEGIN -select Id_Cliente, +select Id_Cliente, Cliente, count(semana) as semanas, (w.code IS NOT NULL) isWorker from ( select distinct v.Id_Cliente, c.name as Cliente, week(fecha, 3) as semana @@ -3935,40 +3911,40 @@ BEGIN -- Ventas totales del ultimo año UPDATE indicators - SET lastYearSales = + SET lastYearSales = (SELECT SUM(importe + recargo) FROM ventas v JOIN vn2008.empresa e ON e.id = v.empresa_id JOIN vn2008.empresa_grupo eg ON eg.empresa_grupo_id = e.empresa_grupo WHERE fecha BETWEEN oneYearBefore AND vDated AND eg.grupo = 'Verdnatura' - ) + ) WHERE updated = vDated; - + -- Greuge total acumulado UPDATE indicators - SET totalGreuge = + SET totalGreuge = (SELECT SUM(amount) FROM vn.greuge WHERE shipped <= vDated - ) + ) WHERE updated = vDated; -- Tasa de morosidad con respecto a las ventas del último mes UPDATE indicators - SET latePaymentRate = - (SELECT SUM(amount) - FROM bi.defaulters + SET latePaymentRate = + (SELECT SUM(amount) + FROM bi.defaulters WHERE date = vDated AND amount > 0) / - (SELECT SUM(importe + recargo) - FROM ventas + (SELECT SUM(importe + recargo) + FROM ventas WHERE fecha BETWEEN oneMonthBefore AND vDated) WHERE updated = vDated; -- Número de trabajadores activos UPDATE indicators - SET countEmployee = + SET countEmployee = (SELECT CAST(SUM(cl.hours_week) / 40 AS DECIMAL (10, 2)) FROM vn.business b JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = b.calendarTypeFk @@ -3987,7 +3963,7 @@ BEGIN -- Número de clientes que han comprado en los últimos 30 dias UPDATE indicators - SET lastMonthActiveClients = + SET lastMonthActiveClients = (SELECT COUNT(DISTINCT t.clientFk) FROM vn.ticket t WHERE t.shipped BETWEEN oneMonthBefore AND vDated @@ -3996,9 +3972,9 @@ BEGIN -- Número de clientes que no han comprado en los últimos 30 dias, pero compraron en los 30 anteriores UPDATE indicators - SET lastMonthLostClients = + SET lastMonthLostClients = (SELECT COUNT(lm.clientFk) - FROM + FROM (SELECT DISTINCT t.clientFk FROM vn.ticket t WHERE t.shipped BETWEEN oneMonthBefore AND vDated @@ -4015,9 +3991,9 @@ BEGIN -- Número de clientes que han comprado en los últimos 30 dias, pero no compraron en los 30 anteriores UPDATE indicators - SET lastMonthNewClients = + SET lastMonthNewClients = (SELECT COUNT(cm.clientFk) - FROM + FROM (SELECT DISTINCT t.clientFk FROM vn.ticket t WHERE t.shipped BETWEEN oneMonthBefore AND vDated @@ -4043,7 +4019,7 @@ BEGIN -- Cálculo de las ventas agrupado por semanas SELECT week INTO vWeek - FROM vn.time + FROM vn.time WHERE dated = vDated; TRUNCATE salesByWeek; @@ -4057,12 +4033,12 @@ BEGIN -- Indicador Ventas semana actual UPDATE indicators i - JOIN salesByWeek s ON s.week= vWeek + JOIN salesByWeek s ON s.week= vWeek AND s.year = YEAR(vDated) SET i.thisWeekSales = s.sales WHERE updated = vDated; - -- Indicador ventas semana actual en el año pasado + -- Indicador ventas semana actual en el año pasado UPDATE indicators i JOIN salesByWeek s ON s.week = vWeek AND s.year = YEAR(vDated)-1 @@ -4093,15 +4069,15 @@ BEGIN SELECT IFNULL(TIMESTAMPADD(DAY,1,MAX(updated)), '2018-04-01') INTO vDated FROM bs.indicators; - + WHILE vDated < util.VN_CURDATE() DO - + CALL indicatorsUpdate(vDated); - + SELECT TIMESTAMPADD(DAY,1,MAX(updated)) INTO vDated FROM bs.indicators; - + END WHILE; END ;; @@ -4126,30 +4102,30 @@ BEGIN TRUNCATE bs.inspeccionSS_2021; INSERT INTO bs.inspeccionSS_2021 - SELECT wbd.businessFk , - w.id, - w.firstName, - w.lastName, - d.name , - wtc.timed , - cl.hours_week , - t.`year` , - t.week , + SELECT wbd.businessFk , + w.id, + w.firstName, + w.lastName, + d.name , + wtc.timed , + cl.hours_week , + t.`year` , + t.week , t.dated , 0 AS orden FROM vn.workerTimeControl wtc JOIN vn.worker w ON w.id = wtc.userFk - JOIN vn.workerBusinessDated wbd ON wbd.workerFk = wtc.userFk + JOIN vn.workerBusinessDated wbd ON wbd.workerFk = wtc.userFk AND wbd.dated = date(wtc.timed) JOIN vn.time t ON t.dated = wbd.dated - JOIN vn.business b ON b.id = wbd.businessFk - JOIN postgresql.calendar_labour_type AS cl ON b.calendarTypeFk = cl.calendar_labour_type_id - JOIN vn.department d ON d.id = b.departmentFk + JOIN vn.business b ON b.id = wbd.businessFk + JOIN postgresql.calendar_labour_type AS cl ON b.calendarTypeFk = cl.calendar_labour_type_id + JOIN vn.department d ON d.id = b.departmentFk JOIN vn.department d2 ON d2.id = d.parentFk AND d2.name = 'PRODUCCION' WHERE wtc.timed BETWEEN '2020-10-01' AND '2021-04-19' AND d.lft BETWEEN d2.lft AND d2.rgt AND lastName NOT LIKE 'FERRER%'; - + SET @orden := 1; SET @id := 0; SET @day := 0; @@ -4158,7 +4134,7 @@ BEGIN SET orden = IF(id = @id AND day(timed) = @day, @orden := @orden + 1, @orden := 1), id = @id := id + (0 * @day := day(timed)) ORDER BY id, timed; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -4180,15 +4156,15 @@ BEGIN DECLARE datSTART DATE; DECLARE datEND DATE; - + SELECT TIMESTAMPADD(WEEK, -1,MAX(fecha)) INTO datSTART FROM bs.m3; - + SET datEND = TIMESTAMPADD(DAY,-1,util.VN_CURDATE()); - - DELETE FROM bs.m3 + + DELETE FROM bs.m3 WHERE fecha >= datSTART; - + INSERT INTO bs.m3 (fecha, provinceFk, warehouseFk, m3, year, month, week, day, dayName, euros) SELECT v.fecha, a.provinceFk, t.warehouseFk, sum(s.quantity * ic.cm3delivery) / 1000000 AS m3, tm.year, tm.month, tm.week, tm.day, dayname(v.fecha), sum(importe) @@ -4231,51 +4207,51 @@ BEGIN DECLARE vManaBankId INT; DECLARE vManaGreugeTypeId INT; - SELECT id INTO vManaId + SELECT id INTO vManaId FROM vn.component WHERE code = 'mana'; - - SELECT id INTO vManaAutoId + + SELECT id INTO vManaAutoId FROM vn.component WHERE code = 'autoMana'; - + SELECT id INTO vClaimManaId FROM vn.component WHERE code = 'manaClaim'; - - SELECT id INTO vManaBankId + + SELECT id INTO vManaBankId FROM vn.bank WHERE code = 'mana'; - - SELECT id INTO vManaGreugeTypeId + + SELECT id INTO vManaGreugeTypeId FROM vn.greugeType WHERE code = 'mana'; SELECT IFNULL(MAX(dated), '2016-01-01') - INTO vFromDated + INTO vFromDated FROM vn.clientManaCache; - + DELETE FROM vn.clientManaCache WHERE dated = vFromDated; SELECT IFNULL(MAX(dated), '2016-01-01') - INTO vFromDated + INTO vFromDated FROM vn.clientManaCache; WHILE timestampadd(DAY,30,vFromDated) < util.VN_CURDATE() DO SELECT timestampadd(DAY,30,vFromDated), - timestampadd(DAY,-90,vFromDated) - INTO + timestampadd(DAY,-90,vFromDated) + INTO vToDated, vForDeleteDated; - + DELETE FROM vn.clientManaCache WHERE dated <= vForDeleteDated; INSERT INTO vn.clientManaCache(clientFk, mana, dated) - SELECT + SELECT Id_Cliente, cast(sum(mana) as decimal(10,2)) as mana, - vToDated as dated - FROM + vToDated as dated + FROM ( SELECT cs.Id_Cliente, Cantidad * Valor as mana FROM vn2008.Tickets t @@ -4283,20 +4259,20 @@ BEGIN JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento WHERE Id_Componente IN (vManaAutoId, vManaId, vClaimManaId) - AND t.Fecha > vFromDated + AND t.Fecha > vFromDated AND date(t.Fecha) <= vToDated UNION ALL SELECT r.Id_Cliente, - Entregado FROM vn2008.Recibos r WHERE Id_Banco = vManaBankId - AND Fechacobro > vFromDated + AND Fechacobro > vFromDated AND Fechacobro <= vToDated - + UNION ALL SELECT g.Id_Cliente, g.Importe FROM vn2008.Greuges g WHERE Greuges_type_id = vManaGreugeTypeId - AND Fecha > vFromDated + AND Fecha > vFromDated AND Fecha <= vToDated UNION ALL SELECT clientFk, mana @@ -4307,7 +4283,7 @@ BEGIN HAVING Id_Cliente; SET vFromDated = vToDated; - + END WHILE; END ;; @@ -4328,19 +4304,21 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `manaSpellers_actualize`() BEGIN -/** - * Recalcula el valor del campo con el modificador de precio para el componente de maná automático. +/** + * Recalcula el valor del campo con el modificador de precio + * para el componente de maná automático. */ - UPDATE vn.workerMana wm - JOIN - (SELECT Id_Trabajador workerFk, FLOOR(SUM(importe)/12) pesoCarteraMensual - FROM bs.vendedores - WHERE año * 100 + mes >= (YEAR(util.VN_CURDATE()) -1) * 100 + MONTH(util.VN_CURDATE()) - GROUP BY workerFk - ) lastYearSales USING(workerFk) - SET pricesModifierRate = GREATEST(minRate, LEAST(maxRate, ROUND(- amount/lastYearSales.pesoCarteraMensual,3))); - + JOIN( + SELECT sb.salespersonFk, FLOOR(SUM(sb.amount) / 12) monthlyAmount + FROM salesByclientSalesPerson sb + JOIN vn.time t ON t.dated = sb.dated + WHERE t.year * 100 + t.month >= + (YEAR(util.VN_CURDATE()) - 1) * 100 + MONTH(util.VN_CURDATE()) + GROUP BY salespersonFk + ) lastYearSales ON wm.workerFk = lastYearSales.salespersonFk + SET pricesModifierRate = GREATEST(minRate, + LEAST(maxRate, ROUND( - amount / lastYearSales.monthlyAmount, 3))); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -4372,8 +4350,8 @@ BEGIN DECLARE vId INT; DECLARE rs CURSOR FOR - SELECT id, `schema`, `procedure` - FROM nightTask + SELECT id, `schema`, `procedure` + FROM nightTask WHERE finished <= util.VN_CURDATE() OR finished IS NULL ORDER BY `order`; @@ -4406,7 +4384,7 @@ BEGIN vError, vErrorCode ); - + IF vError IS NOT NULL THEN SET vNErrors = vNErrors + 1; @@ -4476,7 +4454,7 @@ BEGIN vError = MESSAGE_TEXT, vErrorCode = RETURNED_SQLSTATE; - CALL util.exec(CONCAT('CALL `', vSchema ,'`.`', vProcedure ,'`')); + CALL util.exec(CONCAT('CALL `', vSchema ,'`.`', vProcedure ,'`')); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -4495,22 +4473,22 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `payMethodClientAdd`() BEGIN - INSERT IGNORE INTO `bs`.`payMethodClient` (dated, payMethodFk, clientFk) + INSERT IGNORE INTO `bs`.`payMethodClient` (dated, payMethodFk, clientFk) SELECT util.VN_CURDATE(), c.payMethodFk, c.id - FROM vn.client c + FROM vn.client c JOIN vn.payMethod p ON c.payMethodFk = p.id; - + TRUNCATE `bs`.`payMethodClientEvolution` ; - + INSERT INTO `bs`.`payMethodClientEvolution` (dated, payMethodName, amountClient, amount, equalizationTax) - SELECT p.dated, pm.name, COUNT(p.clientFk), SUM(sub.importe) , SUM(sub.recargo) + SELECT p.dated, pm.name, COUNT(p.clientFk), SUM(sub.importe) , SUM(sub.recargo) FROM bs.payMethodClient p - JOIN (SELECT SUM(v.importe) AS importe, SUM(v.recargo) as recargo, v.fecha, v.Id_cliente + JOIN (SELECT SUM(v.importe) AS importe, SUM(v.recargo) as recargo, v.fecha, v.Id_cliente FROM bs.ventas v WHERE v.fecha>= (SELECT MIN(dated) FROM bs. payMethodClient) GROUP BY v.Id_cliente, v.fecha) sub ON sub.fecha = p.dated AND sub.Id_cliente = p.ClientFk JOIN vn.payMethod pm ON p.payMethodFk = pm.id - GROUP BY dated,payMethodFk; + GROUP BY dated,payMethodFk; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -4530,12 +4508,12 @@ DELIMITER ;; 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 - + DECLARE vFromDateLastYear DATE; DECLARE vToDateLastYear DATE; DECLARE vFromDateTwoYearsAgo DATE; DECLARE vToDateTwoYearsAgo DATE; - + SET vItemFk = IFNULL(vItemFk,0); SET vTypeFk = IFNULL(vTypeFk, 0); SET vCategoryFk = IFNULL(vCategoryFk,0); @@ -4550,19 +4528,19 @@ BEGIN SELECT s.quantity, CAST(v.importe AS DECIMAL(10,0)) importe, v.fecha FROM bs.ventas v - JOIN vn.sale s ON s.id = v.Id_Movimiento - 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.sale s ON s.id = v.Id_Movimiento + 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 vItemFk IN (i.id, 0) AND vTypeFk IN (i.typeFk, 0) AND vCategoryFk IN (it.categoryFk, 0) AND vProducerFk IN (i.producerFk, 0) AND (v.fecha BETWEEN vFromDate AND vToDate OR v.fecha BETWEEN vFromDateLastYear AND vToDateLastYear - OR v.fecha BETWEEN vFromDateTwoYearsAgo AND vToDateTwoYearsAgo + OR v.fecha BETWEEN vFromDateTwoYearsAgo AND vToDateTwoYearsAgo ); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -4581,21 +4559,21 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `salePersonEvolutionAdd`(IN vDateStart DATETIME) BEGIN - DELETE FROM bs.salePersonEvolution + DELETE FROM bs.salePersonEvolution WHERE dated <= DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR); - - + + INSERT INTO bs.salePersonEvolution (dated, amount, equalizationTax, salesPersonFk) - SELECT fecha dated, - CAST(SUM(importe) AS DECIMAL(10,2) ) amount, + SELECT fecha dated, + CAST(SUM(importe) AS DECIMAL(10,2) ) amount, CAST(SUM(recargo) AS DECIMAL(10,2) ) equalizationTax , IFNULL(salesPersonFk,0) salesPersonFk FROM bs.ventas v - JOIN vn.client c ON v.Id_Cliente = c.id + JOIN vn.client c ON v.Id_Cliente = c.id JOIN vn.company co ON co.id = v.empresa_id WHERE co.code = "VNL" AND fecha >= vDateStart GROUP BY v.fecha,c.salesPersonFk - ORDER BY salesPersonFk,dated ASC; + ORDER BY salesPersonFk,dated ASC; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -4617,7 +4595,7 @@ BEGIN /** * Agrupa las ventas por cliente/comercial/fecha en la tabla bs.salesByclientSalesPerson * El asociación cliente/comercial/fecha, se mantiene correcta en el tiempo - * + * * @param vDatedFrom el cálculo se realizará desde la fecha introducida hasta ayer */ @@ -4625,17 +4603,17 @@ BEGIN SET vDatedFrom = util.VN_CURDATE() - INTERVAL 1 MONTH; END IF; - UPDATE salesByclientSalesPerson + UPDATE salesByclientSalesPerson SET amount = 0, equalizationTax = 0, amountNewBorn = 0 WHERE dated BETWEEN vDatedFrom AND util.yesterday(); - - INSERT INTO salesByclientSalesPerson( - dated, - salesPersonFk, - clientFk, - amount, + + INSERT INTO salesByclientSalesPerson( + dated, + salesPersonFk, + clientFk, + amount, equalizationTax) SELECT s.dated, c.salesPersonFk, @@ -4644,7 +4622,7 @@ BEGIN SUM(s.surcharge) FROM sale s JOIN vn.client c on s.clientFk = c.id - WHERE s.dated BETWEEN vDatedFrom AND util.yesterday() + WHERE s.dated BETWEEN vDatedFrom AND util.yesterday() GROUP BY s.dated, c.salesPersonFk, s.clientFk ON DUPLICATE KEY UPDATE amount= VALUES(amount), equalizationTax= VALUES(equalizationTax); @@ -4676,163 +4654,163 @@ BEGIN /** * Almacena datos relativos a las ventas de artículos agrupados por reino y familia * - * @param vDateStart - * @param vDateEnd + * @param vDateStart + * @param vDateEnd */ - - DELETE FROM bs.salesByItemTypeDay + + DELETE FROM bs.salesByItemTypeDay WHERE dated BETWEEN vDateStart AND vDateEnd; - + INSERT INTO bs.salesByItemTypeDay (itemTypeFk, itemCategoryFk, dated) - SELECT id, categoryFk, dated + SELECT id, categoryFk, dated FROM vn.itemType JOIN vn.`time` WHERE dated BETWEEN vDateStart AND vDateEnd; - + UPDATE bs.salesByItemTypeDay it - JOIN (SELECT ic.id itemCategoryFk, + JOIN (SELECT ic.id itemCategoryFk, it.id itemTypeFk, bs.dated, SUM(bs.amount) netSale FROM bs.sale bs JOIN vn.itemType it ON it.id = bs.typeFk - JOIN vn .itemCategory ic ON ic.id = it.categoryFk + JOIN vn .itemCategory ic ON ic.id = it.categoryFk JOIN vn.client c on c.id = bs.clientFk JOIN vn.sale s ON s.id = bs.saleFk - JOIN vn.item i ON i.id = s.itemFk - JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.ticket t ON t.id = s.ticketFk JOIN vn.`time` ti ON ti.dated = bs.dated - WHERE ic.merchandise + WHERE ic.merchandise AND bs.dated BETWEEN vDateStart AND vDateEnd GROUP BY ic.id, it.id, bs.dated) sub ON sub.dated = it.dated AND sub.itemCategoryFk = it.itemCategoryFk AND sub.itemTypeFk = it.itemTypeFk SET it.netSale = sub.netSale; - - + + UPDATE bs.salesByItemTypeDay it - JOIN (SELECT ic.id AS itemCategoryFk, + JOIN (SELECT ic.id AS itemCategoryFk, it.id AS itemTypeFk, bs.dated, SUM(i.stems * s.quantity) stems FROM bs.sale bs JOIN vn.itemType it ON it.id = bs.typeFk - JOIN vn.itemCategory ic ON ic.id = it.categoryFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk JOIN vn.sale s ON s.id = bs.saleFk - JOIN vn.ticket t ON t.id = s.ticketFk - JOIN vn.item i ON i.id = s.itemFk + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.item i ON i.id = s.itemFk JOIN vn.`time` tm ON tm.dated = bs.dated - WHERE ic.merchandise + WHERE ic.merchandise AND bs.dated BETWEEN vDateStart AND vDateEnd - GROUP BY ic.id, it.id, bs.dated) sub ON sub.dated = it.dated AND sub.itemCategoryFk = it.itemCategoryFk AND sub.itemTypeFk = it.itemTypeFk + GROUP BY ic.id, it.id, bs.dated) sub ON sub.dated = it.dated AND sub.itemCategoryFk = it.itemCategoryFk AND sub.itemTypeFk = it.itemTypeFk SET it.stems = sub.stems; - - + + UPDATE bs.salesByItemTypeDay it - JOIN (SELECT ic.id AS itemCategoryFk, + JOIN (SELECT ic.id AS itemCategoryFk, it.id AS itemTypeFk, DATE(t.shipped) dated, COUNT(DISTINCT(i.id)) `references` FROM vn.ticket t - 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 - WHERE ic.merchandise + 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 + WHERE ic.merchandise AND t.shipped BETWEEN vDateStart AND util.dayEnd(vDateEnd) GROUP BY ic.id, it.id, dated) sub ON sub.dated = it.dated AND sub.itemCategoryFk = it.itemCategoryFk AND sub.itemTypeFk = it.itemTypeFk SET it.`references` = sub.`references`; - + UPDATE bs.salesByItemTypeDay it - JOIN (SELECT ic.id AS itemCategoryFk, + JOIN (SELECT ic.id AS itemCategoryFk, it.id AS itemTypeFk, DATE(t.shipped) dated, SUM(i.stems*s.quantity) AS trash FROM vn.sale s - JOIN vn.ticket t ON t.id = s.ticketFk - 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.client c ON c.id = t.clientFk - WHERE c.name = 'BASURA' + JOIN vn.ticket t ON t.id = s.ticketFk + 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.client c ON c.id = t.clientFk + WHERE c.name = 'BASURA' AND t.shipped BETWEEN vDateStart AND util.dayEnd(vDateEnd) GROUP BY ic.id, it.id, dated) sub ON sub.dated = it.dated AND sub.itemCategoryFk = it.itemCategoryFk AND sub.itemTypeFk = it.itemTypeFk - SET it.trash = sub.trash; - + SET it.trash = sub.trash; + UPDATE bs.salesByItemTypeDay it - JOIN (SELECT ic.id AS itemCategoryFk, + JOIN (SELECT ic.id AS itemCategoryFk, it.id AS itemTypeFk, DATE(t.shipped) dated, SUM(IFNULL(i.stems, 1) * s.quantity) AS faults FROM vn.sale s - JOIN vn.ticket t ON t.id = s.ticketFk - 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.client c ON c.id = t.clientFk - WHERE c.name = 'FALTAS' + JOIN vn.ticket t ON t.id = s.ticketFk + 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.client c ON c.id = t.clientFk + WHERE c.name = 'FALTAS' AND t.shipped BETWEEN vDateStart AND util.dayEnd(vDateEnd) GROUP BY ic.id, it.id, dated) sub ON sub.dated = it.dated AND sub.itemCategoryFk = it.itemCategoryFk AND sub.itemTypeFk = it.itemTypeFk - SET it.`faults` = sub.`faults`; - + SET it.`faults` = sub.`faults`; + UPDATE bs.salesByItemTypeDay it - JOIN (SELECT ic.id AS itemCategoryFk, + JOIN (SELECT ic.id AS itemCategoryFk, it.id AS itemTypeFk, DATE(t.shipped) dated, - SUM((cb.quantity * s.price * (100 - s.discount) / 100) * ((cc.maxResponsibility - c.responsibility )/4 )) accepted, + SUM((cb.quantity * s.price * (100 - s.discount) / 100) * ((cc.maxResponsibility - c.responsibility )/4 )) accepted, SUM(cb.quantity * s.price * (100 - s.discount) / 100) claimed FROM vn.claim c JOIN vn.claimBeginning cb ON cb.claimFk = c.id JOIN vn.sale s ON s.id = cb.saleFk JOIN vn.ticket t ON t.id = s.ticketFk 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.itemType it ON it.id = i.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk JOIN vn.claimConfig cc - WHERE ic.merchandise + WHERE ic.merchandise AND t.shipped BETWEEN vDateStart AND util.dayEnd(vDateEnd) GROUP BY ic.id, it.id, dated) sub ON sub.dated = it.dated AND sub.itemCategoryFk = it.itemCategoryFk AND sub.itemTypeFk = it.itemTypeFk SET it.accepted = sub.accepted, it.claimed = sub.claimed; - + UPDATE bs.salesByItemTypeDay it - JOIN(SELECT itemCategoryFk, - itemTypeFk, - dated, - CAST(SUM(sale) AS DECIMAL(10,2)) sale, + JOIN(SELECT itemCategoryFk, + itemTypeFk, + dated, + CAST(SUM(sale) AS DECIMAL(10,2)) sale, CAST(SUM(buy) AS DECIMAL(10,2))buy - FROM(SELECT ic.id itemCategoryFk, + FROM(SELECT ic.id itemCategoryFk, it.id itemTypeFk, bs.dated, SUM(bs.amount) sale, 0 buy FROM bs.sale bs JOIN vn.itemType it ON it.id = bs.typeFk - JOIN vn.itemCategory ic ON ic.id = it.categoryFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk JOIN vn.client c on c.id = bs.clientFk JOIN vn.`time` tm ON tm.dated = bs.dated JOIN vn.sale s ON s.id = bs.saleFk - JOIN vn.item i ON i.id = s.itemFk - WHERE ic.merchandise + JOIN vn.item i ON i.id = s.itemFk + WHERE ic.merchandise AND bs.dated BETWEEN vDateStart AND vDateEnd GROUP BY ic.id, it.id, bs.dated - UNION ALL - SELECT ic.id, + UNION ALL + SELECT ic.id, it.id, t.landed, 0 , SUM(b.buyingValue * b.quantity) - FROM vn.entry e - JOIN vn.travel t ON t.id = e.travelFk - JOIN vn.buy b ON b.entryFk = e.id - 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 + FROM vn.entry e + JOIN vn.travel t ON t.id = e.travelFk + JOIN vn.buy b ON b.entryFk = e.id + 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 WHERE ic.merchandise AND t.landed BETWEEN vDateStart AND vDateEnd - GROUP BY ic.id, it.id, t.landed) sub + GROUP BY ic.id, it.id, t.landed) sub GROUP BY itemCategoryFk, itemTypeFk, dated) sub2 ON sub2.dated = it.dated AND sub2.itemCategoryFk = it.itemCategoryFk AND sub2.itemTypeFk = it.itemTypeFk SET it.sale = sub2.sale, it.buy = sub2.buy; - + DROP TEMPORARY TABLE IF EXISTS tmp.`component`; CREATE TEMPORARY TABLE tmp.`component` (PRIMARY KEY (`itemTypeFk`,`dated`), @@ -4840,18 +4818,18 @@ BEGIN KEY `salesByItemTypeDay_dated_idx` (`dated`)) ENGINE = MEMORY SELECT DATE(t.shipped) dated, - ic.id itemCategoryFk, + ic.id itemCategoryFk, it.id itemTypeFk, SUM(s.quantity * IF(c.code = 'purchaseValue', sc.value,0)) costComponent, SUM(s.quantity * IF(ct.isMargin, sc.value,0)) marginComponent FROM vn.ticket t - JOIN vn.sale s ON t.id = s.ticketFk - 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.saleComponent sc ON sc.saleFk = s.id - STRAIGHT_JOIN vn.component c ON c.id = sc.componentFk - JOIN vn.componentType ct ON ct.id = c.typeFk + JOIN vn.sale s ON t.id = s.ticketFk + 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.saleComponent sc ON sc.saleFk = s.id + STRAIGHT_JOIN vn.component c ON c.id = sc.componentFk + JOIN vn.componentType ct ON ct.id = c.typeFk WHERE t.shipped BETWEEN vDateStart AND util.dayEnd(vDateEnd) GROUP BY ic.id, it.id, dated; @@ -4860,23 +4838,23 @@ BEGIN SET it.costComponent = c.costComponent, it.marginComponent = c.marginComponent, it.saleComponent = c.costComponent + c.marginComponent; - - DROP TEMPORARY TABLE tmp.`component`; - + + DROP TEMPORARY TABLE tmp.`component`; + /* UPDATE bs.salesByItemTypeDay it JOIN(SELECT DATE(t.shipped) dated, - ic.id itemCategoryFk, + ic.id itemCategoryFk, it.id itemTypeFk, SUM(s.quantity * IF(c.code = 'purchaseValue', sc.value,0)) costComponent, SUM(s.quantity * IF(ct.isMargin, sc.value,0)) marginComponent FROM vn.ticket t - JOIN vn.sale s ON t.id = s.ticketFk - 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.saleComponent sc ON sc.saleFk = s.id - STRAIGHT_JOIN vn.component c ON c.id = sc.componentFk - JOIN vn.componentType ct ON ct.id = c.typeFk + JOIN vn.sale s ON t.id = s.ticketFk + 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.saleComponent sc ON sc.saleFk = s.id + STRAIGHT_JOIN vn.component c ON c.id = sc.componentFk + JOIN vn.componentType ct ON ct.id = c.typeFk JOIN vn.`time` tm ON tm.dated = DATE(t.shipped) WHERE t.shipped BETWEEN vDateStart AND util.dayEnd(vDateEnd) GROUP BY ic.id, it.id, dated)sub ON sub.dated = it.dated AND sub.itemCategoryFk = it.itemCategoryFk AND sub.itemTypeFk = it.itemTypeFk @@ -4913,220 +4891,6 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `salesMonthlySnapshot_add` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `salesMonthlySnapshot_add`() -BEGIN - DECLARE vExecutionDay INT; - DECLARE vPlusNewClient INT; - DECLARE vPlusDifference INT; - DECLARE vScoreNewClient INT; - DECLARE vScoreDifference INT; - DECLARE vMaxWorkersWithPlusNewClient INT; - DECLARE vRowCount INT DEFAULT 1; - DECLARE vMaxRow INT; - DECLARE vPreviusMonth DATETIME DEFAULT util.VN_CURDATE(); - - SELECT executionDay, maxPlusNewClient, plusDifference, maxScoreNewClient, scoreDifference, salesPersonWithPlusNewClient - INTO vExecutionDay, vPlusNewClient, vPlusDifference, vScoreNewClient, vScoreDifference, vMaxWorkersWithPlusNewClient - FROM vn.commissionConfig; - - IF(DAY(util.VN_CURDATE()) = vExecutionDay) THEN - -- COMERCIAL Y EQUIPO - DROP TEMPORARY TABLE IF EXISTS tmp.salesPersons; - CREATE TEMPORARY TABLE tmp.salesPersons - ENGINE = MEMORY - SELECT u.id workerFk, - u.name salesPersonName, - d.name teamName - FROM vn.department d - JOIN vn.workerDepartment wd ON wd.departmentFk = d.id - JOIN account.user u ON u.id = wd.workerFk - JOIN vn.department d2 ON d2.id = d.parentFk - WHERE d2.code = 'VT'; - - -- VENTA, COMISIÓN - DROP TEMPORARY TABLE IF EXISTS tmp.sale; - CREATE TEMPORARY TABLE tmp.sale - ENGINE = MEMORY - SELECT YEAR(s.dated) year, - MONTH(s.dated) month, - u.name, - SUM(s.amount) currentSale, - SUM(s.amount)*cc.rate commissionSale, - s.salesPersonFk workerFk, - cc.minimumSalesByQuarter/3 minimumSalesByMonth - FROM - bs.salesByclientSalesPerson s - JOIN vn.client c ON c.id = s.salesPersonFk - JOIN account.user u ON u.id = s.salesPersonFk - JOIN vn.commissionConfig cc - WHERE dated BETWEEN util.firstDayOfMonth(vPreviusMonth) AND LAST_DAY(vPreviusMonth) - GROUP BY year, month, workerFk; - - -- OBJETIVO EVALUABLE (GRUPO) Y OBJETIVO INCENTIVO (INDIVIDUAL) - DROP TEMPORARY TABLE IF EXISTS tmp.objectives; - CREATE TEMPORARY TABLE tmp.objectives - ENGINE = MEMORY - SELECT - sg.rank, - sg.goal goalGroup, - sg4.goal goalIncentive, - sub.walletWeigth, - sub.walletWeigth*sg4.goal/100 AS incentiveObjective, - sub.walletWeigth*sg.goal/100 AS evaluableObjective, - sub.workerFk, - rb.bonus - FROM ( - SELECT sg.`rank` , - u.id workerFk, - IFNULL(v.portfolioWeight,0) AS walletWeigth - FROM bs.vendedores v - JOIN account.`user` u ON u.id = v.Id_Trabajador - JOIN vn.saleGoal sg ON sg.`year` = YEAR(vPreviusMonth) - AND sg.`month` = MONTH(vPreviusMonth) - AND v.portfolioWeight BETWEEN sg.walletWeightFrom AND sg.walletWeightTo - WHERE v.año = YEAR(vPreviusMonth)-1 AND v.mes = MONTH(vPreviusMonth) - GROUP BY u.id - ) sub - JOIN vn.saleGoal sg ON sg.`rank` = sub.rank AND sg.goalType = '1' AND sg.`year` = YEAR(vPreviusMonth) AND sg.`month` = MONTH(vPreviusMonth) - JOIN vn.saleGoal sg4 ON sg4.`rank` = sub.rank AND sg4.goalType = '4' AND sg4.`year` = YEAR(vPreviusMonth) AND sg4.`month` = MONTH(vPreviusMonth) - LEFT JOIN account.`user` u2 ON u2.id = sub.workerFk - JOIN vn.rankBonus rb ON rb.`rank` = sub.`rank`; - - -- PUNTUACIÓN EQUIPO, PLUS OBJETIVO EQUIPO - DROP TEMPORARY TABLE IF EXISTS tmp.scoreTeam; - CREATE TEMPORARY TABLE tmp.scoreTeam - ENGINE = MEMORY - SELECT *, - IF(sub1.teamScore >= sub1.minScoreForPlusTeam, sub1.plusTeamValue, 0) teamPlus - FROM ( - SELECT *, - (100/sub.countSalesPerson)*countGroupAchieved teamScore - FROM ( - SELECT COUNT(u.id) countSalesPerson, - u.id workerFk, - u.name salesPersonName, - d3.workerFk bossFk, - d.name teamName, - cc.minScoreForPlusTeam, - cc.minScoreForPlusBoss, - cc.plusTeam plusTeamValue, - cc.plusBoss, - SUM(IF(s.currentSale > r.evaluableObjective, 1, 0)) countGroupAchieved - FROM vn.department d - JOIN vn.workerDepartment wd ON wd.departmentFk = d.id - JOIN account.user u ON u.id = wd.workerFk - JOIN tmp.sale s ON s.workerFk = wd.workerFk - JOIN tmp.objectives r ON r.workerFk = wd.workerFk - JOIN vn.commissionConfig cc - JOIN vn.department d2 ON d2.id = d.parentFk - JOIN vn.department d3 ON d3.name = d.name - WHERE d2.code = 'VT' - GROUP BY d.name - ) sub - ) sub1; - - -- PLUS VARIABLE JEFE DE EQUIPO - DROP TEMPORARY TABLE IF EXISTS tmp.plusBoss; - CREATE TEMPORARY TABLE tmp.plusBoss - ENGINE = MEMORY - SELECT d.workerFk, - IF(st.teamScore >= st.minScoreForPlusBoss , st.countSalesPerson * st.plusBoss, 0) teamBossPlus - FROM tmp.scoreTeam st - JOIN vn.department d ON d.name = st.teamName; - - -- PLUS CLIENTES NUEVOS - DROP TEMPORARY TABLE IF EXISTS tmp.newClients; - CREATE TEMPORARY TABLE tmp.newClients ( - id INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY, - workerFk INTEGER(11), - name VARCHAR(30), - total DECIMAL(10,3), - newClientPlus INTEGER(11), - newClientScore INTEGER(11) - ); - - INSERT INTO tmp.newClients (workerFk, total, name, newClientPlus) - SELECT u.id workerFk, u.name, SUM(v.importe) total, vPlusNewClient - FROM bs.clientNewBorn cn - JOIN bs.ventas v ON DATE_ADD(cn.firstShipped, INTERVAL 1 YEAR) > v.fecha AND v.Id_Cliente = cn.clientFk - JOIN vn.client c ON c.id = v.Id_Cliente - JOIN account.user u ON u.id = c.salesPersonFk - JOIN vn.workerDepartment wd ON wd.workerFk = u.id - JOIN vn.department d On d.id = wd.departmentFk - JOIN vn.department d2 ON d2.id = d.parentFk - WHERE v.fecha >= util.firstDayOfMonth(vPreviusMonth) - AND cn.firstShipped >= util.firstDayOfMonth(DATE_ADD(vPreviusMonth, INTERVAL -1 year)) - AND d2.code = 'VT' - GROUP BY u.id - ORDER BY total DESC; - - SET vMaxRow = ROW_COUNT(); - - my_loop: LOOP - UPDATE tmp.newClients SET newClientPlus = vPlusNewClient WHERE id = vRowCount; - UPDATE tmp.newClients SET newClientScore = vScoreNewClient WHERE id = vRowCount; - - IF (vRowCount <= vMaxWorkersWithPlusNewClient) THEN - SET vPlusNewClient = vPlusNewClient - vPlusDifference; - ELSE - SET vPlusNewClient = 0; - END IF; - - SET vScoreNewClient = vScoreNewClient - vScoreDifference; - SET vRowCount = vRowCount + 1; - - IF vRowCount > vMaxRow THEN - LEAVE my_loop; - END IF; - END LOOP my_loop; - - INSERT INTO bs.salesMonthlySnapshot (salesPersonName, teamName, `year`, `month`, currentSale, commissionSale, individualPlus, teamPlus, teamScore, newClientPlus, newClientScore, teamBossPlus) - SELECT * - FROM ( - SELECT sp.salesPersonName, - sp.teamName, - s.`year`, - s.`month`, - s.currentSale, - s.commissionSale, - IF(s.currentSale > s.minimumSalesByMonth AND s.currentSale > r.incentiveObjective, r.bonus, 0) individualPlus, - np.teamPlus, - np.teamScore, - nc.newClientPlus, - nc.newClientScore, - pb.teamBossPlus - FROM tmp.salesPersons sp - LEFT JOIN tmp.sale s ON s.workerFk = sp.workerFk - LEFT JOIN tmp.objectives r ON r.workerFk = sp.workerFk - LEFT JOIN tmp.scoreTeam np ON np.teamName = sp.teamName - LEFT JOIN tmp.plusBoss pb ON pb.workerFk = sp.workerFk - LEFT JOIN tmp.newClients nc ON nc.workerFk = sp.workerFk - ) sub - ORDER BY salesPersonName; - - DROP TEMPORARY TABLE - tmp.salesPersons, - tmp.sale, - tmp.objectives, - tmp.scoreTeam, - tmp.newClients; - END IF; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `salesPersonEvolution_add` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -5137,165 +4901,66 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `salesPersonEvolution_add`() BEGIN +/** + * Calcula los datos para los gráficos de evolución agrupado por salesPersonFk y día. + * Recalcula automáticamente los 3 últimos meses para comprobar si hay algún cambio. + */ DECLARE vDated DATE; DECLARE vCont INT DEFAULT 1; - SELECT TIMESTAMPADD(DAY,1,MAX(dated)) INTO vDated - FROM bs.salesPersonEvolution; + SELECT MAX(dated) - INTERVAL 3 MONTH INTO vDated + FROM salesPersonEvolution; + + DELETE FROM salesPersonEvolution + WHERE dated >= vDated; IF ISNULL(vDated) THEN - - SELECT MIN(dated) INTO vDated + SELECT MIN(dated) INTO vDated FROM salesByclientSalesPerson; - - INSERT INTO bs.salesPersonEvolution( salesPersonFk, dated, amount, equalizationTax, amountNewBorn ) - SELECT salesPersonFk, dated, amount, equalizationTax, amountNewBorn - FROM salesByclientSalesPerson + + INSERT INTO salesPersonEvolution( + salesPersonFk, + dated, + amount, + equalizationTax, + amountNewBorn + ) + SELECT salesPersonFk, + dated, + amount, + equalizationTax, + amountNewBorn + FROM salesByclientSalesPerson WHERE dated = vDated GROUP BY salesPersonFk; - SET vDated = TIMESTAMPADD(DAY, 1, vDated); + SET vDated = vDated + INTERVAL 1 DAY; END IF; WHILE vDated < util.VN_CURDATE() DO - - SET vCont = vCont + 1; - - REPLACE bs.salesPersonEvolution( salesPersonFk, dated, amount) - SELECT salesPersonFk, vDated, SUM(amount) - FROM(SELECT salesPersonFk, amount - FROM salesPersonEvolution - WHERE dated = TIMESTAMPADD(DAY,-1,vDated) -- amount acumulado día anterior - UNION ALL - SELECT salesPersonFk, amount * IF(dated < vDated,-1,1) -- suma amount año actual/ resta amount año anterior - FROM salesByclientSalesPerson - WHERE dated IN (vDated, TIMESTAMPADD(DAY,-365,vDated)) + + SET vCont = vCont + 1; + REPLACE salesPersonEvolution(salesPersonFk, dated, amount) + SELECT salesPersonFk, vDated, amount + FROM(SELECT salesPersonFk, SUM(amount) amount + FROM(SELECT salesPersonFk, amount + FROM salesPersonEvolution + WHERE dated = vDated - INTERVAL 1 DAY + UNION ALL + SELECT salesPersonFk, amount + FROM salesByclientSalesPerson + WHERE dated = vDated + UNION ALL + SELECT salesPersonFk, - amount + FROM salesByclientSalesPerson + WHERE dated = vDated - INTERVAL 1 YEAR + )sub + GROUP BY salesPersonFk )sub GROUP BY salesPersonFk; - SET vDated = TIMESTAMPADD(DAY,1,vDated); - + SET vDated = vDated + INTERVAL 1 DAY; END WHILE; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -/*!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 */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; -DELIMITER ;; -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(util.VN_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 util.VN_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 util.VN_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 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!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 */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `vendedores_add`(intYEAR INT, vQuarter INT) -BEGIN - - DECLARE vCommissionRate DOUBLE; - - SELECT rate - INTO vCommissionRate - FROM vn.commissionConfig; - - -- vaciar tabla - DELETE v.* FROM vendedores v - JOIN vn.`time` t ON t.`year` = v.año AND t.`month` = v.mes - WHERE t.`year` = intYEAR AND QUARTER(t.dated) = vQuarter; - - REPLACE vendedores(Id_Trabajador, año, mes, importe, comision, portfolioWeight) - SELECT c.Id_Trabajador - , intYEAR - , MONTH(v.fecha) intMONTH - , sum(v.importe) - , sum(v.importe) * vCommissionRate - , sum(v.importe) - FROM ventas v - JOIN vn2008.Clientes c on v.Id_Cliente = c.Id_Cliente - JOIN vn.`time` t on t.dated = v.fecha - WHERE c.Id_Trabajador is not null - AND t.`year` = intYEAR AND QUARTER(t.dated) = vQuarter - GROUP BY c.Id_Trabajador, t.`month`; - - -- Sustitucion cedidas - lended - INSERT INTO vendedores (Id_Trabajador, mes, año, importe, comision) - SELECT c.salesPersonFk - , t.`month` - , t.`year` - , - sum(importe) - , - sum(importe) * vCommissionRate as lended - FROM ventas v - JOIN vn.client c ON c.id = v.Id_Cliente - JOIN vn.sharingCartDaily scd on scd.ownerFk = c.salesPersonFk AND scd.dated = v.fecha - JOIN vn.`time` t ON t.dated = v.fecha - WHERE t.`year` = intYEAR AND QUARTER(t.dated) = vQuarter - GROUP BY c.salesPersonFk, t.`month` - ON DUPLICATE KEY UPDATE comision = comision + VALUES(comision), - importe = importe + VALUES(importe); - - -- Sustitucion arrendadas - borrowed - INSERT INTO vendedores (Id_Trabajador, mes, año, importe, comision) - SELECT scd.substituteFk - , t.`month` - , t.`year` - , sum(importe) - , sum(importe) * vCommissionRate as borrowed - FROM ventas v - JOIN vn.`client` c ON c.id = v.Id_Cliente - JOIN vn.sharingCartDaily scd on scd.ownerFk = c.salesPersonFk AND scd.dated = v.fecha - JOIN vn.`time` t ON t.dated = v.fecha - WHERE t.`year` = intYEAR AND QUARTER(t.dated) = vQuarter - GROUP BY scd.substituteFk, t.`month` - ON DUPLICATE KEY UPDATE comision = comision + VALUES(comision), - importe = importe + VALUES(importe); - - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -5315,73 +4980,8 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `vendedores_add_launcher`() BEGIN - CALL bs.vendedores_add(YEAR(util.VN_CURDATE()),QUARTER(util.VN_CURDATE())); - CALL bs.vendedores_evolution_add; - CALL bs.salesByclientSalesPerson_add(util.VN_CURDATE()- INTERVAL 15 DAY); - -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `vendedores_evolution_add` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `vendedores_evolution_add`() -BEGIN -/* -Inserta en la tabla compradores_evolution las ventas acumuladas en el ultimo mes -*/ - - DECLARE vYear, vMonth INTEGER; - DECLARE vCurYear, vCurMonth INTEGER; - DECLARE vDateFrom DATE; - DECLARE vDateTo DATE; - - SET vCurYear = year(util.VN_CURDATE()); - SET vCurMonth = month(util.VN_CURDATE()); - - SELECT IFNULL(max(year),vCurYear-1), IFNULL(max(month),1) - INTO vYear, vMonth - FROM bs.vendedores_evolution; - - WHILE (vYear < vCurYear) OR (vYear = vCurYear AND vMonth < vCurMonth) DO - - SELECT max(dated), TIMESTAMPADD(DAY,-364,max(dated)) INTO vDateTo, vDateFrom - FROM vn.time - WHERE year = vYear - AND month = vMonth; - - REPLACE bs.vendedores_evolution( workerFk - , year - , month - , sales) - SELECT c.salesPersonFk - , vYear as year - , vMonth as month - , sum(v.importe) as sales - FROM bs.ventas v - JOIN vn.client c on c.id = v.Id_Cliente - WHERE v.fecha BETWEEN vDateFrom AND vDateTo - AND c.salesPersonFk is not null - GROUP BY c.salesPersonFk; - - SET vMonth = vMonth + 1; - - IF vMonth = 13 THEN - SET vMonth = 1; - SET vYear = vYear + 1; - END IF; - END WHILE; - + CALL bs.salesByclientSalesPerson_add(util.VN_CURDATE()- INTERVAL 45 DAY); + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -5405,7 +5005,7 @@ BEGIN /** * Añade las ventas que se realizaron de hace * una semana hasta hoy -* +* * @param vStarted Fecha de inicio * @param vEnded Fecha de finalizacion * @@ -5413,7 +5013,7 @@ BEGIN DECLARE vStartingDate DATETIME; DECLARE vEndingDate DATETIME; - IF vStarted < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) + IF vStarted < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) OR vEnded < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) THEN CALL util.throw('fechaDemasiadoAntigua'); END IF; @@ -5422,8 +5022,8 @@ BEGIN SET vStartingDate = vStarted ; SET vEndingDate = vn2008.dayend(vStartingDate); - DELETE - FROM sale + DELETE + FROM sale WHERE dated BETWEEN vStartingDate AND vEnded; WHILE vEndingDate <= vEnded DO @@ -5444,28 +5044,28 @@ BEGIN JOIN vn.itemType it ON it.id = i.typeFk JOIN vn.itemCategory ic ON ic.id = it.categoryFk JOIN vn.ticket t ON t.id = s.ticketFk - JOIN vn.address a ON a.id = t.addressFk + JOIN vn.address a ON a.id = t.addressFk JOIN vn.client cl ON cl.id = a.clientFk WHERE t.shipped BETWEEN vStartingDate AND vEndingDate AND s.quantity <> 0 AND s.discount <> 100 - AND ic.merchandise + AND ic.merchandise GROUP BY sc.saleFk HAVING IFNULL(importe,0) <> 0 OR IFNULL(recargo,0) <> 0; UPDATE sale s JOIN ( - SELECT s.id, + SELECT s.id, SUM(s.quantity * sc.value ) margen, s.quantity * s.price * (100 - s.discount ) / 100 pvp FROM vn.sale s - JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.ticket t ON t.id = s.ticketFk JOIN vn.saleComponent sc ON sc.saleFk = s.id - JOIN vn.component c ON c.id = sc.componentFk - JOIN vn.componentType ct ON ct.id = c.typeFk + JOIN vn.component c ON c.id = sc.componentFk + JOIN vn.componentType ct ON ct.id = c.typeFk WHERE t.shipped BETWEEN vStartingDate AND vEndingDate AND ct.isMargin = TRUE - GROUP BY s.id) sub ON sub.id = s.saleFk + GROUP BY s.id) sub ON sub.id = s.saleFk SET s.margin = sub.margen + s.amount + s.surcharge - sub.pvp; SET vStartingDate = TIMESTAMPADD(DAY,1, vStartingDate); @@ -5491,7 +5091,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_add_launcher`() BEGIN - + /** * Añade las ventas que se realizaron de hace * una semana hasta hoy @@ -5517,104 +5117,104 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; +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 */ ; @@ -5633,13 +5233,13 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_contables_add_launcher`() BEGIN - + /** * Reemplaza las ventas contables del último año. * Es el origen de datos para el balance de Entradas * **/ - + CALL bs.ventas_contables_add(YEAR(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())), MONTH(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE()))); END ;; @@ -5660,12 +5260,12 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ventas_contables_por_cliente`(IN vYear INT, IN vMonth INT) BEGIN - + /** * Muestra las ventas (€) de cada cliente * dependiendo del año */ - + DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list; CREATE TEMPORARY TABLE tmp.ticket_list @@ -5674,8 +5274,8 @@ BEGIN FROM vn2008.Tickets t JOIN vn2008.Facturas f ON f.Id_Factura = t.Factura WHERE year(f.Fecha) = vYear - AND month(f.Fecha) = vMonth; - + AND month(f.Fecha) = vMonth; + SELECT vYear Año, vMonth Mes, t.Id_Cliente, @@ -5685,7 +5285,7 @@ BEGIN IF(e2.empresa_grupo,2,0)) AS grupo, t.empresa_id empresa - FROM vn2008.Movimientos m + 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 @@ -5699,9 +5299,9 @@ BEGIN AND m.Descuento <> 100 AND a.tipo_id != 188 GROUP BY t.Id_Cliente, grupo,t.empresa_id; - + DROP TEMPORARY TABLE tmp.ticket_list; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -5720,7 +5320,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `vivosMuertos`() BEGIN - + /** * Devuelve el número de clientes nuevos y muertos, * dependiendo de la fecha actual. @@ -5731,9 +5331,9 @@ BEGIN SET @datSTART = TIMESTAMPADD(YEAR,-2,util.VN_CURDATE()); SET @datEND = TIMESTAMPADD(DAY,-DAY(util.VN_CURDATE()),util.VN_CURDATE()); - + DROP TEMPORARY TABLE IF EXISTS tmp.VivosMuertos; - + CREATE TEMPORARY TABLE tmp.VivosMuertos SELECT c.Id_Cliente, tm.yearMonth, f.Compra, 0 as Nuevo, 0 as Muerto FROM vn2008.Clientes c @@ -5749,10 +5349,10 @@ BEGIN WHERE Fecha BETWEEN @datSTART AND @datEND) f ON f.yearMonth = tm.yearMonth AND f.Id_Cliente = c.Id_Cliente; - + UPDATE tmp.VivosMuertos vm JOIN - (SELECT MIN(tm.yearMonth) firstMonth, f.Id_Cliente + (SELECT MIN(tm.yearMonth) firstMonth, f.Id_Cliente FROM vn2008.Facturas f JOIN vn2008.time tm ON tm.date = f.Fecha WHERE Fecha BETWEEN @datSTART AND @datEND @@ -5760,9 +5360,9 @@ BEGIN AND fm.Id_Cliente = vm.Id_Cliente SET Nuevo = 1; - + SELECT max(yearMonth) INTO @lastYearMonth FROM tmp.VivosMuertos; - + UPDATE tmp.VivosMuertos vm JOIN ( SELECT MAX(tm.yearMonth) firstMonth, f.Id_Cliente @@ -5803,23 +5403,23 @@ BEGIN INTO vWeek, vYear FROM vn.time WHERE dated = util.VN_CURDATE(); - + REPLACE bs.waste SELECT *, 100 * mermas / total as porcentaje FROM ( - SELECT buyer, - year, + SELECT buyer, + year, week, family, itemFk, itemTypeFk, - floor(sum(value)) as total, + floor(sum(value)) as total, floor(sum(IF(clientTypeFk = 'loses', value, 0))) as mermas - FROM vn.saleValue + FROM vn.saleValue where year = vYear and week = vWeek - + GROUP BY family, itemFk - + ) sub ORDER BY mermas DESC; END ;; @@ -5851,56 +5451,56 @@ BEGIN DECLARE vDateEnded DATE; DECLARE vCursor CURSOR FOR - SELECT util.firstDayOfMonth(t.dated), LAST_DAY(t.dated) + SELECT util.firstDayOfMonth(t.dated), LAST_DAY(t.dated) FROM vn.time t WHERE t.dated BETWEEN vDateStarted AND vDateEnded - GROUP BY year,month; + GROUP BY year,month; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + IF DAY(util.VN_CURDATE()) = 21 THEN - + SELECT util.firstDayOfMonth(DATE_SUB(util.VN_CURDATE(), INTERVAL 12 MONTH)), LAST_DAY(DATE_SUB(util.VN_CURDATE(), INTERVAL 1 MONTH)) - INTO vDateStarted, + INTO vDateStarted, vDateEnded; - - DELETE FROM workerLabourDataByMonth + + 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) + INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent) + SELECT 'hiring', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) FROM vn.business b JOIN vn.workCenter wc ON wc.id = b.workCenterFk JOIN vn.worker w ON w.id = b.workerFk LEFT JOIN vn.workerBusinessType wbt ON wbt.id = b.workerBusinessTypeFk LEFT JOIN (SELECT b.id, b.workerFk FROM vn.business b - LEFT JOIN (SELECT ended, workerFk FROM vn.business) wl + LEFT JOIN (SELECT ended, workerFk FROM vn.business) wl ON wl.ended = DATE_SUB(b.started, INTERVAL 1 DAY) AND wl.workerFk = b.workerFk - WHERE b.started BETWEEN vFristDay AND vLastDay AND wl.ended + WHERE b.started BETWEEN vFristDay AND vLastDay AND wl.ended )sub ON sub.workerFk = b.workerFk WHERE wc.payrollCenterFk IS NOT NULL AND b.workCenterFk IS NOT NULL AND b.started BETWEEN vFristDay AND vLastDay AND sub.workerFk IS NULL - AND NOT w.isFreelance; + AND NOT w.isFreelance; -- Bajas periodo - INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent) - SELECT 'layoffs', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) + INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent) + SELECT 'layoffs', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) FROM vn.business b JOIN vn.worker w ON w.id = b.workerFk JOIN vn.workCenter wc ON wc.id = b.workCenterFk @@ -5911,12 +5511,12 @@ BEGIN AND b.ended BETWEEN vFristDay AND vLastDay AND wl.started IS NULL AND NOT w.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) + INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent) + SELECT 'staff', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) FROM vn.business b JOIN vn.worker w ON w.id = b.workerFk JOIN vn.workCenter wc ON wc.id = b.workCenterFk @@ -5926,8 +5526,8 @@ BEGIN AND NOT w.isFreelance; -- Discapacidad - INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent) - SELECT 'disabled', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) + INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent) + SELECT 'disabled', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) FROM vn.business b JOIN vn.worker w ON w.id = b.workerFk JOIN vn.workCenter wc ON wc.id = b.workCenterFk @@ -5961,10 +5561,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `workerProductivity_add`() BEGIN DECLARE vDateFrom DATE; SELECT DATE_SUB(util.VN_CURDATE(),INTERVAL 30 DAY) INTO vDateFrom; - - DELETE FROM workerProductivity + + DELETE FROM workerProductivity WHERE dated >= vDateFrom; - + -- SACADORES Y ARTIFICIAL INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, actionFk) SELECT sub.dated, @@ -5978,7 +5578,7 @@ BEGIN DATE(t.shipped) dated, SUM((ic.cm3delivery * s.quantity)/1000000) volume, TIME_TO_SEC(TIMEDIFF( MAX(st.created),MIN(st.created))) + w.minSeconsItemPicker seconds, - a.accion_id + 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 @@ -5988,70 +5588,70 @@ BEGIN JOIN vncontrol.accion a ON a.accion_id = st.actionFk LEFT JOIN vn.workerDepartment wd ON wd.workerFk = st.workerFk JOIN workerProductivityConfig w ON TRUE - WHERE t.shipped >= vDateFrom - AND ISNULL(sp.saleFk) + WHERE t.shipped >= vDateFrom + AND ISNULL(sp.saleFk) AND (a.accion = 'SACAR' OR a.accion = 'PRESACAR') GROUP BY t.id, t.warehouseFk, st.workerFk ) sub GROUP BY sub.warehouseFk, sub.workerFk, sub.dated; - + -- ENCAJADORES INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, actionFk) SELECT sub2.shipped, sub2.warehouseFk, - sub2.workerFK, - SUM(sub2.volume), + sub2.workerFK, + SUM(sub2.volume), SUM(sub2.seconds), - a.accion_id - FROM (SELECT t.warehouseFk, - SUM(s.volume) volume, - sub.workerFk, + a.accion_id + FROM (SELECT t.warehouseFk, + SUM(s.volume) volume, + sub.workerFk, DATE(t.shipped) shipped, 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 + 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 - GROUP BY s.ticketFk, t.warehouseFk + GROUP BY s.ticketFk, t.warehouseFk )sub2 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, actionFk) SELECT sub2.shipped, sub2.warehouseFk, - sub2.workerFK, - SUM(sub2.volume), + sub2.workerFK, + SUM(sub2.volume), SUM(sub2.seconds), sub2.accion_id - FROM (SELECT t.warehouseFk, - SUM(s.volume) volume, - sub.workerFk, + FROM (SELECT t.warehouseFk, + SUM(s.volume) volume, + sub.workerFk, DATE(t.shipped) shipped, sub.seconds + w.minSeconsPackager seconds, sub.accion_id - FROM vn.saleVolume s + 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, a.accion_id + 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 a.accion = 'CONTROLAR' - AND t.shipped >= vDateFrom + AND t.shipped >= vDateFrom GROUP BY t.id )sub ON sub.ticketFk = t.id JOIN workerProductivityConfig w ON TRUE - GROUP BY s.ticketFk, t.warehouseFk + GROUP BY s.ticketFk, t.warehouseFk )sub2 GROUP BY sub2.warehouseFk,sub2.workerFk, sub2.shipped; END ;; @@ -6337,7 +5937,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `addressFriendship_Update`() BEGIN - REPLACE cache.addressFriendship + REPLACE cache.addressFriendship SELECT addressFk1, addressFk2, count(*) friendship FROM ( @@ -6348,7 +5948,7 @@ BEGIN AND t2.shipped >= TIMESTAMPADD(MONTH,-3,util.VN_CURDATE()) AND t.addressFk != t2.addressFk) sub GROUP BY addressFk1, addressFk2; - + REPLACE cache.zoneAgencyFriendship SELECT r.agencyModeFk, t.zoneFk, count(*) friendship FROM vn.route r @@ -6522,12 +6122,12 @@ BEGIN FROM available a LEFT JOIN tCalc c ON c.id = a.calc_id WHERE c.id IS NULL; - + DELETE a FROM availableNoRaids a LEFT JOIN tCalc c ON c.id = a.calc_id WHERE c.id IS NULL; - + DROP TEMPORARY TABLE tCalc; END ;; DELIMITER ; @@ -6706,27 +6306,27 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 = util.VN_NOW(), - cc.expires = LEAST(ADDTIME(util.VN_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; +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 = util.VN_NOW(), + cc.expires = LEAST(ADDTIME(util.VN_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 */ ; @@ -6744,88 +6344,88 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 util.VN_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; +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 util.VN_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 */ ; @@ -6843,24 +6443,24 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; +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 */ ; @@ -6899,13 +6499,13 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `clean`() -BEGIN - - DECLARE vDateShort DATETIME; - - SET vDateShort = TIMESTAMPADD(MONTH, -1, util.VN_CURDATE()); - - DELETE FROM cache.departure_limit WHERE Fecha < vDateShort; +BEGIN + + DECLARE vDateShort DATETIME; + + SET vDateShort = TIMESTAMPADD(MONTH, -1, util.VN_CURDATE()); + + DELETE FROM cache.departure_limit WHERE Fecha < vDateShort; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -6952,7 +6552,7 @@ DECLARE rs CURSOR FOR DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; - SET myTime = HOUR(util.VN_NOW()) + MINUTE(util.VN_NOW()) / 60; + SET myTime = HOUR(util.VN_NOW()) + MINUTE(util.VN_NOW()) / 60; OPEN rs; @@ -6961,23 +6561,23 @@ DECLARE rs CURSOR FOR WHILE NOT done DO SET resto = IF(inicioProd < rsDeparture, rsDeparture - inicioProd,0); - + SET inicioProd = rsDeparture - rsHoras; - + IF inicioProd - resto < myTime THEN - + SET done = TRUE; - + ELSE - + SET departureLimit = rsDeparture; - + FETCH rs INTO rsDeparture, rsHoras , rsInicio; - + -- SELECT rsDeparture, rsHoras , rsInicio; - + END IF; - + END WHILE; SET departureLimit = IFNULL(departureLimit,24); @@ -7022,7 +6622,7 @@ proc: BEGIN DECLARE started DATE; DECLARE ended DATE; DECLARE vLastRefresh DATE; - + DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN CALL cache_calc_unlock (vCalc); @@ -7072,14 +6672,14 @@ proc: BEGIN DECLARE datEQ DATETIME; DECLARE timDIF TIME; DECLARE v_calc INT; - + CALL cache_calc_start (v_calc, v_refresh, 'prod_graphic', wh_id); - + IF !v_refresh THEN LEAVE proc; END IF; - + CALL vn2008.production_control_source(wh_id, 0); DELETE FROM prod_graphic_source; @@ -7097,8 +6697,8 @@ proc: BEGIN WHERE Fecha = util.VN_CURDATE() GROUP BY wh_id, graphCategory ; - - + + CALL cache_calc_end (v_calc); END ;; DELIMITER ; @@ -7119,7 +6719,7 @@ DELIMITER ;; 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 + * Crea o actualiza la cache con el disponible hasta el día de * ayer. Esta cache es usada como base para otros procedimientos * como el cáculo del visible o del ATP. * @@ -7145,21 +6745,21 @@ proc: BEGIN SET v_date_inv = (SELECT inventoried FROM vn.config LIMIT 1); SET v_curdate = util.VN_CURDATE(); - + DELETE FROM stock; - + INSERT INTO stock (item_id, warehouse_id, amount) SELECT item_id, warehouse_id, SUM(amount) amount FROM ( - SELECT itemFk AS item_id, warehouseFk AS warehouse_id, quantity AS amount + SELECT itemFk AS item_id, warehouseFk AS warehouse_id, quantity AS amount FROM vn.itemTicketOut WHERE shipped >= v_date_inv AND shipped < v_curdate UNION ALL - SELECT itemFk ASitem_id, warehouseInFk AS warehouse_id, quantity AS amount + SELECT itemFk ASitem_id, warehouseInFk AS warehouse_id, quantity AS amount FROM vn.itemEntryIn WHERE landed >= v_date_inv AND landed < v_curdate AND isVirtualStock is FALSE UNION ALL - SELECT itemFk AS item_id ,warehouseOutFk AS warehouse_id, quantity AS amount + SELECT itemFk AS item_id ,warehouseOutFk AS warehouse_id, quantity AS amount FROM vn.itemEntryOut WHERE shipped >= v_date_inv AND shipped < v_curdate ) t @@ -7189,12 +6789,12 @@ BEGIN (INDEX (id)) ENGINE = MEMORY SELECT id FROM cache_calc; - + DELETE v FROM visible v LEFT JOIN tCalc c ON c.id = v.calc_id WHERE c.id IS NULL; - + DROP TEMPORARY TABLE tCalc; END ;; DELIMITER ; @@ -7225,11 +6825,11 @@ proc: BEGIN IF !v_refresh THEN LEAVE proc; END IF; - + -- Calculamos el stock hasta ayer - + CALL `cache`.stock_refresh(false); - + DROP TEMPORARY TABLE IF EXISTS vn2008.tmp_item; CREATE TEMPORARY TABLE vn2008.tmp_item (PRIMARY KEY (item_id)) @@ -7238,9 +6838,9 @@ proc: BEGIN WHERE warehouse_id = v_warehouse; -- Calculamos los movimientos confirmados de hoy - CALL vn.item_GetVisible(v_warehouse, NULL); + CALL vn.item_GetVisible(v_warehouse, NULL); DELETE FROM visible WHERE calc_id = v_calc; - + INSERT INTO visible (calc_id, item_id,visible) SELECT v_calc, item_id, visible FROM vn2008.tmp_item; @@ -8104,9 +7704,9 @@ DELIMITER ;; BEGIN DECLARE nextID INT; - + SELECT 1 + MAX(id) INTO nextID FROM putOrder ; - + SET NEW.orderTradelineItemID = nextID; END */;; @@ -8128,36 +7728,36 @@ DELIMITER ;; BEFORE UPDATE ON `putOrder` FOR EACH ROW BEGIN - + DECLARE vError VARCHAR(100) DEFAULT 'Orderregel niet meer teruggevonden op basis van de orderps'; DECLARE vVmpIdError INT DEFAULT 7; DECLARE vVmpFk INT; DECLARE vSupplyResponseNumberOfUnits INT; - - SELECT sr.vmpID INTO vVmpFk - FROM edi.supplyResponse sr + + SELECT sr.vmpID INTO vVmpFk + FROM edi.supplyResponse sr WHERE sr.id = NEW.supplyResponseID; - - IF NEW.OrderStatus = 3 - AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) - AND NEW.error = vError - AND vVmpFk = vVmpIdError - - THEN - + + IF NEW.OrderStatus = 3 + AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) + AND NEW.error = vError + AND vVmpFk = vVmpIdError + + THEN + SET NEW.OrderStatus = 2; - + END IF; - + -- Error de disponible menor de lo solicitado IF NEW.error LIKE 'error2602%' THEN - + SELECT NumberOfUnits INTO vSupplyResponseNumberOfUnits - FROM edi.supplyResponse sr + FROM edi.supplyResponse sr WHERE sr.ID = NEW.supplyResponseID; - + SET NEW.error = CONCAT('(',vSupplyResponseNumberOfUnits,') ', NEW.error); - + END IF; END */;; DELIMITER ; @@ -8184,16 +7784,16 @@ BEGIN DECLARE vIsEktSender BOOLEAN; IF NEW.OrderStatus = vOrderStatusDenied AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN - + SELECT s.id INTO vSaleFk - FROM vn.sale s + FROM vn.sale s JOIN vn.ticket t ON s.ticketFk = t.id JOIN vn.item i ON i.id = s.itemFk JOIN deliveryInformation di ON di.ID = NEW.deliveryInformationID WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= util.VN_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 @@ -8201,7 +7801,7 @@ BEGIN SET s.quantity = 0 WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= util.VN_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, @@ -8213,26 +7813,26 @@ BEGIN IF (u.id IS NOT NULL AND c.email IS NOT NULL , CONCAT('https://shop.verdnatura.es/#!form=ecomerce%2Fticket&ticket=', t.id ), CONCAT('https://salix.verdnatura.es/#!/ticket/', t.id ,'/summary'))) - FROM vn.sale s + 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 + SELECT v.isEktSender INTO vIsEktSender FROM edi.VMPSettings v - JOIN edi.supplyResponse sr ON sr.vmpID = v.VMPID + 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 @@ -8241,7 +7841,7 @@ BEGIN SELECT i.id, NEW.barcode FROM vn.item i WHERE i.supplyResponseFk = NEW.supplyResponseID; - + END IF; END IF; @@ -8439,8 +8039,8 @@ BEGIN UPDATE vn.buy b JOIN vn.entry e ON e.id = b.entryFk - JOIN vn.travel tr ON tr.id = e.travelFk - JOIN vn.agencyMode am ON am.id = tr.agencyModeFk + JOIN vn.travel tr ON tr.id = e.travelFk + JOIN vn.agencyMode am ON am.id = tr.agencyModeFk JOIN vn.item i ON i.id = b.itemFk JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID SET b.quantity = NEW.NumberOfItemsPerCask * NEW.NumberOfUnits, @@ -8449,7 +8049,7 @@ BEGIN AND am.name = 'LOGIFLORA' AND e.isRaid AND tr.landed >= util.VN_CURDATE(); - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -8590,22 +8190,22 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -8629,15 +8229,15 @@ BEGIN DECLARE vOneWeekAgo DATE DEFAULT TIMESTAMPADD(WEEK,-1,util.VN_CURDATE()); DELETE FROM ekt WHERE fec < vFourYearsAgo; - + DELETE IGNORE sr.* FROM supplyResponse sr LEFT JOIN edi.deliveryInformation di ON sr.ID = di.supplyResponseID WHERE di.LatestOrderDateTime < vOneWeekAgo OR di.ID IS NULL; - - DELETE FROM putOrder + + DELETE FROM putOrder WHERE created < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE()); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -8655,28 +8255,28 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - - +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 */ ; @@ -8695,15 +8295,15 @@ DELIMITER ; DELIMITER ;; 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, + + INSERT INTO edi.ekt(entryYear, + deliveryNumber, fec, hor, item, @@ -8743,17 +8343,17 @@ BEGIN i.value10 s6, p.id putOrderFk, sr.Item_ArticleCode, - sr.vmpID + sr.vmpID FROM edi.putOrder p - JOIN edi.supplyResponse sr ON sr.ID = p.supplyResponseID - JOIN edi.deliveryInformation di ON di.id = p.deliveryInformationID - 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 + JOIN edi.supplyResponse sr ON sr.ID = p.supplyResponseID + JOIN edi.deliveryInformation di ON di.id = p.deliveryInformationID + 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 */ ; @@ -8772,7 +8372,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ekt_load`(IN `vSelf` INT) proc:BEGIN - + DECLARE vRef INT; DECLARE vBuy INT; DECLARE vItem INT; @@ -8797,51 +8397,51 @@ proc:BEGIN 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.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; - + -- 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 @@ -8850,27 +8450,27 @@ proc:BEGIN `to` = 'ekt@verdnatura.es'; END IF; END IF; - + -- Si es una compra de Logiflora 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, IFNULL(b.itemOriginalFk ,b.itemFk) INTO vBuy, vItem - FROM edi.ekt e + 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 @@ -8891,19 +8491,19 @@ proc:BEGIN AND IF(t.pro, l.pro = e.pro, TRUE) AND IF(t.package, l.package = e.package, TRUE) AND IF(t.item, l.item = e.item, TRUE) - AND i.isFloramondo = vIsFloramondoDirect - ORDER BY l.util.VN_NOW DESC, b.id ASC + AND i.isFloramondo = vIsFloramondoDirect + ORDER BY l.util.VN_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 ( entryFk @@ -8926,15 +8526,15 @@ proc:BEGIN ,e.qty stickers ,@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing ,IFNULL(b.`grouping`, e.pac) - ,@pac * e.qty + ,@pac * e.qty ,vForceToPacking ,IF(vHasToChangePackagingFk OR ISNULL(b.packageFk), vPackage, b.packageFk) ,(IFNULL(i.weightByPiece,0) * @pac)/1000 - FROM edi.ekt e + 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 + JOIN vn2008.config cfg WHERE e.id = vSelf LIMIT 1; @@ -8942,33 +8542,36 @@ proc:BEGIN CREATE TEMPORARY TABLE tmp.buyRecalc SELECT buy.id - FROM vn.buy + FROM vn.buy 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 + -- 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; - + FROM vn.ticket t + JOIN vn.ektEntryAssign eea + ON eea.addressFk = t.addressFk + AND t.warehouseFk = eea.warehouseInFk + 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 ( @@ -8990,27 +8593,26 @@ proc:BEGIN a.id, a.agencyModeFk, a.nickname, - w.id, + eea.warehouseInFk, c.id, e.fec, z.id, z.price, z.bonus - FROM edi.ekt e - JOIN vn.ektEntryAssign eea ON eea.sub = e.sub + 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', + SET originFk = vTicketFk, + userFk = account.myUser_getId(), + `action` = 'insert', description = CONCAT('EktLoad ha creado el ticket:', ' ', vTicketFk); END IF; @@ -9020,9 +8622,9 @@ proc:BEGIN 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 @@ -9033,9 +8635,9 @@ proc:BEGIN 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 + SELECT vSaleFk, c.id, e.pri * fhc.floramondoMargin FROM edi.ekt e JOIN edi.floraHollandConfig fhc JOIN vn.component c ON c.code = 'margin' @@ -9059,38 +8661,38 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 >= util.VN_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; - +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 >= util.VN_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 */ ; @@ -9179,7 +8781,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ekt_scan`(vBarcode VARCHAR(512)) BEGIN /** * Busca transaciones a partir de un código de barras, las marca como escaneadas - * y las devuelve. + * y las devuelve. * Ver https://wiki.verdnatura.es/index.php/Ekt#Algoritmos_de_lectura * * @param vBarcode Código de compra de una etiqueta de subasta @@ -9218,19 +8820,19 @@ BEGIN ENGINE = MEMORY SELECT id ektFk FROM ekt LIMIT 0; - CASE + CASE WHEN LENGTH(vBarcode) <= vFloridayBarcodeLength THEN INSERT INTO tmp.ekt - SELECT id + SELECT id FROM edi.ektRecent e WHERE e.cps = vBarcode OR e.batchNumber = vBarcode; WHEN LENGTH(vBarcode) = vFloramondoBarcodeLength THEN INSERT INTO tmp.ekt - SELECT e.id + SELECT e.id FROM edi.ektRecent e - WHERE e.pro = MID(vBarcode,2,6) + WHERE e.pro = MID(vBarcode,2,6) AND CAST(e.ptd AS SIGNED) = MID(vBarcode,8,5); ELSE @@ -9245,7 +8847,7 @@ BEGIN -- Clásico de subasta -- Trade standard -- Trade que construye como la subasta - -- Trade como el anterior pero sin trade code + -- Trade como el anterior pero sin trade code INSERT INTO tmp.ekt SELECT id FROM ekt @@ -9266,9 +8868,9 @@ BEGIN -- BatchNumber largo IF NOT vIsFound THEN INSERT INTO tmp.ekt - SELECT id + SELECT id FROM edi.ektRecent e - WHERE e.batchNumber + WHERE e.batchNumber = LEFT(vBarcode,vUsefulAuctionLeftSegmentLength) AND e.batchNumber > 0; @@ -9278,7 +8880,7 @@ BEGIN -- Order Number IF NOT vIsFound THEN INSERT INTO tmp.ekt - SELECT id + SELECT id FROM edi.ektRecent e WHERE e.putOrderFk = vBarcode; @@ -9288,7 +8890,7 @@ BEGIN -- deliveryNumber incrustado IF NOT vIsFound THEN INSERT INTO tmp.ekt - SELECT id + SELECT id FROM edi.ektRecent e WHERE e.deliveryNumber = MID(vBarcode, 4, 13) @@ -9299,7 +8901,7 @@ BEGIN END CASE; IF vIsFound THEN - UPDATE ekt e + UPDATE ekt e JOIN tmp.ekt t ON t.ektFk = e.id SET e.scanned = TRUE; END IF; @@ -9345,7 +8947,7 @@ proc: BEGIN ROLLBACK; RESIGNAL; END; - + DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN DO RELEASE_LOCK('edi.floramondo_offerRefresh'); @@ -9355,10 +8957,10 @@ proc: BEGIN IF 'test' = (SELECT environment FROM util.config) THEN LEAVE proc; END IF; - + IF !GET_LOCK('edi.floramondo_offerRefresh', 0) THEN LEAVE proc; - END IF; + END IF; SET vStartingTime = util.VN_NOW(); @@ -9863,7 +9465,7 @@ 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 */ @@ -9872,17 +9474,17 @@ BEGIN SELECT MIN(id) id INTO vItemFk FROM edi.item_free; - DELETE 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, @@ -9909,118 +9511,118 @@ BEGIN 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` + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + SELECT vItemFk, t.id , e.s4, 8 FROM edi.ekt e - LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` + 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 + 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 + SELECT vItemFk, t.id , e.s5, 9 FROM edi.ekt e - LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` + 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 + 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 + SELECT vItemFk, t.id , e.s6, 10 FROM edi.ekt e - LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` + 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 + 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 + 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.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 + AND ( ink.name IS NOT NULL OR ik.color IS NOT NULL) LIMIT 1; @@ -10032,8 +9634,8 @@ BEGIN CALL vn.item_refreshTags(); - SET @isTriggerDisabled = FALSE; - + SET @isTriggerDisabled = FALSE; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -10079,7 +9681,7 @@ BEGIN sender = vSender, senderFk = vSenderId, messageId = vMessageId; - + IF vIsDuplicated THEN SELECT id INTO vSelf FROM mail @@ -10104,55 +9706,55 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; 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; - +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 */ ; @@ -10989,7 +10591,7 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`order_afterInsert` AFTER INSERT ON `order` FOR EACH ROW -BEGIN +BEGIN IF NEW.address_id = 2850 THEN -- Fallo que se insertan no se sabe como tickets en este cliente CALL vn.mail_insert( @@ -10998,7 +10600,7 @@ BEGIN 'Creada order al address 2850', CONCAT(account.myUser_getName(), ' ha creado la order ',NEW.id) ); - + END IF; END */;; DELIMITER ; @@ -11015,27 +10617,27 @@ DELIMITER ; /*!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 `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.myUser_getName(), ' ha creado la order ',NEW.id) - ); - END IF; +/*!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.myUser_getName(), ' ha creado la order ',NEW.id) + ); + END IF; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -11150,12 +10752,12 @@ DELIMITER ;; BEGIN DECLARE vIsFirst BOOL; - SELECT (first_row_stamp IS NULL) INTO vIsFirst - FROM `order` + SELECT (first_row_stamp IS NULL) INTO vIsFirst + FROM `order` WHERE id = NEW.orderFk; IF vIsFirst THEN - UPDATE `order` SET first_row_stamp = util.VN_NOW() + UPDATE `order` SET first_row_stamp = util.VN_NOW() WHERE id = NEW.orderFk; END IF; END */;; @@ -11765,7 +11367,7 @@ BEGIN IF vCount = 0 THEN RETURN FALSE; - END IF; + END IF; SELECT COUNT(*) > 0 INTO vHasRole @@ -11846,14 +11448,14 @@ BEGIN * @return tmp.ticketComponent * @return tmp.ticketLot * @return tmp.zoneGetShipped - */ + */ 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); @@ -11866,7 +11468,7 @@ BEGIN JOIN tmp.availableCalc a ON a.calcFk = c.calc_id WHERE c.available > 0 GROUP BY c.item_id; - + CALL vn.catalog_calculate(vDelivery, vAddress, vAgencyMode); DROP TEMPORARY TABLE tmp.item; @@ -11918,7 +11520,7 @@ BEGIN JOIN tmp.availableCalc a ON a.calcFk = c.calc_id WHERE c.available > 0 GROUP BY c.item_id; - + CALL vn.catalog_calculate_beta(vDelivery, vAddress, vAgencyMode); DROP TEMPORARY TABLE tmp.item; @@ -12020,7 +11622,7 @@ BEGIN */ DROP TEMPORARY TABLE IF EXISTS tmp.item; CREATE TEMPORARY TABLE tmp.item - ENGINE = MEMORY + ENGINE = MEMORY SELECT vSelf itemFk; CALL vn.catalog_calculate(vLanded, vAddressFk, vAgencyModeFk); @@ -12060,7 +11662,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getVisible`( vType INT, vPrefix VARCHAR(255)) BEGIN - + /** * Gets visible items of the specified type at specified date. * @@ -12069,7 +11671,7 @@ BEGIN * @param vType The type id * @param vPrefix The article prefix to filter or %NULL for all * @return tmp.itemVisible Visible items - */ + */ DECLARE vPrefixLen SMALLINT; DECLARE vFilter VARCHAR(255) DEFAULT NULL; DECLARE vDateInv DATE DEFAULT vn2008.date_inv(); @@ -12078,13 +11680,13 @@ BEGIN GET DIAGNOSTICS CONDITION 1 @message = MESSAGE_TEXT; CALL vn.mail_insert( - 'cau@verdnatura.es', - NULL, + 'cau@verdnatura.es', + NULL, CONCAT('hedera.item_getVisible error: ', @message), CONCAT( - 'warehouse: ', IFNULL(vWarehouse, ''), - ', Fecha:', IFNULL(vDate, ''), - ', tipo: ', IFNULL(vType,''), + 'warehouse: ', IFNULL(vWarehouse, ''), + ', Fecha:', IFNULL(vDate, ''), + ', tipo: ', IFNULL(vType,''), ', prefijo: ', IFNULL(vPrefix,''))); RESIGNAL; END; @@ -12163,7 +11765,7 @@ BEGIN IF(p.depth > 0, p.depth, 0) depth, p.width, p.height, CEIL(s.quantity / t.packing) etiquetas FROM vn.item i - JOIN `filter` f ON f.itemFk = i.id + JOIN `filter` f ON f.itemFk = i.id JOIN currentStock s ON s.itemFk = i.id LEFT JOIN tmp t ON t.itemFk = i.id LEFT JOIN vn.packaging p ON p.id = t.packageFk @@ -12192,30 +11794,30 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; +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 */ ; @@ -12337,7 +11939,7 @@ BEGIN IF vStatus = 'OK' THEN CALL order_checkConfig(vSelf); - + IF vStatus = 'OK' AND vCreated < TIMESTAMPADD(DAY, -1, util.VN_NOW()) THEN CALL order_update(vSelf); @@ -12493,7 +12095,7 @@ BEGIN IF vSelf IS NOT NULL THEN CALL order_confirm(vSelf); - + DELETE FROM basketOrder WHERE orderFk = vSelf; END IF; @@ -12549,9 +12151,9 @@ BEGIN CREATE TEMPORARY TABLE tmp.`order` ENGINE = MEMORY SELECT myBasket_getId() orderFk; - + CALL order_getTax(); - + DROP TEMPORARY TABLE IF EXISTS tmp.`order`; END ;; DELIMITER ; @@ -12580,7 +12182,7 @@ BEGIN SELECT COUNT(*) INTO vIsMine FROM myOrder WHERE id = vSelf; - + IF vIsMine THEN CALL order_addItem(vSelf, vWarehouse, vItem, vAmount); END IF; @@ -12603,11 +12205,11 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `myOrder_confirm`(vSelf INT) BEGIN DECLARE vIsMine BOOL; - - SELECT COUNT(*) INTO vIsMine + + SELECT COUNT(*) INTO vIsMine FROM myOrder WHERE id = vSelf; - + IF vIsMine THEN CALL order_confirm(vSelf); END IF; @@ -12640,7 +12242,7 @@ BEGIN SELECT COUNT(*) INTO isMine FROM myOrder WHERE id = vSelf; - + IF isMine THEN CALL order_getAvailable(vSelf); END IF; @@ -12660,62 +12262,62 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` 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.myUser_getId(), - 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.myUser_getId(), + 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 */ ; @@ -12732,62 +12334,62 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` 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.myUser_getId(), - 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.myUser_getId(), + 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 */ ; @@ -12967,7 +12569,7 @@ BEGIN SELECT t.id ticketFk FROM myTicket t WHERE shipped BETWEEN TIMESTAMP(vFrom) AND TIMESTAMP(vTo, '23:59:59'); - + CALL vn.ticketGetTotal; SELECT v.id, IFNULL(v.landed, v.shipped) landed, @@ -13027,23 +12629,26 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` 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 - * 'ko' en función de si esta se ha realizado correctamente. - * Este procedimiento debe ser llamado directamente por el cliente - * nada mas finalizar la transacción y solo tiene validez hasta que - * llega la notificacion definitiva desde el banco. + * See tpvTransaction_start() for more info. * - * @param vSelf El identificador de la transacción - * @param vStatus El estado, 'ok' o 'ko' + * @param vSelf Transaction indentifier + * @param vStatus The status, 'ok' o 'ko' */ - IF vStatus IN ('ok', 'ko') - THEN - UPDATE myTpvTransaction SET status = vStatus - WHERE id = vSelf AND response IS NULL; + DECLARE vIsOwned BOOL; + + SELECT COUNT(*) > 0 INTO vIsOwned + FROM myTpvTransaction WHERE id = vSelf; + + IF NOT vIsOwned THEN + CALL util.throw('transactionNotOwnedByUser'); END IF; + + CALL tpvTransaction_end(vSelf, vStatus); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -13060,77 +12665,17 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` 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 - * un identificador de transacción y devolviendo con un SELECT - * los parámetros que deben enviarse a la URL del servicio web - * del banco. + * See tpvTransaction_start() for more info. * - * @param vAmount Cantidad a pagar en céntimos - * @param vCompany El identificador de la empresa - * - * @select Los parámetros que deben pasarse al banco + * @param vAmount Amount to pay in cents + * @param vCompany The company identifier */ - DECLARE vSelf CHAR(12); - DECLARE vMerchant INT; - DECLARE vUrl VARCHAR(255); - DECLARE vKey VARCHAR(50); - DECLARE vEnvironment VARCHAR(255); - - DECLARE EXIT HANDLER FOR SQLEXCEPTION - BEGIN - ROLLBACK; - RESIGNAL; - END; - - START TRANSACTION; - - IF vCompany IS NULL - THEN - SELECT companyFk INTO vCompany - FROM tpvMerchantEnable LIMIT 1; - END IF; - - SELECT merchantFk INTO vMerchant - FROM tpvMerchantEnable WHERE companyFk = vCompany; - - SELECT environment INTO vEnvironment - FROM util.config; - - IF vEnvironment = 'production' - THEN - SELECT c.url, m.secretKey INTO vUrl, vKey - FROM tpvMerchant m - JOIN tpvConfig c - WHERE m.id = vMerchant; - ELSE - SELECT testUrl, testKey INTO vUrl, vKey - FROM tpvConfig; - END IF; - - INSERT INTO myTpvTransaction - SET - merchantFk = vMerchant - ,clientFk = account.myUser_getId() - ,amount = vAmount; - - SET vSelf = LAST_INSERT_ID(); - - SELECT - vAmount amount - ,vSelf transactionId - ,vMerchant merchant - ,currency - ,transactionType - ,terminal - ,merchantUrl - ,vUrl url - ,vKey secretKey - FROM tpvConfig; - - COMMIT; + CALL tpvTransaction_start(vAmount, vCompany, account.myUser_getId()); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -13210,7 +12755,7 @@ BEGIN IF vDone THEN LEAVE l; END IF; - + SET vAdd = vAmount - MOD(vAmount, vGrouping); SET vAmount = vAmount - vAdd; @@ -13226,7 +12771,7 @@ BEGIN rate = vRate, amount = vAdd, price = vPrice; - + SET vRow = LAST_INSERT_ID(); INSERT INTO orderRowComponent (rowFk, componentFk, price) @@ -13244,7 +12789,7 @@ BEGIN IF vAmount > 0 THEN CALL util.throw ('AMOUNT_NOT_MATCH_GROUPING'); END IF; - + COMMIT; CALL vn.ticketCalculatePurge; END ;; @@ -13287,10 +12832,10 @@ BEGIN CREATE TEMPORARY TABLE tmp.item (PRIMARY KEY (itemFk)) ENGINE = MEMORY - SELECT itemFk FROM orderRow + SELECT itemFk FROM orderRow WHERE orderFk = vSelf GROUP BY itemFk; - + CALL vn.catalog_calculate(vDate, vAddress, vAgencyMode); DROP TEMPORARY TABLE tmp.item; @@ -13528,6 +13073,10 @@ BEGIN DECLARE TICKET_FREE INT DEFAULT 2; DECLARE vCalc INT; DECLARE vIsLogifloraItem BOOL; + DECLARE vOldQuantity INT; + DECLARE vNewQuantity INT; + DECLARE vOldInstance JSON; + DECLARE vNewInstance JSON; DECLARE cDates CURSOR FOR SELECT zgs.shipped, r.warehouse_id @@ -13680,7 +13229,7 @@ BEGIN SET vSale = NULL; - SELECT s.id INTO vSale + SELECT s.id, s.quantity INTO vSale, vOldQuantity FROM vn.sale s WHERE ticketFk = vTicket AND price = vPrice @@ -13692,6 +13241,20 @@ BEGIN UPDATE vn.sale SET quantity = quantity + vAmount WHERE id = vSale; + + SELECT s.quantity INTO vNewQuantity + FROM vn.sale s + WHERE id = vSale; + + SET vOldInstance = JSON_OBJECT( + 'quantity', vOldQuantity + ); + SET vNewInstance = JSON_OBJECT( + 'quantity', vNewQuantity + ); + + CALL `util`.`log_addWithUser`('vn', 'ticket', + 'Sale', vTicket, vSale, 'update', vOldInstance, vNewInstance, vUserId); ELSE INSERT INTO vn.sale SET @@ -13705,6 +13268,18 @@ BEGIN SET vSale = LAST_INSERT_ID(); + SET vNewInstance = JSON_OBJECT( + 'itemFk', vItem, + 'ticketFk', vTicket, + 'concept', vConcept, + 'quantity', vAmount, + 'price', vPrice, + 'priceFixed', FALSE, + 'isPriceFixed', TRUE + ); + CALL `util`.`log_addWithUser`('vn', 'ticket', + 'Sale', vTicket, vSale, 'insert', NULL, vNewInstance, vUserId); + INSERT INTO vn.saleComponent (saleFk, componentFk, `value`) SELECT vSale, cm.component_id, cm.price @@ -13890,7 +13465,7 @@ BEGIN INTO vDelivery, vAddress, vAgencyMode FROM `order` WHERE id = vSelf; - + CALL vn.available_calc(vDelivery, vAddress, vAgencyMode); DROP TEMPORARY TABLE IF EXISTS tmp.itemAvailable; @@ -13932,7 +13507,7 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany; CREATE TEMPORARY TABLE tmp.addressCompany (INDEX (addressFk, companyFk)) - ENGINE = MEMORY + ENGINE = MEMORY SELECT DISTINCT o.address_id addressFk, o.company_id companyFk FROM tmp.`order` tmpOrder JOIN hedera.`order` o ON o.id = tmpOrder.orderFk; @@ -13967,7 +13542,7 @@ BEGIN JOIN vn.taxClass tc ON tc.id = bp.taxClassFk GROUP BY tmpOrder.orderFk, pgc.`code`, pgc.rate HAVING taxableBase != 0; - + DROP TEMPORARY TABLE IF EXISTS tmp.orderAmount; CREATE TEMPORARY TABLE tmp.orderAmount (INDEX (orderFk)) @@ -13976,7 +13551,7 @@ BEGIN SUM(CAST(taxableBase * rate / 100 AS DECIMAL(10, 2))) tax FROM tmp.orderTax GROUP BY orderFk, `code`; - + DROP TEMPORARY TABLE tmp.addressTaxArea; END ;; DELIMITER ; @@ -14046,7 +13621,7 @@ BEGIN CREATE TEMPORARY TABLE tmp.`order` ENGINE = MEMORY SELECT vSelf orderFk; - + CALL order_getTax; SELECT IFNULL(SUM(taxableBase), 0.0), IFNULL(SUM(tax), 0.0) @@ -14137,7 +13712,7 @@ proc: BEGIN FROM orderRow r JOIN orderRowComponent c ON c.rowFk = r.id WHERE r.orderFk = vSelf; - + UPDATE orderRow r LEFT JOIN tmp.ticketComponentPrice p ON p.warehouseFk = r.warehouseFk @@ -14162,7 +13737,7 @@ proc: BEGIN ON t.id = c.componentFk AND (t.classRate IS NULL OR t.classRate = r.rate) WHERE r.orderFk = vSelf; - + CALL vn.ticketCalculatePurge; END IF; @@ -14428,6 +14003,124 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `tpvTransaction_end` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `tpvTransaction_end`( + vSelf INT, + vStatus VARCHAR(12)) +BEGIN +/** + * Ends a transaction by setting its status to 'ok' or 'ko' depending on + * if this has been done correctly. + * This procedure must be called directly by the client when the transaction + * ends, it is only valid until the arrival of the definitive notification from + * the payment platform. + * + * @param vSelf Transaction indentifier + * @param vStatus The status, 'ok' o 'ko' + */ + IF vStatus IN ('ok', 'ko') THEN + UPDATE tpvTransaction SET `status` = vStatus + WHERE id = vSelf AND response IS 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 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `tpvTransaction_start` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `tpvTransaction_start`( + vAmount INT, + vCompany INT, + vUser INT) +BEGIN +/** + * Start a new transaction with the virtual TPV, generating an identifier + * of transaction and returning the parameters that should be sent to the + * payment platform. + * + * @param vAmount Amount to pay in cents + * @param vCompany The company identifier + * @select Parameters that will be sent to payment platform + */ + DECLARE vSelf CHAR(12); + DECLARE vMerchant INT; + DECLARE vUrl VARCHAR(255); + DECLARE vKey VARCHAR(50); + DECLARE vEnvironment VARCHAR(255); + + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + ROLLBACK; + RESIGNAL; + END; + + START TRANSACTION; + + IF vCompany IS NULL THEN + SELECT companyFk INTO vCompany + FROM tpvMerchantEnable LIMIT 1; + END IF; + + SELECT merchantFk INTO vMerchant + FROM tpvMerchantEnable WHERE companyFk = vCompany; + + SELECT environment INTO vEnvironment + FROM util.config; + + IF vEnvironment = 'production' THEN + SELECT c.url, m.secretKey INTO vUrl, vKey + FROM tpvMerchant m + JOIN tpvConfig c + WHERE m.id = vMerchant; + ELSE + SELECT testUrl, testKey INTO vUrl, vKey + FROM tpvConfig; + END IF; + + INSERT INTO tpvTransaction + SET merchantFk = vMerchant, + clientFk = vUser, + amount = vAmount; + + SET vSelf = LAST_INSERT_ID(); + + SELECT vAmount amount, + vSelf transactionId, + vMerchant merchant, + currency, + transactionType, + terminal, + merchantUrl, + vUrl url, + vKey secretKey + FROM tpvConfig; + + 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 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `tpvTransaction_undo` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -14506,13 +14199,13 @@ p: BEGIN AND DATE(FECHA) = vDate AND EURODEBE = vAmount LIMIT 1; - + -- Actualiza la transaccion UPDATE tpvTransaction SET response = NULL, status = 'started' WHERE id = vSelf; - + COMMIT; END ;; DELIMITER ; @@ -14545,7 +14238,7 @@ BEGIN UPDATE userSession SET userVisitFk = vUserVisit WHERE ssid = vSsid; - + DELETE FROM userSession WHERE lastUpdate < TIMESTAMPADD(HOUR, -1, util.VN_NOW()); END ;; @@ -14669,7 +14362,7 @@ BEGIN UPDATE visitAgent SET firstAccessFk = vAccessId WHERE id = vAgentId; END IF; - + -- Returns the visit info SELECT vVisit visit, vAccessId access; @@ -15378,7 +15071,7 @@ BEGIN WHILE vI < vLen DO SET vChr = SUBSTR(vPhone, vI + 1, 1); - + IF vChr REGEXP '^[0-9]$' THEN SET vNewPhone = CONCAT(vNewPhone, vChr); @@ -15386,7 +15079,7 @@ BEGIN THEN SET vNewPhone = CONCAT(vNewPhone, '00'); END IF; - + SET vI = vI + 1; END WHILE; @@ -15484,19 +15177,19 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -16451,9 +16144,9 @@ CREATE TABLE `movConta` ( `SerieAgrupacion_` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL, `NumeroFacturaInicial_` int(11) NOT NULL, `NumeroFacturaFinal_` int(11) NOT NULL, - `IdAsientoExterno` text COLLATE utf8mb3_unicode_ci NOT NULL, + `IdAsientoExterno` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, `IdDiarioExterno` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL, - `IdFacturaExterno` text COLLATE utf8mb3_unicode_ci NOT NULL, + `IdFacturaExterno` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, `IdMovimiento` varchar(40) COLLATE utf8mb3_unicode_ci NOT NULL, `IdCuadre` smallint(6) NOT NULL, `FechaCuadre` datetime NOT NULL, @@ -16470,10 +16163,10 @@ CREATE TABLE `movConta` ( `Descripcion5` varchar(40) COLLATE utf8mb3_unicode_ci NOT NULL, `Descripcion6` varchar(40) COLLATE utf8mb3_unicode_ci NOT NULL, `Descripcion7` varchar(40) COLLATE utf8mb3_unicode_ci NOT NULL, - `Descripcion8` text COLLATE utf8mb3_unicode_ci NOT NULL, - `Descripcion9` text COLLATE utf8mb3_unicode_ci NOT NULL, - `Descripcion2` text COLLATE utf8mb3_unicode_ci NOT NULL, - `Descripcion1` text COLLATE utf8mb3_unicode_ci NOT NULL, + `Descripcion8` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, + `Descripcion9` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, + `Descripcion2` varchar(250) COLLATE utf8mb3_unicode_ci NOT NULL, + `Descripcion1` varchar(250) COLLATE utf8mb3_unicode_ci NOT NULL, `Punteo1` smallint(6) NOT NULL, `Punteo9` smallint(6) NOT NULL, `Punteo8` smallint(6) NOT NULL, @@ -16490,10 +16183,10 @@ CREATE TABLE `movConta` ( `CriterioIva` tinyint(4) NOT NULL, `FechaMaxVencimiento` datetime NOT NULL, `TipoCriterioCaja` tinyint(4) NOT NULL, - `MovFacturaOrigenIME` text COLLATE utf8mb3_unicode_ci NOT NULL, - `IdFacturaExternoFinal` text COLLATE utf8mb3_unicode_ci NOT NULL, - `IdFacturaExternoInicial` text COLLATE utf8mb3_unicode_ci NOT NULL, - `IdFacturaExternoOriginal` text COLLATE utf8mb3_unicode_ci NOT NULL, + `MovFacturaOrigenIME` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, + `IdFacturaExternoFinal` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, + `IdFacturaExternoInicial` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, + `IdFacturaExternoOriginal` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, `NumFacturasExternoAgrupacion` int(11) NOT NULL, `CodigoMedioCobro` varchar(1) COLLATE utf8mb3_unicode_ci NOT NULL, `MedioCobro` varchar(31) COLLATE utf8mb3_unicode_ci NOT NULL, @@ -16507,7 +16200,7 @@ CREATE TABLE `movConta` ( `CuotaIvaOriginal` decimal(28,10) NOT NULL, `ClaseAbonoRectificativas` smallint(6) NOT NULL, `RecargoEquivalenciaOriginal` decimal(28,10) NOT NULL, - `ObjetoFactura` text COLLATE utf8mb3_unicode_ci NOT NULL, + `ObjetoFactura` varchar(500) COLLATE utf8mb3_unicode_ci NOT NULL, `enlazadoSage` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`OrdenMovimientos`,`LibreN1`), KEY `ix_movconta2` (`IdProcesoIME`), @@ -16516,8 +16209,30 @@ CREATE TABLE `movConta` ( KEY `ix_movconta` (`enlazadoSage`,`IdProcesoIME`), KEY `movConta_IdProcesoIME` (`IdProcesoIME`), KEY `movConta_Asiento2` (`Asiento`,`IdProcesoIME`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_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 = utf8mb4 */ ; +/*!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 `sage`.`movConta_BEFORE_UPDATE` + BEFORE UPDATE ON `movConta` + FOR EACH ROW +BEGIN + IF NEW.enlazadoSage = TRUE THEN + UPDATE vn.XDiario SET enlazadoSage = TRUE WHERE ASIEN = NEW.Asiento; + 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 `movContaIVA` @@ -16685,22 +16400,22 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `company_getCode`(vCompanyFk INT) RET READS SQL DATA BEGIN /** - * Devuelve la correspondencía del código de empresa de sage. + * Devuelve la correspondencía del código de empresa de sage. * Tiene en cuenta el entorno - * + * * @param vSelf Id de empresa de verdnatura * @return Código de empresa sage */ DECLARE vCompanySageFk INT(2); - - SELECT IF(c.environment = 'production', - co.companyCode, + + SELECT IF(c.environment = 'production', + co.companyCode, co.companyCodeTest ) INTO vCompanySageFk FROM util.config c JOIN vn.company co WHERE co.id = vCompanyFk; - + RETURN vCompanySageFk; END ;; DELIMITER ; @@ -16709,14 +16424,14 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `accountingMovements_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 character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `accountingMovements_add`(vYear INT, vCompanyFk INT) BEGIN @@ -17118,7 +16833,7 @@ BEGIN AND ImporteAsiento < 0; -- Comprobación que los importes e ivas sean correctos, avisa vía CAU - SELECT GROUP_CONCAT(Asiento ORDER BY Asiento ASC SEPARATOR ' \n\r') INTO vBookEntries + SELECT GROUP_CONCAT(Asiento ORDER BY Asiento ASC SEPARATOR ',') INTO vBookEntries FROM(SELECT sub.Asiento FROM (SELECT mc.Asiento, SUM(mc.ImporteAsiento) amount FROM movConta mc @@ -17148,11 +16863,7 @@ BEGIN AND sub.amountTaxableBase/2 <> sub2.amountTaxableBase) sub; IF vBookEntries IS NOT NULL THEN - CALL vn.mail_insert('cau@verdnatura.es, administracion@verdnatura.es', - 'noreply@verdnatura.es', - CONCAT('Asientos contables importados incorrectamente'), - CONCAT('

Existen asientos que difieren entre la info. de XDiario y la que se ha importado a Sage.

- Asientos nº ', vBookEntries, '
')); + SELECT util.notification_send ("book-entries-imported-incorrectly", CONCAT('{"bookEntries":"', vBookEntries,'"}'), null); END IF; END ;; DELIMITER ; @@ -17173,18 +16884,18 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `clientSupplier_add`(vCompanyFk INT) BEGIN /** - * Prepara los datos de clientes y proveedores para exportarlos a Sage + * Prepara los datos de clientes y proveedores para exportarlos a Sage * @vCompanyFk Empresa dela que se quiere trasladar datos */ DECLARE vCountryCeutaMelillaFk INT; DECLARE vCountryCanariasCode, vCountryCeutaMelillaCode VARCHAR(2); SELECT SiglaNacion INTO vCountryCanariasCode - FROM Naciones + FROM Naciones WHERE Nacion ='ISLAS CANARIAS'; SELECT CodigoNacion, SiglaNacion INTO vCountryCeutaMelillaFk, vCountryCeutaMelillaCode - FROM Naciones + FROM Naciones WHERE Nacion ='CEUTA Y MELILLA'; TRUNCATE TABLE clientesProveedores; @@ -17215,7 +16926,7 @@ BEGIN CodigoRetencion, Email1, iban) - SELECT + SELECT company_getCode(vCompanyFk), 'C', c.id, @@ -17232,12 +16943,12 @@ BEGIN IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci, IF(@isCeutaMelilla := IF(pr.Provincia IN ('CEUTA', 'MELILLA'), TRUE, FALSE), vCountryCeutaMelillaFk, IF (@isCanarias, vCountryCanariasCode, n.CodigoNacion)), n.CodigoNacion), IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci, IF(@isCeutaMelilla, vCountryCeutaMelillaCode, IF (@isCanarias, vCountryCanariasCode, n.SiglaNacion)), n.SiglaNacion), IF((c.fi REGEXP '^([[:blank:]]|[[:digit:]])'), 'J','F'), - IF(cu.code IN('ES','EX'), - 1, + IF(cu.code IN('ES','EX'), + 1, IF((cu.isUeeMember AND c.isVies), 2, 4)), IFNULL(c.taxTypeSageFk,0), - IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci, - IF(@isCeutaMelilla, 'CEUTA Y MELILLA', IF (@isCanarias, 'ISLAS CANARIAS', n.Nacion)), + IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci, + IF(@isCeutaMelilla, 'CEUTA Y MELILLA', IF (@isCanarias, 'ISLAS CANARIAS', n.Nacion)), n.Nacion), IFNULL(c.phone, ''), IFNULL(c.mobile, ''), @@ -17251,7 +16962,7 @@ BEGIN LEFT JOIN Naciones n ON n.countryFk = cu.id LEFT JOIN vn.province p ON p.id = c.provinceFk LEFT JOIN Provincias pr ON pr.provinceFk = p.id - WHERE c.isRelevant + WHERE c.isRelevant AND clm.companyFk = vCompanyFk UNION ALL SELECT company_getCode(vCompanyFk), @@ -17280,15 +16991,15 @@ BEGIN IFNULL(SUBSTR(sc.email, 1, (COALESCE(NULLIF(LOCATE(',', sc.email), 0), 99) - 1)), ''), IFNULL(iban, '') FROM vn.supplier s - JOIN supplierLastThreeMonths pl ON pl.supplierFk = s.id + JOIN supplierLastThreeMonths pl ON pl.supplierFk = s.id LEFT JOIN vn.country co ON co.id = s.countryFk LEFT JOIN Naciones n ON n.countryFk = co.id LEFT JOIN vn.province p ON p.id = s.provinceFk LEFT JOIN Provincias pr ON pr.provinceFk = p.id LEFT JOIN vn.supplierContact sc ON sc.supplierFk = s.id LEFT JOIN vn.supplierAccount sa ON sa.supplierFk = s.id - WHERE pl.companyFk = vCompanyFk AND - s.isActive AND + WHERE pl.companyFk = vCompanyFk AND + s.isActive AND s.nif <> '' GROUP BY pl.supplierFk, pl.companyFk; END ;; @@ -17311,10 +17022,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceIn_add`(vInvoiceInFk INT, vX BEGIN /** * Traslada la info de contabilidad relacionada con las facturas recibidas - * + * * @vInvoiceInFk Factura recibida * @vXDiarioFk Id tabla XDiario - */ + */ DECLARE vDone BOOL DEFAULT FALSE; DECLARE vBase DOUBLE; DECLARE vVat DOUBLE; @@ -17330,24 +17041,24 @@ BEGIN DECLARE vInvoiceTypeReceived VARCHAR(1); DECLARE vInvoiceTypeInformative VARCHAR(1); - DECLARE vCursor CURSOR FOR + DECLARE vCursor CURSOR FOR SELECT it.taxableBase, CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)), t.PorcentajeIva, it.transactionTypeSageFk, it.taxTypeSageFk, t.isIntracommunity, - tt.ClaveOperacionDefecto + tt.ClaveOperacionDefecto FROM vn.invoiceIn i - JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id + JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk LEFT JOIN vn.dua d ON d.id = vInvoiceInFk - WHERE i.id = vInvoiceInFk + WHERE i.id = vInvoiceInFk AND d.id IS NULL; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + DELETE FROM movContaIVA WHERE id = vXDiarioFk; @@ -17370,22 +17081,22 @@ BEGIN vTaxCode, vIsIntracommunity, vOperationCode; - - IF vDone THEN + + IF vDone THEN LEAVE l; END IF; - SET vTransactionCodeOld = vTransactionCode; - SET vTaxCodeOld = vTaxCode; + SET vTransactionCodeOld = vTransactionCode; + SET vTaxCodeOld = vTaxCode; - IF vOperationCode IS NOT NULL THEN + IF vOperationCode IS NOT NULL THEN UPDATE movContaIVA SET ClaveOperacionFactura = vOperationCode WHERE id = vXDiarioFk; END IF; - + SET vCounter = vCounter + 1; - CASE vCounter + CASE vCounter WHEN 1 THEN UPDATE movContaIVA SET BaseIva1 = vBase, @@ -17421,21 +17132,21 @@ BEGIN WHERE id = vXDiarioFk; ELSE SELECT vXDiarioFk INTO vXDiarioFk; - END CASE; + END CASE; IF vIsIntracommunity THEN UPDATE movContaIVA SET Intracomunitaria = TRUE WHERE id = vXDiarioFk; END IF; - - SET vTransactionCodeOld = vTransactionCode; - SET vTaxCodeOld = vTaxCode; - + + SET vTransactionCodeOld = vTransactionCode; + SET vTaxCodeOld = vTaxCode; + END LOOP; CLOSE vCursor; - + UPDATE movContaIVA mci JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk JOIN vn.XDiario x ON x.id = mci.id @@ -17447,11 +17158,11 @@ BEGIN mci.Serie = ii.serial, mci.Factura = ii.serialNumber, mci.FechaFactura = ii.issued, - mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) + - IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) + - IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) + + mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) + + IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) + + IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) + IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0), - mci.TipoFactura = IF(id.id, IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative), vInvoiceTypeReceived), + mci.TipoFactura = IF(id.id, IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative), vInvoiceTypeReceived), mci.CodigoCuentaFactura = x.SUBCTA, mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif), mci.Nombre = s.name, @@ -17479,7 +17190,7 @@ BEGIN JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase FROM vn.XDiario x1 JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN - WHERE x2.BASEEURO <> 0 + WHERE x2.BASEEURO <> 0 AND x1.id = vXDiarioFk )sub JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio' @@ -17487,8 +17198,8 @@ BEGIN mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura), mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase), mci.PorRetencion = t.PorcentajeRetencion, - mci.ImporteRetencion = iit.taxableBase * - 1 - WHERE mci.id = vXDiarioFk + mci.ImporteRetencion = iit.taxableBase * - 1 + WHERE mci.id = vXDiarioFk AND e.name = 'Retenciones' AND id.id IS NULL; @@ -17511,10 +17222,10 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceIn_manager`(vYear INT, vCompanyFk INT) BEGIN /** - * Traslada la info de contabilidad relacionada con las facturas recibidas - * + * Traslada la info de contabilidad relacionada con las facturas recibidas + * * @vYear Año contable del que se quiere trasladar la información - * @vCompany Empresa de la que se quiere trasladar datos + * @vCompany Empresa de la que se quiere trasladar datos */ DECLARE vDone BOOL DEFAULT FALSE; DECLARE vInvoiceFk INT; @@ -17526,22 +17237,22 @@ BEGIN DECLARE vAccountTaxOutstanding VARCHAR(10); DECLARE vInvoiceTypeSended VARCHAR(1); DECLARE vCursor CURSOR FOR - SELECT IFNULL(x.CLAVE, x.FACTURA) invoiceInFk, + SELECT IFNULL(x.CLAVE, x.FACTURA) invoiceInFk, x.id XDiarioFk - FROM vn.XDiario x + FROM vn.XDiario x JOIN(SELECT DISTINCT(x.ASIEN) FROM vn.XDiario x LEFT JOIN vn.invoiceIn ii ON x.CLAVE = ii.id LEFT JOIN vn.invoiceInTax it ON it.invoiceInFk = ii.id - WHERE(it.taxTypeSageFk IS NOT NULL OR x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci) - AND x.enlazadoSage = FALSE + WHERE(it.taxTypeSageFk IS NOT NULL OR x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci) + AND x.enlazadoSage = FALSE AND x.FECHA BETWEEN vDatedFrom AND vDatedTo - AND x.empresa_id = vCompanyFk + AND x.empresa_id = vCompanyFk ) sub ON sub.ASIEN = x.ASIEN WHERE x.CLAVE IS NOT NULL; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + SELECT CAST(CONCAT(vYear, '-01-01') AS DATETIME), util.dayEnd(CAST(CONCAT(vYear, '-12-31') AS DATE)) INTO vDatedFrom, vDatedTo; @@ -17555,15 +17266,15 @@ BEGIN SELECT codeSage INTO vInvoiceTypeSended FROM invoiceType WHERE `code` ='sended'; - + DROP TEMPORARY TABLE IF EXISTS tmp.invoiceDua; CREATE TEMPORARY TABLE tmp.invoiceDua - SELECT x.id + SELECT x.id FROM vn.XDiario x JOIN vn.company c ON c.id = x.empresa_id JOIN (SELECT ASIEN - FROM vn.XDiario x - WHERE x.enlazadoSage = FALSE + FROM vn.XDiario x + WHERE x.enlazadoSage = FALSE AND x.SUBCTA = vAccountTaxOutstanding COLLATE utf8mb3_unicode_ci AND x.FECHA BETWEEN vDatedFrom AND vDatedTo )sub ON sub.ASIEN = x.ASIEN @@ -17582,7 +17293,7 @@ BEGIN FROM vn.invoiceIn i JOIN vn.currency c ON c.id = i.currencyFk WHERE i.bookEntried BETWEEN vDatedFrom AND vDatedTo - UNION ALL + UNION ALL SELECT d.id, d.code, vSerialDua, @@ -17591,8 +17302,8 @@ BEGIN FALSE, d.id, '' -- EUROS - FROM vn.dua d - WHERE d.issued IS NOT NULL + FROM vn.dua d + WHERE d.issued IS NOT NULL AND code IS NOT NULL; OPEN vCursor; @@ -17600,7 +17311,7 @@ BEGIN l: LOOP FETCH vCursor INTO vInvoiceFk, vXDiarioFk; - IF vDone THEN + IF vDone THEN LEAVE l; END IF; CALL invoiceIn_add(vInvoiceFk, vXDiarioFk); @@ -17688,21 +17399,21 @@ BEGIN JOIN (SELECT x.ASIEN, x.id FROM vn.XDiario x JOIN(SELECT DISTINCT(x.ASIEN) ASIEN - FROM vn.XDiario x + FROM vn.XDiario x JOIN (SELECT DISTINCT(ASIEN) FROM vn.XDiario x - WHERE SUBCTA LIKE '472%' + WHERE SUBCTA LIKE '472%' AND x.enlazadoSage = FALSE AND x.empresa_id = vCompanyFk AND x.FECHA BETWEEN vDatedFrom AND vDatedTo ) sub ON sub.ASIEN = x.ASIEN WHERE x.SUBCTA LIKE '477%' )sub2 ON sub2.ASIEN = x.ASIEN - WHERE x.CONTRA IS NOT NULL + WHERE x.CONTRA IS NOT NULL AND x.SUBCTA LIKE '477%' GROUP BY x.ASIEN )sub3 ON sub3.ASIEN = x.ASIEN; - + INSERT INTO movContaIVA (`id`, `CodigoDivisa`, @@ -17773,9 +17484,9 @@ BEGIN `FechaGrabacion`, `Intracomunitaria`, `moveData`) - SELECT * + SELECT * FROM tmp.movContaIVA; - + DROP TEMPORARY TABLE tmp.movContaIVA; END ;; @@ -17797,10 +17508,10 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_add`(IN vInvoiceOutFk INT, IN vXDiarioFk INT) BEGIN /** - * Traslada la info de contabilidad relacionada con las facturas emitidas - * + * Traslada la info de contabilidad relacionada con las facturas emitidas + * * @vYear Año contable del que se quiere trasladar la información - * @vCompany Empresa de la que se quiere trasladar datos + * @vCompany Empresa de la que se quiere trasladar datos */ DECLARE vDone BOOL DEFAULT FALSE; DECLARE vMaxLengthName INT DEFAULT 35; @@ -17820,12 +17531,12 @@ BEGIN DECLARE vHasCustomsAccountingNote BOOL; DECLARE vCursor CURSOR FOR - SELECT oit.taxableBase, - oit.vat, - pgc.rate, - pgc.mod347, - pgcRE.rate, - oitRE.vat, + SELECT oit.taxableBase, + oit.vat, + pgc.rate, + pgc.mod347, + pgcRE.rate, + oitRE.vat, tc.transactionCode, tc.taxCode, tc.isIntracommunity, @@ -17834,7 +17545,7 @@ BEGIN JOIN vn.pgc ON pgc.code = oit.pgcFk LEFT JOIN vn.pgcEqu e ON e.vatFk = oit.pgcFk LEFT JOIN vn.pgcEqu eRE ON eRE.equFk = oit.pgcFk - LEFT JOIN vn.invoiceOutTax oitRE ON oitRE.invoiceOutFk = oit.invoiceOutFk + LEFT JOIN vn.invoiceOutTax oitRE ON oitRE.invoiceOutFk = oit.invoiceOutFk AND oitRE.pgcFk = e.equFk LEFT JOIN vn.pgc pgcRE ON pgcRE.code = oitRE.pgcFk LEFT JOIN vn.taxCode tc ON tc.code = pgc.code COLLATE 'utf8mb3_unicode_ci' @@ -17850,12 +17561,12 @@ BEGIN WHERE ASIEN = (SELECT ASIEN FROM vn.XDiario WHERE id = vXDiarioFk); SELECT codeSage INTO vInvoiceTypeSended - FROM invoiceType + FROM invoiceType WHERE code = IF(vHasCustomsAccountingNote, 'informative', 'sended'); - + DELETE FROM movContaIVA WHERE id = vXDiarioFk; - + INSERT INTO movContaIVA(id) VALUES (vXDiarioFk); OPEN vCursor; @@ -17872,13 +17583,13 @@ BEGIN vIsIntracommunity, vOperationCode; - IF vDone THEN + IF vDone THEN LEAVE l; END IF; SET vCounter = vCounter + 1; - - CASE vCounter + + CASE vCounter WHEN 1 THEN UPDATE movContaIVA SET BaseIva1 = vBase, @@ -17919,7 +17630,7 @@ BEGIN CodigoTransaccion4 = vTransactionCode, CodigoIva4 = vTaxCode WHERE id = vXDiarioFk; - END CASE; + END CASE; UPDATE movContaIVA SET Exclusion347 = NOT vMod347, @@ -17930,7 +17641,7 @@ BEGIN END LOOP; CLOSE vCursor; - + UPDATE movContaIVA mci JOIN vn.invoiceOut i ON i.id = vInvoiceOutFk LEFT JOIN vn.invoiceCorrection ic ON ic.correctedFk = vInvoiceOutFk @@ -17955,25 +17666,25 @@ BEGIN mci.MantenerAsiento = TRUE, mci.FechaFacturaOriginal = x.FECHA_EX WHERE mci.id = vXDiarioFk; - + SELECT correctedFk INTO vInvoiceOutCorrectedFk FROM vn.invoiceCorrection WHERE correctingFk = vInvoiceOutFk; - - IF vInvoiceOutCorrectedFk THEN + + IF vInvoiceOutCorrectedFk THEN UPDATE movContaIVA mci JOIN vn.invoiceOut i ON i.id = vInvoiceOutCorrectedFk JOIN vn.invoiceCorrection ic ON ic.correctedFk = vInvoiceOutCorrectedFk - JOIN (SELECT SUM(IF(IFNULL(e.vatFk, TRUE), iot.taxableBase, 0)) taxableBase, + JOIN (SELECT SUM(IF(IFNULL(e.vatFk, TRUE), iot.taxableBase, 0)) taxableBase, SUM(IF(IFNULL(e.vatFk, TRUE), iot.vat, 0)) vat, SUM(IF(IFNULL(e.vatFk, TRUE), 0, iot.vat)) equ FROM vn.invoiceOutTax iot - LEFT JOIN vn.pgcEqu e ON e.vatFk = iot.pgcFk + LEFT JOIN vn.pgcEqu e ON e.vatFk = iot.pgcFk WHERE iot.invoiceOutFk = vInvoiceOutCorrectedFk ) tax JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa' SET mci.TipoRectificativa = 2, - mci.ClaseAbonoRectificativas = 1, + mci.ClaseAbonoRectificativas = 1, mci.FechaFacturaOriginal = i.issued, mci.FechaOperacion = i.issued, mci.BaseImponibleOriginal = tax.taxableBase, @@ -18004,10 +17715,10 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_manager`(vYear INT, vCompanyFk INT) BEGIN /** - * Traslada la info de contabilidad relacionada con las facturas emitidas - * + * Traslada la info de contabilidad relacionada con las facturas emitidas + * * @vYear Año contable del que se quiere trasladar la información - * @vCompany Empresa de la que se quiere trasladar datos + * @vCompany Empresa de la que se quiere trasladar datos */ DECLARE vDone BOOL DEFAULT FALSE; DECLARE vInvoiceFk INT; @@ -18024,7 +17735,7 @@ BEGIN JOIN (SELECT x.ASIEN, CONCAT(x.SERIE, x.FACTURA) refFk FROM vn.XDiario x WHERE x.enlazadoSage = FALSE - AND x.FACTURA + AND x.FACTURA AND x.empresa_id = vCompanyFk AND x.FECHA BETWEEN vDatedFrom AND vDatedTo GROUP BY refFk @@ -18033,19 +17744,19 @@ BEGIN )sub2 ON sub2.refFk = i.ref; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + SELECT CAST(CONCAT(vYear, '-01-01') AS DATETIME), util.dayEnd(CAST(CONCAT(vYear, '-12-31') AS DATE)) INTO vDatedFrom, vDatedTo; - + OPEN vCursor; l: LOOP FETCH vCursor INTO vInvoiceFk, vXDiarioFk; - IF vDone THEN + IF vDone THEN LEAVE l; END IF; - + CALL invoiceOut_add(vInvoiceFk, vXDiarioFk); END LOOP; @@ -18071,7 +17782,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `pgc_add`(vCompanyFk INT) BEGIN /** - * Añade cuentas del plan general contable para exportarlos a Sage + * Añade cuentas del plan general contable para exportarlos a Sage * @vCompanyFk Empresa de la que se quiere trasladar datos */ TRUNCATE TABLE planCuentasPGC; @@ -18081,25 +17792,25 @@ BEGIN CodigoCuenta, Cuenta, ClienteOProveedor) - SELECT * + SELECT * FROM (SELECT company_getCode(vCompanyFk) companyFk, e.id accountFk, UCASE(e.name), '' FROM vn.expence e - UNION + UNION SELECT company_getCode(vCompanyFk), - b.account, + b.account, UCASE(b.bank), - '' + '' FROM vn.bank b WHERE b.isActive AND b.`account` - UNION + UNION SELECT CodigoEmpresa, CodigoCuenta, Nombre, - ClienteOProveedor + ClienteOProveedor FROM clientesProveedores)sub GROUP BY companyFk, accountFk; END ;; @@ -18369,7 +18080,7 @@ DELIMITER ;; FOR EACH ROW BEGIN SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE(); - + CALL visible_log( NEW.isPicked, NEW.warehouseFk, @@ -18493,7 +18204,7 @@ DELIMITER ;; BEGIN SET NEW.lack = NEW.quantity; SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE(); - + CALL visible_log( NEW.isPicked, NEW.warehouseFk, @@ -18704,7 +18415,7 @@ BEGIN DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + SET vSupplied = 0; OPEN vPicks; @@ -18720,7 +18431,7 @@ BEGIN SET vPickGranted = LEAST(vRequested - vSupplied, vPickQuantity); SET vSupplied = vSupplied + vPickGranted; CALL inbound_removePick(vSelf, vOutboundFk, vPickGranted, vPickQuantity); - + UPDATE outbound SET isSync = FALSE, lack = lack + vPickGranted @@ -18800,7 +18511,7 @@ BEGIN END IF; SET vSupplied = LEAST(vAvailable, vLack); - + IF vSupplied > 0 THEN SET vAvailable = vAvailable - vSupplied; UPDATE outbound @@ -18813,7 +18524,7 @@ BEGIN SET vSupplied = vSupplied + vSuppliedFromRequest; SET vAvailable = vAvailable - vSuppliedFromRequest; END IF; - + IF vSupplied > 0 THEN CALL inbound_addPick(vSelf, vOutboundFk, vSupplied); END IF; @@ -18942,7 +18653,7 @@ BEGIN DO RELEASE_LOCK('stock.log_sync'); RESIGNAL; END; - + IF !GET_LOCK('stock.log_sync', 30) THEN CALL util.throw('Lock timeout exceeded'); END IF; @@ -19413,7 +19124,7 @@ BEGIN SET vPickGranted = LEAST(vRequested - vSupplied, vPickQuantity); SET vSupplied = vSupplied + vPickGranted; CALL inbound_removePick(vInboundFk, vSelf, vPickGranted, vPickQuantity); - + UPDATE inbound SET isSync = FALSE, available = available + vPickGranted @@ -19739,12 +19450,11 @@ CREATE TABLE `notificationSubscription` ( -- Table structure for table `version` -- - DROP TABLE IF EXISTS `version`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `version` ( - `code` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL, + `code` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, `number` char(11) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `gitCommit` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `updated` datetime DEFAULT NULL, @@ -19848,11 +19558,11 @@ BEGIN WHILE vI < vLen DO SET vSpaceIni = vI; - + WHILE MID(vString, vI, 1) REGEXP '[[:space:]]' DO SET vI = vI + 1; END WHILE; - + SET vWordIni = vI; SET vI = vWordIni + 1; @@ -19889,11 +19599,11 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `crypt`(vText VARCHAR(255), vKey VARC BEGIN DECLARE vResult VARCHAR(255); - + CALL vn.crypt(vText, vKey, vResult); RETURN vResult; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -19915,11 +19625,11 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `cryptOff`(vText VARCHAR(255), vKey V BEGIN DECLARE vResult VARCHAR(255); - + CALL vn.cryptOff(vText, vKey, vResult); RETURN vResult; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -20087,7 +19797,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` FUNCTION `hasDateOverlapped`(vSarted1 DATE, vEnded1 DATE, vSarted2 DATE, vEnded2 DATE) RETURNS tinyint(1) DETERMINISTIC -BEGIN +BEGIN RETURN GREATEST(vSarted1, vSarted2) <= LEAST(vEnded1,vEnded2); @@ -20116,7 +19826,7 @@ BEGIN */ DECLARE vHashlen INT UNSIGNED; DECLARE vOpad, vIpad TINYBLOB; - + CASE vAlg WHEN 224 THEN SET vHashlen = 64; WHEN 256 THEN SET vHashlen = 64; @@ -20124,16 +19834,16 @@ BEGIN WHEN 512 THEN SET vHashlen = 128; ELSE CALL throw ('WRONG_ALGORYTHM_IDENTIFICATOR_USED'); END CASE; - + IF LENGTH(vKey) > vHashlen THEN SET vKey = UNHEX(SHA2(vKey, vAlg)); END IF; - + SET vKey = RPAD(vKey, vHashlen, 0x00); - + SET vIpad = stringXor(vKey, 0x36); SET vOpad = stringXor(vKey, 0x5C); - + RETURN SHA2(CONCAT(vOpad, UNHEX(SHA2(CONCAT(vIpad, vMsg), vAlg))), vAlg); END ;; DELIMITER ; @@ -20156,7 +19866,49 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `isLeapYear`(vYear INT) RETURNS tinyi BEGIN RETURN (DAYOFYEAR(CONCAT(vYear, "-02-29")) IS NOT 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 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP FUNCTION IF EXISTS `json_removeNulls` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` FUNCTION `json_removeNulls`(vObject JSON) RETURNS longtext CHARSET utf8mb4 COLLATE utf8mb4_bin +BEGIN +/** + * Elimina las propiedades con valor NULL de un objeto. + * + * @param vObject El objeto en formato JSON + * @return El objeto JSON sin propiedades a NULL + */ + DECLARE vKeys JSON; + DECLARE vKey VARCHAR(255); + DECLARE vValue VARCHAR(255); + DECLARE i INT DEFAULT 0; + DECLARE vCount INT; + SET vKeys = JSON_KEYS(vObject); + SET vCount = JSON_LENGTH(vKeys); + WHILE i < vCount DO + SET vKey = JSON_VALUE(vKeys, CONCAT('$[',i,']')); + SET vValue = JSON_VALUE(vObject, CONCAT('$.', vKey)); + IF vValue IS NULL THEN + SET vObject = JSON_REMOVE(vObject, CONCAT('$.', vKey)); + END IF; + SET i := i + 1; + END WHILE; + + RETURN vObject; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -20229,7 +19981,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` FUNCTION `midnight`() RETURNS datetime READS SQL DATA BEGIN - + RETURN TIMESTAMP(util.VN_CURDATE(), '23:59:59'); END ;; @@ -20257,7 +20009,7 @@ BEGIN * modo 3. */ DECLARE vYear INT DEFAULT FLOOR(vYearWeek / 100); - + IF vYearWeek < YEARWEEK(CONCAT(vYear, '-12-31'), 3) THEN RETURN vYearWeek + 1; ELSE @@ -20290,14 +20042,9 @@ BEGIN * @param vAuthorFk The notification author or %NULL if there is no author * @return The notification id */ - DECLARE vNotificationFk INT; - - SELECT id INTO vNotificationFk - FROM `notification` - WHERE `name` = vNotificationName; INSERT INTO notificationQueue - SET notificationFk = vNotificationFk, + SET notificationFk = vNotificationName, params = vParams, authorFk = vAuthorFk; @@ -20368,16 +20115,16 @@ BEGIN */ DECLARE vLen, vPos INT UNSIGNED; DECLARE vResult MEDIUMBLOB; - + SET vLen = LENGTH(vString); SET vPos = 1; SET vResult = ''; - + WHILE vPos <= vLen DO SET vResult = CONCAT(vResult, LPAD(HEX( ORD(SUBSTR(vString, vPos, 1)) ^ vConst), 2, '0')); SET vPos = vPos + 1; END WHILE; - + RETURN UNHEX(vResult); END ;; DELIMITER ; @@ -20487,11 +20234,11 @@ BEGIN IF vYear = vCurYear THEN RETURN 'curYear'; END IF; - + IF vYear = vCurYear - 1 THEN RETURN 'lastYear'; END IF; - + IF vYear = vCurYear - 2 THEN RETURN 'twoYearsAgo'; END IF; @@ -20578,10 +20325,10 @@ BEGIN */ SET vChain = CONCAT('%', vChain, '%'); SET vCompare = CONCAT('%', vCompare, '%'); - SELECT * FROM + SELECT * FROM ( SELECT t1.* FROM - ( + ( SELECT `db`, `name`, @@ -20608,7 +20355,7 @@ BEGIN 'TRIGGER', `ACTION_STATEMENT`, NULL, - NULL + NULL FROM `information_schema`.`TRIGGERS` WHERE `ACTION_STATEMENT` LIKE vChain COLLATE utf8_general_ci UNION ALL @@ -20618,7 +20365,7 @@ BEGIN 'VIEW', `VIEW_DEFINITION`, NULL, - NULL + NULL FROM `information_schema`.`VIEWS` WHERE `VIEW_DEFINITION` LIKE vChain COLLATE utf8_general_ci ) t1 @@ -20649,7 +20396,7 @@ BEGIN 'TRIGGER', `ACTION_STATEMENT`, NULL, - NULL + NULL FROM `information_schema`.`TRIGGERS` WHERE `ACTION_STATEMENT` LIKE vCompare COLLATE utf8_general_ci UNION ALL @@ -20659,7 +20406,7 @@ BEGIN 'VIEW', `VIEW_DEFINITION`, NULL, - NULL + NULL FROM `information_schema`.`VIEWS` WHERE `VIEW_DEFINITION` LIKE vCompare COLLATE utf8_general_ci) t2 ON t2.name = t1.name ORDER BY t1.`db`, t1.`name` @@ -20690,7 +20437,7 @@ BEGIN * @param vValue Valor de la variable */ DECLARE vIndex INT DEFAULT INSTR(USER(), '@'); - + INSERT INTO debug SET `connectionId` = CONNECTION_ID(), `user` = LEFT(USER(), vIndex - 1), @@ -20757,7 +20504,7 @@ BEGIN SET vChain = CONCAT('%', vChain, '%'); SELECT * FROM - ( + ( SELECT `routine_schema` `schema`, `routine_name` `name`, @@ -20784,7 +20531,7 @@ BEGIN 'TRIGGER', `ACTION_STATEMENT`, NULL, - NULL + NULL FROM `information_schema`.`TRIGGERS` WHERE `ACTION_STATEMENT` LIKE vChain COLLATE utf8_general_ci UNION ALL @@ -20794,7 +20541,7 @@ BEGIN 'VIEW', `VIEW_DEFINITION`, NULL, - NULL + NULL FROM `information_schema`.`VIEWS` WHERE `VIEW_DEFINITION` LIKE vChain COLLATE utf8_general_ci ) t @@ -20807,6 +20554,119 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `log_add` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `log_add`( + vSchema VARCHAR(45), + vEntity VARCHAR(45), + vChangedModel VARCHAR(45), + vOriginFk INT, + vChangedModelId INT, + vActionCode VARCHAR(45), + vOldInstance JSON, + vNewInstance JSON) +BEGIN +/** + * Guarda las acciones realizadas por el usuario + * + * @param vOriginFk Id del registro de origen + * @param vActionCode Código de la acción {insert | delete | update} + * @param vScheme Esquema al que pertenece la tabla. + * @param vEntity Nombre que hace referencia a la tabla. + * @param vOldInstance Valores antiguos + * @param vNewInstance Valores nuevos + */ + CALL util.log_addWithUser(vSchema, vEntity, + vChangedModel, vOriginFk, vChangedModelId, vActionCode, vOldInstance, vNewInstance, 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_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `log_addWithUser` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `log_addWithUser`( + vSchema VARCHAR(45), + vEntity VARCHAR(45), + vChangedModel VARCHAR(45), + vOriginFk INT, + vChangedModelId INT, + vActionCode VARCHAR(45), + vOldInstance JSON, + vNewInstance JSON, + vUserId INT) +BEGIN +/** + * Guarda las acciones realizadas por el usuario + * + * @param vScheme Esquema al que pertenece la tabla. + * @param vEntity Nombre que hace referencia a la tabla donde se insertará el log + * @param vChangedModel Nombre que hace referencia a la tabla que se modifica + * @param vOriginFk Id del registro de la tabla origen + * @param vChangedModelId Id del registro de la tabla a la que se realiza la acción + * @param vActionCode Código de la acción {insert | delete | update} + * @param vOldInstance JSON que contiene los valores viejos + * @param vNewInstance JSON que contiene los valores nuevos + * @param vUserId Id del usuario que realiza la acción + */ + DECLARE vTableName VARCHAR(255) DEFAULT CONCAT(IFNULL(vEntity, ''), 'Log'); + DECLARE vKeys JSON; + DECLARE vKey VARCHAR(255); + DECLARE vOldValue VARCHAR(255); + DECLARE vNewValue VARCHAR(255); + DECLARE vValue VARCHAR(255); + DECLARE i INT DEFAULT 0; + DECLARE vCount INT; + + SET vSchema = util.quoteIdentifier(vSchema); + SET vTableName = util.quoteIdentifier(vTableName); + + CASE vActionCode + WHEN 'insert' THEN + SELECT json_removeNulls(vNewInstance) INTO vNewInstance; + WHEN 'update' THEN + SET vKeys = JSON_KEYS(vOldInstance); + SET vCount = JSON_LENGTH(vOldInstance); + WHILE i < vCount DO + SET vKey = JSON_VALUE(vKeys, CONCAT('$[',i,']')); + SET vOldValue = JSON_VALUE(vOldInstance, CONCAT('$.',vKey)); + SET vNewValue = JSON_VALUE(vNewInstance, CONCAT('$.',vKey)); + IF (vOldValue = vNewValue) THEN + SET vOldInstance = JSON_REMOVE(vOldInstance, CONCAT('$.',vKey)); + SET vNewInstance = JSON_REMOVE(vNewInstance, CONCAT('$.',vKey)); + END IF; + SET i := i + 1; + END WHILE; + WHEN 'delete' THEN + SELECT json_removeNulls(vOldInstance) INTO vOldInstance; + END CASE; + + EXECUTE IMMEDIATE CONCAT( + 'INSERT INTO ', vSchema, '.', vTableName, ' SET changedModel = ?, originFk = ?, changedModelId= ?, action = ?, oldInstance = ?, newInstance = ?, userFk = ?' + ) USING vChangedModel, vOriginFk, vChangedModelId, vActionCode, vOldInstance, vNewInstance, vUserId; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `procNoOverlap` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -21008,7 +20868,7 @@ BEGIN INSERT INTO tmp.time (dated) VALUES (vCurrentDate); SET vCurrentDate = DATE_ADD(vCurrentDate, INTERVAL 1 DAY); END WHILE; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -21146,16 +21006,28 @@ CREATE TABLE `XDiario` ( /*!50003 SET @saved_cs_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 character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`XDiario_beforeInsert` BEFORE INSERT ON `XDiario` FOR EACH ROW BEGIN + IF NEW.SUBCTA <=> '' THEN + SET NEW.SUBCTA = NULL; + END IF; + IF NEW.SUBCTA IS NOT NULL AND NOT LENGTH(NEW.SUBCTA) <=> 10 THEN + CALL util.throw('INVALID_STRING_LENGTH'); + END IF; + IF NEW.CONTRA <=> '' THEN + SET NEW.CONTRA = NULL; + END IF; + IF NEW.CONTRA IS NOT NULL AND NOT LENGTH(NEW.CONTRA) <=> 10 THEN + CALL util.throw('INVALID_STRING_LENGTH'); + END IF; CALL XDiario_checkDate(NEW.FECHA); CALL XDiario_checkDate(NEW.FECHA_EX); CALL XDiario_checkDate(NEW.FECHA_OP); @@ -21170,16 +21042,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 = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`XDiario_beforeUpdate` BEFORE UPDATE ON `XDiario` FOR EACH ROW BEGIN + IF NOT NEW.SUBCTA <=> OLD.SUBCTA THEN + IF NEW.SUBCTA <=> '' THEN + SET NEW.SUBCTA = NULL; + END IF; + IF NEW.SUBCTA IS NOT NULL AND NOT LENGTH(NEW.SUBCTA) <=> 10 THEN + CALL util.throw('INVALID_STRING_LENGTH'); + END IF; + END IF; + IF NOT NEW.CONTRA <=> OLD.CONTRA THEN + IF NEW.CONTRA <=> '' THEN + SET NEW.CONTRA = NULL; + END IF; + IF NEW.CONTRA IS NOT NULL AND NOT LENGTH(NEW.CONTRA) <=> 10 THEN + CALL util.throw('INVALID_STRING_LENGTH'); + END IF; + END IF; IF NOT NEW.FECHA <=> OLD.FECHA THEN CALL XDiario_checkDate(NEW.FECHA); END IF; @@ -21385,11 +21273,11 @@ BEGIN END IF; IF NEW.isEqualizated IS NULL THEN - SELECT isEqualizated + SELECT isEqualizated INTO vIsEqualizated FROM client WHERE id = NEW.clientFk; - + SET NEW.isEqualizated = vIsEqualizated; END IF; END */;; @@ -21411,11 +21299,11 @@ DELIMITER ;; BEFORE UPDATE ON `address` FOR EACH ROW BEGIN - + IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN CALL pbx.phone_isValid(NEW.phone); END IF; - + IF !(NEW.mobile <=> OLD.mobile) AND (NEW.mobile <> '')THEN CALL pbx.phone_isValid(NEW.mobile); END IF; @@ -21441,16 +21329,16 @@ DELIMITER ;; BEGIN -- Recargos de equivalencia distintos implican facturacion por consignatario IF NEW.isEqualizated != OLD.isEqualizated THEN - IF + IF (SELECT COUNT(*) FROM ( SELECT DISTINCT (isEqualizated = FALSE) as Equ - FROM address + FROM address WHERE clientFk = NEW.clientFk ) t1 ) > 1 - THEN - UPDATE client + THEN + UPDATE client SET hasToInvoiceByAddress = TRUE WHERE id = NEW.clientFk; END IF; @@ -21458,10 +21346,10 @@ BEGIN IF NEW.isDefaultAddress AND NEW.isActive = FALSE THEN CALL util.throw ('Cannot desactivate the default address'); END IF; - + IF NOT (NEW.isEqualizated <=> OLD.isEqualizated) THEN INSERT IGNORE INTO ticketRecalc (ticketFk) - SELECT id FROM ticket t + SELECT id FROM ticket t WHERE t.addressFk = NEW.id AND t.refFk IS NULL; END IF; @@ -21710,6 +21598,22 @@ SET character_set_client = utf8; 1 AS `invoiced` */; SET character_set_client = @saved_cs_client; +-- +-- Table structure for table `arcRead` +-- + +DROP TABLE IF EXISTS `arcRead`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `arcRead` ( + `id` smallint(2) unsigned NOT NULL AUTO_INCREMENT, + `printerFk` tinyint(3) unsigned DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `worker_printer_FK` (`printerFk`), + CONSTRAINT `worker_printer_FK` FOREIGN KEY (`printerFk`) REFERENCES `printer` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `assignedTicketToWorker` -- @@ -21727,6 +21631,21 @@ CREATE TABLE `assignedTicketToWorker` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Tabla para relacionar un ticket con el sacador del altillo '; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `auctionConfig` +-- + +DROP TABLE IF EXISTS `auctionConfig`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `auctionConfig` ( + `conversionCoefficient` double NOT NULL DEFAULT 1 COMMENT 'value used to calculate the used space of an item in a container', + `warehosueFk` smallint(6) unsigned NOT NULL DEFAULT 7 COMMENT 'default warehouse used for the calculation', + KEY `auctionConfig_FK` (`warehosueFk`), + CONSTRAINT `auctionConfig_FK` FOREIGN KEY (`warehosueFk`) REFERENCES `warehouse` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `autoRadioConfig` -- @@ -21794,8 +21713,8 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`autonomy_BI` BEFORE INSERT ON `autonomy` FOR EACH ROW -BEGIN - +BEGIN + SET NEW.geoFk = zoneGeo_new('autonomy', NEW.`name`, (SELECT geoFk FROM country WHERE id = NEW.countryFk)); END */;; @@ -21845,7 +21764,7 @@ DELIMITER ;; AFTER DELETE ON `autonomy` FOR EACH ROW BEGIN - CALL zoneGeo_delete(OLD.geoFk); + CALL zoneGeo_delete(OLD.geoFk); END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -21921,7 +21840,7 @@ DELIMITER ;; BEFORE INSERT ON `awb` FOR EACH ROW BEGIN - + SET NEW.year= year(util.VN_CURDATE()); @@ -22278,11 +22197,11 @@ DELIMITER ;; BEFORE INSERT ON `budgetNotes` FOR EACH ROW BEGIN - + IF ISNULL(NEW.userFk) THEN - + SET NEW.userFk = account.myUser_getId(); - + END IF; END */;; @@ -22328,6 +22247,7 @@ CREATE TABLE `business` ( KEY `business_departmentFk_idx` (`departmentFk`), KEY `business_workerBusinessProfessionalCategoryFk_idx` (`workerBusinessProfessionalCategoryFk`), KEY `business_calendarTypeFk_idx` (`calendarTypeFk`), + KEY `business_workerBusinessCategoryFk` (`workerBusinessCategoryFk`), KEY `business_workerBusinessTypeFk_idx` (`workerBusinessTypeFk`), KEY `business_workerBusinessAgreementFk_idx` (`workerBusinessAgreementFk`), CONSTRAINT `business_calendarTypeFk` FOREIGN KEY (`calendarTypeFk`) REFERENCES `postgresql`.`calendar_labour_type` (`calendar_labour_type_id`) ON UPDATE CASCADE, @@ -22335,6 +22255,7 @@ CREATE TABLE `business` ( CONSTRAINT `business_departmentFk` FOREIGN KEY (`departmentFk`) REFERENCES `department` (`id`) ON UPDATE CASCADE, CONSTRAINT `business_occupationCodeFk` FOREIGN KEY (`occupationCodeFk`) REFERENCES `occupationCode` (`code`) ON UPDATE CASCADE, CONSTRAINT `business_workerBusinessAgreementFk` FOREIGN KEY (`workerBusinessAgreementFk`) REFERENCES `postgresql`.`labour_agreement` (`labour_agreement_id`) ON UPDATE CASCADE, + CONSTRAINT `business_workerBusinessCategoryFk` FOREIGN KEY (`workerBusinessCategoryFk`) REFERENCES `vn2008`.`payroll_categorias` (`codcategoria`) ON UPDATE CASCADE, CONSTRAINT `business_workerBusinessProfessionalCategoryFk` FOREIGN KEY (`workerBusinessProfessionalCategoryFk`) REFERENCES `postgresql`.`professional_category` (`professional_category_id`) ON UPDATE CASCADE, CONSTRAINT `business_workerBusinessTypeFk` FOREIGN KEY (`workerBusinessTypeFk`) REFERENCES `workerBusinessType` (`id`) ON UPDATE CASCADE, CONSTRAINT `business_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE @@ -22396,28 +22317,28 @@ DELIMITER ;; FOR EACH ROW BEGIN DECLARE isOverlapping BOOL; - + IF NEW.ended IS NULL THEN SET NEW.payedHolidays = 0; END IF; IF !(OLD.started <=> NEW.started AND OLD.ended <=> NEW.ended) THEN - + SELECT COUNT(*) > 0 INTO isOverlapping FROM business b WHERE (util.hasDateOverlapped( - NEW.started, + NEW.started, IFNULL(NEW.ended, b.started), b.started, IFNULL(b.ended, NEW.started)) OR (NEW.ended <=> NULL AND b.ended <=> NULL)) AND b.id <> OLD.id AND workerFk = OLD.workerFk; - - IF isOverlapping THEN + + IF isOverlapping THEN CALL util.throw ('IS_OVERLAPPING'); END IF; - + END IF; END */;; @@ -22663,7 +22584,7 @@ trig: BEGIN LEAVE trig; END IF; - IF @isTriggerDisabled THEN + IF @isTriggerDisabled THEN LEAVE trig; END IF; @@ -22769,12 +22690,12 @@ trig: BEGIN OR !(NEW.created <=> OLD.created) THEN CALL stock.log_add('buy', NEW.id, OLD.id); END IF; - + IF @isModeInventory THEN LEAVE trig; END IF; - IF @isTriggerDisabled THEN + IF @isTriggerDisabled THEN LEAVE trig; END IF; @@ -22784,24 +22705,24 @@ trig: BEGIN INTO vIsBuyerToBeEmailed, vLanded FROM entry e JOIN travel t ON t.id = e.travelFk - JOIN warehouse w ON w.id = t.warehouseInFk + JOIN warehouse w ON w.id = t.warehouseInFk WHERE e.id = NEW.entryFk; - - SELECT it.workerFk, i.longName + + SELECT it.workerFk, i.longName INTO vBuyerFk, vItemName FROM itemCategory k JOIN itemType it ON it.categoryFk = k.id JOIN item i ON i.typeFk = it.id WHERE i.id = OLD.itemFk; - IF vIsBuyerToBeEmailed AND - vBuyerFk != account.myUser_getId() AND + IF vIsBuyerToBeEmailed AND + vBuyerFk != account.myUser_getId() AND vLanded = util.VN_CURDATE() THEN - IF !(NEW.itemFk <=> OLD.itemFk) OR - !(NEW.quantity <=> OLD.quantity) OR + IF !(NEW.itemFk <=> OLD.itemFk) OR + !(NEW.quantity <=> OLD.quantity) OR !(NEW.packing <=> OLD.packing) OR - !(NEW.grouping <=> OLD.grouping) OR - !(NEW.packageFk <=> OLD.packageFk) OR + !(NEW.grouping <=> OLD.grouping) OR + !(NEW.packageFk <=> OLD.packageFk) OR !(NEW.weight <=> OLD.weight) THEN CALL vn.mail_insert( CONCAT(account.user_getNameFromId(vBuyerFk),'@verdnatura.es'), @@ -22830,7 +22751,7 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_beforeDelete` BEFORE DELETE ON buy FOR EACH ROW -BEGIN +BEGIN IF OLD.printedStickers <> 0 THEN CALL util.throw("it is not possible to delete buys with printed labels "); END IF; @@ -22852,15 +22773,17 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_afterDelete` AFTER DELETE ON `buy` FOR EACH ROW -trig: BEGIN +trig: BEGIN DECLARE vValues VARCHAR(255); - IF @isTriggerDisabled THEN + IF @isTriggerDisabled THEN LEAVE trig; END IF; CALL stock.log_add('buy', NULL, OLD.id); + CALL util.debugAdd('buy_deleted', CONCAT(OLD.id,' ', OLD.itemFk,' ', OLD.entryFk, ' ', vn.getWorkerCode())); + /*IF entry_isInventoryOrPrevious(OLD.entryFk) THEN SET vValues = CONCAT_WS(',', OLD.entryFk, @@ -22937,11 +22860,12 @@ CREATE TABLE `calendar` ( `dayOffTypeFk` int(11) NOT NULL, `dated` date NOT NULL, PRIMARY KEY (`id`), + UNIQUE KEY `calendar_UN` (`businessFk`,`dated`), KEY `calendar_employee_business_labour_id_idx` (`businessFk`), KEY `calendar_employee_calendar_state_calendar_state_id_idx` (`dayOffTypeFk`), KEY `id_index` (`id`), CONSTRAINT `calendar_FK` FOREIGN KEY (`dayOffTypeFk`) REFERENCES `absenceType` (`id`) ON UPDATE CASCADE, - CONSTRAINT `calendar_businessFk` FOREIGN KEY (`businessFk`) REFERENCES `business` (`id`) ON UPDATE CASCADE + CONSTRAINT `calendar_businessFk` FOREIGN KEY (`businessFk`) REFERENCES `business` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; @@ -23158,7 +23082,7 @@ BEGIN FROM sale WHERE id = NEW.saleFk; - UPDATE claim + UPDATE claim SET ticketFk = vTicket WHERE id = NEW.claimFk; END */;; @@ -23414,7 +23338,7 @@ CREATE TABLE `claimRma` ( `created` timestamp NOT NULL DEFAULT current_timestamp(), `workerFk` int(10) unsigned NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -23458,7 +23382,7 @@ CREATE TABLE `client` ( `accountingAccount` varchar(10) CHARACTER SET utf8mb3 NOT NULL, `isEqualizated` tinyint(1) NOT NULL DEFAULT 0, `city` varchar(25) COLLATE utf8mb3_unicode_ci DEFAULT NULL, - `provinceFk` smallint(5) unsigned DEFAULT NULL, + `provinceFk` smallint(5) unsigned NOT NULL, `postcode` varchar(8) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `socialName` varchar(60) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `contact` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, @@ -23487,6 +23411,7 @@ CREATE TABLE `client` ( `hasToInvoiceByAddress` tinyint(1) DEFAULT 0, `isCreatedAsServed` tinyint(1) DEFAULT 0, `hasInvoiceSimplified` tinyint(1) NOT NULL DEFAULT 0, + `hasElectronicInvoice` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Registro de facturas mediante FACe', `iban` varchar(45) CHARACTER SET utf8mb3 DEFAULT NULL, `hasLcr` tinyint(1) NOT NULL DEFAULT 0, `bankEntityFk` int(10) unsigned DEFAULT NULL, @@ -23495,7 +23420,7 @@ CREATE TABLE `client` ( `transactionTypeSageFk` tinyint(4) DEFAULT NULL COMMENT 'Tipo de transacción por defecto asociado al cliente en SAGE', `transferorFk` int(11) DEFAULT NULL COMMENT 'Cliente que le ha transmitido la titularidad de la empresa', `lastSalesPersonFk` int(10) unsigned DEFAULT NULL COMMENT 'ultimo comercial que tuvo, para el calculo del peso en los rankings de equipo', - `businessTypeFk` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `businessTypeFk` varchar(20) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT 'florist', `hasIncoterms` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Received incoterms authorization from client', PRIMARY KEY (`id`), UNIQUE KEY `IF` (`fi`), @@ -23556,7 +23481,7 @@ BEGIN END IF; SET NEW.accountingAccount = 4300000000 + NEW.id; - + SET NEW.lastSalesPersonFk = NEW.salesPersonFk; END */;; DELIMITER ; @@ -23584,19 +23509,19 @@ BEGIN IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN CALL pbx.phone_isValid(NEW.phone); END IF; - + IF !(NEW.mobile <=> OLD.mobile) AND (NEW.mobile <> '')THEN CALL pbx.phone_isValid(NEW.mobile); END IF; SELECT id INTO vPayMethodFk - FROM vn.payMethod + FROM vn.payMethod WHERE code = 'bankDraft'; - + IF NEW.payMethodFk = vPayMethodFk AND NEW.dueDay = 0 THEN SET NEW.dueDay = 5; END IF; - + -- Avisar al comercial si ha llegado la documentación sepa/core IF NEW.hasSepaVnl AND !OLD.hasSepaVnl THEN @@ -23609,7 +23534,7 @@ BEGIN IF vText IS NOT NULL THEN - INSERT INTO mail(receiver, replyTo, `subject`, body) + INSERT INTO mail(receiver, replyTo, `subject`, body) SELECT CONCAT(IF(ac.id,u.name, 'jgallego'), '@verdnatura.es'), 'administracion@verdnatura.es', @@ -23620,16 +23545,16 @@ BEGIN LEFT JOIN account.account ac ON ac.id = u.id WHERE w.id = NEW.salesPersonFk; END IF; - + IF NEW.salespersonFk IS NULL AND OLD.salespersonFk IS NOT NULL THEN - IF (SELECT COUNT(clientFk) + IF (SELECT COUNT(clientFk) FROM clientProtected WHERE clientFk = NEW.id ) > 0 THEN CALL util.throw("HAS_CLIENT_PROTECTED"); END IF; END IF; - + IF !(NEW.salesPersonFk <=> OLD.salesPersonFk) THEN SET NEW.lastSalesPersonFk = IFNULL(NEW.salesPersonFk, OLD.salesPersonFk); END IF; @@ -23660,18 +23585,18 @@ BEGIN IF !(NEW.defaultAddressFk <=> OLD.defaultAddressFk) THEN UPDATE `address` SET isDefaultAddress = 0 WHERE clientFk = NEW.id; - + UPDATE `address` SET isDefaultAddress = 1 - WHERE id = NEW.defaultAddressFk; + WHERE id = NEW.defaultAddressFk; END IF; IF NOT (NEW.provinceFk <=> OLD.provinceFk) OR NOT (NEW.isVies <=> OLD.isVies) THEN INSERT IGNORE INTO ticketRecalc (ticketFk) - SELECT id FROM ticket t + SELECT id FROM ticket t WHERE t.clientFk = NEW.id AND t.refFk IS NULL; END IF; - + IF NOT NEW.isActive THEN UPDATE account.`user` SET active = FALSE @@ -23786,15 +23711,15 @@ DELIMITER ;; 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, ' €'), @@ -23881,7 +23806,7 @@ CREATE TABLE `clientItemType` ( KEY `clientItemType_FK_1` (`itemTypeFk`), CONSTRAINT `clientItemType_FK` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `clientItemType_FK_1` FOREIGN KEY (`itemTypeFk`) REFERENCES `itemType` (`code`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='son familias de productos que se quieren sustraer a la oferta del cliente'; +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='son familias de productos que se quieren sustraer a la oferta del cliente'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -24157,23 +24082,23 @@ BEGIN DECLARE vLastSenderInstructions VARCHAR(255); DECLARE vLastId INT; DECLARE vCurrentAgency INT; - + SELECT am.agencyFk INTO vCurrentAgency FROM vn.agencyMode am JOIN vn.ticket t ON t.agencyModeFk = am.id WHERE t.id = NEW.ticketFk; - + SELECT MAX(cmr.id) INTO vLastId FROM cmr JOIN vn.ticket t ON t.id = cmr.ticketFk JOIN vn.agencyMode am ON am.id = t.agencyModeFk - WHERE am.agencyFk = vCurrentAgency + WHERE am.agencyFk = vCurrentAgency ; - + SELECT senderInstruccions INTO vLastSenderInstructions FROM cmr WHERE id = vLastId; - + SET NEW.senderInstruccions = vLastSenderInstructions; END */;; @@ -24303,39 +24228,39 @@ CREATE TABLE `collection` ( /*!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`.`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 */ ; @@ -25220,7 +25145,7 @@ BEGIN UPDATE `client` c JOIN vn.creditClassification cc ON cc.client = c.id SET creditInsurance = NEW.credit WHERE cc.id = NEW.creditClassification; - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -25479,7 +25404,7 @@ BEGIN JOIN vn.department d ON d.id = b.departmentFk SET b.departmentFk = d.parentFk WHERE b.departmentFk = OLD.id; - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -25499,9 +25424,9 @@ DELIMITER ;; AFTER DELETE ON `department` FOR EACH ROW BEGIN - + UPDATE vn.department_recalc SET isChanged = TRUE; - + UPDATE vn.business b JOIN vn.department d ON d.id = b.departmentFk SET b.departmentFk = d.parentFk @@ -25572,11 +25497,36 @@ CREATE TABLE `deviceLog` ( `created` timestamp NOT NULL DEFAULT current_timestamp(), `nameApp` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `versionApp` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `deviceProductionFk` int(10) DEFAULT NULL, PRIMARY KEY (`id`), KEY `deviceLog_FK` (`userFk`), CONSTRAINT `deviceLog_FK` FOREIGN KEY (`userFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_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 = utf8mb4 */ ; +/*!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`.`deviceLog_beforeInsert` +BEFORE INSERT +ON deviceLog FOR EACH ROW +BEGIN + DECLARE vDeviceProductionFk INTEGER; + SELECT dp.id INTO vDeviceProductionFk + FROM deviceProduction dp + WHERE dp.android_id = NEW.android_id; + SET NEW.deviceProductionFk = vDeviceProductionFk; +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 `deviceProduction` @@ -25591,20 +25541,62 @@ CREATE TABLE `deviceProduction` ( `modelFk` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, `macWifi` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `serialNumber` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL, - `departmentFk` int(11) DEFAULT NULL, - `isOutOfService` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0: Ok - 1: No disponible - 2: Sat', `android_id` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `purchased` date NOT NULL DEFAULT '1900-01-01' COMMENT 'Fecha de compra', + `stateFk` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT 'idle', + `isInScalefusion` tinyint(1) DEFAULT 0 COMMENT 'Para saber si esta en Scalefusion', PRIMARY KEY (`id`), UNIQUE KEY `device_id_UNIQUE` (`id`), UNIQUE KEY `sn_UNIQUE` (`imei`), UNIQUE KEY `serial_number_UN` (`serialNumber`), KEY `deviceProductionModelsFgn` (`modelFk`), - KEY `departmentFgn` (`departmentFk`), - CONSTRAINT `departmentFgn` FOREIGN KEY (`departmentFk`) REFERENCES `department` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, - CONSTRAINT `deviceProductionModelsFgn` FOREIGN KEY (`modelFk`) REFERENCES `deviceProductionModels` (`code`) ON UPDATE CASCADE + KEY `deviceProduction_FK` (`stateFk`), + CONSTRAINT `deviceProductionModelsFgn` FOREIGN KEY (`modelFk`) REFERENCES `deviceProductionModels` (`code`) ON UPDATE CASCADE, + CONSTRAINT `deviceProduction_FK` FOREIGN KEY (`stateFk`) REFERENCES `deviceProductionState` (`code`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_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 = utf8mb4 */ ; +/*!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`.`deviceProduction_afterInsert` + AFTER INSERT + ON deviceProduction FOR EACH ROW +BEGIN + INSERT INTO deviceProductionLog (originFk, userFk, newInstance, action, changedModel, changedModelId) + VALUES(NEW.id, account.myUser_getId(), NEW.stateFk, 'INSERT', 'deviceProduction', NEW.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 = utf8mb4 */ ; +/*!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`.`deviceProduction_afterUpdate` + BEFORE UPDATE + ON vn.deviceProduction FOR EACH ROW +BEGIN + INSERT INTO deviceProductionLog (originFk, userFk, newInstance, oldInstance , action, changedModel, changedModelId) + VALUES(OLD.id, account.myUser_getId(), NEW.stateFk, OLD.stateFk , 'update', 'deviceProduction', 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 `deviceProductionConfig` @@ -25646,6 +25638,28 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +-- +-- Table structure for table `deviceProductionLog` +-- + +DROP TABLE IF EXISTS `deviceProductionLog`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `deviceProductionLog` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `originFk` int(11) NOT NULL, + `userFk` int(10) unsigned DEFAULT NULL, + `deviceProduction` int(10) unsigned NOT NULL, + `action` set('insert','update','delete','retired') COLLATE utf8mb3_unicode_ci NOT NULL, + `created` timestamp NULL DEFAULT current_timestamp(), + `oldInstance` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `newInstance` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `changedModel` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `changedModelId` int(11) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `deviceProductionModels` -- @@ -25659,6 +25673,20 @@ CREATE TABLE `deviceProductionModels` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `deviceProductionState` +-- + +DROP TABLE IF EXISTS `deviceProductionState`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `deviceProductionState` ( + `code` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, + `description` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, + PRIMARY KEY (`code`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `deviceProductionUser` -- @@ -25677,6 +25705,35 @@ CREATE TABLE `deviceProductionUser` ( CONSTRAINT `deviceProductionUser_PK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_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 = utf8mb4 */ ; +/*!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`.`deviceProductionUser_afterDelete` + AFTER DELETE + ON deviceProductionUser FOR EACH ROW +BEGIN + INSERT INTO deviceProductionLog (originFk, userFk, oldInstance, action, changedModel, changedModelId) + SELECT + OLD.deviceProductionFk, + account.myUser_getId(), + stateFk, + 'DELETE', + 'deviceProductionUser', + OLD.deviceProductionFk + FROM deviceProduction + WHERE id = OLD.deviceProductionFk; +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 `disabilityGrade` @@ -25739,20 +25796,20 @@ DELIMITER ;; BEGIN DECLARE vHardCopyNumber INT; DECLARE vDmsTypeCode INT; - + IF (SELECT NOT hasDms FROM warehouse WHERE id = NEW.warehouseFk) THEN CALL util.throw('this warehouse has not dms'); END IF; IF NEW.hasFile THEN - SELECT 1 + MAX(hardCopyNumber) INTO vHardCopyNumber - FROM dms + SELECT 1 + MAX(hardCopyNumber) INTO vHardCopyNumber + FROM dms WHERE warehouseFk = NEW.warehouseFk; - + SET NEW.hardCopyNumber = IFNULL(vHardCopyNumber,1); END IF; - - SELECT code INTO vDmsTypeCode + + SELECT code INTO vDmsTypeCode FROM dmsType WHERE NEW.dmsTypeFk = id; IF (vDmsTypeCode ='ticket') THEN UPDATE ticket SET isSigned = 1 WHERE id = NEW.reference; @@ -25772,31 +25829,31 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -/*!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; +/*!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 */ ; @@ -25815,14 +25872,14 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`dms_beforeDelete` BEFORE DELETE ON `dms` FOR EACH ROW -BEGIN +BEGIN DECLARE vCanNotBeDeleted INT; - SELECT COUNT(*) INTO vCanNotBeDeleted - FROM dmsType dt - WHERE NOT (code <=> 'trash') + SELECT COUNT(*) INTO vCanNotBeDeleted + FROM dmsType dt + WHERE NOT (code <=> 'trash') AND dt.id = OLD.dmsTypeFk; - - IF vCanNotBeDeleted THEN + + IF vCanNotBeDeleted THEN CALL util.throw('A dms can not be deleted'); END IF; END */;; @@ -25896,10 +25953,11 @@ DROP TABLE IF EXISTS `docuware`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `docuware` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, - `fileCabinetName` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, - `dialogName` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL, - `find` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `code` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, + `fileCabinetName` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL, + `action` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL, + `dialogName` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL, + `findById` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -25914,7 +25972,7 @@ DROP TABLE IF EXISTS `docuwareConfig`; CREATE TABLE `docuwareConfig` ( `id` int(11) NOT NULL AUTO_INCREMENT, `url` varchar(75) COLLATE utf8mb3_unicode_ci DEFAULT NULL, - `token` varchar(1000) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `cookie` varchar(1000) COLLATE utf8mb3_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -26137,10 +26195,10 @@ CREATE TABLE `ektEntryAssign` ( `sub` mediumint(8) unsigned DEFAULT NULL, `pro` mediumint(8) unsigned DEFAULT NULL, `auction` int(11) DEFAULT NULL, - `warehouseOutFk` int(11) DEFAULT NULL, - `warehouseInFk` int(11) DEFAULT NULL, - `agencyModeFk` int(11) DEFAULT NULL, - `supplierFk` int(11) DEFAULT NULL, + `warehouseOutFk` int(11) NOT NULL, + `warehouseInFk` int(11) NOT NULL, + `agencyModeFk` int(11) NOT NULL, + `supplierFk` int(11) NOT NULL, `entryFk` int(11) DEFAULT NULL, `ref` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `addressFk` int(11) DEFAULT NULL, @@ -26178,10 +26236,14 @@ DELIMITER ; /*!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 ektEntryAssign_afterUpdate -AFTER UPDATE -ON ektEntryAssign FOR EACH ROW - UPDATE entry SET reference = NEW.`ref` WHERE id = NEW.entryFk */;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER vn.ektEntryAssign_afterUpdate + AFTER UPDATE ON ektEntryAssign + FOR EACH ROW +BEGIN + IF NOT(NEW.`ref` <=> OLD.`ref`) OR NOT(NEW.`entryFk` <=> OLD.`entryFk`) THEN + UPDATE entry SET reference = NEW.`ref` WHERE id = NEW.entryFk; + END IF; +END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; /*!50003 SET character_set_client = @saved_cs_client */ ; @@ -26285,7 +26347,6 @@ CREATE TABLE `entry` ( `buyerFk` int(10) unsigned DEFAULT NULL, `typeFk` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL COMMENT 'Tipo de entrada', `reference` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL COMMENT 'Referencia para eti', - `ref` varchar(50) GENERATED ALWAYS AS (`invoiceNumber`) VIRTUAL COMMENT 'Columna virtual provisional para Salix', PRIMARY KEY (`id`), KEY `Id_Proveedor` (`supplierFk`), KEY `Fecha` (`dated`), @@ -26337,7 +26398,7 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entry_afterInsert` AFTER INSERT ON `entry` FOR EACH ROW -BEGIN +BEGIN CALL travel_requestRecalc(NEW.travelFk); END */;; DELIMITER ; @@ -26377,7 +26438,7 @@ BEGIN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'A cloned entry cannot be moved to a travel with different warehouses'; END IF; - + IF NEW.travelFk IS NULL THEN SELECT COUNT(*) INTO vPrintedCount FROM buy @@ -26397,7 +26458,7 @@ BEGIN END IF; IF !(NEW.travelFk <=> OLD.travelFk) - OR !(NEW.currencyFk <=> OLD.currencyFk) THEN + OR !(NEW.currencyFk <=> OLD.currencyFk) THEN SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk,NEW.supplierFk); END IF; @@ -26432,7 +26493,7 @@ BEGIN OR !(NEW.isRaid <=> OLD.isRaid) THEN CALL stock.log_add('entry', NEW.id, OLD.id); END IF; - + IF !(NEW.travelFk <=> OLD.travelFk) THEN CALL travel_requestRecalc(OLD.travelFk); CALL travel_requestRecalc(NEW.travelFk); @@ -26485,7 +26546,7 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entry_afterDelete` AFTER DELETE ON `entry` FOR EACH ROW -BEGIN +BEGIN CALL travel_requestRecalc(OLD.travelFk); END */;; DELIMITER ; @@ -26791,7 +26852,7 @@ CREATE TABLE `expedition` ( `ticketFk` int(10) NOT NULL, `freightItemFk` int(11) DEFAULT 1 COMMENT 'itemFk del artículo que nos va a facturar el proveedor de transporte.', `created` timestamp NULL DEFAULT current_timestamp(), - `itemFk` int(11) DEFAULT NULL COMMENT 'Si es necesario el itemFk del cubo, se obtiene mediante packagingFk, join packing.itemFk', + `itemFk__` int(11) DEFAULT NULL COMMENT 'Si es necesario el itemFk del cubo, se obtiene mediante packagingFk, join packing.itemFk', `counter` smallint(5) unsigned NOT NULL, `workerFk` int(10) unsigned DEFAULT NULL, `externalId` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL, @@ -26834,17 +26895,17 @@ BEGIN DECLARE intcounter INT; DECLARE vShipFk INT; - IF NEW.freightItemFk IS NOT NULL THEN + IF NEW.freightItemFk IS NOT NULL THEN UPDATE ticket SET packages = nz(packages) + 1 WHERE id = NEW.ticketFk; - SELECT IFNULL(MAX(counter),0) +1 INTO intcounter - FROM expedition e - INNER JOIN ticket t1 ON e.ticketFk = t1.id + SELECT IFNULL(MAX(counter),0) +1 INTO intcounter + FROM expedition e + INNER JOIN ticket t1 ON e.ticketFk = t1.id LEFT JOIN ticketState ts ON ts.ticket = t1.id - INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped) + INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped) AND t1.warehouseFk = t2.warehouseFk - WHERE t2.id = NEW.ticketFk AND ts.alertLevel < 3 AND t1.companyFk = t2.companyFk + WHERE t2.id = NEW.ticketFk AND ts.alertLevel < 3 AND t1.companyFk = t2.companyFk AND t1.agencyModeFk = t2.agencyModeFk; SET NEW.`counter` = intcounter; @@ -26869,9 +26930,9 @@ DELIMITER ;; FOR EACH ROW BEGIN IF NEW.counter <> OLD.counter THEN - IF (SELECT COUNT(*) FROM expedition e + IF (SELECT COUNT(*) FROM expedition e INNER JOIN ticket t1 ON e.ticketFk = t1.id - INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped) + INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped) WHERE t1.id = NEW.ticketFk AND counter = NEW.counter) > 0 THEN SET NEW.id = NULL; END IF; @@ -26895,11 +26956,11 @@ DELIMITER ;; BEFORE DELETE ON `expedition` FOR EACH ROW BEGIN - UPDATE ticket t - SET packages = (SELECT COUNT(counter)-1 + UPDATE ticket t + SET packages = (SELECT COUNT(counter)-1 FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk) - WHERE t.id = OLD.ticketFk; - + WHERE t.id = OLD.ticketFk; + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -27013,13 +27074,13 @@ DELIMITER ;; BEGIN DECLARE vNewPosition INT; - + SELECT MAX(position) + 1 INTO vNewPosition FROM vn.expeditionPallet WHERE truckFk = NEW.truckFk; - + SET NEW.position = IFNULL(vNewPosition,1); - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -27118,7 +27179,7 @@ DELIMITER ;; BEGIN SET NEW.workerFk = vn.getUser(); - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -27179,9 +27240,9 @@ DELIMITER ;; BEFORE INSERT ON expeditionState FOR EACH ROW BEGIN - + SET NEW.userFk = account.myUser_getId(); - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -27205,7 +27266,7 @@ BEGIN UPDATE vn.expedition e SET e.stateTypeFk = NEW.typeFk WHERE e.id = NEW.expeditionFk; - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -27294,13 +27355,23 @@ DROP TABLE IF EXISTS `expeditionTruck`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `expeditionTruck` ( `id` int(11) NOT NULL AUTO_INCREMENT, + `roadmapFk` int(10) unsigned DEFAULT NULL, + `warehouseFk` smallint(6) unsigned DEFAULT NULL, `ETD` datetime DEFAULT NULL, `description` varchar(45) COLLATE utf8mb3_unicode_ci NOT NULL, `bufferFk` int(11) DEFAULT NULL COMMENT 'buffer destino de las cajas', + `created` timestamp NULL DEFAULT current_timestamp(), + `userFk` int(10) unsigned DEFAULT NULL, PRIMARY KEY (`id`), KEY `expeditionTruck_idx1` (`ETD`), KEY `expeditionTruck_FK` (`bufferFk`), - CONSTRAINT `expeditionTruck_FK` FOREIGN KEY (`bufferFk`) REFERENCES `srt`.`buffer` (`id`) ON DELETE SET NULL ON UPDATE CASCADE + KEY `expeditionTruck_FK_1` (`warehouseFk`), + KEY `expeditionTruck_FK_2` (`roadmapFk`), + KEY `expeditionTruck_FK_3` (`userFk`), + CONSTRAINT `expeditionTruck_FK` FOREIGN KEY (`bufferFk`) REFERENCES `srt`.`buffer` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT `expeditionTruck_FK_1` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE, + CONSTRAINT `expeditionTruck_FK_2` FOREIGN KEY (`roadmapFk`) REFERENCES `roadmap` (`id`) ON UPDATE CASCADE, + CONSTRAINT `expeditionTruck_FK_3` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -27615,15 +27686,15 @@ CREATE TABLE `greuge` ( `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `greugeTypeFk` int(11) DEFAULT NULL, `ticketFk` int(11) DEFAULT NULL, - `userFK` int(10) unsigned DEFAULT NULL, + `userFk` int(10) unsigned DEFAULT NULL, PRIMARY KEY (`Id`), KEY `greuges_type_fk_idx` (`greugeTypeFk`), KEY `Id_Ticket_Greuge_Ticket_idx` (`ticketFk`), KEY `Greuges_cliente_idx` (`clientFk`), KEY `greuge_shipped_IDX` (`shipped`) USING BTREE, - KEY `greuge_FK` (`userFK`), + KEY `greuge_FK` (`userFk`), CONSTRAINT `Id_Ticket_Greuge_Ticket` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `greuge_FK` FOREIGN KEY (`userFK`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `greuge_FK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `greuges_type_fk` FOREIGN KEY (`greugeTypeFk`) REFERENCES `greugeType` (`id`) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci ROW_FORMAT=COMPACT; /*!40101 SET character_set_client = @saved_cs_client */; @@ -28030,49 +28101,49 @@ BEGIN DECLARE vIssuingCountry, vhostCountry INT; DECLARE vActive TINYINT; DECLARE vWithholdingSageFk INT; - - SELECT withholdingSageFk INTO vWithholdingSageFk - FROM vn.supplier + + SELECT withholdingSageFk INTO vWithholdingSageFk + FROM vn.supplier WHERE id = NEW.supplierFk; - SET NEW.withholdingSageFk = vWithholdingSageFk; - - SELECT countryFk, isActive INTO vIssuingCountry, vActive - FROM vn.supplier + SET NEW.withholdingSageFk = vWithholdingSageFk; + + SELECT countryFk, isActive INTO vIssuingCountry, vActive + FROM vn.supplier WHERE id = NEW.supplierFk; - - SELECT countryFk INTO vhostCountry - FROM vn.supplier + + SELECT countryFk INTO vhostCountry + FROM vn.supplier WHERE id = NEW.companyFk; IF vActive = 0 THEN CALL util.throw('INACTIVE_PROVIDER'); END IF; - - IF (SELECT COUNT(*) FROM vn.invoiceIn - WHERE supplierRef = NEW.supplierRef - AND supplierFk = NEW.supplierFk + + IF (SELECT COUNT(*) FROM vn.invoiceIn + WHERE supplierRef = NEW.supplierRef + AND supplierFk = NEW.supplierFk AND YEAR(issued) = YEAR(NEW.issued) ) THEN CALL util.throw('reference duplicated'); END IF; - + SELECT CASE WHEN (SELECT account FROM vn.supplier where id = NEW.supplierFk) LIKE '___3______' THEN 'C' - WHEN (SELECT vIssuingCountry=vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry + WHEN (SELECT vIssuingCountry=vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry where p1.CEE < 2 and p2.CEE < 2) = 1 THEN 'R' - WHEN (SELECT vIssuingCountry <> vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry - where p1.CEE < 2 and p2.CEE < 2) = 1 THEN 'E' + WHEN (SELECT vIssuingCountry <> vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry + where p1.CEE < 2 and p2.CEE < 2) = 1 THEN 'E' WHEN (SELECT vIssuingCountry<>vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry - where NOT p1.CEE < 2 AND not p1.id = 1) = 1 THEN 'W' + where NOT p1.CEE < 2 AND not p1.id = 1) = 1 THEN 'W' END INTO vSerie; - + SET NEW.serial = IFNULL(vSerie,'R'); IF vSerie LIKE 'W' THEN - SELECT IFNULL(MAX(serialNumber) + 1,1) INTO vNumReceived - FROM invoiceIn - WHERE `serial` LIKE NEW.serial AND - YEAR(issued) = YEAR(NEW.issued) AND + SELECT IFNULL(MAX(serialNumber) + 1,1) INTO vNumReceived + FROM invoiceIn + WHERE `serial` LIKE NEW.serial AND + YEAR(issued) = YEAR(NEW.issued) AND companyFk = NEW.companyFk; SET NEW.serialNumber = vNumReceived; END IF; @@ -28098,9 +28169,9 @@ BEGIN DECLARE vWithholdingSageFk INT; - IF (SELECT COUNT(*) FROM vn.invoiceIn - WHERE supplierRef = NEW.supplierRef - AND supplierFk = NEW.supplierFk + IF (SELECT COUNT(*) FROM vn.invoiceIn + WHERE supplierRef = NEW.supplierRef + AND supplierFk = NEW.supplierFk AND YEAR(issued) = YEAR(NEW.issued) AND id <> NEW.id ) THEN @@ -28110,7 +28181,7 @@ BEGIN IF NEW.supplierFk != OLD.supplierFk THEN CALL supplier_checkIsActive(NEW.supplierFk); SELECT withholdingSageFk INTO vWithholdingSageFk - FROM vn.supplier + FROM vn.supplier WHERE id = NEW.supplierFk; SET NEW.withholdingSageFk = vWithholdingSageFk; END IF; @@ -28135,23 +28206,23 @@ DELIMITER ;; FOR EACH ROW BEGIN - IF NEW.issued != OLD.issued + IF NEW.issued != OLD.issued OR NEW.currencyFk != OLD.currencyFk THEN UPDATE invoiceInTax iit JOIN invoiceIn ii ON ii.id = iit.invoiceInFk LEFT JOIN referenceRate rr ON rr.dated = ii.issued - AND rr.currencyFk = ii.currencyFk + AND rr.currencyFk = ii.currencyFk SET iit.taxableBase = IF(iit.foreignValue IS NULL, iit.taxableBase, iit.foreignValue / rr.value) WHERE ii.id = NEW.id; - + UPDATE invoiceInDueDay iidd JOIN invoiceIn ii ON ii.id = iidd.invoiceInFk LEFT JOIN referenceRate rr ON rr.dated = ii.issued - AND rr.currencyFk = ii.currencyFk + AND rr.currencyFk = ii.currencyFk SET iidd.amount = IF(iidd.foreignValue IS NULL, iidd.amount, iidd.foreignValue / rr.value) - WHERE ii.id = NEW.id; - + WHERE ii.id = NEW.id; + END IF; END */;; @@ -28161,6 +28232,24 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +-- +-- Table structure for table `invoiceInConfig` +-- + +DROP TABLE IF EXISTS `invoiceInConfig`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `invoiceInConfig` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `retentionRate` int(3) NOT NULL, + `retentionName` varchar(25) COLLATE utf8mb3_unicode_ci NOT NULL, + `sageWithholdingFk` smallint(6) NOT NULL, + PRIMARY KEY (`id`), + KEY `invoiceInConfig_sageWithholdingFk` (`sageWithholdingFk`), + CONSTRAINT `invoiceInConfig_sageWithholdingFk` FOREIGN KEY (`sageWithholdingFk`) REFERENCES `sage`.`TiposRetencion` (`CodigoRetencion`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `invoiceInDueDay` -- @@ -28197,13 +28286,13 @@ DELIMITER ;; FOR EACH ROW BEGIN DECLARE vIsNotified BOOLEAN; - - SELECT isNotified INTO vIsNotified - FROM vn.invoiceIn ii + + SELECT isNotified INTO vIsNotified + FROM vn.invoiceIn ii JOIN vn.supplier s ON s.id = ii.supplierFk JOIN vn.payMethod pm ON pm.id = s.payMethodFk WHERE ii.id = NEW.invoiceInFk; - + IF (NEW.dueDated <= util.VN_CURDATE() AND vIsNotified) THEN CALL mail_insert( @@ -28211,12 +28300,12 @@ BEGIN 'begonya@verdnatura.es', 'Añadido vencimiento en el pasado', CONCAT( - account.myUser_getName(), ' ha añadido un vencimiento de ', + account.myUser_getName(), ' ha añadido un vencimiento de ', NEW.amount, '€ en una fecha pasada en la recibida ', NEW.invoiceInFk ) ); END IF; - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -28237,13 +28326,13 @@ DELIMITER ;; FOR EACH ROW BEGIN DECLARE vIsNotified BOOLEAN; - - SELECT isNotified INTO vIsNotified - FROM vn.invoiceIn ii + + SELECT isNotified INTO vIsNotified + FROM vn.invoiceIn ii JOIN vn.supplier s ON s.id = ii.supplierFk JOIN vn.payMethod pm ON pm.id = s.payMethodFk WHERE ii.id = NEW.invoiceInFk; - + IF (NEW.dueDated <= util.VN_CURDATE() AND vIsNotified) THEN CALL mail_insert( @@ -28251,12 +28340,12 @@ BEGIN 'begonya@verdnatura.es', 'Añadido vencimiento en el pasado', CONCAT( - account.myUser_getName(), ' ha añadido un vencimiento de ', + account.myUser_getName(), ' ha añadido un vencimiento de ', NEW.amount,'€ en una fecha pasada en la recibida ',NEW.invoiceInFk ) ); END IF; - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -28528,15 +28617,15 @@ DELIMITER ;; FOR EACH ROW BEGIN CALL clientRisk_update(NEW.clientFk, NEW.companyFk, NEW.amount); - IF (SELECT COUNT(*) - FROM client - WHERE id = NEW.clientFk + IF (SELECT COUNT(*) + FROM client + WHERE id = NEW.clientFk AND businessTypeFk = 'officialOrganism' ) THEN CALL mail_insert('administracion@verdnatura.es', NULL, CONCAT('Se ha emitido una factura al organismo: ', NEW.clientFk), - CONCAT('Presentar factura en FACE https://salix.verdnatura.es/#!/invoice-out/', + CONCAT('Presentar factura en FACE https://salix.verdnatura.es/#!/invoice-out/', NEW.id, '/summary')); END IF; @@ -28609,23 +28698,6 @@ CREATE TABLE `invoiceOutExpence` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Desglosa la base imponible de una factura en funcion del tipo de gasto/venta'; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `invoiceOutQueue` --- - -DROP TABLE IF EXISTS `invoiceOutQueue`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `invoiceOutQueue` ( - `invoiceFk` int(10) unsigned NOT NULL, - `queued` datetime NOT NULL DEFAULT current_timestamp(), - `printed` datetime DEFAULT NULL, - `status` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT '', - PRIMARY KEY (`invoiceFk`), - CONSTRAINT `invoiceOut_queue_invoiceOut_id_fk` FOREIGN KEY (`invoiceFk`) REFERENCES `invoiceOut` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Queue for PDF invoicing'; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `invoiceOutSerial` -- @@ -28805,13 +28877,13 @@ BEGIN DECLARE vItemPackingType VARCHAR(1); IF NEW.itemPackingTypeFk IS NULL THEN - + SELECT itemPackingTypeFk INTO vItemPackingType - FROM vn.itemType it + FROM vn.itemType it WHERE id = NEW.typeFk; SET NEW.itemPackingTypeFk = vItemPackingType; - + END IF; END */;; DELIMITER ; @@ -28828,26 +28900,26 @@ DELIMITER ; /*!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; - - DELETE ifr.* - FROM edi.item_free ifr - WHERE ifr.id = NEW.id; - +/*!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 */ ; @@ -28867,23 +28939,23 @@ DELIMITER ;; BEFORE UPDATE ON `item` FOR EACH ROW BEGIN - + DECLARE vNewPackingShelve INT; - IF ISNULL(NEW.packingShelve) AND NOT ISNULL(NEW.packingOut) THEN - - SELECT NEW.packingOut * vc.shelveVolume / vc.standardFlowerBox + IF ISNULL(NEW.packingShelve) AND NOT ISNULL(NEW.packingOut) THEN + + SELECT NEW.packingOut * vc.shelveVolume / vc.standardFlowerBox INTO vNewPackingShelve FROM vn.volumeConfig vc; - + SET NEW.packingShelve = vNewPackingShelve; - + END IF; IF NEW.itemPackingTypeFk = '' THEN SET NEW.itemPackingTypeFk = NULL; - + END IF; END */;; @@ -29072,21 +29144,6 @@ SET character_set_client = utf8; 1 AS `name` */; SET character_set_client = @saved_cs_client; --- --- Table structure for table `itemCleanConfig` --- - -DROP TABLE IF EXISTS `itemCleanConfig`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `itemCleanConfig` ( - `id` int(11) NOT NULL, - `quantity` int(11) NOT NULL COMMENT 'Indica el número de items que va a procesar', - `isStop` tinyint(1) DEFAULT NULL COMMENT 'Si está a TRUE para el proceso a tiempo real', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `itemCleanLog` -- @@ -29096,7 +29153,6 @@ DROP TABLE IF EXISTS `itemCleanLog`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `itemCleanLog` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `itemFrom` int(11) DEFAULT NULL COMMENT 'Indica el item por donde ha empezado', `itemDeleted` int(11) DEFAULT NULL COMMENT 'Indica la cantidad de items que ha eliminado', `created` timestamp NULL DEFAULT current_timestamp(), PRIMARY KEY (`id`) @@ -29196,15 +29252,15 @@ BEGIN IF NEW.itemFk IN (95, 98) THEN SET NEW.cm3 = 0; END IF; - + IF !(NEW.cm3delivery <=> OLD.cm3delivery) THEN INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) - SELECT r.id + SELECT r.id FROM vn.itemCost ic JOIN vn.sale s ON s.itemFk = ic.itemFk - JOIN vn.ticket t ON t.id = s.ticketFk AND t.warehouseFk = ic.warehouseFk + JOIN vn.ticket t ON t.id = s.ticketFk AND t.warehouseFk = ic.warehouseFk JOIN vn.route r ON r.id = t.routeFk - WHERE r.isOk = FALSE + WHERE r.isOk = FALSE AND ic.itemFk = NEW.itemFk AND r.created >= util.VN_CURDATE() GROUP BY r.id; @@ -29377,6 +29433,7 @@ DROP TABLE IF EXISTS `itemPackingType`; CREATE TABLE `itemPackingType` ( `code` varchar(1) COLLATE utf8mb3_unicode_ci NOT NULL, `description` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL, + `isActive` tinyint(1) NOT NULL, PRIMARY KEY (`code`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Define la linea de encajado para cada producto'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -29498,6 +29555,7 @@ CREATE TABLE `itemShelving` ( `packing` int(11) unsigned DEFAULT NULL, `packagingFk` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `userFk` int(10) unsigned DEFAULT NULL, + `isChecked` tinyint(1) DEFAULT NULL COMMENT 'Este valor cambia al escanear un carro. True: Existe. False: Nuevo. Null: No escaneado', PRIMARY KEY (`id`), KEY `itemShelving_fk1_idx` (`itemFk`), KEY `itemShelving_fk2_idx` (`shelvingFk`), @@ -29521,10 +29579,10 @@ DELIMITER ;; BEFORE INSERT ON `itemShelving` FOR EACH ROW BEGIN - + SET NEW.userFk = account.myUser_getId(); - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -29631,8 +29689,8 @@ DELIMITER ;; /*!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, +INSERT INTO vn.itemShelvingLog(itemShelvingFk, + workerFk, accion, shelvingFk, itemFk) @@ -29814,7 +29872,7 @@ DELIMITER ;; BEGIN UPDATE vn.sale - SET isPicked = TRUE + SET isPicked = TRUE WHERE id = NEW.saleFk; END */;; @@ -29986,7 +30044,7 @@ trig: BEGIN IF @isTriggerDisabled OR visTriggerDisabled THEN LEAVE trig; END IF; - + SET vItemFk = NEW.itemFk; DROP TEMPORARY TABLE IF EXISTS tmp.item; CREATE TEMPORARY TABLE tmp.item @@ -30011,7 +30069,7 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemTag_beforeUpdate` BEFORE UPDATE ON `itemTag` FOR EACH ROW -BEGIN +BEGIN IF !(OLD.`value` <=> NEW.`value`) OR !(OLD.intValue <=> NEW.intValue) THEN SET NEW.intValue = itemTag_getIntValue(NEW.`value`); @@ -30044,7 +30102,7 @@ trig: BEGIN IF @isTriggerDisabled OR visTriggerDisabled THEN LEAVE trig; END IF; - + SET vItemFk = NEW.itemFk; DROP TEMPORARY TABLE IF EXISTS tmp.item; CREATE TEMPORARY TABLE tmp.item @@ -30080,7 +30138,7 @@ trig: BEGIN IF @isTriggerDisabled OR visTriggerDisabled THEN LEAVE trig; END IF; - + SET vItemFk = OLD.itemFk; DROP TEMPORARY TABLE IF EXISTS tmp.item; CREATE TEMPORARY TABLE tmp.item @@ -30166,9 +30224,9 @@ CREATE TABLE `itemType` ( `workerFk` int(10) unsigned NOT NULL, `isInventory` tinyint(4) NOT NULL DEFAULT 1 COMMENT 'Se utiliza tanto en el cálculo del inventario, como en el del informe del inventario valorado', `created` timestamp NULL DEFAULT current_timestamp(), - `transaction` tinyint(4) NOT NULL DEFAULT 0, + `transaction__` tinyint(4) NOT NULL DEFAULT 0, `making` int(10) unsigned DEFAULT NULL COMMENT 'Son productos de confección propia', - `location` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `location__` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `life` smallint(5) unsigned DEFAULT NULL, `maneuver` double NOT NULL DEFAULT 0.21, `target` double NOT NULL DEFAULT 0.15, @@ -30177,9 +30235,9 @@ CREATE TABLE `itemType` ( `density` double NOT NULL DEFAULT 167 COMMENT 'Almacena el valor por defecto de la densidad en kg/m3 para el calculo de los portes aereos, en articulos se guarda la correcta', `promo` double NOT NULL DEFAULT 0, `isPackaging` tinyint(1) NOT NULL DEFAULT 0, - `hasComponents` tinyint(1) NOT NULL DEFAULT 1, - `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT 60, - `compression` decimal(5,2) DEFAULT 1.00, + `hasComponents__` tinyint(1) NOT NULL DEFAULT 1, + `warehouseFk__` smallint(6) unsigned NOT NULL DEFAULT 60, + `compression__` decimal(5,2) DEFAULT 1.00, `itemPackingTypeFk` varchar(1) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `temperatureFk` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL, `isUnconventionalSize` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'familia con productos cuyas medidas no son aptas para la cinta transportadora o paletizar', @@ -30192,13 +30250,13 @@ CREATE TABLE `itemType` ( KEY `Trabajador` (`workerFk`), KEY `reino_id` (`categoryFk`), KEY `Tipos_fk3_idx` (`making`), - KEY `warehouseFk5_idx` (`warehouseFk`), + KEY `warehouseFk5_idx` (`warehouseFk__`), KEY `temperatureFk` (`temperatureFk`), CONSTRAINT `Tipos_fk3` FOREIGN KEY (`making`) REFERENCES `confectionType` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `Trabajador` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE, CONSTRAINT `itemType_ibfk_1` FOREIGN KEY (`categoryFk`) REFERENCES `itemCategory` (`id`) ON UPDATE CASCADE, CONSTRAINT `temperatureFk` FOREIGN KEY (`temperatureFk`) REFERENCES `temperature` (`code`), - CONSTRAINT `warehouseFk5` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE + CONSTRAINT `warehouseFk5` FOREIGN KEY (`warehouseFk__`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Protege la tabla tipos de updates para los 4 parámetros de los compradores, en funcion del valor del campo CodigoRojo de tblContadores.'; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -30488,7 +30546,7 @@ DELIMITER ;; BEFORE INSERT ON `machine` FOR EACH ROW BEGIN - + SET NEW.workerFk = vn.getUser(); END */;; @@ -30622,9 +30680,9 @@ DELIMITER ;; BEGIN IF NEW.sender IS NOT NULL THEN - + SET NEW.receiver = NEW.sender; - + END IF; END */;; @@ -30687,8 +30745,8 @@ DELIMITER ;; FOR EACH ROW BEGIN IF (NEW.code IS NULL) THEN - SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT - FROM information_schema.TABLES + SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT + FROM information_schema.TABLES WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate')); END IF; END */;; @@ -30729,6 +30787,26 @@ CREATE TABLE `manuscript` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `mdbApp` +-- + +DROP TABLE IF EXISTS `mdbApp`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `mdbApp` ( + `app` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL, + `baselineBranchFk` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL, + `userFk` int(10) unsigned DEFAULT NULL, + `locked` datetime DEFAULT NULL, + PRIMARY KEY (`app`), + KEY `mdbApp_FK` (`userFk`), + KEY `mdbApp_FK_1` (`baselineBranchFk`), + CONSTRAINT `mdbApp_FK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT `mdbApp_FK_1` FOREIGN KEY (`baselineBranchFk`) REFERENCES `mdbBranch` (`name`) ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `mdbBranch` -- @@ -30738,10 +30816,27 @@ DROP TABLE IF EXISTS `mdbBranch`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `mdbBranch` ( `name` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '', + `dsName` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL, PRIMARY KEY (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `mdbConfig` +-- + +DROP TABLE IF EXISTS `mdbConfig`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `mdbConfig` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `issueTrackerUrl` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL, + `issueNumberRegex` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL, + `chatDestination` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL COMMENT 'User (@) or channel (#) to send the message', + PRIMARY KEY (`id`) +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Global configuration parameters for Access'; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `mdbVersion` -- @@ -30759,6 +30854,29 @@ CREATE TABLE `mdbVersion` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `mdbVersionTree` +-- + +DROP TABLE IF EXISTS `mdbVersionTree`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `mdbVersionTree` ( + `app` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL, + `version` int(10) unsigned NOT NULL, + `branchFk` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL, + `fromVersion` int(10) unsigned NOT NULL, + `userFk` int(10) unsigned NOT NULL, + `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `created` timestamp NOT NULL DEFAULT current_timestamp(), + PRIMARY KEY (`app`,`version`), + KEY `mdbVersionTree_FK` (`userFk`), + KEY `mdbVersionTree_FK_2` (`branchFk`), + CONSTRAINT `mdbVersionTree_FK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE, + CONSTRAINT `mdbVersionTree_FK_2` FOREIGN KEY (`branchFk`) REFERENCES `mdbBranch` (`name`) ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `medicalCenter` -- @@ -31558,7 +31676,7 @@ DELIMITER ;; BEGIN -- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ; - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -31683,13 +31801,13 @@ BEGIN SELECT account INTO cuenta_banco FROM bank WHERE id = NEW.bankFk; - + SELECT account INTO cuenta_proveedor FROM supplier WHERE id = NEW.supplierFk; - + CALL vn.ledger_next(vNewBookEntry); - + INSERT INTO XDiario ( ASIEN, FECHA, SUBCTA, @@ -31715,7 +31833,7 @@ BEGIN cuenta_banco CONTRA, NEW.amount EURODEBE, 0 EUROHABER) gf; - + IF NEW.bankingFees <> 0 THEN INSERT INTO XDiario ( ASIEN, FECHA, @@ -31737,7 +31855,7 @@ BEGIN FROM supplier s JOIN country c ON s.countryFk = c.id WHERE s.id = NEW.supplierFk; - END IF; + END IF; END IF; SET NEW.dueDated = IFNULL(NEW.dueDated, NEW.received); @@ -31745,15 +31863,15 @@ BEGIN SELECT isActive INTO isSupplierActive FROM supplier WHERE id = NEW.supplierFk; - + IF isSupplierActive = FALSE THEN 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 */ ; @@ -31775,12 +31893,12 @@ DELIMITER ;; 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 @@ -32370,6 +32488,7 @@ CREATE TABLE `printQueue` ( `error` text COLLATE utf8mb3_unicode_ci DEFAULT NULL, `errorNumber` int(11) DEFAULT NULL, `created` timestamp NOT NULL DEFAULT current_timestamp(), + `serverId` int(10) unsigned DEFAULT NULL COMMENT 'Indica el id del servidor de impresión', PRIMARY KEY (`id`), KEY `statusCode` (`statusCode`), KEY `printerFk` (`printerFk`), @@ -32421,7 +32540,7 @@ DROP TABLE IF EXISTS `printer`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `printer` ( - `id` tinyint(3) unsigned NOT NULL, + `id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `path` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `modelFk` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, @@ -32442,7 +32561,7 @@ CREATE TABLE `printer` ( CONSTRAINT `printer_FK` FOREIGN KEY (`modelFk`) REFERENCES `printerModel` (`code`) ON UPDATE CASCADE, CONSTRAINT `printer_FK_1` FOREIGN KEY (`paperSizeFk`) REFERENCES `paperSize` (`code`), CONSTRAINT `printer_sectorFk` FOREIGN KEY (`sectorFk`) REFERENCES `sector` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -32645,11 +32764,11 @@ DELIMITER ;; BEFORE INSERT ON projectNotes FOR EACH ROW BEGIN - + IF ISNULL(NEW.userFk) THEN - + SET NEW.userFk = account.myUser_getId(); - + END IF; END */;; @@ -32805,10 +32924,10 @@ DELIMITER ;; BEFORE INSERT ON `province` FOR EACH ROW BEGIN - + SET NEW.geoFk = zoneGeo_new('province', NEW.`name`, (SELECT geoFk FROM autonomy WHERE id = NEW.autonomyFk)); - + SET NEW.countryFk = (SELECT a.countryFk FROM vn.autonomy a WHERE a.id = NEW.autonomyFk); END */;; @@ -32829,14 +32948,14 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`province_beforeUpdate` BEFORE UPDATE ON `province` FOR EACH ROW -BEGIN - +BEGIN + IF !(OLD.autonomyFk <=> NEW.autonomyFk) THEN - + SET NEW.countryFk = (SELECT a.countryFk FROM vn.autonomy a WHERE a.id = NEW.autonomyFk); END IF; - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -32852,19 +32971,19 @@ DELIMITER ; /*!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`.`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 */ ; @@ -32884,7 +33003,7 @@ DELIMITER ;; AFTER DELETE ON `province` FOR EACH ROW BEGIN - CALL zoneGeo_delete(OLD.geoFk); + CALL zoneGeo_delete(OLD.geoFk); END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -33013,20 +33132,20 @@ CREATE TABLE `receipt` ( /*!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`.`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 */ ; @@ -33082,18 +33201,18 @@ DELIMITER ; /*!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`.`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 */ ; @@ -33195,7 +33314,7 @@ DROP TABLE IF EXISTS `referenceCurrent`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `referenceCurrent` ( - `dated` date NOT NULL, + `dated` date NOT NULL DEFAULT current_timestamp(), `value` decimal(10,4) NOT NULL, `currencyFk` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`dated`,`currencyFk`), @@ -33241,14 +33360,14 @@ DROP TABLE IF EXISTS `report`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `report` ( - `id` tinyint(3) unsigned NOT NULL, + `id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `paperSizeFk` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `method` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL COMMENT 'Salix method', PRIMARY KEY (`id`), KEY `report_FK` (`paperSizeFk`), CONSTRAINT `report_FK` FOREIGN KEY (`paperSizeFk`) REFERENCES `paperSize` (`code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -33267,6 +33386,31 @@ CREATE TABLE `returnBuckets` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `roadmap` +-- + +DROP TABLE IF EXISTS `roadmap`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `roadmap` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `tractorPlate` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `trailerPlate` varchar(12) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `phone` varchar(15) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `supplierFk` int(11) DEFAULT NULL, + `etd` datetime DEFAULT NULL, + `observations` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + `created` timestamp NULL DEFAULT current_timestamp(), + `userFk` int(10) unsigned DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `supplierFk` (`supplierFk`), + KEY `userFk` (`userFk`), + CONSTRAINT `roadmap_ibfk_1` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE, + CONSTRAINT `roadmap_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Temporary table structure for view `role` -- @@ -33360,19 +33504,39 @@ DELIMITER ; /*!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`.`route_afterInsert` + AFTER INSERT ON `route` + FOR EACH ROW +BEGIN + CALL route_calcCommission(NEW.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 = utf8mb4 */ ; +/*!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`.`route_beforeUpdate` BEFORE UPDATE ON `route` FOR EACH ROW BEGIN DECLARE vKmMax INT; - + IF NEW.isOk <> FALSE AND OLD.isOk = FALSE THEN - SET NEW.m3 = ( SELECT SUM(litros)/1000 - FROM vn.saleVolume s - JOIN vn.ticket t ON s.ticketFk = t.id + SET NEW.m3 = ( SELECT SUM(litros)/1000 + FROM vn.saleVolume s + JOIN vn.ticket t ON s.ticketFk = t.id WHERE t.routeFk = NEW.id); END IF; - + IF NEW.kmEnd < NEW.kmStart AND NEW.kmEnd <> 0 THEN CALL util.throw ('KmEnd menor que kmStart'); END IF; @@ -33406,15 +33570,15 @@ 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 - + -- Inserta el gestdoc en todos los tickets de la ruta INSERT INTO ticketDms(ticketFk,dmsFk) SELECT id, NEW.gestdocFk FROM ticket WHERE routeFk = NEW.id ON DUPLICATE KEY UPDATE dmsFk = NEW.gestdocFk; - -- Update del firmado - UPDATE ticket t - JOIN ticketDms tg ON t.id = tg.ticketFk + -- Update del firmado + UPDATE ticket t + JOIN ticketDms tg ON t.id = tg.ticketFk SET isSigned = 1 WHERE t.routeFk = NEW.id; END IF; @@ -33597,6 +33761,38 @@ CREATE TABLE `routeLog` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `routeMaster` +-- + +DROP TABLE IF EXISTS `routeMaster`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `routeMaster` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `warehoseFk` smallint(6) unsigned DEFAULT NULL, + `km` int(11) NOT NULL DEFAULT 0, + `packages` int(11) NOT NULL DEFAULT 0, + `vehicleCost` decimal(10,2) NOT NULL DEFAULT 0.00, + `staffCost` decimal(10,2) NOT NULL DEFAULT 0.00, + `vehicle` decimal(10,2) NOT NULL DEFAULT 0.00, + `staff` decimal(10,2) NOT NULL DEFAULT 0.00, + `fuel` int(11) NOT NULL DEFAULT 0, + `freelancers` decimal(10,2) NOT NULL DEFAULT 0.00, + `year` int(11) NOT NULL DEFAULT 0, + `mounth` int(11) NOT NULL DEFAULT 0, + `expense` decimal(10,2) NOT NULL DEFAULT 0.00, + `freelancersPackages` int(11) NOT NULL DEFAULT 0, + `kmCost` decimal(10,2) NOT NULL DEFAULT 0.00, + `packageCost` decimal(10,2) NOT NULL DEFAULT 0.00, + `freelancerPackageCost` decimal(10,2) NOT NULL DEFAULT 0.00, + `created` timestamp NULL DEFAULT current_timestamp(), + PRIMARY KEY (`id`), + KEY `fk_rutas_warehouse_id_idx` (`warehoseFk`), + CONSTRAINT `routeMaster_FK` FOREIGN KEY (`warehoseFk`) REFERENCES `warehouse` (`id`) +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `routeRecalc` -- @@ -33695,7 +33891,7 @@ CREATE TABLE `sale` ( `concept` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL, `quantity` decimal(10,2) NOT NULL DEFAULT 0.00, `originalQuantity` double(9,1) DEFAULT NULL, - `price` decimal(10,2) DEFAULT 0.00, + `price` decimal(10,2) NOT NULL DEFAULT 0.00, `discount` tinyint(2) unsigned NOT NULL DEFAULT 0, `priceFixed` decimal(10,2) NOT NULL DEFAULT 0.00, `reserved` tinyint(1) NOT NULL DEFAULT 0, @@ -33723,7 +33919,6 @@ DELIMITER ;; AFTER INSERT ON `sale` FOR EACH ROW BEGIN - IF (SELECT COUNT(*) from item i WHERE id = NEW.itemFk AND family = 'SER') THEN CALL util.throw('Cannot insert a service item into a ticket'); END IF; @@ -33731,26 +33926,31 @@ BEGIN CALL stock.log_add('sale', NEW.id, NULL); CALL ticket_requestRecalc(NEW.ticketFk); - IF NEW.quantity > 0 THEN - + IF NEW.quantity > 0 THEN + UPDATE vn.collection c - JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk + JOIN vn.ticketCollection tc ON tc.collectionFk = c.id + AND tc.ticketFk = NEW.ticketFk JOIN vn.item i ON i.id = NEW.itemFk - AND (c.itemPackingTypeFk = i.itemPackingTypeFk - OR ISNULL(c.itemPackingTypeFk)) + AND (c.itemPackingTypeFk = i.itemPackingTypeFk + OR c.itemPackingTypeFk IS NULL) SET c.saleTotalCount = c.saleTotalCount + 1; - + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) - SELECT r.id + SELECT r.id FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk JOIN vn.route r ON r.id = t.routeFk - WHERE r.isOk = FALSE + WHERE r.isOk = FALSE AND s.id = NEW.id AND r.created >= util.VN_CURDATE() GROUP BY r.id; END IF; + IF NEW.quantity = 0 THEN + CALL util.debugAdd('saleZeroQuantity', + CONCAT('[', user(), ']', ' Inserted sale: ', NEW.id)); + END IF; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -33770,7 +33970,7 @@ DELIMITER ;; BEFORE UPDATE ON `sale` FOR EACH ROW BEGIN -/* +/* IF (SELECT COUNT(*) from item i WHERE id = NEW.itemFk AND family = 'SER') THEN CALL util.throw('Cannot insert a service item into a ticket'); END IF; @@ -33781,7 +33981,7 @@ BEGIN IF old.discount > 0 AND NEW.discount = 0 THEN INSERT INTO ticketLog - SET originFk = NEW.ticketFk, userFk = account.myUser_getId(), `action` = 'insert', + SET originFk = NEW.ticketFk, userFk = account.myUser_getId(), `action` = 'insert', description = CONCAT('Cambio de descuento del item :', ' ', new.itemFk, ' de ', old.discount ,' a 0 '); END IF; END */;; @@ -33793,11 +33993,11 @@ DELIMITER ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb3 */ ; -/*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; /*!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`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_afterUpdate` AFTER UPDATE ON `sale` @@ -33807,7 +34007,7 @@ BEGIN DECLARE vPickedLines INT; DECLARE vCollectionFk INT; DECLARE vUserRole VARCHAR(255); - + IF !(NEW.id <=> OLD.id) OR !(NEW.ticketFk <=> OLD.ticketFk) OR !(NEW.itemFk <=> OLD.itemFk) @@ -33830,45 +34030,45 @@ BEGIN UPDATE ticketRequest SET ticketFk = NEW.ticketFk WHERE saleFk = NEW.id; END IF; - + SELECT account.myUser_getName() INTO vUserRole; SELECT account.user_getMysqlRole(vUserRole) INTO vUserRole; IF !(OLD.quantity <=> NEW.quantity) THEN - SELECT COUNT(*) INTO vIsToSendMail + SELECT COUNT(*) INTO vIsToSendMail FROM vncontrol.inter i JOIN vn.state s ON s.id = i.state_id - WHERE s.code='PACKED' + WHERE s.code='PACKED' AND i.Id_Ticket = OLD.ticketFk AND vUserRole IN ('salesPerson', 'salesTeamBoss') LIMIT 1; - + IF vIsToSendMail THEN CALL vn.mail_insert('jefesventas@verdnatura.es', 'noreply@verdnatura.es', CONCAT('Ticket ', OLD.ticketFk ,' modificada cantidad tras encajado'), CONCAT('Ticket ', OLD.ticketFk ,'.
', - 'Modificada la catidad de ', OLD.quantity, ' a ' , NEW.quantity, + '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' ) ); END IF; IF (OLD.quantity > NEW.quantity) THEN INSERT INTO saleComponent(saleFk, componentFk, value) - SELECT NEW.id, cm.id, sc.value + SELECT NEW.id, cm.id, sc.value FROM saleComponent sc JOIN component cd ON cd.id = sc.componentFk JOIN component cm ON cm.code = 'mana' WHERE saleFk = NEW.id AND cd.code = 'lastUnitsDiscount' ON DUPLICATE KEY UPDATE value = sc.value + VALUES(value); - - DELETE sc.* + + DELETE sc.* FROM vn.saleComponent sc JOIN component c ON c.id = sc.componentFk WHERE saleFk = NEW.id AND c.code = 'lastUnitsDiscount'; - END IF; + END IF; INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) - SELECT r.id + SELECT r.id FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk JOIN vn.route r ON r.id = t.routeFk @@ -33879,19 +34079,21 @@ BEGIN END IF; IF !(ABS(NEW.isPicked) <=> ABS(OLD.isPicked)) AND NEW.quantity > 0 THEN - UPDATE vn.collection c JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk SET c.salePickedCount = c.salePickedCount + IF(NEW.isPicked != 0, 1, -1); - END IF; IF !(NEW.quantity <=> OLD.quantity) AND (NEW.quantity = 0 OR OLD.quantity = 0) THEN - UPDATE vn.collection c JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk SET c.saleTotalCount = c.saleTotalCount + IF(OLD.quantity = 0, 1, -1); END IF; + + IF NEW.quantity = 0 THEN + CALL util.debugAdd('saleZeroQuantity', + CONCAT('[', user(), ']', ' Updated sale: ', NEW.id)); + END IF; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -33913,11 +34115,11 @@ DELIMITER ;; BEGIN IF OLD.quantity > 0 THEN INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) - SELECT r.id + SELECT r.id FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk JOIN vn.route r ON r.id = t.routeFk - WHERE r.isOk = FALSE + WHERE r.isOk = FALSE AND s.id = OLD.id AND r.created >= util.VN_CURDATE() GROUP BY r.id; @@ -33940,43 +34142,43 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_afterDelete` AFTER DELETE ON `sale` FOR EACH ROW -BEGIN +BEGIN DECLARE vIsToSendMail BOOL; DECLARE vUserRole VARCHAR(255); - + CALL stock.log_add('sale', NULL, OLD.id); CALL ticket_requestRecalc(OLD.ticketFk); SELECT account.myUser_getName() INTO vUserRole; SELECT account.user_getMysqlRole(vUserRole) INTO vUserRole; - SELECT COUNT(*) INTO vIsToSendMail + SELECT COUNT(*) INTO vIsToSendMail FROM vncontrol.inter i JOIN vn.state s ON s.id = i.state_id - WHERE s.code='PACKED' + WHERE s.code='PACKED' AND i.Id_Ticket = OLD.ticketFk AND vUserRole IN ('salesPerson', 'salesBoss') LIMIT 1; - IF vIsToSendMail THEN + IF vIsToSendMail THEN CALL vn.mail_insert('jefesventas@verdnatura.es', 'noreply@verdnatura.es', CONCAT('Ticket ', OLD.ticketFk ,' eliminado artículo tras encajado' ), CONCAT('Ticket ', OLD.ticketFk ,'.
', 'Eliminado artículo ', OLD.itemFk, ' tras estado encajado del ticket.
Este email se ha generado automáticamente' ) ); - END IF; - + END IF; + IF OLD.quantity > 0 THEN - + UPDATE vn.collection c JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = OLD.ticketFk - JOIN vn.item i ON i.id = OLD.itemFk - AND (c.itemPackingTypeFk = i.itemPackingTypeFk + JOIN vn.item i ON i.id = OLD.itemFk + AND (c.itemPackingTypeFk = i.itemPackingTypeFk OR ISNULL(c.itemPackingTypeFk)) SET c.saleTotalCount = c.saleTotalCount - 1, c.salePickedCount = c.salePickedCount - ABS(OLD.isPicked); - + END IF; END */;; DELIMITER ; @@ -34015,10 +34217,10 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`BEFORE_INSERT` BEFORE INSERT ON `saleBuy` FOR EACH ROW -BEGIN - +BEGIN + SET NEW.workerFk = vn.getUser(); - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -34037,13 +34239,13 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleBuy_AI` AFTER INSERT ON `saleBuy` FOR EACH ROW -BEGIN +BEGIN /* Activar de nuevo cuando volvamos a vender fruta y verdura - * + * UPDATE vn.sale s SET s.concept = CONCAT(s.concept, ' Lote: ', NEW.buyFk) WHERE s.id = NEW.saleFk; -*/ +*/ END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -34051,21 +34253,6 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; --- --- Table structure for table `saleChecked` --- - -DROP TABLE IF EXISTS `saleChecked`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `saleChecked` ( - `saleFk` int(11) NOT NULL, - `isChecked` int(11) NOT NULL DEFAULT 0, - PRIMARY KEY (`saleFk`), - CONSTRAINT `fk_Movimientos_checked_1` FOREIGN KEY (`saleFk`) REFERENCES `sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `saleCloned` -- @@ -34299,7 +34486,7 @@ CREATE TABLE `saleTracking` ( `id` int(11) NOT NULL AUTO_INCREMENT, `stateFk` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`id`), - UNIQUE KEY `saleTracking_UN` (`saleFk`,`workerFk`,`actionFk`,`stateFk`), + UNIQUE KEY `saleTracking_UN` (`saleFk`,`workerFk`,`stateFk`), KEY `Id_Movimiento` (`saleFk`), KEY `fgnStateFk_idx` (`stateFk`), KEY `saleTracking_idx5` (`created`), @@ -34318,45 +34505,18 @@ CREATE TABLE `saleTracking` ( /*!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`.`saleTracking_beforeInsert` - BEFORE INSERT ON `saleTracking` - FOR EACH ROW -BEGIN - IF(NEW.stateFk = 14) THEN - SET NEW.actionFk = 3; - END IF; - - IF(NEW.stateFk = 8) THEN - SET NEW.actionFk = 4; - 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`.`saleTracking_After_Insert` AFTER INSERT ON `saleTracking` FOR EACH ROW BEGIN - - IF NEW.isChecked THEN - + + IF NEW.isChecked THEN + UPDATE vn.sale s - SET s.isPicked = TRUE + SET s.isPicked = TRUE WHERE s.id = NEW.saleFk AND s.isPicked = 0; - + END IF; END */;; @@ -34665,9 +34825,9 @@ BEGIN IF NEW.workerFk = NEW.workerSubstitute THEN CALL util.throw ('worker and workerSubstitute must be different'); ELSE - INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) - SELECT NEW.workerFk, NEW.workerSubstitute, dated - FROM time + INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) + SELECT NEW.workerFk, NEW.workerSubstitute, dated + FROM time WHERE dated BETWEEN NEW.started AND NEW.ended; END IF; END */;; @@ -34692,14 +34852,14 @@ BEGIN IF NEW.workerFk = NEW.workerSubstitute THEN CALL util.throw ('worker and workerSubstitute must be different'); ELSE - DELETE sc FROM sharingCartDaily sc - WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND - sc.ownerFk = OLD.workerFk AND + DELETE sc FROM sharingCartDaily sc + WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND + sc.ownerFk = OLD.workerFk AND sc.substituteFk = OLD.workerSubstitute; - - INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) - SELECT NEW.workerFk, NEW.workerSubstitute, dated - FROM time + + INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) + SELECT NEW.workerFk, NEW.workerSubstitute, dated + FROM time WHERE dated BETWEEN NEW.started AND NEW.ended; END IF; @@ -34722,9 +34882,9 @@ DELIMITER ;; BEFORE DELETE ON `sharingCart` FOR EACH ROW BEGIN - DELETE sc FROM sharingCartDaily sc - WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND - sc.ownerFk = OLD.workerFk AND + DELETE sc FROM sharingCartDaily sc + WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND + sc.ownerFk = OLD.workerFk AND sc.substituteFk = OLD.workerSubstitute; END */;; DELIMITER ; @@ -34857,9 +35017,9 @@ DELIMITER ;; BEGIN IF NEW.code = "" THEN - + CALL util.throw('NOT_EMPTY_CODE_ALLOWED'); - + END IF; END */;; @@ -34881,13 +35041,13 @@ DELIMITER ;; BEFORE UPDATE ON `shelving` FOR EACH ROW BEGIN - + IF NEW.code = "" THEN - + CALL util.throw('NOT_EMPTY_CODE_ALLOWED'); - + END IF; - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -35079,7 +35239,7 @@ DELIMITER ;; FOR EACH ROW BEGIN UPDATE vn2008.Clientes c - JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditClassification cc ON c.Id_Cliente = cc.client JOIN creditInsurance ci ON ci.creditClassification = cc.id SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance; END */;; @@ -35103,12 +35263,12 @@ DELIMITER ;; BEGIN IF NEW.dateLeaving IS NOT NULL THEN UPDATE vn2008.Clientes c - JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditClassification cc ON c.Id_Cliente = cc.client JOIN creditInsurance ci ON ci.creditClassification = cc.id SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance; ELSE UPDATE vn2008.Clientes c - JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditClassification cc ON c.Id_Cliente = cc.client JOIN creditInsurance ci ON ci.creditClassification = cc.id SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance; END IF; @@ -35132,7 +35292,7 @@ DELIMITER ;; FOR EACH ROW BEGIN UPDATE vn2008.Clientes c - JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditClassification cc ON c.Id_Cliente = cc.client JOIN creditInsurance ci ON ci.creditClassification = cc.id SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance; END */;; @@ -35361,6 +35521,22 @@ CREATE TABLE `state` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `stateI18n` +-- + +DROP TABLE IF EXISTS `stateI18n`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `stateI18n` ( + `stateFk` tinyint(3) unsigned NOT NULL, + `lang` char(2) NOT NULL, + `name` varchar(255) NOT NULL, + PRIMARY KEY (`stateFk`,`lang`), + CONSTRAINT `stateI18n_state_id` FOREIGN KEY (`stateFk`) REFERENCES `state` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `stockBuyed` -- @@ -35464,30 +35640,48 @@ CREATE TABLE `supplier` ( /*!50003 SET @saved_cs_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 character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = '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 vHasChange BOOL; + DECLARE vPayMethodChanged BOOL; DECLARE vPayMethodHasVerified BOOL; + DECLARE vParams JSON; + DECLARE vOldPayMethodName VARCHAR(20); + DECLARE vNewPayMethodName VARCHAR(20); SELECT hasVerified INTO vPayMethodHasVerified FROM payMethod WHERE id = NEW.payMethodFk; - SET vHasChange = (NEW.payDemFk <> OLD.payDemFk) OR (NEW.payDay <> OLD.payDay); + SET vPayMethodChanged = NOT(NEW.payMethodFk <=> OLD.payMethodFk); - IF vPayMethodHasVerified AND !vHasChange THEN - SET vHasChange = (NEW.payMethodFk <> OLD.payMethodFk); + IF vPayMethodChanged THEN + SELECT name INTO vOldPayMethodName + FROM payMethod + WHERE id = OLD.payMethodFk; + SELECT name INTO vNewPayMethodName + FROM payMethod + WHERE id = NEW.payMethodFk; + + SET vParams = JSON_OBJECT( + 'name', NEW.name, + 'oldPayMethod', vOldPayMethodName, + 'newPayMethod', vNewPayMethodName + ); + SELECT util.notification_send('supplier-pay-method-update', vParams, NULL) INTO @id; END IF; - IF vHasChange THEN + SET vHasChange = NOT(NEW.payDemFk <=> OLD.payDemFk AND NEW.payDay <=> OLD.payDay) OR vPayMethodChanged; + + IF vHasChange AND vPayMethodHasVerified THEN SET NEW.isPayMethodChecked = FALSE; END IF; @@ -35555,23 +35749,23 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER supplierAccount_afterUpdate - AFTER UPDATE ON supplierAccount - FOR EACH ROW -BEGIN - DECLARE vPayMethodHasVerified BOOL; - - SELECT pm.hasVerified INTO vPayMethodHasVerified - FROM vn.supplier s - JOIN vn.payMethod pm ON pm.id = s.payMethodFk - WHERE s.id = OLD.supplierFk; - - IF OLD.iban <> NEW.iban OR OLD.bankEntityFk <> NEW.bankEntityFk AND vPayMethodHasVerified THEN - UPDATE vn.supplier - SET isPayMethodChecked = FALSE - WHERE id = OLD.supplierFk; - END IF; - +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER supplierAccount_afterUpdate + AFTER UPDATE ON supplierAccount + FOR EACH ROW +BEGIN + DECLARE vPayMethodHasVerified BOOL; + + SELECT pm.hasVerified INTO vPayMethodHasVerified + FROM vn.supplier s + JOIN vn.payMethod pm ON pm.id = s.payMethodFk + WHERE s.id = OLD.supplierFk; + + IF OLD.iban <> NEW.iban OR OLD.bankEntityFk <> NEW.bankEntityFk AND vPayMethodHasVerified THEN + UPDATE vn.supplier + SET isPayMethodChecked = FALSE + WHERE id = OLD.supplierFk; + END IF; + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -35683,6 +35877,19 @@ CREATE TABLE `supplierContact` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `supplierDebtConfig` +-- + +DROP TABLE IF EXISTS `supplierDebtConfig`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `supplierDebtConfig` ( + `dated` date NOT NULL DEFAULT '2014-12-31' COMMENT 'date from which we start counting', + `invalidBalances` double NOT NULL DEFAULT 0.5 COMMENT 'balances not to be paid' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `supplierExpense` -- @@ -36083,21 +36290,21 @@ 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 = utf8mb3 */ ; -/*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; /*!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`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_afterInsert` AFTER INSERT ON `ticket` FOR EACH ROW BEGIN - + DECLARE vClientType VARCHAR(255); DECLARE vStateCode VARCHAR(255); DECLARE vTransferorFirstShipped DATE; - + -- Borrar cuando se cambie el insert ticket en la APP móvil SELECT typeFk INTO vClientType @@ -36109,9 +36316,9 @@ BEGIN SET vStateCode = 'FREE'; END IF; - INSERT INTO vncontrol.inter(Id_Ticket, state_id, Id_Trabajador) - SELECT NEW.id, id, account.myUser_getId() - FROM state + INSERT INTO ticketTracking(ticketFk, stateFk, workerFk) + SELECT NEW.id, id, account.myUser_getId() + FROM state WHERE `code` = vStateCode COLLATE utf8_general_ci; IF YEAR(NEW.shipped) > 2000 THEN @@ -36124,7 +36331,7 @@ BEGIN INSERT INTO bs.clientNewBorn(clientFk, firstShipped, lastShipped) VALUES(NEW.clientFk, IFNULL(vTransferorFirstShipped, util.VN_CURDATE()), util.VN_CURDATE()) ON DUPLICATE KEY UPDATE lastShipped = util.VN_CURDATE(); - + END IF; END */;; @@ -36147,17 +36354,17 @@ DELIMITER ;; FOR EACH ROW BEGIN DECLARE vNewTime TIME; - + IF !(NEW.routeFk <=> OLD.routeFk) THEN - INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) - SELECT r.id + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id FROM vn.route r - WHERE r.isOk = FALSE + WHERE r.isOk = FALSE AND r.id IN (OLD.routeFk,NEW.routeFk) AND r.created >= util.VN_CURDATE() GROUP BY r.id; END IF; - + IF !(DATE(NEW.shipped) <=> DATE(OLD.shipped)) THEN IF YEAR(NEW.shipped) < 2000 THEN SIGNAL SQLSTATE '46000' @@ -36169,13 +36376,13 @@ BEGIN END IF; END IF; - + IF !(NEW.isDeleted <=> OLD.isDeleted) AND NEW.isDeleted THEN - INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) - SELECT r.id + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id FROM vn.ticket t JOIN vn.route r ON r.id = t.routeFk - WHERE r.isOk = FALSE + WHERE r.isOk = FALSE AND t.id = NEW.id AND r.created >= util.VN_CURDATE() GROUP BY r.id; @@ -36185,7 +36392,7 @@ BEGIN SET NEW.zoneFk = NULL; END IF; - IF NEW.routeFk AND NEW.isDeleted THEN + IF NEW.routeFk AND NEW.isDeleted THEN CALL util.throw ('This ticket is deleted'); END IF; @@ -36194,22 +36401,22 @@ BEGIN FROM vn.ticket WHERE routeFk = NEW.routeFk HAVING MAX(TIME(shipped)) > TIME(NEW.shipped); - + IF vNewTime THEN SET NEW.shipped = TIMESTAMP(DATE(NEW.shipped), vNewTime); INSERT INTO vn.ticketLog - SET originFk = NEW.id, - userFk = account.myUser_getId(), - `action` = 'update', + SET originFk = NEW.id, + userFk = account.myUser_getId(), + `action` = 'update', description = CONCAT('Cambia la hora por cambio de ruta de ', TIME(OLD.shipped), ' a ', TIME(NEW.shipped)); END IF; INSERT IGNORE INTO zoneAgencyMode (agencyModeFk,zoneFk) - SELECT r.agencyModeFk, NEW.zoneFk FROM route r + SELECT r.agencyModeFk, NEW.zoneFk FROM route r WHERE r.id = NEW.routeFk; - + CALL vn.routeUpdateM3(NEW.routeFk); END IF; END */;; @@ -36243,7 +36450,7 @@ BEGIN OR !(NEW.companyFk <=> OLD.companyFk) THEN CALL ticket_requestRecalc(NEW.id); END IF; - + IF NEW.clientFk = 2067 AND !(NEW.clientFk <=> OLD.clientFk) THEN -- Fallo que se insertan no se sabe como tickets en este cliente CALL mail_insert( @@ -36253,10 +36460,10 @@ BEGIN CONCAT(account.myUser_getName(), ' ha modificado el ticket ',NEW.id) ); END IF; - + IF NEW.routeFk <> OLD.routeFk THEN - UPDATE expedition + UPDATE expedition SET hasNewRoute = TRUE WHERE ticketFk = NEW.id; @@ -36280,11 +36487,11 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_beforeDelete` BEFORE DELETE ON `ticket` FOR EACH ROW -BEGIN - INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) - SELECT r.id +BEGIN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id FROM vn.route r - WHERE r.isOk = FALSE + WHERE r.isOk = FALSE AND r.id = OLD.routeFk AND r.created >= util.VN_CURDATE() GROUP BY r.id; @@ -36337,31 +36544,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 */ ; @@ -36413,13 +36620,13 @@ DELIMITER ;; BEFORE DELETE ON `ticketDms` FOR EACH ROW BEGIN - UPDATE dms - SET dmsTypeFk = (SELECT id - FROM dmsType + UPDATE dms + SET dmsTypeFk = (SELECT id + FROM dmsType WHERE `code` = 'trash' ) - WHERE id = OLD.dmsFk AND ( SELECT IF(COUNT(*) > 0, FALSE, TRUE) - FROM ticketDms + WHERE id = OLD.dmsFk AND ( SELECT IF(COUNT(*) > 0, FALSE, TRUE) + FROM ticketDms WHERE dmsFk = OLD.dmsFk ) ; END */;; @@ -36483,7 +36690,6 @@ CREATE TABLE `ticketDown_SelectionType` ( -- Table structure for table `ticketLastState` -- - DROP TABLE IF EXISTS `ticketLastState`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -36771,7 +36977,7 @@ DELIMITER ;; BEGIN SET NEW.workerFk = vn.getUser(); - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -37016,7 +37222,7 @@ DELIMITER ;; BEGIN CALL ticket_requestRecalc(NEW.ticketFk); - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -37088,6 +37294,23 @@ CREATE TABLE `ticketServiceType` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COMMENT='Lista de los posibles servicios a elegir'; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `ticketSms` +-- + +DROP TABLE IF EXISTS `ticketSms`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `ticketSms` ( + `smsFk` mediumint(8) unsigned NOT NULL, + `ticketFk` int(11) DEFAULT NULL, + PRIMARY KEY (`smsFk`), + KEY `ticketSms_FK_1` (`ticketFk`), + CONSTRAINT `ticketSms_FK` FOREIGN KEY (`smsFk`) REFERENCES `sms` (`id`) ON UPDATE CASCADE, + CONSTRAINT `ticketSms_FK_1` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Temporary table structure for view `ticketState` -- @@ -37173,18 +37396,18 @@ BEGIN DECLARE vState VARCHAR(15); DECLARE vZoneFk INT; DECLARE vBoardingStateFk INT; - + SELECT s.code INTO vState FROM state s WHERE s.id = NEW.stateFk; - + SELECT t.zonefk INTO vZoneFk FROM ticket t - WHERE t.id = NEW.ticketFk; - + WHERE t.id = NEW.ticketFk; + IF vState = 'OK' AND vZoneFk IS NULL THEN CALL util.throw("ASSIGN_ZONE_FIRST"); - END IF; + END IF; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -37205,11 +37428,11 @@ DELIMITER ;; FOR EACH ROW BEGIN DECLARE vNumTicketsPrepared INT; - + REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name) SELECT NEW.ticketFk, NEW.id, `name` FROM state - WHERE id = NEW.stateFk; + WHERE id = NEW.stateFk; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -37232,21 +37455,21 @@ BEGIN DECLARE vTicketFk INT; DECLARE vTicketTrackingFk INT; DECLARE vStateName VARCHAR(15); - + IF NEW.stateFk <> OLD.stateFk THEN REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name) SELECT NEW.ticketFk, NEW.id, `name` FROM state WHERE id = NEW.stateFk; END IF; - + IF NEW.ticketFk <> OLD.ticketFk THEN SELECT i.ticketFk, i.id, s.`name` - INTO vTicketFk, vTicketTrackingFk, vStateName - FROM ticketTracking i - JOIN state s ON i.stateFk = s.id - WHERE ticketFk = NEW.ticketFk - ORDER BY created DESC + INTO vTicketFk, vTicketTrackingFk, vStateName + FROM ticketTracking i + JOIN state s ON i.stateFk = s.id + WHERE ticketFk = NEW.ticketFk + ORDER BY created DESC LIMIT 1; IF vTicketFk > 0 THEN @@ -37282,18 +37505,18 @@ BEGIN DELETE FROM vn.ticketLastState WHERE ticketFk = OLD.ticketFk; END; - + CALL util.debugAdd('deletedState', CONCAT('interFk: ', OLD.id, ' ticketFk: ', OLD.ticketFk, ' stateFk: ', OLD.stateFk)); SELECT i.ticketFk, i.id, s.`name` - INTO vTicketFk, vTicketTrackingFk, vStateName - FROM ticketTracking i - JOIN state s ON i.stateFk = s.id - WHERE ticketFk = OLD.ticketFk - ORDER BY created DESC + INTO vTicketFk, vTicketTrackingFk, vStateName + FROM ticketTracking i + JOIN state s ON i.stateFk = s.id + WHERE ticketFk = OLD.ticketFk + ORDER BY created DESC LIMIT 1; IF vTicketFk > 0 THEN @@ -37321,22 +37544,6 @@ CREATE TABLE `ticketTrackingState` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Temporary table structure for view `ticketTracking__` --- - -DROP TABLE IF EXISTS `ticketTracking__`; -/*!50001 DROP VIEW IF EXISTS `ticketTracking__`*/; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -/*!50001 CREATE VIEW `ticketTracking__` AS SELECT - 1 AS `id`, - 1 AS `stateFk`, - 1 AS `created`, - 1 AS `ticketFk`, - 1 AS `workerFk` */; -SET character_set_client = @saved_cs_client; - -- -- Table structure for table `ticketTrolley` -- @@ -37873,7 +38080,7 @@ BEGIN CALL stock.log_add('travel', NEW.id, OLD.id); IF !(NEW.shipped <=> OLD.shipped) THEN - UPDATE entry + UPDATE entry SET commission = entry_getCommission(travelFk, currencyFk,supplierFk) WHERE travelFk = NEW.id; END IF; @@ -38148,6 +38355,18 @@ CREATE TABLE `vehicle` ( ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `vehicleConfig` +-- + +DROP TABLE IF EXISTS `vehicleConfig`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `vehicleConfig` ( + `eventEarlyDays` int(11) DEFAULT 15 COMMENT 'Previous days on which the expiration of an event must be notified' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `vehicleDms` -- @@ -38182,10 +38401,11 @@ CREATE TABLE `vehicleEvent` ( `description` varchar(250) COLLATE utf8mb3_unicode_ci NOT NULL, `vehicleFk` int(11) NOT NULL, `userFk` int(10) unsigned NOT NULL, + `notified` datetime DEFAULT 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` FOREIGN KEY (`vehicleStateFk`) REFERENCES `vehicleState` (`id`), CONSTRAINT `vehicleEvent_FK_1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -38239,10 +38459,11 @@ 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, + `id` int(11) NOT NULL AUTO_INCREMENT, `state` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL, + `hasToNotify` int(11) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -38339,6 +38560,7 @@ CREATE TABLE `warehouse` ( `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, + `isHalt` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Almacén en el que descargan nuestros troncales', PRIMARY KEY (`id`), UNIQUE KEY `name_UNIQUE` (`name`), KEY `Id_Paises` (`countryFk`), @@ -38367,7 +38589,7 @@ DELIMITER ;; BEGIN IF NEW.isFeedStock THEN INSERT INTO warehouseAlias(`name`) VALUES(NEW.`name`); - INSERT INTO warehouseJoined(warehouseFk, warehouseAliasFk) + INSERT INTO warehouseJoined(warehouseFk, warehouseAliasFk) VALUES(NEW.id,LAST_INSERT_ID()); END IF; END */;; @@ -38391,7 +38613,7 @@ DELIMITER ;; BEGIN IF NEW.isFeedStock IS TRUE and OLD.isFeedStock IS FALSE then INSERT INTO warehouseAlias(`name`) VALUES(NEW.`name`); - INSERT INTO warehouseJoined(warehouseFk, warehouseAliasFk) + INSERT INTO warehouseJoined(warehouseFk, warehouseAliasFk) VALUES(NEW.id,LAST_INSERT_ID()); END IF; END */;; @@ -38539,7 +38761,9 @@ DELIMITER ;; BEFORE UPDATE ON worker FOR EACH ROW BEGIN - CALL vn.printer_checkSector(NEW.labelerFk, NEW.sectorFk); + IF NOT (NEW.labelerFk <=> OLD.labelerFk AND NEW.sectorFk <=> OLD.sectorFk) THEN + CALL vn.printer_checkSector(NEW.labelerFk, NEW.sectorFk); + END IF; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -38818,7 +39042,7 @@ CREATE TABLE `workerJourney` ( KEY `workerJourney_dated_idx` (`dated`), KEY `workerJourney_businessFk` (`businessFk`), CONSTRAINT `fk_workerJourney_user` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE, - CONSTRAINT `workerJourney_businessFk` FOREIGN KEY (`businessFk`) REFERENCES `business` (`id`) ON UPDATE CASCADE + CONSTRAINT `workerJourney_businessFk` FOREIGN KEY (`businessFk`) REFERENCES `business` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -39103,9 +39327,9 @@ DELIMITER ;; AFTER INSERT ON `workerTimeControl` FOR EACH ROW BEGIN - IF NEW.timed > DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY) THEN + IF NEW.timed > DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY) THEN CALL util.throw('date in the future'); - END IF; + END IF; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -39143,6 +39367,8 @@ CREATE TABLE `workerTimeControlConfig` ( `dayMaxTime` int(11) DEFAULT NULL COMMENT 'Tiempo máximo desde la entrada hasta la salida, expresado en segundos', `shortWeekDays` int(11) DEFAULT NULL COMMENT 'Días a tener en cuenta para calcular el descanso corto', `longWeekDays` int(11) DEFAULT NULL COMMENT 'Días a tener en cuenta para calcular el descanso largo', + `teleworkingStart` int(11) DEFAULT NULL COMMENT 'Hora comienzo jornada de los teletrabajdores expresada en segundos', + `teleworkingStartBreakTime` int(11) DEFAULT NULL COMMENT 'Hora comienzo descanso de los teletrabjadores expresada en segundos', PRIMARY KEY (`id`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='All values in seconds'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -39507,6 +39733,20 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +-- +-- Table structure for table `zipConfig` +-- + +DROP TABLE IF EXISTS `zipConfig`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `zipConfig` ( + `id` double(10,2) NOT NULL, + `maxSize` int(11) DEFAULT NULL COMMENT 'in MegaBytes', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `zone` -- @@ -39659,10 +39899,10 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_BI` BEFORE INSERT ON `zoneExclusion` FOR EACH ROW -BEGIN - +BEGIN + SET NEW.userFk = account.myUser_getId(); - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -39681,10 +39921,10 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_BU` BEFORE UPDATE ON `zoneExclusion` FOR EACH ROW -BEGIN - +BEGIN + SET NEW.userFk = account.myUser_getId(); - + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -40179,6 +40419,24 @@ DELIMITER ;; /*!50003 SET character_set_client = @saved_cs_client */ ;; /*!50003 SET character_set_results = @saved_cs_results */ ;; /*!50003 SET collation_connection = @saved_col_connection */ ;; +/*!50106 DROP EVENT IF EXISTS `vehicle_notify` */;; +DELIMITER ;; +/*!50003 SET @saved_cs_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' */ ;; +/*!50003 SET @saved_time_zone = @@time_zone */ ;; +/*!50003 SET time_zone = 'SYSTEM' */ ;; +/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `vehicle_notify` ON SCHEDULE EVERY 1 DAY STARTS '2022-01-01 00:07:00' ON COMPLETION NOT PRESERVE DISABLE COMMENT 'Notifies subscribed users of events in vehicles that are about t' DO CALL vn.vehicle_notifyEvents */ ;; +/*!50003 SET time_zone = @saved_time_zone */ ;; +/*!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 */ ;; /*!50106 DROP EVENT IF EXISTS `workerTimeControl_sendMail` */;; DELIMITER ;; /*!50003 SET @saved_cs_client = @@character_set_client */ ;; @@ -40312,7 +40570,7 @@ BEGIN DECLARE vGeoFk INT; SELECT p.geoFk INTO vGeoFk - FROM address a + FROM address a JOIN town t ON t.provinceFk = a.provinceFk JOIN postCode p ON p.townFk = t.id AND p.`code` = a.postalCode WHERE a.id = vSelf @@ -40339,12 +40597,12 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` FUNCTION `barcodeToItem`(vBarcode VARCHAR(22)) RETURNS int(11) DETERMINISTIC BEGIN - + /** * Obtiene el id del artículo * * @param vBarcode código de barras - * + * * return id del item */ @@ -40354,35 +40612,35 @@ BEGIN FROM vn.item WHERE id = vBarcode OR comment = vBarcode LIMIT 1; - - IF vItemFk THEN + + IF vItemFk THEN RETURN vItemFk; END IF; - SELECT itemFk INTO vItemFk - FROM buy + SELECT itemFk INTO vItemFk + FROM buy WHERE id = vBarcode; - - IF vItemFk THEN + + IF vItemFk THEN RETURN vItemFk; END IF; - - SELECT itemFk INTO vItemFk - FROM itemBarcode + + SELECT itemFk INTO vItemFk + FROM itemBarcode WHERE code = vBarcode; - - IF vItemFk THEN + + IF vItemFk THEN RETURN vItemFk; END IF; - SELECT i.id INTO vItemFk + SELECT i.id INTO vItemFk FROM vn.item i WHERE i.name LIKE CONCAT('%',vBarcode,'%') ORDER BY i.id ASC LIMIT 1; - + RETURN vItemFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -40404,9 +40662,9 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `botanicExport_isUpdatable`(vEdiGenus DETERMINISTIC BEGIN DECLARE vIsUpdatable INTEGER; - SELECT COUNT(*) INTO vIsUpdatable - FROM botanicExport - WHERE ediGenusFk = vEdiGenusFk + SELECT COUNT(*) INTO vIsUpdatable + FROM botanicExport + WHERE ediGenusFk = vEdiGenusFk AND (vEdiSpecieFk = ediSpecieFk OR IFNULL(vEdiSpecieFk,ediSpecieFk) IS NULL) AND (vCountryFk = countryFk OR IFNULL(vCountryFk,countryFk) IS NULL) AND vRestriction = restriction; @@ -40503,16 +40761,16 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `catalog_componentReverse`(vWarehouse DETERMINISTIC BEGIN /* Calcula los componentes para un cliente a partir de un coste y volumen - * @param vWarehouse + * @param vWarehouse * @param vCost Valor de coste del articulo * @param vM3 m3 del articulo - * @param vAddressFk + * @param vAddressFk * @param vZoneFk - * @return vRetailedPrice precio de venta sin iva + * @return vRetailedPrice precio de venta sin iva * @return tmp.catalog_component (warehouseFk, itemFk, componentFk, cost) */ - - DECLARE vBoxVolume BIGINT; + + DECLARE vBoxVolume BIGINT; DECLARE vCustomer INT; DECLARE vComponentRecovery INT DEFAULT 17; DECLARE vComponentMana INT DEFAULT 39; @@ -40521,11 +40779,11 @@ BEGIN DECLARE vComponentCost INT DEFAULT 28; DECLARE vRetailedPrice DECIMAL(10,2); DECLARE vItem INT DEFAULT 98; - + SELECT volume INTO vBoxVolume FROM vn.packaging WHERE id = '94'; - + SELECT clientFk INTO vCustomer FROM address WHERE id = vAddressFk; DROP TEMPORARY TABLE IF EXISTS tmp.catalog_component; @@ -40549,7 +40807,7 @@ BEGIN -- Margen -- No se aplica margen, cau 12589 /* INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost) - SELECT vWarehouse, vItem, vComponentMargin, (vCost / ((100 - rate2) / 100)) - vCost + SELECT vWarehouse, vItem, vComponentMargin, (vCost / ((100 - rate2) / 100)) - vCost FROM vn.rate WHERE dated <= util.VN_CURDATE() AND warehouseFk = vWarehouse @@ -40558,7 +40816,7 @@ BEGIN */ -- Recobro INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost) - SELECT vWarehouse, vItem, vComponentRecovery, ROUND(LEAST(recobro,0.25), 3) + SELECT vWarehouse, vItem, vComponentRecovery, ROUND(LEAST(recobro,0.25), 3) FROM bi.claims_ratio WHERE Id_Cliente = vCustomer AND recobro > 0.009; @@ -40575,7 +40833,7 @@ BEGIN ROUND( vM3 * (z.price - z.bonus) - * z.inflation + * z.inflation / vBoxVolume, 4 ) FROM zone z @@ -40612,11 +40870,8 @@ BEGIN * @param vDate date to check the risk * @return client risk */ - DECLARE vDebt DECIMAL(10,2); - SELECT vn.client_getDebt(vClient,vDate) INTO vDebt; - RETURN vDebt; END ;; DELIMITER ; @@ -40650,30 +40905,30 @@ BEGIN DECLARE vAutoManaComponent INT; DECLARE vManaBank INT; DECLARE vManaGreugeType INT; - + SELECT id INTO vManaGreugeType FROM greugeType WHERE code = 'mana'; SELECT id INTO vManaBank FROM bank WHERE code = 'mana'; SELECT id INTO vManaComponent FROM component WHERE code = 'mana'; SELECT id INTO vAutoManaComponent FROM component WHERE code = 'autoMana'; - + SELECT COUNT(*) INTO vHasMana FROM `client` c WHERE c.id = vClient AND c.typeFk = 'normal'; - + IF NOT vHasMana THEN RETURN 0; END IF; - + SELECT max(dated) INTO vFromDated FROM clientManaCache; SELECT sum(mana) INTO vMana - FROM + FROM ( SELECT mana FROM clientManaCache WHERE clientFk = vClient - AND dated = vFromDated + AND dated = vFromDated UNION ALL SELECT s.quantity * value FROM ticket t @@ -40681,7 +40936,7 @@ BEGIN JOIN sale s on s.ticketFk = t.id JOIN saleComponent sc on sc.saleFk = s.id WHERE sc.componentFk IN (vManaComponent, vAutoManaComponent) - AND t.shipped > vFromDated + AND t.shipped > vFromDated AND t.shipped < TIMESTAMPADD(DAY,1,util.VN_CURDATE()) AND a.clientFk = vClient UNION ALL @@ -40745,7 +41000,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `clientTaxArea`(vClientId INT, vCompa READS SQL DATA BEGIN /** - * Devuelve el area de un cliente, + * Devuelve el area de un cliente, * intracomunitario, extracomunitario o nacional. * * @param vClient Id del cliente @@ -40792,7 +41047,7 @@ BEGIN SELECT COUNT(*) INTO vHasDebt FROM `client` c WHERE c.id = vClient AND c.typeFk = 'normal'; - + IF NOT vHasDebt THEN RETURN 0; END IF; @@ -40880,8 +41135,8 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `client_getSalesPerson`(vClientFk INT DETERMINISTIC BEGIN /** - * Dado un id cliente y una fecha, devuelve su comercial para ese dia, teniendo - * en cuenta la jerarquía de las tablas: 1º la de sharingclient, 2º la de + * Dado un id cliente y una fecha, devuelve su comercial para ese dia, teniendo + * en cuenta la jerarquía de las tablas: 1º la de sharingclient, 2º la de * sharingcart y tercero la de clientes. * * @param vClientFk El id del cliente @@ -40919,29 +41174,29 @@ BEGIN l: LOOP SELECT workerSubstitute INTO vWorkerSubstituteFk - FROM sharingCart + FROM sharingCart WHERE util.VN_CURDATE() BETWEEN started AND ended AND workerFk = vSalesPersonFk ORDER BY id LIMIT 1; - + IF vWorkerSubstituteFk IS NULL THEN LEAVE l; END IF; - + SELECT COUNT(*) > 0 INTO vLoop FROM tmp.stack WHERE substitute = vWorkerSubstituteFk; IF vLoop THEN LEAVE l; END IF; - + INSERT INTO tmp.stack SET substitute = vWorkerSubstituteFk; - + SET vSalesPersonFk = vWorkerSubstituteFk; END LOOP; - + DROP TEMPORARY TABLE tmp.stack; END IF; @@ -40975,11 +41230,11 @@ BEGIN **/ DECLARE vClientFk INT; DECLARE vDated DATE; - + SELECT clientFk, shipped INTO vClientFk, vDated FROM ticket WHERE id = vTicketFk; - + RETURN client_getSalesPerson(vClientFk, vDated); END ;; DELIMITER ; @@ -41010,12 +41265,12 @@ BEGIN **/ DECLARE vWorkerCode CHAR(3); DECLARE vSalesPersonFk INT; - + SET vSalesPersonFk = client_getSalesPerson(vClientFk, vDated); SELECT code INTO vWorkerCode - FROM worker + FROM worker WHERE id = vSalesPersonFk; RETURN vWorkerCode; @@ -41048,11 +41303,11 @@ BEGIN **/ DECLARE vClientFk INT; DECLARE vDated DATE; - + SELECT clientFk, shipped INTO vClientFk, vDated FROM ticket WHERE id = vTicketFk; - + RETURN client_getSalesPersonCode(vClientFk, vDated); END ;; DELIMITER ; @@ -41132,6 +41387,41 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP FUNCTION IF EXISTS `currency_getCommission` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` FUNCTION `currency_getCommission`(vSelf INT) RETURNS int(11) + DETERMINISTIC +BEGIN +/** + * Devuelve el tipo de cambio en el dia de hoy dada el tipo de moneda + * + * @param vSelf id del tipo de moneda + * @return devuelve la comision + */ + DECLARE vCommission INT; + + SELECT ROUND(-100 * (1 - (1 / r.value))) INTO vCommission + FROM referenceCurrent r + WHERE r.currencyFk = vSelf + AND r.`dated` <= util.VN_CURDATE() + ORDER BY r.`dated` DESC + LIMIT 1; + + RETURN vCommission; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP FUNCTION IF EXISTS `currentRate` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -41145,7 +41435,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `currentRate`(vCurrencyFk INT, vDated BEGIN DECLARE curRate DECIMAL(10,4); - + SELECT value INTO curRate FROM referenceRate WHERE dated <= vDated @@ -41176,23 +41466,23 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `deviceProductionUser_accessGranted`( BEGIN /* * Comprueba si el usuario puede entrar en la aplicacion de almacen con ese movil - * + * * */ - + /*DECLARE vIsGranted BOOLEAN; DECLARE vDeviceProductionFk INT(11) DEFAULT NULL; - SELECT dp.id INTO vDeviceProductionFk - FROM vn.deviceProduction dp + SELECT dp.id INTO vDeviceProductionFk + FROM vn.deviceProduction dp WHERE dp.android_id = android_id; IF vDeviceProductionFk THEN - - SELECT COUNT(*) INTO vIsGranted - FROM vn.deviceProductionUser dpu - WHERE dpu.userFk = vUserFK + + SELECT COUNT(*) INTO vIsGranted + FROM vn.deviceProductionUser dpu + WHERE dpu.userFk = vUserFK AND dpu.deviceProductionFk = vDeviceProductionFk; - + RETURN vIsGranted; END IF;*/ RETURN TRUE; @@ -41216,16 +41506,16 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `duaTax_getRate`(vDua INT, vTaxClass DETERMINISTIC BEGIN DECLARE vCountryFk INTEGER; - + SELECT s.countryFk INTO vCountryFk FROM dua d JOIN supplier s ON s.id = d.companyFk WHERE d.id = vDua; - + RETURN (SELECT rate FROM (SELECT taxClassFk, rate - FROM invoiceInTaxBookingAccount + FROM invoiceInTaxBookingAccount WHERE effectived <= util.VN_CURDATE() AND countryFk = vCountryFk AND taxClassFk = vTaxClass @@ -41251,70 +41541,70 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` FUNCTION `ekt_getEntry`(vEktFk INT) RETURNS int(11) READS SQL DATA -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; - - SELECT ea.id - INTO vEntryAssignFk - FROM edi.ekt e - JOIN vn.ektEntryAssign ea ON - IFNULL(ea.sub, e.sub) <=> e.sub AND - IFNULL(ea.kop, e.kop) <=> e.kop AND - IFNULL(ea.pro, e.pro) <=> e.pro AND - IFNULL(ea.auction, e.auction) <=> e.auction - WHERE e.id = vEktFk - ORDER BY - IF(ea.sub,1,0) * 1000 + - IF(ea.kop,1,0) * 100 + - IF(ea.pro,1,0) * 10 + - IF(ea.auction,1,0) DESC - LIMIT 1; - - SET vTravelFk = vn.ekt_getTravel(vEntryAssignFk, vEktFk); - - IF vTravelFk THEN - - 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 - AND e.auction <=> ea.auction - AND e.companyFk <=> ea.companyFk; - - IF vEntryFk IS NULL THEN - INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro, auction) - SELECT vTravelFk, ea.supplierFk, ea.companyFk, cu.id, ea.kop, ea.sub, ea.ref, ea.pro, ea.auction - FROM vn.ektEntryAssign ea - JOIN vn.currency cu ON cu.code = 'EUR' - WHERE ea.id = vEntryAssignFk; - - SET vEntryFk = LAST_INSERT_ID(); - 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; +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; + + SELECT ea.id + INTO vEntryAssignFk + FROM edi.ekt e + JOIN vn.ektEntryAssign ea ON + IFNULL(ea.sub, e.sub) <=> e.sub AND + IFNULL(ea.kop, e.kop) <=> e.kop AND + IFNULL(ea.pro, e.pro) <=> e.pro AND + IFNULL(ea.auction, e.auction) <=> e.auction + WHERE e.id = vEktFk + ORDER BY + IF(ea.sub,1,0) * 1000 + + IF(ea.kop,1,0) * 100 + + IF(ea.pro,1,0) * 10 + + IF(ea.auction,1,0) DESC + LIMIT 1; + + SET vTravelFk = vn.ekt_getTravel(vEntryAssignFk, vEktFk); + + IF vTravelFk THEN + + 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 + AND e.auction <=> ea.auction + AND e.companyFk <=> ea.companyFk; + + IF vEntryFk IS NULL THEN + INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, reference, pro, auction) + SELECT vTravelFk, ea.supplierFk, ea.companyFk, cu.id, ea.kop, ea.sub, ea.ref, ea.pro, ea.auction + FROM vn.ektEntryAssign ea + JOIN vn.currency cu ON cu.code = 'EUR' + WHERE ea.id = vEntryAssignFk; + + SET vEntryFk = LAST_INSERT_ID(); + 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 */ ; @@ -41336,7 +41626,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `ekt_getTravel`(vEntryAssignFk INT, v BEGIN /** * Devuelve un vn.travel.id - * + * * @param vEntryAssignFk Identificador de vn.entryAssign */ DECLARE vTravelFk INT; @@ -41398,36 +41688,36 @@ BEGIN DECLARE vCurrentCommission INT; DECLARE vIsCurrencyUsd INT; DECLARE vLastEntryFk INT; - + SELECT count(*) INTO vIsCurrencyUsd FROM currency c WHERE c.code = 'USD' AND id = vCurrencyFk; - + IF NOT vIsCurrencyUsd THEN - + SELECT e.id INTO vLastEntryFk FROM vn.entry e JOIN vn.travel tr ON tr.id = e.travelFk WHERE e.supplierFk = vSupplierFk ORDER BY tr.landed DESC LIMIT 1; - + IF vLastEntryFk THEN - + SELECT commission INTO vCurrentCommission FROM vn.entry WHERE id = vLastEntryFk; - + ELSE - + SELECT commission INTO vCurrentCommission FROM supplier s WHERE s.id = vSupplierFk; - + END IF; - + RETURN vCurrentCommission; - + ELSE SELECT ROUND(-100 * (1 - (1 / r.value))) INTO vCommission @@ -41436,11 +41726,11 @@ BEGIN WHERE t.id = vTravelFk ORDER BY r.`dated` DESC LIMIT 1; - + RETURN IFNULL(vCommission, 0); - + END IF; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -41492,10 +41782,10 @@ DELIMITER ;; 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 */ @@ -41503,51 +41793,51 @@ BEGIN DECLARE vTravelFk INT; DECLARE vEntryFk INT; DECLARE previousEntryFk INT; - + SET vTravelFk = vn.travel_getForLogiflora(vLanded, vWarehouseFk); - + IF vLanded THEN - - SELECT IFNULL(MAX(id),0) INTO vEntryFk + + SELECT IFNULL(MAX(id),0) INTO vEntryFk FROM vn.entry - WHERE travelFk = vTravelFk + WHERE travelFk = vTravelFk AND isRaid; IF NOT vEntryFk THEN - + INSERT INTO vn.entry(travelFk, supplierFk, commission, companyFk, currencyFk, isRaid) SELECT vTravelFk, s.id, 4, c.id, cu.id, TRUE FROM vn.supplier s JOIN vn.company c ON c.code = 'VNL' JOIN vn.currency cu ON cu.code = 'EUR' WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN'; - - SELECT MAX(id) INTO vEntryFk + + SELECT MAX(id) INTO vEntryFk FROM vn.entry WHERE travelFk = vTravelFk; - + END IF; + + END IF; - END IF; - - SELECT entryFk INTO previousEntryFk + SELECT entryFk INTO previousEntryFk FROM edi.warehouseFloramondo wf WHERE wf.warehouseFk = vWarehouseFk; - + IF IFNULL(previousEntryFk,0) != vEntryFk THEN - - UPDATE buy b - SET b.printedStickers = 0 + + UPDATE buy b + SET b.printedStickers = 0 WHERE entryFk = previousEntryFk; DELETE FROM buy WHERE entryFk = previousEntryFk; - + DELETE FROM entry WHERE id = previousEntryFk; - + END IF; - + RETURN vEntryFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -41596,32 +41886,32 @@ DELIMITER ; DELIMITER ;; 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; - +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 */ ; @@ -41680,27 +41970,27 @@ BEGIN DECLARE vDeliveryType INTEGER DEFAULT 0; DECLARE isWaitingForPickUp BOOLEAN DEFAULT FALSE; DECLARE vCode VARCHAR(45); - + SELECT am.deliveryMethodFk - INTO vDeliveryType + INTO vDeliveryType FROM ticket t JOIN agencyMode am ON am.id = t.agencyModeFk WHERE t.id = vTicket; - + CASE vDeliveryType WHEN 1 THEN -- AGENCIAS SET vCode = 'DELIVERED'; - + WHEN 2 THEN -- REPARTO SET vCode = 'ON_DELIVERY'; - + ELSE -- MERCADO, OTROS SELECT MIN(t.warehouseFk <> w.id) INTO isWaitingForPickUp - FROM ticket t + FROM ticket t LEFT JOIN warehouse w ON w.pickUpagencyModeFk = t.agencyModeFk WHERE t.id = vTicket; - + IF isWaitingForPickUp THEN SET vCode = 'WAITING_FOR_PICKUP'; ELSE @@ -41730,28 +42020,28 @@ BEGIN DECLARE vDeliveryType INTEGER DEFAULT 0; DECLARE isWaitingForPickUp BOOLEAN DEFAULT FALSE; DECLARE vCode VARCHAR(45); - - SELECT + + SELECT a.Vista - INTO vDeliveryType + INTO vDeliveryType FROM vn2008.Tickets t JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia WHERE Id_Ticket = vTicket; - + CASE vDeliveryType WHEN 1 THEN -- AGENCIAS SET vCode = 'DELIVERED'; - + WHEN 2 THEN -- REPARTO SET vCode = 'ON_DELIVERY'; - + ELSE -- MERCADO, OTROS SELECT t.warehouse_id <> w.warehouse_id INTO isWaitingForPickUp - FROM vn2008.Tickets t - LEFT JOIN vn2008.warehouse_pickup w + FROM vn2008.Tickets t + LEFT JOIN vn2008.warehouse_pickup w ON w.agency_id = t.Id_Agencia AND w.warehouse_id = t.warehouse_id WHERE t.Id_Ticket = vTicket; - + IF isWaitingForPickUp THEN SET vCode = 'WAITING_FOR_PICKUP'; ELSE @@ -41854,30 +42144,30 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` FUNCTION `getNextDueDate`(vDated DATE, vGapDays INT, vPayDay INT) RETURNS date NO SQL -BEGIN - - DECLARE vReturn DATE; - DECLARE vDuaDate DATE; - DECLARE vDuaDateDay INT; - - SELECT TIMESTAMPADD(DAY, vGapDays, vDated) INTO vDuaDate; - - IF vDuaDate = CONCAT(YEAR(vDuaDate), '-03-01') THEN - SET vDuaDate = TIMESTAMPADD (DAY , -1, vDuaDate); - ELSEIF vDuaDate = CONCAT(YEAR(vDuaDate), '-02-29') THEN - SET vDuaDate = TIMESTAMPADD (DAY , -2, vDuaDate); - END IF; - - IF MONTH(vDuaDate) = 2 AND vPayDay = 30 THEN - IF util.isLeapYear(YEAR(vDuaDate)) THEN - SET vPayDay = 29; - ELSE - SET vPayDay = 28; - END IF; - END IF; - - SELECT DAY(vDuaDate) INTO vDuaDateDay; - RETURN TIMESTAMPADD(MONTH, (vDuaDateDay > vPayDay), DATE_FORMAT(vDuaDate, CONCAT('%y/%m/', vPayDay))); +BEGIN + + DECLARE vReturn DATE; + DECLARE vDuaDate DATE; + DECLARE vDuaDateDay INT; + + SELECT TIMESTAMPADD(DAY, vGapDays, vDated) INTO vDuaDate; + + IF vDuaDate = CONCAT(YEAR(vDuaDate), '-03-01') THEN + SET vDuaDate = TIMESTAMPADD (DAY , -1, vDuaDate); + ELSEIF vDuaDate = CONCAT(YEAR(vDuaDate), '-02-29') THEN + SET vDuaDate = TIMESTAMPADD (DAY , -2, vDuaDate); + END IF; + + IF MONTH(vDuaDate) = 2 AND vPayDay = 30 THEN + IF util.isLeapYear(YEAR(vDuaDate)) THEN + SET vPayDay = 29; + ELSE + SET vPayDay = 28; + END IF; + END IF; + + SELECT DAY(vDuaDate) INTO vDuaDateDay; + RETURN TIMESTAMPADD(MONTH, (vDuaDateDay > vPayDay), DATE_FORMAT(vDuaDate, CONCAT('%y/%m/', vPayDay))); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -41898,11 +42188,11 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `getShipmentHour`(vTicket INT) RETURN READS SQL DATA BEGIN DECLARE vShipmentHour INT; - + SELECT HOUR(shipped) INTO vShipmentHour FROM ticket WHERE id = vTicket; - + IF vShipmentHour = 0 THEN DROP TEMPORARY TABLE IF EXISTS tmp.production_buffer; @@ -41917,11 +42207,11 @@ BEGIN JOIN agencyMode am on am.id = t.agencyModeFk JOIN address a on a.id = t.addressFk WHERE t.id = vTicket; - - SELECT Hora INTO vShipmentHour + + SELECT Hora INTO vShipmentHour FROM tmp.production_buffer; END IF; - + RETURN vShipmentHour; END ;; DELIMITER ; @@ -41946,12 +42236,12 @@ BEGIN SELECT rate3 INTO price FROM vn.priceFixed - WHERE itemFk = vItemFk + WHERE itemFk = vItemFk AND util.VN_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 + WHERE itemFk = vItemFk AND clientFk = vClientFk ; RETURN price; END ;; @@ -41976,23 +42266,23 @@ BEGIN /** * Devuelve el ticket que debe de preparar el trabajador * - * @param vWorker Id del trabajador + * @param vWorker Id del trabajador * @param vWarehouse Id del almacén * @return Id del ticket * * #UPDATED PAK 2019/08/16 * #PENDING REVIEW **/ - + DECLARE vToday DATETIME DEFAULT util.VN_CURDATE(); DECLARE vYesterday DATETIME; DECLARE vTodayvMidniight DATETIME DEFAULT midnight(vToday); DECLARE vTicket INT DEFAULT NULL; DECLARE PREVIOUS_PREPARATION INT; DECLARE vHasBeenPreviouslyPrepared INT DEFAULT 0; - + -- Si hay algun ticket previamente seleccionado, y se ha quedado sin empezar, lo recupera en primer lugar. - /* + /* SELECT i.Id_Ticket INTO vTicket FROM vncontrol.inter i JOIN vn.state s ON s.id = i.state_id @@ -42009,7 +42299,7 @@ BEGIN AND i.Id_Trabajador = vWorker AND sub.ticketFk IS NULL LIMIT 1; - + IF vTicket IS NULL THEN */ SELECT id INTO PREVIOUS_PREPARATION @@ -42017,20 +42307,20 @@ BEGIN WHERE code LIKE 'PREVIOUS_PREPARATION'; SET vYesterday = TIMESTAMPADD(DAY,-1,vToday); - + DROP TEMPORARY TABLE IF EXISTS tmp.workerComercial; CREATE TEMPORARY TABLE tmp.workerComercial ENGINE = MEMORY - SELECT workerFk as worker FROM `grant` g - JOIN grantGroup gg ON g.`groupFk` = gg.id + SELECT workerFk as worker FROM `grant` g + JOIN grantGroup gg ON g.`groupFk` = gg.id WHERE gg.description = 'Comerciales'; - - DELETE wc.* + + DELETE wc.* FROM tmp.workerComercial wc JOIN `grant` g ON g.workerFk = wc.worker - JOIN grantGroup gg ON g.`groupFk` = gg.id - WHERE gg.description = 'Gerencia'; - + JOIN grantGroup gg ON g.`groupFk` = gg.id + WHERE gg.description = 'Gerencia'; + DROP TEMPORARY TABLE IF EXISTS tmp.production_buffer; CREATE TEMPORARY TABLE tmp.production_buffer ENGINE = MEMORY @@ -42051,18 +42341,18 @@ BEGIN LEFT JOIN vn.zone z ON z.id = t.zoneFk WHERE t.shipped BETWEEN vYesterday AND vTodayvMidniight AND t.warehouseFk = vWarehouse - AND + AND ( (tls.code = 'PRINTED' AND wc.worker IS NULL) - OR + OR (tls.code ='PICKER_DESIGNED' AND tls.worker = vWorker) - OR + OR (tls.code = 'PRINTED_BACK') - OR + OR (tls.code = 'PRINTED PREVIOUS') ); - - + + SELECT ticket INTO vTicket FROM tmp.production_buffer ORDER BY (code = 'PICKER_DESIGNED') DESC, (code = 'PRINTED PREVIOUS') DESC ,Hora, Minuto, loadingOrder @@ -42073,15 +42363,15 @@ BEGIN FROM vncontrol.inter WHERE Id_Ticket = vTicket AND state_id = PREVIOUS_PREPARATION; - - IF vHasBeenPreviouslyPrepared AND ticketWarehouseGet(vTicket) = 1 THEN - + + IF vHasBeenPreviouslyPrepared AND ticketWarehouseGet(vTicket) = 1 THEN + INSERT IGNORE INTO vn.ticketDown(ticketFk) VALUES(vTicket); - + END IF; -- END IF; - + RETURN vTicket; END ;; @@ -42105,7 +42395,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `getTicketTrolleyLabelCount`(vTicket BEGIN DECLARE vLabelCount INT DEFAULT 0; - SELECT labelCount INTO vLabelCount + SELECT labelCount INTO vLabelCount FROM ticketTrolley WHERE ticket = vTicket; @@ -42209,7 +42499,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` FUNCTION `hasAnyNegativeBase`() RETURNS tinyint(1) DETERMINISTIC -BEGIN +BEGIN /* Calcula si existe alguna base imponible negativa * Requiere la tabla temporal vn.ticketToInvoice(id) @@ -42217,14 +42507,14 @@ BEGIN * returns BOOLEAN */ DECLARE hasAnyNegativeBase BOOLEAN; - + DROP TEMPORARY TABLE IF EXISTS tmp.ticket; CREATE TEMPORARY TABLE tmp.ticket (KEY (ticketFk)) ENGINE = MEMORY SELECT id ticketFk FROM ticketToInvoice; - + CALL ticket_getTax(NULL); SELECT COUNT(*) INTO hasAnyNegativeBase @@ -42237,9 +42527,9 @@ BEGIN DROP TEMPORARY TABLE tmp.ticketTax; DROP TEMPORARY TABLE tmp.ticket; - + RETURN hasAnyNegativeBase; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -42261,17 +42551,17 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `hasItemsInSector`(vTicketFk INT, vSe BEGIN DECLARE vItemCount INT; - + SELECT count(*) INTO vItemCount - FROM vn.sale s + FROM vn.sale s JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk JOIN vn.shelving sh ON sh.code = ish.shelvingFk JOIN vn.parking p ON p.id = sh.parkingFk WHERE s.ticketFk = vTicketFk AND p.sectorFk = vSectorFk; - + RETURN vItemCount; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -42294,7 +42584,7 @@ BEGIN DECLARE vCountry INT; DECLARE hasSomeNegativeBase BOOLEAN; - SELECT s.countryFk + SELECT s.countryFk INTO vCountry FROM supplier s JOIN ticket t ON t.companyFk = s.id @@ -42303,9 +42593,9 @@ BEGIN SELECT COUNT(*) INTO hasSomeNegativeBase FROM ( SELECT SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2)) taxableBase - FROM sale s + FROM sale s JOIN item i ON i.id = s.itemFk - JOIN itemTaxCountry itc + JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = vCountry WHERE s.ticketFk = vTicket GROUP BY itc.taxClassFk @@ -42335,12 +42625,12 @@ BEGIN DECLARE totalAmount DECIMAL(10,2); SELECT SUM(vat) INTO totalAmount - FROM ( + FROM ( SELECT iot.vat FROM invoiceOutTax iot JOIN invoiceOut io ON io.id = iot.invoiceOutFk WHERE io.ref = vInvoiceRef - UNION ALL + UNION ALL SELECT ioe.amount FROM invoiceOutExpence ioe JOIN invoiceOut io ON io.id = ioe.invoiceOutFk @@ -42370,7 +42660,7 @@ BEGIN DECLARE vIssued DATE; DECLARE vSerial VARCHAR(15); - SELECT issued, ref + SELECT issued, ref INTO vIssued, vSerial FROM invoiceOut WHERE id = vSelf; @@ -42441,9 +42731,9 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `invoiceSerial`(vClientFk INT, vCompa DETERMINISTIC BEGIN /** - * Obtiene la serie de de una factura + * Obtiene la serie de de una factura * dependiendo del area del cliente. - * + * * @param vClientFk Id del cliente * @param vCompanyFk Id de la empresa * @param vType Tipo de factura ["R", "M", "G"] @@ -42542,7 +42832,7 @@ BEGIN 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 SET isIntrastatOperation = TRUE; END IF; @@ -42566,19 +42856,19 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -42615,7 +42905,7 @@ BEGIN WHERE sl.scan_id = vScanId AND t.Id_Ruta ) t1; - + RETURN vDistinctRoutesInThePallet = 1; END ;; DELIMITER ; @@ -42639,20 +42929,20 @@ BEGIN DECLARE vPacking INTEGER DEFAULT 0; DECLARE vItemFk INTEGER; - + SELECT vn.barcodeToItem(vBarcode) INTO vItemFk; - - SELECT IFNULL(packing,0) INTO vPacking - FROM vn.buy + + SELECT IFNULL(packing,0) INTO vPacking + FROM vn.buy WHERE id = CAST(vBarcode AS DECIMAL(18,0)); - - - - + + + + IF NOT vPacking THEN CALL cache.last_buy_refresh(FALSE); SELECT IFNULL(packing,1) INTO vPacking - FROM + FROM (SELECT packing , created FROM vn.itemShelving WHERE itemFk = vItemFk @@ -42665,11 +42955,11 @@ BEGIN ) packings ORDER BY created desc LIMIT 1; - + END IF; - + RETURN vPacking; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -42694,11 +42984,11 @@ BEGIN DECLARE vColumn INT; DECLARE vClosestParkingFk INT; DECLARE vSectorFk INT; - + SELECT p.column, sectorFk INTO vColumn, vSectorFk FROM vn.parking p WHERE p.id = vParkingFk; - + SELECT itemShelvingFk INTO vClosestParkingFk FROM ( @@ -42708,12 +42998,12 @@ BEGIN JOIN vn.itemPlacementSupplyList ipsl ON ipsl.sectorFk = ispss.sectorFk AND ipsl.itemFk = ispss.itemFk WHERE p.sectorFk = vSectorFk AND ipsl.saldo > 0 - ) sub + ) sub ORDER BY distance LIMIT 1; - + RETURN vClosestParkingFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -42735,17 +43025,17 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `itemsInSector_get`(vTicketFk INT, vS BEGIN DECLARE vItemCount INT; - + SELECT count(*) INTO vItemCount - FROM vn.sale s + FROM vn.sale s JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk JOIN vn.shelving sh ON sh.code = ish.shelvingFk JOIN vn.parking p ON p.id = sh.parkingFk WHERE s.ticketFk = vTicketFk AND p.sectorFk = vSectorFk; - + RETURN vItemCount; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -42788,17 +43078,17 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -42817,30 +43107,30 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -42877,7 +43167,7 @@ BEGIN FROM packaging p JOIN item i ON i.id = vSelf WHERE p.id = vPackaging; - + RETURN vVolume; END ;; @@ -42898,7 +43188,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` FUNCTION `lastDayOfWeek`(vYear INT, vWeek INT) RETURNS date DETERMINISTIC -BEGIN +BEGIN /** * Returns the date of the last day of the week * @@ -42934,23 +43224,23 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -42973,9 +43263,9 @@ BEGIN DECLARE result INT; DECLARE vSenderFk INT; - SELECT id INTO vSenderFk + SELECT id INTO vSenderFk FROM account.user WHERE `name` = account.myUser_getName(); - + RETURN (SELECT messageSendWithUser(vSenderFk, vRecipient, vMessage)); END ;; DELIMITER ; @@ -43002,9 +43292,9 @@ BEGIN DECLARE vSendDate DATETIME DEFAULT util.VN_NOW(); DECLARE vSender VARCHAR(255) CHARSET utf8; - SELECT `name` INTO vSender + SELECT `name` INTO vSender FROM account.user WHERE id = vSenderFK; - + SET vRecipient = LOWER(vRecipient); DROP TEMPORARY TABLE IF EXISTS tRecipients; @@ -43025,7 +43315,7 @@ BEGIN IF vCount = 0 THEN RETURN vCount; - END IF; + END IF; SET vUuid = UUID(); @@ -43036,7 +43326,7 @@ BEGIN message = vMessage, sendDate = vSendDate; - INSERT INTO messageInbox (uuid, sender, recipient, finalRecipient, message, sendDate) + INSERT INTO messageInbox (uuid, sender, recipient, finalRecipient, message, sendDate) SELECT vUuid, vSender, vRecipient, finalRecipient, vMessage, vSendDate FROM tRecipients; @@ -43110,7 +43400,7 @@ BEGIN -- Devuelte el volumen total de la orden sumada DECLARE vWarehouseId INTEGER; DECLARE vVolume DECIMAL(10,3); - + SELECT IFNULL(SUM(o.amount * ic.cm3delivery)/1000000,0) INTO vVolume FROM hedera.orderRow o JOIN item i ON i.id = o.itemFk @@ -43187,7 +43477,7 @@ BEGIN WHERE cb.id = packagingReturnFk; SET vValue = IF (vAmount IS NULL, - IFNULL(base,0), + IFNULL(base,0), vAmount / IFNULL(upload, 0) + IFNULL(base, 0)); ELSE SET vValue = IFNULL(price, 0) + IFNULL(base, 0); @@ -43214,7 +43504,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `phytoPassport`(vRef VARCHAR(15)) RET DETERMINISTIC BEGIN DECLARE vPhyto TEXT CHARSET utf8 COLLATE utf8_unicode_ci; -SELECT +SELECT GROUP_CONCAT(i.id, ':', ppa.denomination, @@ -43249,6 +43539,38 @@ WHERE ''), '%'); RETURN vPhyto; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP FUNCTION IF EXISTS `priceFixed_getRate2` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` FUNCTION `priceFixed_getRate2`(vFixedPriceFk INT, vRate3 DOUBLE) RETURNS double +BEGIN + + DECLARE vWarehouse INT; + DECLARE vRate2 DOUBLE; + + SELECT round(vRate3 * (1 + ((r.rate2 - r.rate3)/100)), 2) INTO vRate2 + FROM vn.rate r + JOIN vn.priceFixed p ON p.id = vFixedPriceFk + WHERE r.dated <= p.started + AND r.warehouseFk = p.warehouseFk + ORDER BY r.dated DESC + LIMIT 1; + + RETURN vRate2; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -43271,20 +43593,20 @@ BEGIN DECLARE vRouteFk INT; DECLARE vAddressFk INT; - + DECLARE vLanded DATE; DECLARE vZoneFk INT; DECLARE vSignificativeFriendship INT DEFAULT 6; DECLARE vVolumeMax DECIMAL(5,1) DEFAULT 10; - + SELECT addressFk, zoneFk, landed INTO vAddressFk, vZoneFk, vLanded - FROM vn.ticket + FROM vn.ticket WHERE id = vTicketFk; - + -- Se inicia la selección de rutas posibles con aquellas cuyas agencias alguna vez han estado asociadas con nuestra zona DROP TEMPORARY TABLE IF EXISTS tmp.route; CREATE TEMPORARY TABLE tmp.route - SELECT r.id routeFk, + SELECT r.id routeFk, zf.friendship zoneFriendship FROM vn.route r JOIN cache.zoneAgencyFriendship zf ON zf.agencyModeFk = r.agencyModeFk @@ -43292,16 +43614,16 @@ BEGIN AND zf.zoneFk = vZoneFk AND r.created = vLanded ORDER BY friendship; - + -- Se eliminan aquellas que superan el volumen máximo DELETE r.* - FROM tmp.route r + FROM tmp.route r JOIN (SELECT routeFk, sum(volume) volume FROM vn.saleVolume WHERE landed = vLanded GROUP BY routeFk) sub ON sub.routeFk = r.routeFk WHERE sub.volume > vVolumeMax; - + -- Se ordenan las que quedan en función con la afinidad del resto de consignatarios de cada ruta SELECT routeFk INTO vRouteFk FROM @@ -43313,7 +43635,7 @@ BEGIN ORDER BY zoneFriendship DESC, friendshipSum DESC ) sub LIMIT 1; - + RETURN vRouteFk; END ;; DELIMITER ; @@ -43338,9 +43660,9 @@ BEGIN DECLARE vRouteFk INT; DECLARE vAddressFk INT; DECLARE vShipped DATETIME; - + SELECT addressFk, date(shipped) INTO vAddressFk, vShipped - FROM vn.ticket + FROM vn.ticket WHERE id = vTicketFk; SELECT routeFk INTO vRouteFk @@ -43354,7 +43676,7 @@ BEGIN ORDER BY friendshipSum DESC ) sub LIMIT 1; - + RETURN vRouteFk; END ;; DELIMITER ; @@ -43378,20 +43700,20 @@ BEGIN DECLARE vRouteFk INT; DECLARE vAddressFk INT; - + DECLARE vLanded DATE; DECLARE vZoneFk INT; DECLARE vSignificativeFriendship INT DEFAULT 6; DECLARE vVolumeMax DECIMAL(5,1) DEFAULT 10; - + SELECT addressFk, zoneFk, landed INTO vAddressFk, vZoneFk, vLanded - FROM vn.ticket + FROM vn.ticket WHERE id = vTicketFk; - + -- Se inicia la selección de rutas posibles con aquellas cuyas agencias alguna vez han estado asociadas con nuestra zona DROP TEMPORARY TABLE IF EXISTS tmp.route; CREATE TEMPORARY TABLE tmp.route - SELECT r.id routeFk, + SELECT r.id routeFk, zf.friendship zoneFriendship FROM vn.route r JOIN cache.zoneAgencyFriendship zf ON zf.agencyModeFk = r.agencyModeFk @@ -43399,16 +43721,16 @@ BEGIN AND zf.zoneFk = vZoneFk AND r.created = vLanded ORDER BY friendship; - + -- Se eliminan aquellas que superan el volumen máximo DELETE r.* - FROM tmp.route r + FROM tmp.route r JOIN (SELECT routeFk, sum(volume) volume FROM vn.saleVolume WHERE landed = vLanded GROUP BY routeFk) sub ON sub.routeFk = r.routeFk WHERE sub.volume > vVolumeMax; - + -- Se ordenan las que quedan en función con la afinidad del resto de consignatarios de cada ruta SELECT routeFk INTO vRouteFk FROM @@ -43420,7 +43742,7 @@ BEGIN ORDER BY zoneFriendship DESC, friendshipSum DESC ) sub LIMIT 1; - + RETURN vRouteFk; END ;; DELIMITER ; @@ -43440,27 +43762,27 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -43480,7 +43802,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` FUNCTION `testCIF`(vCIF VARCHAR(9)) RETURNS varchar(10) CHARSET utf8 COLLATE utf8_unicode_ci DETERMINISTIC BEGIN - + DECLARE vLetraInicial VARCHAR(1); DECLARE vLetraFinal VARCHAR(1); DECLARE vParteNumerica VARCHAR(7); @@ -43492,60 +43814,60 @@ BEGIN SET vLetraInicial = SUBSTR(vCIF, 1, 1); SET vLetraFinal = SUBSTR(vCIF, 9, 1); SET vParteNumerica = SUBSTR(vCIF, 2, 7); - - WHILE i < 7 DO - + + WHILE i < 7 DO + SET i = i + 1; - + SET vNumero = CAST(SUBSTR(vParteNumerica, i, 1) AS DECIMAL(1,0)); - + IF i MOD 2 THEN - + SET vNumero = vNumero * 2; SET vNumero = vNumero MOD 10 + FLOOR(vNumero/10); - + END IF; - + SET vSuma = vSuma + vNumero; - + END WHILE; - + SET vSuma = vSuma MOD 10; - + IF vSuma > 0 THEN - + SET vSuma = 10 - vSuma; - + END IF; - + -- Comprobación de dígito de control IF CAST(vLetraFinal AS DECIMAL(1,0)) = vSuma THEN - + SET vResult = TRUE; - + END IF; - + IF vSuma = 0 THEN - + SET vSuma = 10; - + END IF; - + IF CHAR(64 + vSuma) = vLetraFinal THEN - + SET vResult = TRUE; - + END IF; - + -- Sólo se aceptan letras como caracter inicial IF ASCII(vLetraInicial) < 65 OR ASCII(vLetraInicial) > 87 THEN -- Ha de ser entre la A y la W - + SET vResult = FALSE; - + END IF; - + RETURN vResult; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -43564,55 +43886,55 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -43631,29 +43953,29 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -43673,21 +43995,21 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` FUNCTION `ticketCollection_getNoPacked`(vCollectionFk INT) RETURNS varchar(100) CHARSET utf8 COLLATE utf8_unicode_ci DETERMINISTIC BEGIN - + /* * return message with tickets and collection if there is tickets of a collection without expeditions - * + * * @param vCollectionFk the collection to check * @return an array with collection and tickets without expeditions - * + * */ - + DECLARE vAnswer VARCHAR(100) DEFAULT ''; IF collection_isPacked(vCollectionFk) = FALSE 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 + LEFT JOIN vn.expedition e ON e.ticketFk = tc.ticketFk WHERE tc.collectionFk = vCollectionFk AND ISNULL(e.id); END IF; @@ -43733,9 +44055,9 @@ BEGIN DROP TEMPORARY TABLE tmp.ticket, tmp.ticketTotal; - + RETURN vTotal; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -43754,79 +44076,79 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -43856,9 +44178,9 @@ BEGIN LEFT JOIN vn2008.movement_label l ON l.Id_Movimiento = s.id WHERE ticketFk = vTicketFk ) sub; - + RETURN IFNULL(vSplitCounter,'--'); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -43907,21 +44229,21 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `ticketTotalVolumeBoxes`(vTicketId IN DETERMINISTIC BEGIN -/* +/* * Devuelve el volumen estimado del ticket sumado, en cajas * * vTicketId Numero de ticket - * + * */ DECLARE vVolumeBoxM3 DOUBLE; DECLARE vTicketTotalVolumeBoxes DECIMAL(10,1); DECLARE vVnBoxId VARCHAR(10) DEFAULT '94'; - + SELECT volume / 1000000 INTO vVolumeBoxM3 FROM packaging WHERE id = vVnBoxId; - + SET vTicketTotalVolumeBoxes = ticketTotalVolume(vTicketId) / vVolumeBoxM3; - + RETURN vTicketTotalVolumeBoxes; END ;; @@ -43946,7 +44268,7 @@ BEGIN DECLARE vWarehouseFk INT; SELECT warehouseFk INTO vWarehouseFk - FROM ticket + FROM ticket WHERE id = vTicketFk; RETURN vWarehouseFk; @@ -43968,21 +44290,21 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -44002,44 +44324,44 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` FUNCTION `ticket_get`(vParamFk INT) RETURNS int(11) READS SQL DATA proc:BEGIN - + /* Devuelve el número de ticket o collection consultando en varias tablas posibles - * + * * @param vParamFk Número a validar * @return vValidFk Identificador validado */ - + DECLARE vValidFk INT; -- Tabla vn.saleGroup SELECT s.ticketFk INTO vValidFk FROM vn.sale s JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id - JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk + JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk WHERE sg.id = vParamFk AND sg.created > TIMESTAMPADD(WEEK,-1, util.VN_CURDATE()) LIMIT 1; - + IF vValidFk THEN - + RETURN vValidFk; - + LEAVE proc; - + END IF; -- Tabla vn.collection SELECT c.id INTO vValidFk - FROM vn.collection c + FROM vn.collection c WHERE c.id = vParamFk AND c.created > TIMESTAMPADD(WEEK,-1, util.VN_CURDATE()); - + IF vValidFk THEN - + RETURN vValidFk; - + LEAVE proc; - + END IF; -- Tabla vn.ticket @@ -44047,17 +44369,17 @@ proc:BEGIN FROM vn.ticket t WHERE t.id = vParamFk AND t.shipped > TIMESTAMPADD(WEEK,-1, util.VN_CURDATE()); - + IF vValidFk THEN - + RETURN vValidFk; - + LEAVE proc; - + END IF; RETURN NULL; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -44083,8 +44405,8 @@ BEGIN * @vTicketFk Id del ticket a calcular */ DECLARE deliveryPrice DECIMAL (10,2); - - IF (SELECT isVolumetric FROM ticket t JOIN zone z ON t.zoneFk = z.id + + IF (SELECT isVolumetric FROM ticket t JOIN zone z ON t.zoneFk = z.id WHERE t.id = vTicketFk) THEN SELECT SUM(sv.freight) INTO deliveryPrice FROM vn.saleVolume sv @@ -44095,7 +44417,7 @@ BEGIN LEFT JOIN expedition e ON e.ticketFk = t.id JOIN expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk WHERE t.id = vTicketFk; - + END IF; RETURN deliveryPrice; END ;; @@ -44116,21 +44438,21 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -44159,10 +44481,10 @@ BEGIN * @param vAddressFk Consignatario * @param vCompanyFk Empresa * @param vAgencyModeFk agencia - */ - + */ + DECLARE vTicket INT; - + SELECT t.id INTO vTicket FROM vn.ticket t WHERE (t.clientFk <=> vClientFk OR vClientFk IS NULL) @@ -44172,7 +44494,7 @@ BEGIN AND (t.companyFk <=> vCompanyFk OR vCompanyFk IS NULL) AND (t.agencyModeFk <=> vAgencyModeFk OR vAgencyModeFk IS NULL) LIMIT 1; - + IF vTicket IS NULL THEN CALL vn.ticket_add( vClientFk, @@ -44188,7 +44510,7 @@ BEGIN vTicket ); END IF; - + RETURN vTicket; END ;; DELIMITER ; @@ -44208,18 +44530,18 @@ DELIMITER ; DELIMITER ;; 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 */ ; @@ -44332,7 +44654,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `timeWorkerControl_getDirection`(vUse READS SQL DATA BEGIN /** - * Verifica la dirección de la fichada + * Verifica la dirección de la fichada * @param vUserFk Identificador del trabajador * @param vTimed Hora de la fichada * @return Retorna sentido de la fichada 'in, out, middle' @@ -44345,40 +44667,40 @@ BEGIN DECLARE vDayStayMax INT; DECLARE vTimedSeconds INT; DECLARE vLastTimeIn INT; - + SELECT UNIX_TIMESTAMP(vTimed) INTO vTimedSeconds; - + SELECT dayStayMax INTO vDayStayMax FROM vn.workerTimeControlParams; SELECT timed, direction INTO vNext,vNextDirection - FROM vn.workerTimeControl - WHERE userFk = vUserFk + FROM vn.workerTimeControl + WHERE userFk = vUserFk AND direction IN ('in','out') AND timed > vTimed ORDER BY timed ASC LIMIT 1; - + SELECT timed, direction INTO vPrevious, vPreviousDirection - FROM vn.workerTimeControl - WHERE userFk = vUserFk + FROM vn.workerTimeControl + WHERE userFk = vUserFk AND direction IN ('in','out') AND timed < vTimed ORDER BY timed DESC - LIMIT 1; - - IF (vTimedSeconds - UNIX_TIMESTAMP(vPrevious) + UNIX_TIMESTAMP(vNext) - vTimedSeconds)<= vDayStayMax AND vPreviousDirection = 'in' AND vNextDirection = 'out' THEN + LIMIT 1; + + IF (vTimedSeconds - UNIX_TIMESTAMP(vPrevious) + UNIX_TIMESTAMP(vNext) - vTimedSeconds)<= vDayStayMax AND vPreviousDirection = 'in' AND vNextDirection = 'out' THEN RETURN 'middle'; END IF; - - + + IF (vTimedSeconds> UNIX_TIMESTAMP(vPrevious)) THEN - IF vPreviousDirection = 'in' THEN + IF vPreviousDirection = 'in' THEN RETURN 'out'; ELSE SELECT UNIX_TIMESTAMP(MAX(timed)) INTO vLastTimeIn - FROM vn.workerTimeControl - WHERE userFk = vUserFk + FROM vn.workerTimeControl + WHERE userFk = vUserFk AND direction ='in' AND timed < vPrevious; IF vTimedSeconds - vLastTimeIn <= vDayStayMax THEN @@ -44432,11 +44754,11 @@ 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 */ @@ -44444,8 +44766,8 @@ BEGIN DECLARE vTravelFk INT; IF vLanded THEN - - SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk + + 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 @@ -44456,14 +44778,14 @@ BEGIN AND landed = vLanded; IF NOT vTravelFk THEN - + INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk) - SELECT vLanded, util.VN_CURDATE(), vWarehouseFk, wOut.id, am.id - FROM vn.warehouse wOut + SELECT vLanded, util.VN_CURDATE(), vWarehouseFk, wOut.id, am.id + FROM vn.warehouse wOut JOIN vn.agencyMode am ON am.name = 'LOGIFLORA' WHERE wOut.name = 'Holanda'; - - SELECT MAX(tr.id) INTO vTravelFk + + 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 @@ -44471,11 +44793,11 @@ BEGIN AND wOut.name = 'Holanda' AND landed = vLanded; END IF; - + END IF; - + RETURN vTravelFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -44502,21 +44824,21 @@ BEGIN DECLARE vChar INT; SET vLength = length(vString); - + WHILE vLength > 0 DO - + SET vChar = MID(vString,vLength,1); - + SET vSeed = vSeed + ASCII(vChar); - + SET vLength = vLength - 1; - + END WHILE; SET vCode = FLOOR(SQRT(vSeed)*1000000) mod 1000; RETURN vCode; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -44543,21 +44865,21 @@ BEGIN DECLARE vChar INT; SET vLength = length(vString); - + WHILE vLength > 0 DO - + SET vChar = MID(vString,vLength,1); - + SET vSeed = vSeed + ASCII(vChar); - + SET vLength = vLength - 1; - + END WHILE; SET vCode = FLOOR(SQRT(vSeed)*1000000) mod 1000; RETURN vCode; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -44635,24 +44957,24 @@ DELIMITER ; DELIMITER ;; 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), util.VN_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), util.VN_NOW()) AND ISNULL(m.outTimed)) + THEN + RETURN TRUE; + ELSE + RETURN FALSE; + END IF; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -44679,15 +45001,15 @@ BEGIN * @param vTimeOut * @return vNigthlyHours */ - DECLARE vNigthlyHours DECIMAL(5,2); + DECLARE vNigthlyHours DECIMAL(5,2); DECLARE vSecondsPerHour INT(4) DEFAULT 3600; - + SELECT GREATEST(0, TIMESTAMPDIFF(SECOND, - IF(TIME(vTimeIn) BETWEEN endNightlyHours AND startNightlyHours, - CONCAT(DATE(vTimeIn), ' ', startNightlyHours), + IF(TIME(vTimeIn) BETWEEN endNightlyHours AND startNightlyHours, + CONCAT(DATE(vTimeIn), ' ', startNightlyHours), vTimeIn), - IF(TIME(vTimeOut) BETWEEN endNightlyHours AND startNightlyHours, - CONCAT(DATE(vTimeOut), ' ', endNightlyHours), + IF(TIME(vTimeOut) BETWEEN endNightlyHours AND startNightlyHours, + CONCAT(DATE(vTimeOut), ' ', endNightlyHours), vTimeOut))) / vSecondsPerHour INTO vNigthlyHours FROM vn.workerTimeControlConfig; @@ -44719,47 +45041,47 @@ BEGIN SELECT dayStayMax INTO vDayStayMax FROM workerTimeControlParams; - + SELECT timeWorkerControl_getDirection(vUserFk,vTimed) INTO vDirection; IF vDirection = 'out' THEN - + SELECT MAX(timed) INTO vLastIn - FROM workerTimeControl - WHERE userFk = vUserFk + FROM workerTimeControl + WHERE userFk = vUserFk AND direction = 'in' AND timed < vTimed; - + UPDATE workerTimeControl wtc SET wtc.direction = 'middle' WHERE userFk = vUserFk AND direction = 'out' AND timed BETWEEN vLastIn AND vTimed; - + ELSE IF vDirection = 'in' THEN - - SELECT COUNT(*) INTO vHasDirectionOut + + SELECT COUNT(*) INTO vHasDirectionOut FROM workerTimeControl wtc - WHERE userFk = vUserFk + WHERE userFk = vUserFk AND direction = 'out' - AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed); + AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed); UPDATE workerTimeControl wtc SET wtc.direction = IF (vHasDirectionOut,'middle','out') WHERE userFk = vUserFk AND direction = 'in' - AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed); + AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed); END IF; END IF; - + INSERT INTO workerTimeControl(userFk, timed, warehouseFk, direction, manual) VALUES(vUserFk, vTimed, vWarehouseFk, vDirection, vIsManual); - + SET vLastInsertedId = LAST_INSERT_ID(); - + CALL workerTimeControlSOWP(vUserFk, vTimed); - + RETURN vLastInsertedId; END ;; DELIMITER ; @@ -44788,47 +45110,47 @@ BEGIN SELECT dayStayMax INTO vDayStayMax FROM workerTimeControlParams; - + SELECT timeWorkerControl_getDirection(vUserFk,vTimed) INTO vDirection; IF vDirection = 'out' THEN - + SELECT MAX(timed) INTO vLastIn - FROM workerTimeControl - WHERE userFk = vUserFk + FROM workerTimeControl + WHERE userFk = vUserFk AND direction = 'in' AND timed < vTimed; - + UPDATE workerTimeControl wtc SET wtc.direction = 'middle' WHERE userFk = vUserFk AND direction = 'out' AND timed BETWEEN vLastIn AND vTimed; - + ELSE IF vDirection = 'in' THEN - - SELECT COUNT(*) INTO vHasDirectionOut + + SELECT COUNT(*) INTO vHasDirectionOut FROM workerTimeControl wtc - WHERE userFk = vUserFk + WHERE userFk = vUserFk AND direction = 'out' - AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed); + AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed); UPDATE workerTimeControl wtc SET wtc.direction = IF (vHasDirectionOut,'middle','out') WHERE userFk = vUserFk AND direction = 'in' - AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed); + AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed); END IF; END IF; - + INSERT INTO workerTimeControl(userFk, timed, warehouseFk, direction, manual) VALUES(vUserFk, vTimed, vWarehouseFk, vDirection, vIsManual); - + SET vLastInsertedId = LAST_INSERT_ID(); - + CALL workerTimeControlSOWP(vUserFk, vTimed); - + RETURN vLastInsertedId; END ;; DELIMITER ; @@ -44854,17 +45176,17 @@ BEGIN * @return Devuelve TRUE en caso de que este trabajando. Si se encuentra en un descanso devolverá FALSE */ DECLARE vLastIn DATETIME ; - + SELECT MAX(timed) INTO vLastIn - FROM vn.workerTimeControl + FROM vn.workerTimeControl WHERE userFk = vWorkerFk AND direction = 'in'; - IF (SELECT MOD(COUNT(*),2) - FROM vn.workerTimeControl - WHERE userFk = vWorkerFk AND + IF (SELECT MOD(COUNT(*),2) + FROM vn.workerTimeControl + WHERE userFk = vWorkerFk AND timed >= vLastIn - ) THEN + ) THEN RETURN TRUE; ELSE RETURN FALSE; @@ -44959,7 +45281,7 @@ BEGIN SET `type` = vType, `name` = vName, parentFk = vParentFk; - + SET vSelf = LAST_INSERT_ID(); UPDATE zoneGeoRecalc SET isChanged = TRUE; @@ -44983,7 +45305,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `addNoteFromDelivery`(idTicket INT,nota TEXT) BEGIN - + DECLARE observationTypeFk INT DEFAULT 3; /*3 = REPARTIDOR*/ INSERT INTO ticketObservation(ticketFk,observationTypeFk,description) @@ -45011,24 +45333,24 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `addressTaxArea`() READS SQL DATA BEGIN /** - * Devuelve el taxArea para un conjunto de Consignatarios y empresas, + * Devuelve el taxArea para un conjunto de Consignatarios y empresas, * * @table tmp.addressCompany(addressFk, companyFk) valores a calcular * @return tmp.addressTaxArea(addressFk,companyFk) */ DECLARE vSpainCountryCode INT DEFAULT 1; - + DROP TEMPORARY TABLE IF EXISTS tmp.addressTaxArea; CREATE TEMPORARY TABLE tmp.addressTaxArea (PRIMARY KEY (addressFk, companyFk)) ENGINE = MEMORY - SELECT CASE - WHEN (NOT cClient.isUeeMember OR NOT cSupplier.isUeeMember) AND s.countryFk != c.countryFk THEN + SELECT CASE + WHEN (NOT cClient.isUeeMember OR NOT cSupplier.isUeeMember) AND s.countryFk != c.countryFk THEN 'WORLD' - WHEN cClient.isUeeMember AND cSupplier.isUeeMember AND c.countryFk != s.countryFk AND c.isVies THEN + WHEN cClient.isUeeMember AND cSupplier.isUeeMember AND c.countryFk != s.countryFk AND c.isVies THEN 'CEE' - WHEN a.isEqualizated AND c.countryFk = vSpainCountryCode THEN + WHEN a.isEqualizated AND c.countryFk = vSpainCountryCode THEN 'EQU' ELSE 'NATIONAL' @@ -45065,27 +45387,27 @@ BEGIN * @param vAddress id de la direccion * @param vWarehouse id del warehouse * @return vShipped la primera fecha disponible y vLanded la fecha de llegada/recojida -*/ +*/ DECLARE vAgency INT; DECLARE vShipped DATE; DECLARE vLanded DATE DEFAULT util.VN_CURDATE(); SELECT agencyFk INTO vAgency FROM agencyMode WHERE id= vAgencyMode; l: LOOP - + CALL agencyHourGetShipped(vLanded,vAddress,vAgency); - SELECT shipped INTO vShipped + SELECT shipped INTO vShipped FROM tmp.agencyHourGetShipped WHERE warehouseFk = vWarehouse LIMIT 1; - + IF vShipped THEN LEAVE l; END IF; - + SET vLanded = DATE_ADD(vLanded, INTERVAL +1 DAY); - + END LOOP; - + SELECT vShipped,vLanded; END ;; DELIMITER ; @@ -45136,7 +45458,7 @@ BEGIN LIMIT 1 ) t WHERE IF(vDated = util.VN_CURDATE(), t.maxHour > HOUR(util.VN_NOW()), TRUE) AND t.substractDay < 225; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -45159,14 +45481,14 @@ BEGIN * DEPRECATED usar zoneGetWarehouse * Devuelve el listado de agencias disponibles para la fecha, * dirección y warehouuse pasadas - * + * * @param vAddress no puede ser NULL * @param vWarehouse warehouse donde comprobaremos las agencias y fecha * @param vDate Fecha de recogida * @table agencyModeWarehouseList Listado de agencias disponibles */ DECLARE vAgency INT; - DECLARE vDone BOOL DEFAULT FALSE; + DECLARE vDone BOOL DEFAULT FALSE; DECLARE vCur CURSOR FOR SELECT DISTINCT a.id FROM agency a @@ -45190,13 +45512,13 @@ BEGIN PRIMARY KEY(id) ) ENGINE = MEMORY; - + OPEN vCur; FETCH vCur INTO vAgency; WHILE NOT vDone DO - + INSERT INTO tmp.agencyModeWarehouseList SELECT am.id, am.name, am.description,am.deliveryMethodFk, TIMESTAMPADD(DAY, -ah.substractDay, vDate), w.name FROM agencyHour ah @@ -45225,7 +45547,7 @@ BEGIN END WHILE; CLOSE vCur; - + SELECT * FROM tmp.agencyModeWarehouseList; DROP TEMPORARY TABLE tmp.agencyModeWarehouseList; END ;; @@ -45251,9 +45573,9 @@ BEGIN CALL vn.agencyHourGetShipped(vDate, vAddress, vAgency); SELECT * FROM tmp.agencyHourGetShipped; - + DROP TEMPORARY TABLE IF EXISTS tmp.agencyHourGetShipped; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -45291,7 +45613,7 @@ BEGIN DECLARE cWarehouses CURSOR FOR SELECT warehouseFk, shipped FROM tmp.zoneGetShipped; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; @@ -45300,7 +45622,7 @@ BEGIN CALL vn.zone_getShipped (vDate, vAddress, vAgencyMode, FALSE); DROP TEMPORARY TABLE IF EXISTS tmp.availableCalc; - CREATE TEMPORARY TABLE tmp.availableCalc( + CREATE TEMPORARY TABLE tmp.availableCalc( calcFk INT UNSIGNED, PRIMARY KEY (calcFk) ) @@ -45311,7 +45633,7 @@ BEGIN l: LOOP SET vDone = FALSE; FETCH cWarehouses INTO vWarehouse, vShipment; - + IF vDone THEN LEAVE l; END IF; @@ -45344,7 +45666,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `bankEntity_checkBic`(vBic VARCHAR(2 BEGIN /** * If the bic length is Incorrect throw exception - * + * * @param vBic bic code */ @@ -45352,7 +45674,7 @@ BEGIN SELECT bicLength INTO vConfigBicLenght FROM vn.bankEntityConfig bec; - + IF LENGTH(vBic) <> vConfigBicLenght THEN CALL util.throw(CONCAT('bic must be of length ', vConfigBicLenght )); END IF; @@ -45379,14 +45701,14 @@ BEGIN * Manda correo cuando caduca un seguro * de los leasing * -*/ +*/ INSERT INTO mail (receiver,replyTo,subject,body) SELECT 'administracion@verdnatura.es' receiver, 'noreply@verdnatura.es' replyTo, CONCAT('El seguro de la poliza ',b.id,' ',b.bank,' ha finalizado.') subject, CONCAT('El seguro de la poliza ',b.id,' ',b.bank,' ha finalizado.') body - FROM vn.bankPolicy bp - LEFT JOIN vn.supplier s + FROM vn.bankPolicy bp + LEFT JOIN vn.supplier s ON s.id = bp.supplierFk LEFT JOIN vn.bank b ON b.id = bp.bankFk @@ -45408,39 +45730,39 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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, util.VN_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; - +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, util.VN_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; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -45601,81 +45923,81 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - DECLARE vWeight DECIMAL(10,2); - DECLARE vPacking INT; - - SELECT b.entryFk, - b.itemFk, - i.packingOut, - ic.merchandise, - vc.standardFlowerBox, - b.weight, - b.packing - INTO - vEntryFk, - vItemFk, - vPackingOut, - vIsMerchandise, - vStandardFlowerBox, - vWeight, - vPacking - 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)); - - IF vWeight AND vPacking THEN - UPDATE itemCost SET - grams = vWeight * 1000 / vPacking - WHERE itemFk = vItemFk - AND warehouseFk = vWarehouse; - END IF; - END IF; - - SELECT isFeedStock INTO vIsFeedStock - FROM warehouse WHERE id = vWarehouseOut; - - 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; - +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; + DECLARE vWeight DECIMAL(10,2); + DECLARE vPacking INT; + + SELECT b.entryFk, + b.itemFk, + i.packingOut, + ic.merchandise, + vc.standardFlowerBox, + b.weight, + b.packing + INTO + vEntryFk, + vItemFk, + vPackingOut, + vIsMerchandise, + vStandardFlowerBox, + vWeight, + vPacking + 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)); + + IF vWeight AND vPacking THEN + UPDATE itemCost SET + grams = vWeight * 1000 / vPacking + WHERE itemFk = vItemFk + AND warehouseFk = vWarehouse; + END IF; + END IF; + + SELECT isFeedStock INTO vIsFeedStock + FROM warehouse WHERE id = vWarehouseOut; + + 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 */ ; @@ -45723,7 +46045,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_getSplit`(vSelf INT, vDated DAT BEGIN /** * Devuelve las ventas de una compra - * + * * @param vSelf Identificador de vn.buy */ DECLARE vItemFk INT; @@ -45819,11 +46141,11 @@ BEGIN -- Devuelve los splits creados SELECT CONCAT(sp.counter,'/',sp.labels) labels, COALESCE(sfc.nickname, sfa.nickname, a.nickname) destination, - s.itemFk, - i.longName, - i.`size`, - vn.ticketSplitCounter(t.id) counter, - IF(sfa.id OR sfc.id, + s.itemFk, + i.longName, + i.`size`, + vn.ticketSplitCounter(t.id) counter, + IF(sfa.id OR sfc.id, a.nickname, CONCAT(a.id, ' ', p.`name`,' (', c.`code`,')')) destination2 FROM tmp.split sp @@ -45869,12 +46191,12 @@ BEGIN item_getVolume(b.itemFk, b.packageFk)) / vc.trolleyM3 / 1000000 ,1) AS DECIMAL(10,2)) carros , CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) * item_getVolume(b.itemFk, b.packageFk)) / vc.palletM3 / 1000000,1) AS DECIMAL(10,2)) espais - FROM buy b + FROM buy b JOIN tmp.buy tb ON tb.buyFk = b.id JOIN volumeConfig vc JOIN item i ON i.id = b.itemFk JOIN itemType it ON it.id = i.typeFk - LEFT JOIN temperature t ON t.code = it.temperatureFk + LEFT JOIN temperature t ON t.code = it.temperatureFk GROUP BY Temp; END ;; DELIMITER ; @@ -45894,21 +46216,21 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_getVolumeByAgency`(vDated DATE, vAgencyFk INT) BEGIN - + DROP TEMPORARY TABLE IF EXISTS tmp.buy; CREATE TEMPORARY TABLE tmp.buy (buyFk INT NOT NULL, PRIMARY KEY (buyFk)) ENGINE = MEMORY; - INSERT INTO tmp.buy + INSERT INTO tmp.buy SELECT b.id - FROM buy b - JOIN entry e ON e.id = b.entryFk - JOIN travel t ON t.id = e.travelFk + FROM buy b + JOIN entry e ON e.id = b.entryFk + JOIN travel t ON t.id = e.travelFk WHERE t.landed = vDated AND t.agencyModeFk IN (0, vAgencyFk); CALL buy_getVolume(); DROP TEMPORARY TABLE tmp.buy; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -45927,19 +46249,19 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_getVolumeByEntry`(vEntryFk INT) BEGIN - + DROP TEMPORARY TABLE IF EXISTS tmp.buy; CREATE TEMPORARY TABLE tmp.buy (buyFk INT NOT NULL, PRIMARY KEY (buyFk)) ENGINE = MEMORY; - - INSERT INTO tmp.buy + + INSERT INTO tmp.buy SELECT b.id - FROM buy b - JOIN entry e ON e.id = b.entryFk + FROM buy b + JOIN entry e ON e.id = b.entryFk WHERE e.id = vEntryFk; CALL buy_getVolume(); DROP TEMPORARY TABLE tmp.buy; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -46027,12 +46349,12 @@ BEGIN * inserta en tmp.buyRecalc las compras de un awb * * @param awbFk - */ + */ DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc; CREATE TEMPORARY TABLE tmp.buyRecalc SELECT b.id - FROM buy b + FROM buy b JOIN entry e ON e.id = b.entryFk JOIN duaEntry de ON de.entryFk = e.id JOIN dua d ON d.id = de.duaFk @@ -46064,7 +46386,7 @@ BEGIN * Recalcula los precios de una compra * * @param vBuyFk - */ + */ DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc; CREATE TEMPORARY TABLE tmp.buyRecalc @@ -46095,12 +46417,12 @@ BEGIN * Recalcula los precios de una entrada * * @param vEntryFk - */ + */ DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc; CREATE TEMPORARY TABLE tmp.buyRecalc SELECT b.id - FROM buy b + FROM buy b WHERE b.entryFk = vEntryFk; CALL buy_recalcPrices(); @@ -46140,12 +46462,12 @@ BEGIN LIMIT 0; INSERT INTO tBuy(buyFk) - SELECT b.id + SELECT b.id FROM buy b JOIN tmp.ekt t ON t.ektFk = b.ektFk JOIN vn.entry en ON en.id = b.entryFk JOIN vn.travel tr ON tr.id = en.travelFk - JOIN vn.warehouse w ON w.id = tr.warehouseInFk + JOIN vn.warehouse w ON w.id = tr.warehouseInFk JOIN vn.country c ON c.id = w.countryFk AND c.code = 'NL'; SELECT b.id buy, i.doPhoto do_photo, b.stickers - b.printedStickers stickersToPrint @@ -46175,24 +46497,24 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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, util.VN_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; +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, util.VN_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 */ ; @@ -46212,7 +46534,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `buy_updatePacking`(vWarehouseFk INT, vItemFk INT, vPacking INT) BEGIN /** - * Actualiza packing + * Actualiza packing * * @param vWarehouseFk warehouse del item * @param vItemFk id del item @@ -46222,8 +46544,8 @@ BEGIN UPDATE buy b JOIN tmp.buyUltimate bu ON b.id = bu.buyFk - SET b.packing = vPacking - WHERE bu.warehouseFk = vWarehouseFk + SET b.packing = vPacking + WHERE bu.warehouseFk = vWarehouseFk AND bu.itemFk = vItemFk; DROP TEMPORARY TABLE tmp.buyUltimate; @@ -46262,7 +46584,7 @@ BEGIN */ DROP TEMPORARY TABLE IF EXISTS tmp.item; CREATE TEMPORARY TABLE tmp.item - ENGINE = MEMORY + ENGINE = MEMORY SELECT vItemFk itemFk; CALL catalog_calculate(vLanded, vAddressFk, vAgencyModeFk); @@ -46284,7 +46606,7 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_calculate`(vLanded DATE, vAddressFk INT, vAgencyModeFk INT) -BEGIN +BEGIN /** * Calcula los articulos disponibles y sus precios * @@ -46292,7 +46614,7 @@ BEGIN * @param vLanded Fecha de recepcion de mercancia * @param vAddressFk Id del consignatario * @param vAgencyModeFk Id de la agencia - * @return tmp.ticketCalculateItem(itemFk, available, producer, + * @return tmp.ticketCalculateItem(itemFk, available, producer, * item, size, stems, category, inkFk, image, origin, price) * @return tmp.ticketLot(warehouseFk, itemFk, available, buyFk) * @return tmp.ticketComponent @@ -46328,22 +46650,22 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem; CREATE TEMPORARY TABLE tmp.ticketCalculateItem( - itemFk INT(11) NOT NULL, + 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), + 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), + origin VARCHAR(3), price DECIMAL(10,2), priceKg DECIMAL(10,2), `grouping` INT(10) UNSIGNED, PRIMARY KEY `itemFk` (`itemFk`) ) ENGINE = MEMORY DEFAULT CHARSET=utf8; - + OPEN cTravelTree; l: LOOP @@ -46365,20 +46687,20 @@ BEGIN bu.buyFk, vZoneFk FROM `cache`.available a - LEFT JOIN cache.availableNoRaids anr ON anr.item_id = a.item_id + 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 JOIN vn.`zone` z ON z.id = vZoneFk - LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id - LEFT JOIN edi.supplyResponse sr ON sr.ID = it.supplyResponseFk - LEFT JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID + LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id + LEFT JOIN edi.supplyResponse sr ON sr.ID = it.supplyResponseFk + LEFT JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID LEFT JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID 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 + 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) @@ -46395,7 +46717,7 @@ BEGIN JOIN vn.itemType itt ON itt.id = it.typeFk JOIN vn.itemCategory itc on itc.id = itt.categoryFk JOIN vn.address ad ON ad.id = vAddressFk - LEFT JOIN vn.clientItemType cit + LEFT JOIN vn.clientItemType cit ON cit.clientFk = ad.clientFk AND cit.itemTypeFk = itt.id LEFT JOIN vn.clientItemCategory cic @@ -46408,7 +46730,7 @@ BEGIN AND (itc.isReclining OR ISNULL(it.`size`) OR it.`size` < z.itemMaxSize OR ISNULL(z.itemMaxSize)) AND NOT (cit.isAllowed <=> FALSE) AND (ISNULL(cic.itemCategoryFk) OR cit.isAllowed); - + DROP TEMPORARY TABLE tmp.buyUltimate; CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk); @@ -46489,7 +46811,7 @@ BEGIN * Calcula los componentes de los articulos de tmp.ticketLot * * @param vZoneFk para calcular el transporte - * @param vAddressFk Consignatario + * @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) @@ -46497,15 +46819,15 @@ BEGIN * * @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; + FROM address + WHERE id = vAddressFk; SELECT (c.country = 'FRANCIA' AND vWarehouseFk = vVNHWarehouseFk) INTO vIsFrenchVNHBuyer @@ -46519,16 +46841,16 @@ BEGIN CREATE TEMPORARY TABLE tmp.ticketComponentCalculate (PRIMARY KEY (itemFk, warehouseFk)) ENGINE = MEMORY - SELECT - tl.itemFk, - tl.warehouseFk, + SELECT + tl.itemFk, + tl.warehouseFk, tl.available, 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, IFNULL(pf.packing, GREATEST(b.grouping, b.packing)) packing, IFNULL(pf.`grouping`, b.`grouping`) `grouping`, ABS(IFNULL(pf.box, b.groupingMode)) groupingMode, - tl.buyFk, + tl.buyFk, i.typeFk, IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping FROM tmp.ticketLot tl @@ -46536,7 +46858,7 @@ BEGIN 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 + LEFT JOIN specialPrice sp ON sp.itemFk = i.id AND sp.clientFk = vClientFk LEFT JOIN ( SELECT * FROM ( @@ -46548,55 +46870,55 @@ BEGIN pf.rate3, zw.warehouseFk FROM priceFixed pf - JOIN zoneWarehouse zw ON zw.zoneFk = vZoneFk + 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 LIMIT 10000000000000000000 ) tpf GROUP BY tpf.itemFk, tpf.warehouseFk - ) pf ON pf.itemFk = tl.itemFk + ) pf ON pf.itemFk = tl.itemFk AND pf.warehouseFk = tl.warehouseFk - WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01 + WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01 AND ic.merchandise - AND tl.zoneFk = vZoneFk + AND tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk; -- Coste INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost) - SELECT - tcc.warehouseFk, - tcc.itemFk, - c2.id, + SELECT + tcc.warehouseFk, + tcc.itemFk, + c2.id, b.buyingValue + b.freightValue + b.packageValue + b.comissionValue - FROM tmp.ticketComponentCalculate tcc + 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, + SELECT + tcc.warehouseFk, + tcc.itemFk, + c2.id, tcc.rate3 - b.buyingValue - b.freightValue - b.packageValue - b.comissionValue - FROM tmp.ticketComponentCalculate tcc + 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, + SELECT + tcc.warehouseFk, + tcc.itemFk, + c2.id, - vFrenchDiscount * (b.buyingValue + b.freightValue + b.packageValue + b.comissionValue) / ( 1 - vFrenchDiscount) - FROM tmp.ticketComponentCalculate tcc + 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; @@ -46605,17 +46927,17 @@ BEGIN 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 * + 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)) - ), - cc.maxPriceIncreasingRatio), + ), + cc.maxPriceIncreasingRatio), 3) FROM tmp.ticketComponentBase tcb JOIN vn.component c2 ON c2.code = 'debtCollection' @@ -46633,29 +46955,29 @@ BEGIN 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 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), + 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 + 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; - -- Individual + -- Individual INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost) SELECT tcb.warehouseFk, tcb.itemFk, @@ -46666,10 +46988,10 @@ BEGIN JOIN vn.client c ON c.id = vClientFk JOIN vn.businessType bt ON bt.code = c.businessTypeFk WHERE bt.code = 'individual'; - + -- Venta por paquetes INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost) - SELECT tcc.warehouseFk, tcc.itemFk, c2.id, tcc.rate2 - tcc.rate3 + 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 @@ -46682,12 +47004,12 @@ BEGIN SELECT vZoneFk id; CALL zone_getOptionsForShipment(vShipped, TRUE); - + -- Reparto INSERT INTO tmp.ticketComponent - SELECT tcc.warehouseFK, + SELECT tcc.warehouseFK, tcc.itemFk, - c2.id, + 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 @@ -46696,21 +47018,21 @@ BEGIN 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 + LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk AND ic.itemFk = tcc.itemFk - HAVING cost <> 0; + HAVING cost <> 0; DROP TEMPORARY TABLE tmp.zoneOption; - + 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, + 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 @@ -46721,11 +47043,11 @@ BEGIN GROUP BY tcc.itemFk, tcc.warehouseFk HAVING ABS(sumCost) > 0.001; - -- Rappel + -- Rappel INSERT INTO tmp.ticketComponent - SELECT tcc.warehouseFk, - tcc.itemFk, - IFNULL(c.componentFk ,c2.id), + 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 @@ -46746,16 +47068,16 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentRate; CREATE TEMPORARY TABLE tmp.ticketComponentRate ENGINE = MEMORY - SELECT tcc.warehouseFk, - tcc.itemFk, + SELECT tcc.warehouseFk, + tcc.itemFk, 1 rate, - IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`, + 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 + CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg FROM tmp.ticketComponentCalculate tcc - JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk + JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk AND tcs.warehouseFk = tcc.warehouseFk - WHERE IFNULL(tcs.classRate, 1) = 1 + 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; @@ -46775,17 +47097,17 @@ BEGIN 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`, + SELECT + tcc.warehouseFk, + tcc.itemFk, + 3 rate, + tcc.available `grouping`, SUM(tcs.sumCost) price, - SUM(tcs.sumCost) / weightGrouping priceKg + SUM(tcs.sumCost) / weightGrouping priceKg FROM tmp.ticketComponentCalculate tcc - JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk + JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk AND tcs.warehouseFk = tcc.warehouseFk - WHERE IFNULL(tcs.classRate, 3) = 3 + WHERE IFNULL(tcs.classRate, 3) = 3 GROUP BY tcs.warehouseFk, tcs.itemFk; INSERT INTO tmp.ticketComponentPrice (warehouseFk, itemFk, rate, `grouping`, price, priceKg) @@ -46793,14 +47115,14 @@ BEGIN SELECT * FROM tmp.ticketComponentRate ORDER BY price LIMIT 10000000000000000000 ) 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 */ ; @@ -46819,7 +47141,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_componentPrepare`() BEGIN - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent; CREATE TEMPORARY TABLE tmp.ticketComponent ( `warehouseFk` INT UNSIGNED NOT NULL, @@ -46829,9 +47151,9 @@ BEGIN INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC), UNIQUE `fkItemWarehouseComponent` (`itemFk` ASC, `warehouseFk` ASC, `componentFk` ASC) )ENGINE=MEMORY DEFAULT CHARSET=utf8; - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPrice; - CREATE TEMPORARY TABLE tmp.ticketComponentPrice ( + CREATE TEMPORARY TABLE tmp.ticketComponentPrice ( `warehouseFk` INT UNSIGNED NOT NULL, `itemFk` INT NOT NULL, `rate` INT NOT NULL, @@ -46840,7 +47162,7 @@ BEGIN `priceKg` DECIMAL(10,4), INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC), UNIQUE `fkItemWarehouseRate` (`itemFk` ASC, `warehouseFk` ASC, `rate` ASC) - )ENGINE=MEMORY DEFAULT CHARSET=utf8; + )ENGINE=MEMORY DEFAULT CHARSET=utf8; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -46859,7 +47181,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_componentPurge`() BEGIN - DROP TEMPORARY TABLE + DROP TEMPORARY TABLE tmp.ticketComponentPrice, tmp.ticketComponent, tmp.ticketLot; @@ -46883,12 +47205,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `catalog_test`() 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, + * @return tmp.ticketCalculateItem(itemFk, available, producer, * item, size, stems, category, inkFk, image, origin, price) * @return tmp.ticketLot(warehouseFk, itemFk, available, buyFk) * @return tmp.ticketComponent @@ -46910,10 +47232,10 @@ proc: BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.item; CREATE TEMPORARY TABLE tmp.item - ENGINE = MEMORY + ENGINE = MEMORY SELECT 10 itemFk; -- Establece los almacenes y las fechas que van a entrar al disponible -SELECT 1; +SELECT 1; CALL vn.zone_getShipped (vLanded, vAddressFk, vAgencyModeFk, FALSE); SELECT 2; DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot; @@ -46928,25 +47250,25 @@ SELECT 2; KEY `item_warehouse` (`itemFk`,`warehouseFk`) USING HASH ) ENGINE=MEMORY DEFAULT CHARSET=utf8; CALL catalog_componentPrepare(); - + SELECT 3; DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem; CREATE TEMPORARY TABLE tmp.ticketCalculateItem( - itemFk INT(11) NOT NULL, + 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), + 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), + origin VARCHAR(3), price DECIMAL(10,2), priceKg DECIMAL(10,2), PRIMARY KEY `itemFk` (`itemFk`) ) ENGINE = MEMORY DEFAULT CHARSET=utf8; - + OPEN cTravelTree; l: LOOP @@ -46973,35 +47295,35 @@ SELECT 5; LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.item_id WHERE i.calc_id = vAvailableCalc AND i.available > 0; - + DROP TEMPORARY TABLE tmp.buyUltimate; - + CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk); SELECT 6; INSERT INTO tmp.ticketCalculateItem ( - itemFk, - available, - producer, - item, - size, - stems, - category, + itemFk, + available, + producer, + item, + size, + stems, + category, inkFk, image, origin, price, priceKg) - SELECT - tl.itemFk, + SELECT + tl.itemFk, SUM(tl.available) available, - p.name producer, - i.name item, - i.size size, - i.stems, - i.category, - i.inkFk, + p.name producer, + i.name item, + i.size size, + i.stems, + i.category, + i.inkFk, i.image, - o.code origin, + o.code origin, bl.price, bl.priceKg FROM tmp.ticketLot tl @@ -47009,11 +47331,11 @@ SELECT 6; LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible JOIN origin o ON o.id = i.originFk JOIN ( - SELECT * + SELECT * FROM (SELECT price, itemFk, priceKg FROM tmp.ticketComponentPrice WHERE warehouseFk = vWarehouseFk - ORDER BY (rate = 2) DESC + ORDER BY (rate = 2) DESC LIMIT 10000000000000000000) sub GROUP BY itemFk ) bl ON bl.itemFk = tl.itemFk @@ -47025,8 +47347,8 @@ SELECT 6; CLOSE cTravelTree; DROP TEMPORARY TABLE tmp.item; -SELECT 7; - +SELECT 7; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -47052,6 +47374,7 @@ BEGIN DECLARE v26Month DATE; DECLARE v3Month DATE; DECLARE vTrashId VARCHAR(15); + DECLARE v5Years DATE; SET vDateShort = util.VN_CURDATE() - INTERVAL 2 MONTH; SET vOneYearAgo = util.VN_CURDATE() - INTERVAL 1 YEAR; @@ -47059,6 +47382,7 @@ BEGIN SET v18Month = util.VN_CURDATE() - INTERVAL 18 MONTH; SET v26Month = util.VN_CURDATE() - INTERVAL 26 MONTH; SET v3Month = util.VN_CURDATE() - INTERVAL 3 MONTH; + SET v5Years = util.VN_CURDATE() - INTERVAL 5 YEAR; DELETE FROM ticketParking WHERE created < vDateShort; DELETE FROM routesMonitor WHERE dated < vDateShort; @@ -47084,8 +47408,6 @@ BEGIN 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 - JOIN sale s ON sc.saleFk = s.id WHERE s.created < vDateShort; DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Month; DELETE bm FROM buyMark bm @@ -47093,7 +47415,9 @@ BEGIN JOIN entry e ON e.id = b.entryFk JOIN travel t ON t.id = e.travelFk WHERE t.landed <= vDateShort; - DELETE FROM vn.buy WHERE created < vDateShort AND entryFk = 9200; + DELETE b FROM vn.buy b + JOIN vn.entryConfig e ON e.defaultEntry = b.entryFk + WHERE b.created < vDateShort; DELETE FROM vn.itemShelvingLog WHERE created < vDateShort; DELETE FROM vn.stockBuyed WHERE creationDate < vDateShort; DELETE FROM vn.itemCleanLog WHERE created < util.VN_NOW() - INTERVAL 1 YEAR; @@ -47210,6 +47534,8 @@ BEGIN CALL shelving_clean; + DELETE FROM chat WHERE dated < v5Years; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -47347,76 +47673,76 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -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), +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 */ ; @@ -47442,21 +47768,21 @@ BEGIN */ DECLARE vClientDebt DOUBLE; - + SELECT vn.clientGetDebt(vClientFk, util.VN_CURDATE()) INTO vClientDebt; - + INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk) VALUES (vClientFk, 'Saldo pendiente', vClientDebt, util.VN_CURDATE(), 5); - + CALL vn.clientGreugeSpray(vClientFk, TRUE, '', TRUE); - + INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk) SELECT vClientFk, 'Liquidación cliente', sum(amount), util.VN_CURDATE(), 5 FROM vn.greuge WHERE clientFk = vClientFk; - - UPDATE vn.client - SET salesPersonFk = NULL + + UPDATE vn.client + SET salesPersonFk = NULL WHERE id = vClientFk; END ;; @@ -47476,46 +47802,46 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; 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(util.VN_CURDATE()) - LIMIT 1; - - DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt; - CREATE TEMPORARY TABLE tmp.clientGetDebt - SELECT clientFk - FROM bs.defaulter - WHERE created = util.VN_CURDATE() - AND amount; - - CALL clientGetDebt(util.VN_CURDATE()); - - UPDATE client c - JOIN bi.defaulters d ON d.client = c.id AND d.date = util.VN_CURDATE() - JOIN config ON TRUE - 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 = util.VN_CURDATE() - WHERE (d.amount > config.defaultersMaxAmount - AND rk.risk > 0) - AND c.typeFk = 'normal' - AND r.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(util.VN_CURDATE()) + LIMIT 1; + + DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt; + CREATE TEMPORARY TABLE tmp.clientGetDebt + SELECT clientFk + FROM bs.defaulter + WHERE created = util.VN_CURDATE() + AND amount; + + CALL clientGetDebt(util.VN_CURDATE()); + + UPDATE client c + JOIN bi.defaulters d ON d.client = c.id AND d.date = util.VN_CURDATE() + JOIN config ON TRUE + 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 = util.VN_CURDATE() + WHERE (d.amount > config.defaultersMaxAmount + AND rk.risk > 0) + AND c.typeFk = 'normal' + AND r.id IS NULL + AND (vIsRemittanced OR pm.code <> 'bankDraft'); + + DROP TEMPORARY TABLE tmp.clientGetDebt; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -47533,15 +47859,15 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `clientGetDebt`(vDate DATE) -BEGIN -/** - * Call client_getDebt - * - * @table tmp.clientGetDebt(clientFk) - * @param vDate Fecha maxima de los registros - * @return tmp.risk - */ - CALL vn.client_getDebt(vDate); +BEGIN +/** + * Call client_getDebt + * + * @table tmp.clientGetDebt(clientFk) + * @param vDate Fecha maxima de los registros + * @return tmp.risk + */ + CALL vn.client_getDebt(vDate); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -47573,33 +47899,33 @@ BEGIN DECLARE vIssued DATETIME; DECLARE vBalance DOUBLE DEFAULT 0.00; DECLARE cur CURSOR FOR - SELECT - created, - issued, + SELECT + created, + issued, ROUND(amount, 2) AS balance FROM invoiceOut - WHERE clientFk = vClientFk AND companyFk = vCompanyFk - UNION ALL - SELECT - created, - payed, + WHERE clientFk = vClientFk AND companyFk = vCompanyFk + UNION ALL + SELECT + created, + payed, ROUND(-1 * amountPaid, 2) AS balance - FROM receipt + FROM receipt WHERE clientFk = vClientFk AND companyFk = vCompanyFk ORDER BY issued, created; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + OPEN cur; - + proc: LOOP SET vDone = FALSE; - + FETCH cur INTO vCreated, vIssued, vBalance; IF vDate IS NULL THEN SET vDate=vIssued; END IF; - + IF vDone THEN LEAVE proc; END IF; @@ -47611,66 +47937,66 @@ BEGIN SET vDone = TRUE; END IF; END LOOP; - + CLOSE cur; - - SELECT - issued, - CAST(debtOut AS DECIMAL(10,2)) debtOut, + + SELECT + issued, + CAST(debtOut AS DECIMAL(10,2)) debtOut, CAST(debtIn AS DECIMAL(10,2)) debtIn, - ref, - companyFk, + ref, + companyFk, priority FROM - (SELECT - NULL AS issued, - SUM(amountUnpaid) AS debtOut, - NULL AS debtIn, - 'Saldo Anterior' AS ref, + (SELECT + NULL AS issued, + SUM(amountUnpaid) AS debtOut, + NULL AS debtIn, + 'Saldo Anterior' AS ref, companyFk, - 0 as priority - FROM - (SELECT SUM(amount) AS amountUnpaid, companyFk, 0 + 0 as priority + FROM + (SELECT SUM(amount) AS amountUnpaid, companyFk, 0 FROM invoiceOut - WHERE clientFk = vClientFK - AND issued < vDate - GROUP BY companyFk - - UNION ALL - - SELECT SUM(-1 * amountPaid), companyFk, 0 - FROM receipt - WHERE clientFk = vClientFK - AND payed < vDate - GROUP BY companyFk) AS transactions - GROUP BY companyFk - - UNION ALL - - SELECT - issued, - amount as debtOut, - NULL AS debtIn, + WHERE clientFk = vClientFK + AND issued < vDate + GROUP BY companyFk + + UNION ALL + + SELECT SUM(-1 * amountPaid), companyFk, 0 + FROM receipt + WHERE clientFk = vClientFK + AND payed < vDate + GROUP BY companyFk) AS transactions + GROUP BY companyFk + + UNION ALL + + SELECT + issued, + amount as debtOut, + NULL AS debtIn, ref, companyFk, - 1 - FROM invoiceOut - WHERE clientFk = vClientFK + 1 + FROM invoiceOut + WHERE clientFk = vClientFK AND issued >= vDate - UNION ALL - - SELECT - r.payed, - NULL as debtOut, - r.amountPaid, - r.invoiceFk, + UNION ALL + + SELECT + r.payed, + NULL as debtOut, + r.amountPaid, + r.invoiceFk, r.companyFk, - 0 + 0 FROM receipt r - WHERE r.clientFk = vClientFK - AND r.payed >= vDate) t - INNER JOIN `client` c ON c.id = vClientFK - HAVING debtOut <> 0 OR debtIn <> 0 + WHERE r.clientFk = vClientFK + AND r.payed >= vDate) t + INNER JOIN `client` c ON c.id = vClientFK + HAVING debtOut <> 0 OR debtIn <> 0 ORDER BY issued, priority DESC, debtIn; END ;; DELIMITER ; @@ -47728,13 +48054,13 @@ BEGIN WHERE id = vClientFk; ELSE - + SELECT id INTO vOwner FROM vn.worker WHERE code = vWorkerCode COLLATE utf8_general_ci; END IF; - + DROP TEMPORARY TABLE IF EXISTS tmp.clientList; CREATE TEMPORARY TABLE tmp.clientList SELECT DISTINCT t.clientFk, floor(cr.yearSale / 12) monthSale @@ -47746,7 +48072,7 @@ BEGIN AND t.shipped >= TIMESTAMPADD(MONTH,-1,util.VN_CURDATE()) AND c.id != vClientFk HAVING monthSale > 100; - + SELECT SUM(monthSale) INTO vTotalSale FROM tmp.clientList; @@ -47757,7 +48083,7 @@ BEGIN SELECT vClientFk, 'Reparto greuge', -vGreuge, util.VN_CURDATE(), vGreugeTypeFk; END IF; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -47778,12 +48104,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `clientPackagingOverstock`(vClientFk BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.clientPackagingOverstock; CREATE TEMPORARY TABLE tmp.clientPackagingOverstock - ENGINE = MEMORY - SELECT itemFk, - sum(GotfromClient) - sum(SenttoClient) as devueltos, + ENGINE = MEMORY + SELECT itemFk, + sum(GotfromClient) - sum(SenttoClient) as devueltos, sum(InvoicedtoClient) - sum(InvoicedfromClient) as facturados, - LEAST( - sum(GotfromClient) - sum(SenttoClient), + LEAST( + sum(GotfromClient) - sum(SenttoClient), sum(InvoicedtoClient) - sum(InvoicedfromClient) ) as abonables FROM @@ -47791,14 +48117,14 @@ BEGIN SELECT t.*, IF(@month = month, 0, 1) monthEnd, @month := month - FROM + FROM ( - SELECT x.id as ticketFk, - date(x.shipped) as shipped, - x.itemFk, - IFNULL(cast(sum(x.InvoicedtoClient) as DECIMAL(10,0)),0) InvoicedtoClient, - IFNULL(cast(sum(x.InvoicedfromClient) as DECIMAL(10,0)),0) InvoicedfromClient, - IFNULL(cast(sum(x.SenttoClient) as DECIMAL(10,0)),0) SenttoClient, + SELECT x.id as ticketFk, + date(x.shipped) as shipped, + x.itemFk, + IFNULL(cast(sum(x.InvoicedtoClient) as DECIMAL(10,0)),0) InvoicedtoClient, + IFNULL(cast(sum(x.InvoicedfromClient) as DECIMAL(10,0)),0) InvoicedfromClient, + IFNULL(cast(sum(x.SenttoClient) as DECIMAL(10,0)),0) SenttoClient, IFNULL(cast(sum(x.GotfromClient) as DECIMAL(10,0)),0) GotfromClient, i.name as concept, x.refFk as invoice, @@ -47817,11 +48143,11 @@ BEGIN @month := 0 month, t.companyFk FROM sale s - JOIN ticket t on t.id = s.ticketFk - JOIN packaging p ON p.itemFk = s.itemFk + JOIN ticket t on t.id = s.ticketFk + JOIN packaging p ON p.itemFk = s.itemFk LEFT JOIN packageEquivalentItem pe ON pe.itemFk = s.itemFk WHERE t.clientFk = vClientFk - AND t.shipped > '2017-11-30' + AND t.shipped > '2017-11-30' AND p.isPackageReturnable UNION ALL SELECT NULL, @@ -47834,7 +48160,7 @@ BEGIN 'Histórico', NULL, NULL - + FROM ticketPackagingStartingStock tps LEFT JOIN packageEquivalentItem pe ON pe.itemFk = tps.itemFk WHERE tps.clientFk = vClientFk @@ -47850,8 +48176,8 @@ BEGIN NULL AS refFk, NULL, t.companyFk - FROM ticketPackaging tp - JOIN ticket t on t.id = tp.ticketFk + FROM ticketPackaging tp + JOIN ticket t on t.id = tp.ticketFk JOIN packaging p ON p.id = tp.packagingFk LEFT JOIN packageEquivalentItem pe ON pe.itemFk = p.itemFk WHERE t.clientFk = vClientFk @@ -47888,11 +48214,11 @@ BEGIN -- SET vGraceDays = GREATEST(vGraceDays, 90); CALL vn.clientPackagingOverstock(vClientFk,vGraceDays); - + SELECT id INTO vWarehouseFk FROM vn.warehouse WHERE hasConfectionTeam; - + CALL vn.ticket_add( vClientFk ,util.VN_CURDATE() @@ -47905,22 +48231,22 @@ BEGIN ,account.myUser_getId() ,TRUE ,vNewTicket); - + INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price) SELECT vNewTicket, cpo.itemFk, - cpo.abonables, i.longName, p.price FROM tmp.clientPackagingOverstock cpo JOIN vn.item i ON i.id = cpo.itemFk JOIN vn.packaging p ON p.itemFk = cpo.itemFk WHERE cpo.abonables > 0; - + INSERT INTO vn.ticketPackaging(ticketFk, packagingFk, quantity) SELECT vNewTicket, p.id, cpo.abonables FROM tmp.clientPackagingOverstock cpo JOIN vn.packaging p ON p.itemFk = cpo.itemFk WHERE cpo.abonables > 0; - + SELECT vNewTicket; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -47958,9 +48284,9 @@ BEGIN 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 + 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; @@ -48072,7 +48398,7 @@ BEGIN JOIN client c ON c.accountingAccount = lc.account WHERE lc.`date` BETWEEN vDateFrom AND vDateTo )sub - GROUP BY companyFk, clientFk + GROUP BY companyFk, clientFk ) sub1 ON sub1.clientFk = c.id JOIN supplier s ON s.id = sub1.companyFk JOIN company co ON co.id = sub1.companyFk @@ -48113,13 +48439,13 @@ BEGIN SET vEnded = TIMESTAMP(IFNULL(vDate, util.VN_CURDATE()), '23:59:59'); DROP TEMPORARY TABLE IF EXISTS tClientRisk; - CREATE TEMPORARY TABLE 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 @@ -48134,7 +48460,7 @@ BEGIN WHERE t.receiptFk IS NULL AND t.status = 'ok' GROUP BY t.clientFk; - + INSERT INTO tClientRisk SELECT t.clientFk, totalWithVat FROM ticket t @@ -48150,7 +48476,7 @@ BEGIN FROM client c JOIN tClientRisk cr ON cr.clientFk = c.id GROUP BY c.id; - + DROP TEMPORARY TABLE tClientRisk; END ;; DELIMITER ; @@ -48174,9 +48500,9 @@ BEGIN DECLARE i INT DEFAULT 0; DECLARE c INT DEFAULT 0; DECLARE maxClientFk INT; - + DROP TEMPORARY TABLE IF EXISTS tmp.client; - + CREATE TEMPORARY TABLE tmp.`client` (id INT AUTO_INCREMENT, clientFk INT, @@ -48184,40 +48510,40 @@ BEGIN PRIMARY KEY(id), UNIQUE KEY clientFk (clientFk)) ENGINE = MEMORY; - + INSERT INTO tmp.client(clientFk) SELECT DISTINCT clientFk FROM vn.invoiceOut WHERE issued > TIMESTAMPADD(MONTH, -2, util.VN_CURDATE()); - + SELECT max(id) INTO maxClientFk FROM tmp.client; - - + + WHILE i < vNumber DO - + SET i = i + 1; - + WHILE c = 0 DO - + SELECT id INTO c FROM tmp.client WHERE id = floor(RAND() * maxClientFk) + 1 AND isSelected = FALSE LIMIT 1; - + END WHILE; - + -- SELECT i, maxClientFk, c; - - UPDATE tmp.client - SET isSelected = TRUE + + UPDATE tmp.client + SET isSelected = TRUE WHERE id = c; - + SET c = 0; - + END WHILE; - + SELECT c.id, c.name FROM tmp.client tc JOIN vn.client c ON c.id = tc.clientFk WHERE isSelected @@ -48294,35 +48620,35 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `cmr_getByTicket`(vTicketFk INT) BEGIN DECLARE vLanded DATE; - + SELECT DATE_ADD(util.VN_CURDATE(), INTERVAL landingDays DAY) INTO vLanded FROM vn.cmrConfig; IF vTicketFk THEN - + IF (SELECT count(ticketFk) FROM vn.cmr WHERE ticketFk = vTicketFk) THEN - + SELECT id FROM vn.cmr WHERE ticketFk = vTicketFk; - + ELSE - + INSERT INTO vn.cmr(ticketFk, companyFk, addressFromFk, addressToFk, ead) SELECT vTicketFk, t.companyFk, a.id, t.addressFk, vLanded FROM vn.ticket t - JOIN vn.warehouse w ON w.id = t.warehouseFk - JOIN vn.address a ON a.id = w.addressFk + JOIN vn.warehouse w ON w.id = t.warehouseFk + JOIN vn.address a ON a.id = w.addressFk WHERE t.id = vTicketFk; - + SELECT LAST_INSERT_ID(); - + END IF; - + ELSE - + INSERT INTO vn.cmr(ead) VALUES(vLanded); - + SELECT LAST_INSERT_ID(); - + END IF; END ;; DELIMITER ; @@ -48345,7 +48671,7 @@ BEGIN /** * Insert the monthly CMR summary in vn.mail on the 5th of each month. */ - + SET SESSION group_concat_max_len = 1000000; -- IF (DAY(util.VN_CURDATE()) = 5) THEN INSERT INTO @@ -48373,7 +48699,7 @@ BEGIN CMR Ticket ' - , GROUP_CONCAT(' ', c.id, ' ', c.ticketFk, ' ' ORDER BY c.id SEPARATOR '' ), + , GROUP_CONCAT(' ', c.id, ' ', c.ticketFk, ' ' ORDER BY c.id SEPARATOR '' ), '

@@ -48391,7 +48717,7 @@ BEGIN -- Actualizamos el estado a 'Enviado' UPDATE vn.cmr c SET c.state = 'Sent' - WHERE c.state = 'Pending' + WHERE c.state = 'Pending' AND MONTH(c.created) = MONTH(util.VN_CURDATE() - INTERVAL 1 MONTH) AND YEAR(c.created) = YEAR(util.VN_CURDATE() - INTERVAL 1 MONTH); -- END IF; @@ -48414,7 +48740,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `collectionPlacement_get`(vParamFk INT(11), vIsPicker bool) BEGIN /** Devuelve el listado de ubicaciones a las que hay que ir para preparar una colección o ticket - * + * * @param vParamFk Identificador de vn.collection o Identificador de vn.ticket * @param vIsPicker Booleano para distinguer el sacador del revisador */ @@ -48431,7 +48757,7 @@ BEGIN FROM vn.ticketCollection tc JOIN vn.sale s ON s.ticketFk = tc.ticketFk WHERE tc.collectionFk = vParamFk - UNION ALL + UNION ALL SELECT s.ticketFk, s.id, s.itemFk, s.quantity FROM vn.sale s WHERE s.ticketFk = vParamFk; @@ -48456,8 +48782,8 @@ BEGIN (INDEX(itemFk)) ENGINE = MEMORY SELECT b.itemFk, - CASE b.groupingMode - WHEN 0 THEN 1 + CASE b.groupingMode + WHEN 0 THEN 1 WHEN 2 THEN b.packing ELSE b.`grouping` END AS `grouping` @@ -48497,10 +48823,10 @@ BEGIN , st.saleFk as salePreviousPrepared , iss.userFk , ts.quantity - FROM tmp.sale ts - LEFT JOIN (SELECT DISTINCT saleFk + FROM tmp.sale ts + LEFT JOIN (SELECT DISTINCT saleFk FROM vn.saleTracking st - JOIN vn.state s ON s.id = st.stateFk + 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 @@ -48521,13 +48847,13 @@ BEGIN SELECT saleFk, priority as olderPriority FROM (SELECT saleFk, priority FROM tmp.salePlacementList - ORDER BY isPreviousPrepared DESC, + ORDER BY isPreviousPrepared DESC, itemShelvingSaleFk IS NULL DESC, - visible >= quantity DESC, + visible >= quantity DESC, visible > 0 DESC, IFNULL(shelvingPriority,0) DESC, priority - LIMIT 10000000000000000000 + LIMIT 10000000000000000000 ) sub GROUP BY saleFk; @@ -48536,7 +48862,7 @@ BEGIN 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; + 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 @@ -48550,10 +48876,10 @@ BEGIN FROM tmp.salePlacementList spl JOIN vn.sale s ON s.id = spl.saleFk ORDER BY saleOrder, - isPreviousPrepared DESC, + isPreviousPrepared DESC, itemShelvingSaleFk DESC, IF(vIsPicker, visible = 0, TRUE), - s.quantity <= spl.visible DESC, + s.quantity <= spl.visible DESC, shelvingPriority DESC, -- PAK 05/11/2021 priority; @@ -48586,27 +48912,27 @@ BEGIN DECLARE vConcept VARCHAR(50); DECLARE itemFk INT; DECLARE vSaleFk INT default 0; - + DECLARE vDescription VARCHAR(50); DECLARE vItemName VARCHAR(50); - + SELECT barcodeToItem(vItemFk) INTO itemFk; - + SELECT CONCAT(vn.getUser()," ",DATE_FORMAT(util.VN_NOW( ), "%H:%i" )," ",i.name) INTO vConcept FROM vn.item i WHERE i.id = itemFk; - + SELECT name INTO vItemName FROM vn.item WHERE id = vItemFk; SELECT CONCAT("Añadido articulo ", vItemName, " cantidad:", vQuantity) INTO vDescription; - - INSERT INTO vn.ticketLog (originFk, userFk, action , description) + + INSERT INTO vn.ticketLog (originFk, userFk, action , description) VALUES(vTicketFk, vn.getUser(), 'update', vDescription); - + INSERT INTO vn.sale (itemFk,ticketFk,concept,quantity,isAdded) VALUES (itemFk,vTicketFk,vConcept,vQuantity,1); SELECT last_insert_id() INTO vSaleFk; - + CALL vn.sale_calculateComponent(vSaleFk, null); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -48624,7 +48950,7 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_assign`(vUserFk INT, OUT vCollectionFk INT) -proc:BEGIN +proc:BEGIN /* Comprueba si existen colecciones libres que se ajustan al perfil del usuario * y le asigna la más antigua. * Añade un registro al semillero de colecciones @@ -48657,14 +48983,14 @@ proc:BEGIN FROM vn.collection c JOIN vn.ticketCollection tc ON tc.collectionFk = c.id JOIN vn.state s ON s.code = 'PRINTED_AUTO' - JOIN vn.productionConfig pc - WHERE c.workerFk IS NULL + JOIN vn.productionConfig pc + WHERE c.workerFk IS NULL AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime; DELETE c.* FROM vn.collection c - JOIN vn.productionConfig pc - WHERE c.workerFk IS NULL + JOIN vn.productionConfig pc + WHERE c.workerFk IS NULL AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime; -- Se a�ade registro al semillero @@ -48674,8 +49000,8 @@ proc:BEGIN -- Comprueba si hay colecciones disponibles que se ajustan a su configuracion SELECT MIN(c.id) INTO vCollectionFk - FROM vn.collection c - JOIN vn.operator o + FROM vn.collection c + JOIN vn.operator o ON (o.itemPackingTypeFk = c.itemPackingTypeFk OR c.itemPackingTypeFk IS NULL) AND o.numberOfWagons = c.wagons AND o.trainFk = c.trainFk @@ -48710,11 +49036,11 @@ DELIMITER ; DELIMITER ;; 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 - * + * * @table Devuelve tabla temporal con las colecciones pendientes. */ DROP TEMPORARY TABLE IF EXISTS tCollection; @@ -48722,18 +49048,18 @@ BEGIN CREATE TEMPORARY TABLE tCollection SELECT c.id collectionFk, date(c.created) created - FROM collection c - JOIN ticketCollection tc ON tc.collectionFk = c.id - JOIN sale s ON s.ticketFk = tc.ticketFk + FROM collection c + JOIN ticketCollection tc ON tc.collectionFk = c.id + JOIN sale s ON s.ticketFk = tc.ticketFk JOIN ticketState ts ON ts.ticketFk = tc.ticketFk JOIN state s2 ON s2.id = ts.stateFk JOIN productionConfig pc 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 + WHERE c.workerFk = vWorkerFk AND TIMESTAMPDIFF(HOUR, c.created , util.VN_NOW()) < pc.pendingCollectionsAge AND s.quantity != 0 - AND s2.order < pc.pendingCollectionsOrder + AND s2.order < pc.pendingCollectionsOrder GROUP BY c.id HAVING COUNT(*) > COUNT(DISTINCT st.id); @@ -48760,15 +49086,15 @@ BEGIN * Selecciona los tickets de una colección/ticket * @param vParamFk ticketFk/collectionFk * @return Retorna ticketFk, level, agencyName, warehouseFk, salesPersonFk, observaciones - */ + */ DECLARE vItemPackingTypeFk VARCHAR(1); -- Si los sacadores son los de pruebas, pinta los colores SELECT itemPackingTypeFk INTO vItemPackingTypeFk - FROM vn.collection + FROM vn.collection WHERE id = vParamFk; - SELECT t.id ticketFk, + SELECT t.id ticketFk, IF (!(vItemPackingTypeFk <=> 'V'), cc.code,CONCAT(SUBSTRING('ABCDEFGH',tc.wagon, 1),'-',tc.`level` )) `level`, am.name agencyName, t.warehouseFk, @@ -48778,20 +49104,20 @@ BEGIN FROM vn.ticket t LEFT 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` + 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.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 + LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 1 - WHERE t.id = vParamFk + WHERE t.id = vParamFk AND t.shipped >= util.yesterday() UNION ALL - SELECT t.id ticketFk, + SELECT t.id ticketFk, IF(!(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`, am.name agencyName, t.warehouseFk, @@ -48801,15 +49127,15 @@ BEGIN 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` + 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.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 + LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 1 WHERE tc.collectionFk = vParamFk; @@ -48830,21 +49156,21 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -48934,133 +49260,6 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `collection_missingTrash` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_missingTrash`( - vSaleFk BIGINT, - vQuantity INT, - vIsTrash BOOLEAN, - vWarehouseFk INT, - vNewQuantity INT) -BEGIN -/** -* Modifica la cantidad de una sale tirándola a faltas o basura -* -* @param vSaleFk el id de la sale -* @param vQuantity cantidad que se va a tirar a faltas o basura -* @param vWarehouseFk id warehouse -* @param vNewQuantity cantidad que se queda en el ticket original -*/ - DECLARE vTicketFk INT; - DECLARE vClientFk INT DEFAULT 400; - DECLARE vClientName VARCHAR(50); - DECLARE vConsignatario INT; - DECLARE vOriginalQuantity INT; - DECLARE vDescription VARCHAR(100); - DECLARE vCompanyVnlFk INT; - DECLARE vOrigin INT; - - IF vIsTrash THEN - SELECT id INTO vClientFk - FROM client c - WHERE c.name='BASURA'; - END IF; - - SELECT CONCAT("Cambio cantidad del artículo ",itemFk, ", ",concept,", de ", quantity," a ", vNewQuantity), ticketFk - INTO vDescription,vOrigin - FROM sale - WHERE id = vSaleFk; - - CALL logAdd(vOrigin, 'update', 'ticket', vDescription); - - SELECT t.id INTO vTicketFk - FROM ticket t - WHERE t.created > DATE_SUB(util.VN_NOW(), INTERVAL 1 DAY) - AND t.clientFk = vClientFk - AND t.warehouseFk = vWarehouseFk - LIMIT 1; - - IF vTicketFk IS NULL THEN - SELECT c.name , co.id INTO vClientName,vConsignatario - FROM client c - JOIN address co ON c.id = co.clientFk - WHERE c.id = vClientFk - LIMIT 1; - - SELECT id INTO vCompanyVnlFk - FROM company - WHERE code = 'VNL'; - - CALL ticket_add(vClientFk, - util.VN_NOW(), vWarehouseFk, - vCompanyVnlFk, - vConsignatario, - NULL, - NULL, - NULL, - account.myUser_getId(), - TRUE, - vTicketFk); - - SELECT t.id INTO vTicketFk - FROM ticket t - WHERE t.created > DATE_SUB(util.VN_NOW(), INTERVAL 1 DAY) - AND t.clientFk = vClientFk - AND t.warehouseFk = vWarehouseFk - LIMIT 1; - END IF; - - INSERT INTO sale (itemFk, - ticketFk, - concept, - quantity, - originalQuantity, - price, - discount, - priceFixed, - reserved, - isPicked, - isPriceFixed, - created, - isAdded) - SELECT itemFk, - vTicketFk, - CONCAT(concept," ",getWorkerCode(), " ", LEFT(CAST(util.VN_NOW() AS TIME),5)), - vQuantity, - originalQuantity, - price, - discount, - priceFixed, - reserved, - isPicked, - isPriceFixed, - created, - isAdded - FROM sale s - WHERE s.id = vSaleFk; - - SELECT quantity INTO vOriginalQuantity - FROM sale - WHERE id = vSaleFk; - - UPDATE sale - SET originalQuantity = vOriginalQuantity, - quantity = vNewQuantity - WHERE id = vSaleFk; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `collection_new` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -49302,8 +49501,8 @@ proc:BEGIN -- Se anulan el resto de carros libres para que sólo uno lleve un pedido excesivo DELETE tt.* FROM tTrain tt - LEFT JOIN (SELECT DISTINCT wagon - FROM tTrain + LEFT JOIN (SELECT DISTINCT wagon + FROM tTrain WHERE ticketFk IS NOT NULL ) nn ON nn.wagon = tt.wagon WHERE nn.wagon IS NULL; @@ -49398,7 +49597,7 @@ proc:BEGIN WHERE w.id = vn.getUser(); SELECT COUNT(ws.id) INTO vWagons - FROM workerShelving ws + FROM workerShelving ws WHERE ws.workerFk = vWorkerFk AND ws.collectionFk IS NULL; @@ -49428,7 +49627,7 @@ proc:BEGIN ORDER BY wagon ASC, level ASC; UPDATE vn.ticketCollection tc - JOIN tmp.smartTags ts ON tc.wagon = ts.wagon AND tc.level = ts.level + JOIN tmp.smartTags ts ON tc.wagon = ts.wagon AND tc.level = ts.level SET tc.smartTagFk = ts.code WHERE tc.collectionFk = vCollectionFk; @@ -49475,14 +49674,14 @@ proc:BEGIN DECLARE vTrainFk INT DEFAULT 1; DECLARE vUserFk INT; DECLARE vHourMatters BOOL DEFAULT TRUE; - + SELECT pc.ticketPrintedMax * vWagons, pc.ticketTrolleyMax * vWagons, pc.maxNotReadyCollections INTO vMaxTicketPrinted, vMaxTickets, vMaxNotReadyCollections FROM vn.productionConfig pc; /*IF NOT vn.deviceProductionUser_Exists(vUserFk) THEN - + LEAVE proc; - + END IF;*/ SELECT w.code, w.id INTO vWorkerCode, vUserFk @@ -49494,44 +49693,44 @@ proc:BEGIN INTO vIsPreviousPrepared, vWarehouseFk, vItemPackingTypeFk FROM vn.sector WHERE id = vSectorFk; -- Hola - + -- Si está habilitado el modo cazador para las motos, y el usuario no esta registrado, se sale. - - IF (SELECT isTractorHuntingMode FROM vn.deviceProductionConfig dpc) AND vItemPackingTypeFk = 'H' THEN - IF (SELECT COUNT(*) FROM vn.workerWithoutTractor wwt WHERE wwt.workerFk = vUserFk) THEN + + IF (SELECT isTractorHuntingMode FROM vn.deviceProductionConfig dpc) AND vItemPackingTypeFk = 'H' THEN + IF (SELECT COUNT(*) FROM vn.workerWithoutTractor wwt WHERE wwt.workerFk = vUserFk) THEN CALL util.throw('Usuario no registrado con moto'); LEAVE proc; END IF; END IF; - - + + -- Si hay colecciones sin terminar, sale del proceso SELECT count(*) INTO vNotReadyCollections FROM ( SELECT count(DISTINCT s.id) totalRow, count(DISTINCT st.id) pickedRow - FROM vn.collection c - JOIN vn.ticketCollection tc ON tc.collectionFk = c.id - JOIN vn.sale s ON s.ticketFk = tc.ticketFk + FROM vn.collection c + 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 = vUserFk + WHERE c.workerFk = vUserFk AND c.created >= TIMESTAMPADD(HOUR , -6,util.VN_NOW()) AND s.quantity != 0 GROUP BY c.id - HAVING totalRow > pickedRow) sub; + HAVING totalRow > pickedRow) sub; IF vMaxNotReadyCollections < vNotReadyCollections THEN - + CALL util.throw('Hay colecciones pendientes'); LEAVE proc; - + END IF; IF vIsPreviousPrepared THEN CALL util.throw('Es de preparación previa'); LEAVE proc; -- Hasta que tengamos el altillo, vamos a cancelar esta opcion - + SELECT id INTO vStateFk FROM vn.state WHERE `code` = 'PREVIOUS_PREPARATION'; @@ -49543,37 +49742,37 @@ proc:BEGIN END IF; - CALL vn.productionControl(vWarehouseFk, 0); + 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 -- Pedidos pequeños - + SET vTrainFk = 2; - + SET vHourMatters = FALSE; - - DELETE pb.* + + DELETE pb.* FROM tmp.productionBuffer pb - JOIN vn.volumeConfig vc + 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 = vUserFk, 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'; - + -- 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 @@ -49586,13 +49785,13 @@ proc:BEGIN JOIN vn.state s ON s.id = pb.state WHERE s.code = 'PICKER_DESIGNED' AND pb.workerCode = vWorkerCode; - + IF hasAssignedTickets THEN - - UPDATE vn.collection - SET itemPackingTypeFk = NULL + + UPDATE vn.collection + SET itemPackingTypeFk = NULL WHERE id = vCollectionFk; - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketToSplit; CREATE TEMPORARY TABLE tmp.ticketToSplit SELECT pb.ticketFk @@ -49600,42 +49799,42 @@ proc:BEGIN 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, + ORDER BY HH, + mm, + s.`order` DESC, pb.m3 DESC; - - WHILE (SELECT COUNT(*) FROM tmp.ticketToSplit) DO - + + WHILE (SELECT COUNT(*) FROM tmp.ticketToSplit) DO + SELECT MIN(ticketFk) INTO vTicketToSplit FROM tmp.ticketToSplit; - + CALL vn.ticket_splitItemPackingType(vTicketToSplit,IFNULL(vItemPackingTypeFk, 'H')); - + INSERT INTO vn.ticketCollection(ticketFk, collectionFk) SELECT ticketFk, vCollectionFk FROM tmp.ticketIPT - WHERE (itemPackingTypeFk = vItemPackingTypeFk) ; - + 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 - JOIN vn.productionConfig pc + JOIN vn.productionConfig pc WHERE pb.shipped = util.VN_CURDATE() - AND (pb.ubicacion IS NOT NULL + AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE ) AND s.isPreparable AND ( @@ -49643,7 +49842,7 @@ proc:BEGIN OR (pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)) OR (pb.H = 0 AND pb.V = 0 AND pb.N > 0 AND ISNULL(pb.collectionH) AND ISNULL(pb.collectionV)) ) - AND (pc.isPreviousPreparationRequired = FALSE + AND (pc.isPreviousPreparationRequired = FALSE OR pb.previousWithoutParking = FALSE); SET vMaxTicketPrinted = vMaxTicketPrinted - vPrintedTickets; @@ -49654,16 +49853,16 @@ proc:BEGIN SELECT s2.id, pb.ticketFk, vUserFk FROM tmp.productionBuffer pb 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.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 = util.VN_CURDATE() - AND (LENGTH(pb.problem) = 0 + AND (LENGTH(pb.problem) = 0 OR (pb.problem = 'PEQUEÑO' AND vTrainFk = 2)) - AND (pb.ubicacion IS NOT NULL + AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE ) AND s.isPrintable AND s.isOK @@ -49673,23 +49872,23 @@ proc:BEGIN OR (pb.H = 0 AND pb.V = 0 AND pb.N > 0 AND ISNULL(pb.collectionH) AND ISNULL(pb.collectionV)) ) AND t.created < TIMESTAMPADD(MINUTE, - tc.pickingDelay , util.VN_NOW()) - AND (pc.isPreviousPreparationRequired = FALSE + AND (pc.isPreviousPreparationRequired = FALSE OR pb.previousWithoutParking = FALSE) - ORDER BY HH, + ORDER BY HH, mm, s.`order` DESC, pb.m3 DESC LIMIT vMaxTicketPrinted; - + -- 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, (pb.H + pb.V = 0) isNeutral FROM tmp.productionBuffer pb 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.ticketStateToday tst ON tst.ticket = pb.ticketFk JOIN vn.state s ON s.id = tst.state JOIN vn.productionConfig pc @@ -49698,46 +49897,46 @@ proc:BEGIN OR (pb.V > 0 AND vItemPackingTypeFk = 'V' AND ISNULL(pb.collectionV)) OR (pb.H = 0 AND pb.V = 0 AND pb.N > 0 AND ISNULL(pb.collectionH) AND ISNULL(pb.collectionV)) ) - AND (pb.ubicacion IS NOT NULL + AND (pb.ubicacion IS NOT NULL OR a.isOwn = FALSE ) AND LENGTH(pb.problem) = 0 AND s.isPreparable - AND (pc.isPreviousPreparationRequired = FALSE + AND (pc.isPreviousPreparationRequired = FALSE OR pb.previousWithoutParking = FALSE) ORDER BY pb.HH, pb.mm, s.`order` DESC LIMIT vMaxTickets; - - WHILE (SELECT COUNT(*) FROM tmp.ticketToSplit) DO - + + WHILE (SELECT COUNT(*) FROM tmp.ticketToSplit) DO + SELECT MIN(ticketFk) INTO vTicketToSplit FROM tmp.ticketToSplit; - - - IF (SELECT isNeutral - FROM tmp.ticketToSplit + + + IF (SELECT isNeutral + FROM tmp.ticketToSplit WHERE ticketFk = vTicketToSplit) THEN - + INSERT INTO vn.ticketCollection(ticketFk, collectionFk) VALUES(vTicketToSplit, vCollectionFk); - + ELSE - + CALL vn.ticket_splitItemPackingType(vTicketToSplit, vItemPackingTypeFk); - + INSERT INTO vn.ticketCollection(ticketFk, collectionFk) SELECT ticketFk, vCollectionFk FROM tmp.ticketIPT WHERE itemPackingTypeFk = vItemPackingTypeFk; - + DROP TEMPORARY TABLE tmp.ticketIPT; - + END IF; - + 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 @@ -49764,20 +49963,20 @@ proc:BEGIN 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.item i ON i.id = s.itemFk JOIN vn.volumeConfig vc - WHERE i.packingShelve + WHERE i.packingShelve GROUP BY t.ticketFk; - UPDATE tmp.ticket t + 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 + SELECT ticketFk, HH, mm INTO vFirstTicketFk, vHour, vMinute FROM tmp.ticket ORDER BY productionOrder DESC, HH, mm @@ -49785,47 +49984,47 @@ proc:BEGIN -- Hay que excluir aquellos que no tengan la misma hora de preparación IF vHourMatters THEN - - DELETE + + DELETE FROM tmp.ticket - WHERE HH != vHour + WHERE HH != vHour OR mm != vMinute; - + END IF; - + -- 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 + JOIN vn.volumeConfig vc WHERE t.ticketFk = vFirstTicketFk) THEN - DELETE - FROM tmp.ticket + DELETE + FROM tmp.ticket WHERE ticketFk != vFirstTicketFk; - + ELSE - + DELETE t.* - FROM tmp.ticket t - JOIN vn.volumeConfig vc + 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.* + 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, + ( SELECT MAX(i.size) maxHeigth, tc.ticketFk FROM vn.ticketCollection tc JOIN vn.sale s ON s.ticketFk = tc.ticketFk @@ -49834,11 +50033,11 @@ proc:BEGIN 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, + SELECT cv.`level` as shelve, 1 as wagon, cv.`lines`, cv.liters, @@ -49854,7 +50053,7 @@ proc:BEGIN SET vWagonCounter = vWagonCounter + 1; INSERT INTO tmp.wagonsVolumetry(shelve, wagon, `lines`, liters, height) - SELECT cv.`level` as shelve, + SELECT cv.`level` as shelve, vWagonCounter as wagon, cv.`lines`, cv.liters, @@ -49870,11 +50069,11 @@ proc:BEGIN SELECT ticketFk, shelve, wagon, linesDif, LitersDif, heightDif FROM ( SELECT t.ticketFk, - wv.shelve, + 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.`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 @@ -49883,14 +50082,14 @@ proc:BEGIN 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 @@ -49906,57 +50105,57 @@ proc:BEGIN 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 + ORDER BY heightDif, litersDif, linesDif LIMIT 1; END IF; IF vShelve > 0 THEN - - UPDATE tmp.ticket + + 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 + + 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 + + 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; @@ -49965,29 +50164,29 @@ proc:BEGIN DELETE FROM tmp.ticket WHERE shelve = 0; -- Elimina los tickets bloqueados que no se van a preparar - DELETE tc.* + 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.* + DELETE tc.* FROM vn.ticketCollection tc - JOIN vn.ticketCollection tc2 ON tc2.ticketFk = tc.ticketFk + 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; + 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, + SET tc.level = t.shelve, tc.wagon = t.wagon, tc.itemCount = t.`lines`, tc.liters = t.shelveLiters; @@ -49995,38 +50194,38 @@ proc:BEGIN -- Actualiza el estado de los tickets INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador) SELECT vStateFk, ticketFk, vUserFk - FROM vn.ticketCollection tc + 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 + IF (SELECT count(*) FROM vn.ticketCollection WHERE collectionFk = vCollectionFk) THEN CALL vn.sales_mergeByCollection(vCollectionFk); UPDATE vn.collection c - JOIN (SELECT count(*) saleTotalCount , + 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, + ) sub + SET c.saleTotalCount = sub.saleTotalCount, c.salePickedCount = sub.salePickedCount WHERE c.id = vCollectionFk; - - SELECT vCollectionFk; + + SELECT vCollectionFk; ELSE CALL util.throw('No ha sido posible obtener colección'); DELETE FROM vn.collection WHERE id = vCollectionFk; - + END IF; DROP TEMPORARY TABLE @@ -50036,8 +50235,8 @@ proc:BEGIN tmp.wagonsVolumetry, tmp.ticketShelve, tmp.productionBuffer; - - + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -50054,30 +50253,36 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_printSticker`(vSelf INT) +CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_printSticker`( + vSelf INT, + vLabelCount INT +) BEGIN /** - * Prints a yellow label from a collection or a ticket + * Prints a yellow label from a collection or a ticket * * @param vSelf collection or ticket + * @param vLabelCount number of times the collection has been printed */ - DECLARE vPrinterFk INT; + DECLARE vPrintArgs JSON DEFAULT JSON_OBJECT('collectionOrTicketFk', vSelf); - SELECT w.labelerFk INTO vPrinterFk FROM worker w WHERE w.id = account.myUser_getId(); + IF vLabelCount IS NULL THEN + INSERT INTO ticketTrolley + SELECT ticketFk, 1 + FROM ticketCollection + WHERE collectionFk = vSelf + ON DUPLICATE KEY UPDATE labelCount = labelCount + 1; + ELSE + SET vPrintArgs = JSON_MERGE_PATCH(vPrintArgs, JSON_OBJECT('labelCount', vLabelCount)); + END IF; CALL report_print( - 'LabelCollection', - vPrinterFk, - account.myUser_getId(), - JSON_OBJECT('collectionFk', vSelf), - 'high' - ); - - INSERT INTO ticketTrolley(ticket, labelCount) - SELECT ticketFk, 1 - FROM ticketCollection - WHERE collectionFk = vSelf - ON DUPLICATE KEY UPDATE labelCount = labelCount + 1; + 'LabelCollection', + (SELECT w.labelerFk FROM worker w WHERE w.id = account.myUser_getId()), + account.myUser_getId(), + vPrintArgs, + 'high' + ); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -50129,34 +50334,34 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_updateSale`( vStateFk INT, vTicketFk INT) BEGIN - + DECLARE vNumPrepared INT; DECLARE vNumTotal INT; - REPLACE INTO vn.saleTracking(saleFk,isChecked, originalQuantity, workerFk, actionFk,stateFk) + REPLACE INTO vn.saleTracking(saleFk,isChecked, originalQuantity, workerFk, actionFk,stateFk) VALUES(vSaleFk,1,vOriginalQuantity,vWorkerFk,vStateFk,vStateFk); - - UPDATE vn.sale SET isPicked = 1 + + UPDATE vn.sale SET isPicked = 1 WHERE id = vSaleFk; - + SELECT COUNT(s.id) INTO vNumPrepared FROM vn.sale s WHERE s.ticketFk = vTicketFk AND s.isPicked = 1; - + SELECT COUNT(s.id) INTO vNumTotal FROM vn.sale s WHERE s.ticketFk = vTicketFk; - + IF vNumPrepared = vNumTotal THEN - + INSERT INTO vncontrol.inter SET state_id = vStateFk, Id_Ticket = vTicketFk, Id_Trabajador = vWorkerFk; - + CALL vn.collection_update(vTicketFk); - + END IF; - - + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -50174,27 +50379,232 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `company_getSuppliersDebt` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `company_getSuppliersDebt`(vSelf INT, vMonthsAgo INT) BEGIN +/** + * Generates a temporary table containing outstanding payments to suppliers. + * + * @vSelf company id + */ + DECLARE vStartingDate DATETIME DEFAULT TIMESTAMPADD (MONTH,- vMonthsAgo,util.VN_CURDATE()); + DECLARE vCurrencyEuroFk INT; + DECLARE vStartDate DATE; + DECLARE vInvalidBalances DOUBLE; -DECLARE vCompanyFk INT; + SELECT dated, invalidBalances INTO vStartDate, vInvalidBalances FROM supplierDebtConfig; + SELECT id INTO vCurrencyEuroFk FROM currency WHERE code = 'EUR'; - SELECT IFNULL(uc.companyFk, rc.defaultCompanyFk) - INTO vCompanyFk - FROM vn.routeConfig rc - LEFT JOIN userConfig uc ON uc.userFk = workerFk; + DROP TEMPORARY TABLE IF EXISTS tOpeningBalances; + CREATE TEMPORARY TABLE tOpeningBalances ( + supplierFk INT NOT NULL, + companyFk INT NOT NULL, + openingBalances DOUBLE NOT NULL, + closingBalances DOUBLE NOT NULL, + currencyFk INT NOT NULL, + PRIMARY KEY (supplierFk, companyFk, currencyFk) + ) ENGINE = MEMORY; + -- Calculates the opening and closing balance for each supplier + INSERT INTO tOpeningBalances + SELECT supplierFk, + companyFk, + SUM(amount * isBeforeStarting) AS openingBalances, + SUM(amount) closingBalances, + currencyFk + FROM ( + SELECT p.supplierFk, + p.companyFk, + IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa) AS amount, + p.received < vStartingDate isBeforeStarting, + p.currencyFk + FROM payment p + WHERE p.received > vStartDate + AND p.companyFk = vSelf + UNION ALL + SELECT r.supplierFk, + r.companyFk, + - IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue) AS Total, + rv.dueDated < vStartingDate isBeforeStarting, + r.currencyFk + FROM invoiceIn r + INNER JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk + WHERE r.issued > vStartDate + AND r.isBooked + AND r.companyFk = vSelf + ) sub GROUP BY companyFk, supplierFk, currencyFk; - SELECT - s.name AS name , - s.NIF AS nif , - s.street AS street , - s.city AS city , - s.postCode AS postCode + DROP TEMPORARY TABLE IF EXISTS tPendingDuedates; + CREATE TEMPORARY TABLE tPendingDuedates ( + id INT auto_increment, + expirationId INT, + dated DATE, + supplierFk INT NOT NULL, + companyFk INT NOT NULL, + amount DECIMAL(10, 2) NOT NULL, + currencyFk INT NOT NULL, + pending DECIMAL(10, 2) DEFAULT 0, + balance DECIMAL(10, 2) DEFAULT 0, + endingBalance DECIMAL(10, 2) DEFAULT 0, + isPayment BOOLEAN, + isReconciled BOOLEAN, + PRIMARY KEY (id), + INDEX (supplierFk, companyFk, currencyFk) + ) ENGINE = MEMORY; - 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; + INSERT INTO tPendingDuedates ( + expirationId, + dated, + supplierFk, + companyFk, + amount, + currencyFk, + isPayment, + isReconciled + )SELECT p.id, + p.dueDated, + p.supplierFk, + p.companyFk, + IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa), + p.currencyFk, + TRUE isPayment, + p.isConciliated + FROM payment p + WHERE p.dueDated >= vStartingDate + AND p.companyFk = vSelf + UNION ALL + SELECT r.id, + rv.dueDated, + r.supplierFk, + r.companyFk, + -IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue), + r.currencyFk, + FALSE isPayment, + TRUE + FROM invoiceIn r + LEFT JOIN tOpeningBalances si ON r.companyFk = si.companyFk + AND r.supplierFk = si.supplierFk + AND r.currencyFk = si.currencyFk + JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk + WHERE rv.dueDated >= vStartingDate + AND (si.closingBalances IS NULL OR si.closingBalances <> 0) + AND r.isBooked + AND r.companyFk = vSelf + ORDER BY supplierFk, companyFk, companyFk, dueDated, isPayment DESC, id; + -- util.VN_NOW, we calculate the outstanding amount for each receipt in descending order + SET @risk := 0.0; + SET @supplier := 0.0; + SET @company := 0.0; + SET @moneda := 0.0; + SET @pending := 0.0; + SET @day := util.VN_CURDATE(); + + UPDATE tPendingDuedates vp + LEFT JOIN tOpeningBalances si ON vp.companyFk = si.companyFk + AND vp.supplierFk = si.supplierFk + AND vp.currencyFk = si.currencyFk + SET vp.balance = @risk := ( + IF ( + @company <> vp.companyFk + OR @supplier <> vp.supplierFk + OR @moneda <> vp.currencyFk, + IFNULL(si.openingBalances, 0), + @risk + ) + + vp.amount + ), + -- if there is a change of company or supplier or currency, the balance is reset + vp.pending = @pending := IF ( + @company <> vp.companyFk + OR @supplier <> vp.supplierFk + OR @moneda <> vp.currencyFk + OR @day <> vp.dated, + vp.amount * (NOT vp.isPayment), + @pending + vp.amount + ), + vp.companyFk = @company := vp.companyFk, + vp.supplierFk = @supplier := vp.supplierFk, + vp.currencyFk = @moneda := vp.currencyFk, + vp.dated = @day := vp.dated, + vp.balance = @risk, + vp.pending = @pending; + + CREATE OR REPLACE TEMPORARY TABLE tRowsToDelete ENGINE = MEMORY + SELECT expirationId, + dated, + supplierFk, + companyFk, + currencyFk, + balance + FROM tPendingDuedates + WHERE balance < vInvalidBalances + AND balance > - vInvalidBalances; + + DELETE vp.* + FROM tPendingDuedates vp + JOIN tRowsToDelete rd ON ( + vp.dated < rd.dated + OR (vp.dated = rd.dated AND vp.expirationId <= rd.expirationId) + ) + AND vp.supplierFk = rd.supplierFk + AND vp.companyFk = rd.companyFk + AND vp.currencyFk = rd.currencyFk + WHERE vp.isPayment = FALSE; + + SELECT vp.expirationId, + vp.dated, + vp.supplierFk, + vp.companyFk, + vp.currencyFk, + vp.amount, + vp.pending, + vp.balance, + s.payMethodFk, + vp.isPayment, + vp.isReconciled, + vp.endingBalance + FROM tPendingDuedates vp + LEFT JOIN supplier s ON s.id = vp.supplierFk; + + DROP TEMPORARY TABLE tOpeningBalances; + DROP TEMPORARY TABLE tPendingDuedates; + DROP TEMPORARY TABLE tRowsToDelete; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -50214,7 +50624,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `conveyorExpedition_Add`(vStarted DATETIME, vEnded DATETIME) BEGIN - + DECLARE startingMinute INT; TRUNCATE vn.conveyorExpedition; @@ -50231,23 +50641,23 @@ BEGIN conveyorBuildingClassFk) SELECT e.id, e.created, - 10 * p.depth as depth, + 10 * p.depth as depth, 10 * p.width as width, 10 * p.height as height, IFNULL(t.routeFk,am.agencyFk) routeFk, hour(e.created) * 60 + minute(e.created), IFNULL(et.description , a.name), IFNULL(t.routeFk,am.agencyFk) criterion, - IFNULL(p.conveyorBuildingClassFk , pc.defaultConveyorBuildingClass) + IFNULL(p.conveyorBuildingClassFk , pc.defaultConveyorBuildingClass) FROM vn.expedition e JOIN vn.ticket t ON t.id = e.ticketFk JOIN vn.packaging p ON p.id = e.packagingFk LEFT JOIN vn.zone z ON z.id = t.zoneFk LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk - LEFT JOIN vn.agency a ON a.id = am.agencyFk - LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk - LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk - JOIN vn.packagingConfig pc + LEFT JOIN vn.agency a ON a.id = am.agencyFk + LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk + LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk + JOIN vn.packagingConfig pc WHERE t.warehouseFk IN (60,1,44) AND e.created BETWEEN vStarted AND vEnded AND p.height < 140 @@ -50256,8 +50666,8 @@ BEGIN SELECT MIN(productionMinute) INTO startingMinute FROM vn.conveyorExpedition ce ; - - UPDATE vn.conveyorExpedition + + UPDATE vn.conveyorExpedition SET productionMinute = productionMinute - startingMinute; END ;; @@ -50326,7 +50736,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `createPedidoInterno`(vItemFk INT,vQuantity INT) BEGIN - + UPDATE vn.item SET upToDown = vQuantity WHERE id = vItemFk; END ;; @@ -50349,52 +50759,52 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `crypt`(vText VARCHAR(255), vKey VAR BEGIN DECLARE vEncryptedText VARCHAR(255) DEFAULT ''; - + DECLARE vKeyLength INT; DECLARE vKeyPosition INT DEFAULT 1; DECLARE vKeyChar VARCHAR(1); - + DECLARE vTextLength INT; DECLARE vTextPosition INT DEFAULT 1; DECLARE vTextChar VARCHAR(1); - + DECLARE vEncryptedChar VARCHAR(1); DECLARE vEncryptedCharPosition INT; - + DECLARE vChain VARCHAR(255) DEFAULT '#$.-_0123456789abcdefghijklmnopqrstuvwxyz'; DECLARE vChainTextPosition INT; DECLARE vChainKeyPosition INT; DECLARE vChainLength INT; - + DECLARE vInvalidadChars VARCHAR(255) DEFAULT ''; - - SET vTextLength = LENGTH(vText); + + SET vTextLength = LENGTH(vText); SET vKeyLength = LENGTH(vKey); SET vChainLength = LENGTH(vChain); - + WHILE vTextPosition <= vTextLength DO - + SET vTextChar = MID(vText,vTextPosition,1); SET vKeyChar = MID(vKey,vKeyPosition,1); - + SET vChainTextPosition = LOCATE(vTextChar, vChain); SET vInvalidadChars = IF(vChainTextPosition, vInvalidadChars, CONCAT(vInvalidadChars,vTextChar)); SET vChainKeyPosition = LOCATE(vKeyChar, vChain); SET vEncryptedCharPosition = vChainTextPosition + vChainKeyPosition; - + IF vEncryptedCharPosition > vChainLength THEN - + SET vEncryptedCharPosition = vEncryptedCharPosition - vChainLength; - + END IF; - + SET vEncryptedChar = MID(vChain, vEncryptedCharPosition,1); - + SET vEncryptedText = CONCAT(vEncryptedText, vEncryptedChar); - + SET vKeyPosition = IF(vKeyPosition = vKeyLength, 1,vKeyPosition + 1); SET vTextPosition = vTextPosition + 1; - + END WHILE; SET vResult = IF(LENGTH(vInvalidadChars), CONCAT('Caracteres no válidos: ',vInvalidadChars),vEncryptedText); @@ -50419,49 +50829,49 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `cryptOff`(vText VARCHAR(255), vKey BEGIN DECLARE vUncryptedText VARCHAR(255) DEFAULT ''; - + DECLARE vKeyLength INT; DECLARE vKeyPosition INT DEFAULT 1; DECLARE vKeyChar VARCHAR(1); - + DECLARE vTextLength INT; DECLARE vTextPosition INT DEFAULT 1; DECLARE vTextChar VARCHAR(1); - + DECLARE vUncryptedChar VARCHAR(1); DECLARE vUncryptedCharPosition INT; - + DECLARE vChain VARCHAR(255) DEFAULT '#$.-_0123456789abcdefghijklmnopqrstuvwxyz'; DECLARE vChainTextPosition INT; DECLARE vChainKeyPosition INT; DECLARE vChainLength INT; - - SET vTextLength = LENGTH(vText); + + SET vTextLength = LENGTH(vText); SET vKeyLength = LENGTH(vKey); SET vChainLength = LENGTH(vChain); - + WHILE vTextPosition <= vTextLength DO - + SET vTextChar = MID(vText,vTextPosition,1); SET vKeyChar = MID(vKey,vKeyPosition,1); - + SET vChainTextPosition = LOCATE(vTextChar, vChain); SET vChainKeyPosition = LOCATE(vKeyChar, vChain); SET vUncryptedCharPosition = vChainTextPosition - vChainKeyPosition; - + IF vUncryptedCharPosition < 1 THEN - + SET vUncryptedCharPosition = vUncryptedCharPosition + vChainLength; - + END IF; - + SET vUncryptedChar = MID(vChain, vUncryptedCharPosition,1); - + SET vUncryptedText = CONCAT(vUncryptedText, vUncryptedChar); - + SET vKeyPosition = IF(vKeyPosition = vKeyLength, 1,vKeyPosition + 1); SET vTextPosition = vTextPosition + 1; - + END WHILE; SET vResult = vUncryptedText; @@ -50557,7 +50967,7 @@ BEGIN OR (vSelf IS NOT NULL AND parentFk = vSelf); DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + SET vSons = 0; OPEN vChildren; @@ -50568,11 +50978,11 @@ BEGIN IF vDone THEN LEAVE myLoop; END IF; - + SET vIndex = vIndex + 1; SET vLft = vIndex; SET vSons = vSons + 1; - + CALL department_calcTreeRec( vChildFk, CONCAT(vPath, vChildFk, '/'), @@ -50627,7 +51037,7 @@ proc: BEGIN SELECT isChanged INTO vIsChanged FROM department_recalc; - + IF vIsChanged THEN UPDATE department_recalc SET isChanged = FALSE; CALL vn.department_calcTree; @@ -50651,18 +51061,18 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; 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; - - +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 */ ; @@ -50721,19 +51131,19 @@ BEGIN FROM department g JOIN tChilds c ON c.id = g.id WHERE g.parentFk IS NOT NULL; - + INSERT IGNORE INTO tNodes SELECT id FROM tParents; - + IF ROW_COUNT() = 0 THEN LEAVE myLoop; END IF; - + DELETE FROM tChilds; INSERT INTO tChilds SELECT id FROM tParents; END LOOP; - + DROP TEMPORARY TABLE tChilds, tParents; @@ -50771,18 +51181,18 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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); - - +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 */ ; @@ -50801,12 +51211,12 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `deviceProductionUser_exists`(vUserFk INT) BEGIN - + /* SELECT COUNT(*) AS UserExists - FROM vn.deviceProductionUser dpu + FROM vn.deviceProductionUser dpu WHERE dpu.userFk = vUserFk;*/ SELECT TRUE; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -50852,18 +51262,18 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -50882,10 +51292,10 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `device_checkLogin`(vUserFk INT, vAndroidID VARCHAR(50)) BEGIN - + /* * Comprueba si está registrado el dispositivo mediante su androidId - * + * * @param vUSerFk el id del user * @param vAndroidID es el identificador android_id del dispositivo */ @@ -50897,20 +51307,20 @@ BEGIN SELECT dpc.isAllUsersallowed INTO vIsAllUsersAllowed FROM vn.deviceProductionConfig dpc; - IF NOT vIsAllUsersAllowed THEN - + IF NOT vIsAllUsersAllowed THEN + SELECT COUNT(*) INTO vIsDepartment - FROM vn.workerDepartment dp + FROM vn.workerDepartment dp JOIN department d ON d.id = dp.departmentFk WHERE dp.workerFk = vUserFk AND d.hasToCheckLogin; - + IF vIsDepartment THEN SELECT COUNT(*) INTO vIsAuthorized - FROM vn.deviceProductionUser dpu + FROM vn.deviceProductionUser dpu JOIN vn.deviceProduction dp ON dp.id = dpu.deviceProductionFk WHERE dpu.userFk = vUserFk AND dp.android_id = vAndroidID; - + IF NOT vIsAuthorized THEN SET vMessage = 'Usuario no autorizado'; END IF; @@ -50940,15 +51350,15 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `duaEntryValueUpdate`(vDuaFk INT) BEGIN UPDATE duaEntry de - JOIN + JOIN ( SELECT b.entryFk, sum(b.quantity * b.buyingValue) as total FROM buy b JOIN duaEntry de ON de.entryFk = b.entryFk WHERE duaFk = vDuaFk GROUP BY b.entryFk ) sub ON sub.entryFk = de.entryFk - - LEFT JOIN + + LEFT JOIN (SELECT e.id, sum(iit.taxableBase) as euros FROM entry e JOIN invoiceInTax iit ON iit.invoiceInFk = e.invoiceInFk @@ -50956,11 +51366,11 @@ BEGIN WHERE de.duaFk = vDuaFk GROUP BY e.id ) sub2 ON sub2.id = de.entryFk - + SET de.value = sub.total, de.euroValue = sub2.euros WHERE duaFk = vDuaFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -50984,7 +51394,7 @@ BEGIN DECLARE vInvoiceFk INT; DECLARE vASIEN BIGINT DEFAULT 0; DECLARE vCounter INT DEFAULT 0; - + DECLARE rs CURSOR FOR SELECT e.invoiceInFk FROM entry e @@ -50997,7 +51407,7 @@ BEGIN DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; OPEN rs; - + UPDATE invoiceIn ii JOIN entry e ON e.invoiceInFk = ii.id JOIN duaEntry de ON de.entryFk = e.id @@ -51009,41 +51419,41 @@ BEGIN ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried), e.isConfirmed = TRUE WHERE d.id = vDuaFk; - + SELECT IFNULL(ASIEN,0) INTO vASIEN FROM dua WHERE id = vDuaFk; - + FETCH rs INTO vInvoiceFk; - + WHILE NOT done DO CALL invoiceInBookingMain(vInvoiceFk); - + IF vCounter > 0 OR vASIEN > 0 THEN - + UPDATE vn2008.XDiario x JOIN vn.ledgerConfig lc ON lc.lastBookEntry = x.ASIEN SET x.ASIEN = vASIEN; - + ELSE - + SELECT lastBookEntry INTO vASIEN FROM vn.ledgerConfig; - + END IF; - + SET vCounter = vCounter + 1; - + FETCH rs INTO vInvoiceFk; END WHILE; - + CLOSE rs; - - UPDATE dua + + UPDATE dua SET ASIEN = vASIEN WHERE id = vDuaFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -51069,9 +51479,9 @@ BEGIN SELECT awbFk,companyFk FROM dua WHERE id = vDuaFk; - + SELECT LAST_INSERT_ID() INTO vNewDuaFk; - + INSERT INTO duaEntry(duaFk, entryFk, value, customsValue) SELECT vNewDuaFk, entryFk, value, value - customsValue FROM duaEntry @@ -51100,29 +51510,29 @@ BEGIN DECLARE vBookDated DATE; DECLARE vDiff DECIMAL(10,2); DECLARE vApunte BIGINT; - + SELECT ASIEN, IFNULL(bookEntried, util.VN_CURDATE()) INTO vBookNumber, vBookDated - FROM dua + FROM dua WHERE id = vDuaFk; - + IF vBookNumber IS NULL OR NOT vBookNumber THEN CALL ledger_next(vBookNumber); END IF; - + -- Apunte de la aduana INSERT INTO XDiario( ASIEN, FECHA, SUBCTA, - CONCEPTO, + CONCEPTO, EUROHABER, SERIE, empresa_id, CLAVE, FACTURA) - SELECT + SELECT vBookNumber, d.bookEntried, '4700000999', @@ -51135,20 +51545,20 @@ BEGIN FROM duaTax dt JOIN dua d ON d.id = dt.duaFk WHERE dt.duaFk = vDuaFk; - + -- Apuntes por tipo de IVA y proveedor - + INSERT INTO XDiario( ASIEN, FECHA, SUBCTA, - CONTRA, + CONTRA, EURODEBE, BASEEURO, - CONCEPTO, - FACTURA, + CONCEPTO, + FACTURA, IVA, - AUXILIAR, + AUXILIAR, SERIE, FECHA_EX, FECHA_OP, @@ -51168,17 +51578,17 @@ BEGIN FECREGCON ) - SELECT + SELECT vBookNumber ASIEN, vBookDated FECHA, tr.account SUBCTA, '4330002067' CONTRA, sum(dt.tax) EURODEBE, - sum(dt.base) BASEEURO, + sum(dt.base) BASEEURO, CONCAT('DUA nº',d.code) CONCEPTO, d.id FACTURA, dt.rate IVA, - '*' AUXILIAR, + '*' AUXILIAR, 'D' SERIE, d.issued FECHA_EX, d.operated FECHA_OP, @@ -51205,10 +51615,10 @@ BEGIN WHERE ta.effectived <= vBookDated AND taxAreaFk = 'WORLD' ORDER BY ta.effectived DESC - LIMIT 10000000000000000000 + LIMIT 10000000000000000000 ) tba GROUP BY rate - ) tr ON tr.rate = dt.rate + ) tr ON tr.rate = dt.rate JOIN supplier s ON s.id = d.companyFk WHERE d.id = vDuaFk GROUP BY dt.rate; @@ -51216,16 +51626,16 @@ BEGIN SELECT SUM(EURODEBE) -SUM(EUROHABER), MAX(id) INTO vDiff, vApunte FROM XDiario WHERE ASIEN = vBookNumber; - + UPDATE XDiario SET BASEEURO = 100 * (EURODEBE - vDiff) / IVA, - EURODEBE = EURODEBE - vDiff + EURODEBE = EURODEBE - vDiff WHERE id = vApunte; - + UPDATE dua SET ASIEN = vBookNumber WHERE id = vDuaFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -51246,21 +51656,21 @@ 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 - * + * * @param vDuaFk Id del dua a recalcular **/ DELETE FROM duaTax WHERE duaFk = vDuaFk; - - INSERT INTO duaTax(duaFk, supplierFk, taxClassFk, base) + + INSERT INTO duaTax(duaFk, supplierFk, taxClassFk, base) SELECT vDuaFk, supplierFk, taxClassFk, sum(sub.Base) as Base FROM intrastat ist JOIN (SELECT - e.supplierFk, + e.supplierFk, i.intrastatFk, CAST(sum(b.quantity * b.buyingValue * de.customsValue / de.value) * di.amount/ tei.Base AS DECIMAL(10,2)) as Base - FROM buy b + FROM buy b JOIN item i ON i.id = b.itemFk JOIN entry e ON e.id = b.entryFk JOIN duaEntry de ON de.entryFk = e.id @@ -51268,15 +51678,15 @@ BEGIN ( SELECT i.intrastatFk, CAST(sum(b.quantity * b.buyingValue * de.customsValue / de.value) AS DECIMAL(10,2)) as Base - FROM buy b + FROM buy b JOIN item i ON i.id = b.itemFk JOIN entry e ON e.id = b.entryFk JOIN duaEntry de ON de.entryFk = e.id WHERE de.duaFk = vDuaFk GROUP BY i.intrastatFk - + ) tei ON tei.intrastatFk = i.intrastatFk - JOIN + JOIN ( SELECT intrastatFk, sum(amount) as amount FROM duaIntrastat @@ -51285,7 +51695,7 @@ BEGIN ) di ON di.intrastatFk = i.intrastatFk WHERE de.duaFk = vDuaFk GROUP BY e.supplierFk, i.intrastatFk - HAVING Base + HAVING Base ) sub ON ist.id = sub.intrastatFk GROUP BY ist.taxClassFk, sub.supplierFk; END ;; @@ -51305,15 +51715,15 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 ; +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 */ ; @@ -51352,71 +51762,71 @@ DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; OPEN cur1; read_loop: LOOP - + SET done = FALSE; SET vEntryFk = 0; - + FETCH cur1 INTO vId; - + IF done THEN LEAVE read_loop; END IF; - + SELECT IFNULL(e.id,0) INTO vEntryFk FROM vn.entry e JOIN vn.travel tr ON tr.id = e.travelFk - JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk AND ea.warehouseInFk = tr.warehouseInFk AND ea.agencyModeFk = tr.agencyModeFk AND ea.supplierFk = e.supplierFk WHERE ea.id = vId AND tr.landed = vLanded LIMIT 1; - + IF NOT vEntryFk THEN - + SELECT IFNULL(e.id,0) INTO vEntryFk FROM vn.entry e JOIN vn.travel tr ON tr.id = e.travelFk - JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk AND ea.warehouseInFk = tr.warehouseInFk AND ea.agencyModeFk = tr.agencyModeFk WHERE ea.id = vId AND tr.landed = vLanded AND ea.supplierFk IS NULL LIMIT 1; - + END IF; - + IF NOT vEntryFk THEN - + SET vTravelFk = 0; - - SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk + + SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk FROM vn.travel tr - JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk AND ea.warehouseInFk = tr.warehouseInFk AND ea.agencyModeFk = tr.agencyModeFk WHERE ea.id = vId AND tr.landed = vLanded; - + IF NOT vTravelFk THEN - + INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk) SELECT vLanded, vLanded, warehouseInFk, warehouseOutFk, agencyModeFk - FROM vn.ektEntryAssign + FROM vn.ektEntryAssign WHERE id = vId; - - SELECT MAX(tr.id) INTO vTravelFk + + SELECT MAX(tr.id) INTO vTravelFk FROM vn.travel tr - JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk AND ea.warehouseInFk = tr.warehouseInFk AND ea.agencyModeFk = tr.agencyFk WHERE ea.id = vId AND tr.landed = vLanded; - + END IF; - + INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk) SELECT vTravelFk, IFNULL(ea.supplierFk,s.id), c.id, cu.id FROM vn.supplier s @@ -51424,13 +51834,13 @@ OPEN cur1; JOIN vn.currency cu ON cu.code = 'EUR' JOIN vn.ektEntryAssign ea ON ea.id = vId WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN'; - - SELECT MAX(id) INTO vEntryFk + + SELECT MAX(id) INTO vEntryFk FROM vn.entry WHERE travelFk = vTravelFk; - + END IF; - + UPDATE vn.ektEntryAssign SET entryFk = vEntryFk WHERE id = vId; @@ -51438,7 +51848,7 @@ OPEN cur1; END LOOP; CLOSE cur1; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -51458,18 +51868,18 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `energyMeter_record`(vInput INT, vActiveTime INT) BEGIN DECLARE vConsumption INT; - + SELECT consumption INTO vConsumption FROM energyInput WHERE input = vInput; - INSERT INTO vn.energyMeter - SET - `input` = vInput, - `period` = DATE_FORMAT(util.VN_NOW(), '%Y-%m-%d %H:00:00'), + INSERT INTO vn.energyMeter + SET + `input` = vInput, + `period` = DATE_FORMAT(util.VN_NOW(), '%Y-%m-%d %H:00:00'), `activeTime` = vActiveTime, `consumption` = CAST(IFNULL((vConsumption / 3600) * vActiveTime, 0) AS DECIMAL(10,2)) - ON DUPLICATE KEY UPDATE + ON DUPLICATE KEY UPDATE `activeTime` = `activeTime` + vActiveTime, `consumption` = `consumption` + CAST(VALUES(`consumption`) AS DECIMAL(10,2)); END ;; @@ -51492,28 +51902,28 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `entryDelivered`(vDated DATE, vEntry BEGIN DECLARE vTravelFk INT; - + SELECT travelFk INTO vTravelFk - FROM vn.entry + FROM vn.entry WHERE id = vEntryFk; - + IF (SELECT COUNT(*) FROM vn.entry WHERE travelFk = vTravelFk) = 1 THEN - + UPDATE vn.travel SET shipped = LEAST(shipped, vDated), landed = vDated WHERE id = vTravelFk; - + ELSE - + INSERT INTO vn.travel(shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, ref, isDelivered, isReceived) SELECT LEAST(shipped, vDated), vDated, warehouseInFk, warehouseOutFk, agencyModeFk, CONCAT(account.myUser_getName(),' ', vEntryFk), TRUE, TRUE FROM vn.travel WHERE id = vTravelFk; - + SELECT LAST_INSERT_ID() INTO vTravelFk; - - UPDATE vn.entry - SET travelFk = vTravelFk + + UPDATE vn.entry + SET travelFk = vTravelFk WHERE id = vEntryFk; - + END IF; END ;; @@ -51542,7 +51952,7 @@ BEGIN WHERE b.entryFk = vEntryFk; CALL vn.ticket_recalcComponents(vTicketFk); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -51566,29 +51976,29 @@ BEGIN DECLARE vEntry INT; DECLARE vBucket VARCHAR(10); DECLARE vSupplierFk INT; - + SET vSupplierFk = IF (vLandingWarehouse = 1, 850, 963); -- seleccionamos travel SELECT t.id, e.id INTO vTravel, vEntry FROM travel t LEFT JOIN entry e ON t.id = e.travelFk - WHERE t.landed = vInOutDate AND t.shipped = vInOutDate AND t.warehouseOutFk = vShipmentWarehouse + WHERE t.landed = vInOutDate AND t.shipped = vInOutDate AND t.warehouseOutFk = vShipmentWarehouse AND t.warehouseInFk = vLandingWarehouse AND t.agencyModeFk IS NULL AND e.supplierFk = vSupplierFk - LIMIT 1; - + LIMIT 1; + -- creamos el travel si es necesario IF IFNULL(vTravel, FALSE) = FALSE THEN INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk) VALUES (vInOutDate, vInOutDate, vLandingWarehouse, vShipmentWarehouse); SELECT LAST_INSERT_ID() INTO vTravel; END IF; - + -- creamos la Entrada si es necesario IF IFNULL(vEntry, FALSE) = FALSE THEN INSERT INTO entry (supplierFk, travelFk) VALUES (vSupplierFk, vTravel); -- proveedor 'CONFECCION ARTIFICIAL' SELECT LAST_INSERT_ID() INTO vEntry; END IF; - + -- creamos el cubo si es necesario SELECT id INTO vBucket FROM packaging WHERE volume = vVolume LIMIT 1; IF vBucket IS NULL THEN @@ -51598,7 +52008,7 @@ BEGIN SELECT id INTO vBucket FROM packaging WHERE volume = vVolume LIMIT 1; END IF; - INSERT INTO buy(itemFk,quantity, entryFk, packageFk, packing, stickers, buyingValue, price2, price3) + INSERT INTO buy(itemFk,quantity, entryFk, packageFk, packing, stickers, buyingValue, price2, price3) SELECT itemFk, quantity, vEntry, @@ -51629,59 +52039,18 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_clone`(vSelf INT) BEGIN /** - * Clona una entrada. + * clones an entry. * - * @param vSelf Identificador de vn.entry + * @param vSelf The entry id */ DECLARE vNewEntryFk INT; - CALL vn.entry_cloneWithoutBuy(vSelf, vNewEntryFk); + START TRANSACTION; - INSERT INTO vn.buy( - entryFk, - itemFk, - quantity, - buyingValue, - freightValue, - isIgnored, - stickers, - packing, - `grouping`, - groupingMode, - containerFk, - comissionValue, - packageValue, - packageFk, - price1, - price2, - price3, - minPrice, - workerFk, - weight, - itemOriginalFk) - SELECT vNewEntryFk, - itemFk, - quantity, - buyingValue, - freightValue, - isIgnored, - stickers, - packing, - `grouping`, - groupingMode, - containerFk, - comissionValue, - packageValue, - packageFk, - price1, - price2, - price3, - minPrice, - workerFk, - weight, - itemOriginalFk - FROM vn.buy b - WHERE b.entryFk = vSelf; + CALL entry_cloneHeader(vSelf, vNewEntryFk, NULL); + CALL entry_copyBuys(vSelf, vNewEntryFk); + + COMMIT; SELECT vNewEntryFk; END ;; @@ -51692,6 +52061,61 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `entry_cloneHeader` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_cloneHeader`( + vSelf INT, + OUT vNewEntryFk INT, + vTravelFk INT +) +BEGIN +/** + * Clones an entry header. + * + * @param vSelf The entry id + * @param vTravelFk Travel for the new entry or %NULL to use the source entry travel + * @param vNewEntryFk The new entry id + */ + INSERT INTO entry( + travelFk, + supplierFk, + dated, + isExcludedFromAvailable, + notes, + isRaid, + commission, + currencyFk, + companyFk + ) + SELECT IFNULL(vTravelFk, travelFk), + supplierFk, + dated, + isExcludedFromAvailable, + notes, + isRaid, + commission, + currencyFk, + companyFk + FROM entry + WHERE id = vSelf; + + SET vNewEntryFk = LAST_INSERT_ID(); + + CALL logAdd(vNewEntryFk, 'insert', 'entry', CONCAT('clona entrada ', 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 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `entry_cloneWithoutBuy` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -51703,41 +52127,19 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_cloneWithoutBuy`(vSelf INT, OUT vNewEntryFk INT) BEGIN /** - * Clona una entrada sin compras + * Clona una entrada sin compras * - * @param vSelf Identificador de vn.entry - * @param vNewEntryFk Identificador de la nueva entrada + * @param vSelf Identificador de vn.entry + * @param vNewEntryFk Identificador de la nueva entrada */ START TRANSACTION; - INSERT INTO vn.entry( - supplierFk, - dated, - isExcludedFromAvailable, - notes, - isRaid, - commission, - travelFk, - currencyFk, - companyFk, - loadPriority, - `ref` - ) - SELECT supplierFk, - dated, - isExcludedFromAvailable, - notes, - isRaid, - commission, - travelFk, - currencyFk, - companyFk, - loadPriority, - `ref` - FROM vn.entry e - WHERE e.id = vSelf; + CALL entry_cloneHeader(vSelf, vNewEntryFk, NULL); - SET vNewEntryFk = LAST_INSERT_ID(); + UPDATE entry d JOIN entry s ON s.id = vSelf + SET d.`reference` = s.`reference`, + d.loadPriority = s.loadPriority + WHERE d.id = vNewEntryFk; COMMIT; END ;; @@ -51748,6 +52150,78 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `entry_copyBuys` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_copyBuys`(vSelf INT, vCopyTo INT) +BEGIN +/** + * Copies an entry buys to another buy. + * + * @param vSelf The entry id + * @param vCopyTo The destination entry id + */ + INSERT INTO buy( + entryFk, + itemFk, + quantity, + buyingValue, + freightValue, + isIgnored, + stickers, + packing, + `grouping`, + groupingMode, + containerFk, + comissionValue, + packageValue, + packageFk, + price1, + price2, + price3, + minPrice, + isChecked, + location, + weight, + itemOriginalFk + ) + SELECT vCopyTo, + itemFk, + quantity, + buyingValue, + freightValue, + isIgnored, + stickers, + packing, + `grouping`, + groupingMode, + containerFk, + comissionValue, + packageValue, + packageFk, + price1, + price2, + price3, + minPrice, + isChecked, + location, + weight, + itemOriginalFk + FROM buy + WHERE entryFk = 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 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `entry_fixMisfit` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -51789,7 +52263,8 @@ BEGIN price1, price2, price3, - minPrice) + minPrice, + weight) SELECT vSelf, itemFk, (printedStickers - stickers) * packing quantity, @@ -51808,7 +52283,8 @@ BEGIN price1, price2, price3, - minPrice + minPrice, + weight FROM vn.buy b WHERE b.entryFk = vSelf AND b.printedStickers != b.stickers; @@ -51835,7 +52311,7 @@ BEGIN -- Obtiene fecha de llegada y almacén entrante - SELECT landed, warehouseInFk INTO vLanded, vWarehouseFk + SELECT landed, warehouseInFk INTO vLanded, vWarehouseFk FROM vn.travel t JOIN vn.entry e ON t.id = e.travelFk WHERE e.id = vEntry; @@ -51848,13 +52324,13 @@ BEGIN SELECT * FROM ( SELECT * FROM - ( + ( SELECT rate0, rate1, rate2, rate3 FROM vn.rate WHERE dated <= vLanded AND warehouseFk = vWarehouseFk ORDER BY dated DESC - + ) sub UNION ALL SELECT rate0, rate1, rate2, rate3 @@ -51908,14 +52384,14 @@ BEGIN SET e.travelFk = vNewTravelFk, e.evaNotes = CONCAT('No impresas de: ', vSelf, ' ', IFNULL(e.evaNotes,'')) WHERE e.id = vNewEntryFk; - + IF vChangeEntry THEN UPDATE buy b SET b.entryFk = vNewEntryFk WHERE b.printedStickers = 0 AND b.entryFk = vSelf; END IF; - + INSERT INTO buy(entryFk, itemFk, quantity, @@ -51961,7 +52437,7 @@ BEGIN FROM buy b WHERE b.entryFk = vSelf AND b.printedStickers != b.stickers; - + IF vChangeEntry THEN UPDATE buy SET stickers = printedStickers, @@ -51973,7 +52449,7 @@ BEGIN FROM item i WHERE i.description = 'MISFIT' LIMIT 1; - + INSERT INTO buy(entryFk, itemFk, quantity, @@ -52023,7 +52499,7 @@ BEGIN UPDATE entry e JOIN buy b ON b.entryFk = e.id - SET e.ref = CONCAT(e.ref,'(1)'), + SET e.reference = CONCAT(e.reference,'(1)'), e.invoiceAmount = vInvoiceAmountOldEntryFk WHERE e.id = vSelf; @@ -52033,7 +52509,7 @@ BEGIN UPDATE entry e JOIN buy b ON b.entryFk = e.id - SET e.`ref` = CONCAT(e.`ref`,'(2)'), + SET e.reference = CONCAT(e.reference,'(2)'), e.invoiceAmount = vInvoiceAmountNewEntry WHERE e.id = vNewEntryFk; @@ -52048,11 +52524,11 @@ BEGIN description = CONCAT('Se ha creado la entrada ', vNewEntryFk,' transferida desde la ', vSelf), userFk = account.myUser_getId(), originFk = vNewEntryFk; - + UPDATE entry SET gestDocFk = (SELECT gestDocFk FROM entry WHERE id = vSelf LIMIT 1) WHERE id = vNewEntryFk; - + INSERT INTO duaEntry (duaFk, entryFk) SELECT duaFk, vNewEntryFk FROM duaEntry WHERE entryFk = vSelf LIMIT 1; END ;; @@ -52126,12 +52602,12 @@ BEGIN */ DECLARE v_done BOOL DEFAULT FALSE; DECLARE vEntryFk INTEGER; - + DECLARE vCur CURSOR FOR SELECT id FROM tmp.recalcEntryCommision; DECLARE CONTINUE HANDLER FOR NOT FOUND - SET v_done = TRUE; + SET v_done = TRUE; OPEN vCur; @@ -52142,7 +52618,7 @@ BEGIN IF v_done THEN LEAVE l; END IF; - + CALL vn2008.buy_tarifas_entry(vEntryFk); END LOOP; @@ -52167,7 +52643,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_splitByShelving`(vShelvingFk BEGIN /** * Divide las compras entre dos entradas de acuerdo con lo ubicado en una matr�cula - * + * * @param vShelvingFk Identificador de vn.shelving * @param vFromEntryFk Entrada origen * @param vToEntryFk Entrada destino @@ -52177,49 +52653,49 @@ BEGIN DECLARE buyStickers INT; DECLARE vDone BOOLEAN DEFAULT FALSE; - DECLARE cur CURSOR FOR + DECLARE cur CURSOR FOR SELECT bb.id buyFk, FLOOR(ish.visible / ish.packing) AS ishStickers, bb.stickers buyStickers FROM vn.itemShelving ish - JOIN (SELECT b.id, b.itemFk, b.stickers - FROM vn.buy b + JOIN (SELECT b.id, b.itemFk, b.stickers + FROM vn.buy b WHERE b.entryFk = vFromEntryFk ORDER BY b.stickers DESC - LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk + LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk AND bb.stickers >= FLOOR(ish.visible / ish.packing) WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci GROUP BY ish.id; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - - -- Cantidades de la matrícula que exceden la de las entradas - SELECT ish.itemFk, - i.longName, + + -- Cantidades de la matrícula que exceden la de las entradas + SELECT ish.itemFk, + i.longName, FLOOR(ish.visible / ish.packing) AS etiEnMatricula, bb.stickers etiEnEntrada FROM vn.itemShelving ish - JOIN vn.item i ON i.id = ish.itemFk - LEFT JOIN (SELECT b.id, b.itemFk, b.stickers - FROM vn.buy b + JOIN vn.item i ON i.id = ish.itemFk + LEFT JOIN (SELECT b.id, b.itemFk, b.stickers + FROM vn.buy b WHERE b.entryFk = vFromEntryFk ORDER BY b.stickers DESC LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci AND IFNULL(bb.stickers,0) < FLOOR(ish.visible / ish.packing) GROUP BY ish.id; - + OPEN cur; read_loop: LOOP SET vDone = FALSE; - + FETCH cur INTO vBuyFk, ishStickers, buyStickers; - + IF vDone THEN LEAVE read_loop; END IF; - + IF ishStickers = buyStickers THEN UPDATE vn.buy SET entryFk = vToEntryFk @@ -52227,9 +52703,9 @@ BEGIN ELSE UPDATE vn.buy SET stickers = stickers - ishStickers, - quantity = stickers * packing + quantity = stickers * packing WHERE id = vBuyFk; - + INSERT INTO vn.buy(entryFk, itemFk, quantity, @@ -52287,7 +52763,7 @@ BEGIN itemOriginalFk FROM vn.buy WHERE id = vBuyFk; - + END IF; END LOOP; @@ -52309,36 +52785,74 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `entry_updateComission` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_updateComission`(vCurrency 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 +/** + * Actualiza la comision de las entradas de hoy a futuro y las recalcula + * + * @param vCurrency id del tipo de moneda(SAR,EUR,USD,GBP,JPY) + */ + CREATE OR REPLACE TEMPORARY TABLE tmp.recalcEntryCommision + SELECT e.id FROM vn.entry e - WHERE e.id = vSelf; + JOIN vn.travel t ON t.id = e.travelFk + JOIN vn.warehouse w ON w.id = t.warehouseInFk + WHERE t.shipped >= util.VN_CURDATE() + AND e.currencyFk = vCurrency; - SET vNewEntryFk = LAST_INSERT_ID(); - - UPDATE vn.buy b - SET b.entryFk = vNewEntryFk - WHERE b.entryFk = vSelf - AND b.id > vBuyFk; - - SELECT vNewEntryFk; + UPDATE vn.entry e + JOIN tmp.recalcEntryCommision tmp ON tmp.id = e.id + SET e.commission = currency_getCommission(vCurrency); + CALL entry_recalc(); + DROP TEMPORARY TABLE tmp.recalcEntryCommision; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -52366,7 +52880,7 @@ BEGIN * @param vAction Accion que se quiere añadir * @param vDatedFrom Fecha desde * @param vDatedTo Fecha hasta - */ + */ DECLARE vDepartment VARCHAR(255); CASE @@ -52417,7 +52931,7 @@ BEGIN WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo AND cr.description = vDepartment GROUP BY cd.workerFk; - + CREATE OR REPLACE TEMPORARY TABLE volume ENGINE = MEMORY SELECT SUM(w.volume) volume, @@ -52428,15 +52942,15 @@ BEGIN CREATE OR REPLACE TEMPORARY TABLE errorsByChecker ENGINE = MEMORY - SELECT sub1.workerFk, COUNT(id) errors + 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 + 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 @@ -52448,13 +52962,13 @@ BEGIN SELECT COUNT(t.id) errors, e.workerFk FROM vn.expeditionMistake pm - JOIN vn.expedition e ON e.id = pm.expeditionFk + JOIN vn.expedition e ON e.id = pm.expeditionFk JOIN vn.ticket t ON t.id = e.ticketFk WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo GROUP BY e.workerFk; IF (vDepartment = 'Sacadores') THEN - + INSERT INTO errorProduction(userFk, firstname, lastname, @@ -52487,12 +53001,12 @@ BEGIN LEFT JOIN errorsByChecker ec2 ON ec2.workerFk = t.workerFk JOIN (SELECT DISTINCT w.id -- Verificamos que son sacadores FROM vn.collection c - JOIN vn.state s ON s.id = c.stateFk + JOIN vn.state s ON s.id = c.stateFk JOIN vn.train tn ON tn.id = c.trainFk - JOIN vn.worker w ON w.id = c.workerFk + JOIN vn.worker w ON w.id = c.workerFk WHERE c.created BETWEEN vDatedFrom AND vDatedTo) sub ON sub.id = w.id GROUP BY w.id; - + CREATE OR REPLACE TEMPORARY TABLE itemPickerErrors -- Errores de los sacadores, derivadores de los revisadores ENGINE = MEMORY SELECT COUNT(c.ticketFk) errors, @@ -52512,7 +53026,7 @@ BEGIN JOIN itemPickerErrors ipe ON ipe.workerFk = ep.userFk SET ep.error = ep.error + ipe.errors WHERE vDatedFrom = ep.dated AND ep.rol = 'Sacadores'; - + DROP TEMPORARY TABLE itemPickerErrors; ELSE INSERT INTO errorProduction(userFk, @@ -52548,7 +53062,7 @@ BEGIN LEFT JOIN expeditionErrors pe ON pe.workerFk = t.workerFk GROUP BY w.id; END IF; - + DROP TEMPORARY TABLE total, errorsByClaim, volume, @@ -52574,7 +53088,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_addLauncher`() BEGIN DECLARE vDatedFrom DATETIME; DECLARE vDatedTo DATETIME; - + SELECT DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo; CALL vn.errorProduction_add('SACAR', vDatedFrom, vDatedTo); @@ -52605,7 +53119,7 @@ BEGIN DECLARE vRouteFk INT DEFAULT 0; SELECT t.routeFk INTO vRouteFk - FROM vn.expedition exp + FROM vn.expedition exp INNER JOIN ticket t on t.id = exp.ticketFk WHERE exp.id = vExpeditionFk; @@ -52633,6 +53147,119 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `expeditionPallet_build` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionPallet_build`(IN vExpeditions JSON, IN vArcId INT, IN vWorkerFk INT, OUT vPalletFk INT) +BEGIN +/** Construye un pallet de expediciones. + * + * Primero comprueba si esas expediciones ya pertenecen a otro pallet, + * en cuyo caso actualiza ese pallet. + * + * @param vExpeditions JSON_ARRAY con esta estructura [exp1, exp2, exp3, ...] + * @param vArcId INT Identificador de vn.arcRead + * @param vWorkerFk INT Identificador de vn.worker + * @param out vPalletFk Identificador de vn.expeditionPallet + */ + DECLARE vCounter INT; + DECLARE vExpeditionFk INT; + DECLARE vTruckFk INT; + DECLARE vPrinterFk INT; + + DROP TEMPORARY TABLE IF EXISTS tExpedition; + CREATE TEMPORARY TABLE tExpedition + SELECT + e.id expeditionFk, + r.id routeFk, + ep.id palletFk + FROM + vn.expedition e, + vn.route r, + vn.expeditionPallet ep + LIMIT 0; + + ALTER TABLE tExpedition ADD PRIMARY KEY (expeditionFk); + + SET vCounter = JSON_LENGTH(vExpeditions); + + WHILE vCounter DO + SET vCounter = vCounter - 1; + + SET vExpeditionFk = JSON_EXTRACT(vExpeditions,CONCAT("$[", vCounter, "]")); + + INSERT IGNORE INTO tExpedition(expeditionFk, routeFk, palletFk) + SELECT vExpeditionFk, t.routeFk, es.palletFk + FROM vn.expedition e + LEFT JOIN vn.ticket t ON t.id = e.ticketFk + LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id + WHERE e.id = vExpeditionFk; + END WHILE; + + SELECT palletFk INTO vPalletFk + FROM ( + SELECT palletFk, count(*) n + FROM tExpedition + WHERE palletFk > 0 + GROUP BY palletFk + ORDER BY n DESC + LIMIT 100 ) sub + LIMIT 1; + + IF vPalletFk IS NULL THEN + SELECT expeditionTruckFk + INTO vTruckFk + FROM ( + SELECT rm.expeditionTruckFk, count(*) n + FROM vn.routesMonitor rm + JOIN tExpedition e ON e.routeFk = rm.routeFk + GROUP BY expeditionTruckFk + ORDER BY n DESC + LIMIT 1) sub; + + IF vTruckFk IS NOT NULL THEN + INSERT INTO vn.expeditionPallet(truckFk) + VALUES(vTruckFk); + + SET vPalletFk = LAST_INSERT_ID(); + END IF; + END IF; + + IF vPalletFk IS NOT NULL THEN + INSERT INTO vn.expeditionScan(expeditionFk, palletFk, workerFk) + SELECT expeditionFk, vPalletFk, vWorkerFk + FROM tExpedition + ON DUPLICATE KEY UPDATE palletFk = vPalletFk, workerFk = vWorkerFk; + + SELECT printerFk INTO vPrinterFk + FROM vn.arcRead + WHERE id = vArcId; + + CALL vn.report_print( + 'LabelPalletExpedition', + vPrinterFk, + account.myUser_getId(), + JSON_OBJECT('palletFk', vPalletFk, 'userFk', vWorkerFk), + 'high' + ); + + UPDATE vn.expeditionPallet SET isPrint = TRUE WHERE id = vPalletFk; + END IF; + + DROP TEMPORARY TABLE tExpedition; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `expeditionPallet_Del` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -52695,24 +53322,29 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionPallet_printLabel`(vSelf INT) BEGIN /** - * Calls the report_print procedure and passes it + * Calls the report_print procedure and passes it * the necessary parameters for printing. * * @param vSelf expeditioPallet id. */ DECLARE vPrinterFk INT; - - SELECT w.labelerFk INTO vPrinterFk FROM worker w WHERE w.id = account.myUser_getId(); + DECLARE vUserFk INT DEFAULT account.myUser_getId(); + + SELECT w.labelerFk INTO vPrinterFk + FROM worker w + WHERE w.id = vUserFk; CALL vn.report_print( 'LabelPalletExpedition', vPrinterFk, account.myUser_getId(), - JSON_OBJECT('palletFk',vSelf), + JSON_OBJECT('palletFk', vSelf, 'userFk', vUserFk), 'high' ); - UPDATE vn.expeditionPallet SET isPrint = TRUE WHERE id = vSelf; + UPDATE vn.expeditionPallet + SET isPrint = TRUE + WHERE id = vSelf; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -52764,22 +53396,22 @@ BEGIN DECLARE vTotal INT DEFAULT 0; IF vPalletFk = 0 THEN -- Nuevo pallet - - INSERT INTO vn.expeditionPallet(truckFk) + + INSERT INTO vn.expeditionPallet(truckFk) VALUES(vTruckFk); - + SELECT LAST_INSERT_ID() INTO vPalletFk; - + END IF; - + SELECT COUNT(expeditionFk) INTO vTotal FROM vn.expeditionScan WHERE palletFk = vPalletFk; - + IF vTotal <> 0 THEN - SELECT expeditionFk, + SELECT expeditionFk, palletFk - FROM vn.expeditionScan + FROM vn.expeditionScan WHERE palletFk = vPalletFk; - ELSE + ELSE SELECT 0 expeditionFk,vPalletFk palletFk; END IF; END ;; @@ -52852,12 +53484,12 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionScan_Put`(vPalletFk INT, vExpeditionFk INT) BEGIN - - REPLACE vn.expeditionScan(expeditionFk, palletFk) + + REPLACE vn.expeditionScan(expeditionFk, palletFk) VALUES(vExpeditionFk, vPalletFk); - + SELECT LAST_INSERT_ID() INTO vPalletFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -52875,33 +53507,33 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb3_general_ci */ ; 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; - +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 */ ; @@ -52919,23 +53551,23 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_general_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -52953,20 +53585,20 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb3_general_ci */ ; 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; - +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 */ ; @@ -52987,7 +53619,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_addByPallet`(vPalle BEGIN /** * Inserta nuevos registros en la tabla vn.expeditionState - * + * * @param vPalletFk Identificador de vn.expedition * @param vStateCode Corresponde a vn.expeditionStateType.code */ @@ -53004,7 +53636,7 @@ BEGIN IF NOT hasExpeditions THEN DROP TEMPORARY TABLE tExpeditionScan; - CALL util.throw('palletDoesNotExist'); + CALL util.throw('palletDoesNotExist'); END IF; INSERT INTO vn.expeditionState(expeditionFk, typeFk) @@ -53028,22 +53660,22 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb3_general_ci */ ; 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; - +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 */ ; @@ -53085,8 +53717,8 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionTruck_List`() BEGIN - SELECT id truckFk, - ETD, + SELECT id truckFk, + ETD, description Destino FROM vn.expeditionTruck WHERE ETD BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) @@ -53130,7 +53762,7 @@ BEGIN JOIN address a ON t.addressFk = a.id JOIN route r ON r.id = t.routeFk LEFT JOIN warehouse w ON t.warehouseFk = w.id - LEFT JOIN (SELECT sub.ticketFk, + 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 @@ -53161,7 +53793,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expedition_getState`(vExpeditionFk INT) BEGIN - + DECLARE vTicketsPendientes INT; DECLARE vEtiquetasTotales INT; DECLARE vEtiquetasEscaneadas INT; @@ -53171,24 +53803,24 @@ BEGIN FROM vn.ticket t JOIN vn.expedition e ON e.ticketFk = t.id WHERE e.id = vExpeditionFk; - + SELECT COUNT(*) INTO vTicketsPendientes FROM vn.ticket t LEFT JOIN vn.expedition e ON e.ticketFk = t.id WHERE t.routeFk = vRouteFk AND ISNULL(e.id); - + SELECT COUNT(*) INTO vEtiquetasTotales - FROM vn.expedition e + FROM vn.expedition e JOIN vn.ticket t ON t.id = e.ticketFk WHERE t.routeFk = vRouteFk; - + SELECT COUNT(*) INTO vEtiquetasEscaneadas - FROM vn.expeditionScan es + FROM vn.expeditionScan es JOIN vn.expedition e ON e.id = es.expeditionFk - JOIN vn.ticket t ON t.id = e.ticketFk + JOIN vn.ticket t ON t.id = e.ticketFk WHERE t.routeFk = vRouteFk; - + SELECT e.ticketFk ticket, t.nickname cliente, a.city ciudad, @@ -53202,17 +53834,17 @@ BEGIN vTicketsPendientes AS ticketsPendientes, vEtiquetasTotales AS etiquetasTotales, vEtiquetasEscaneadas AS etiquetasEscaneadas - FROM vn.expedition e - JOIN vn.ticket t ON t.id = e.ticketFk - JOIN vn.address a ON a.id = t.addressFk - JOIN vn.province p ON p.id = a.provinceFk - JOIN vn.`zone`z ON z.id = t.zoneFk - LEFT JOIN vn.route r ON r.id = t.routeFk - LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk - LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id - LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk + FROM vn.expedition e + JOIN vn.ticket t ON t.id = e.ticketFk + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.`zone`z ON z.id = t.zoneFk + LEFT JOIN vn.route r ON r.id = t.routeFk + LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk + LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id + LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk WHERE e.id = vExpeditionFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -53231,12 +53863,12 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expedition_StateGet`(vExpeditionFk INT) BEGIN - + /* Devuelve una "ficha" con todos los datos relativos a la expedición - * - * param vExpeditionFk + * + * param vExpeditionFk */ - + DECLARE vTicketsPendientes INT; DECLARE vEtiquetasTotales INT; DECLARE vEtiquetasEscaneadas INT; @@ -53247,34 +53879,34 @@ BEGIN FROM vn.ticket t JOIN vn.expedition e ON e.ticketFk = t.id WHERE e.id = vExpeditionFk; - + SELECT COUNT(*) INTO vTicketsPendientes FROM vn.ticket t LEFT JOIN vn.expedition e ON e.ticketFk = t.id WHERE t.routeFk = vRouteFk AND ISNULL(e.id); - + SELECT COUNT(*) INTO vEtiquetasTotales - FROM vn.expedition e + FROM vn.expedition e JOIN vn.ticket t ON t.id = e.ticketFk WHERE t.routeFk = vRouteFk; - + SELECT COUNT(*) INTO vEtiquetasEscaneadas - FROM vn.expeditionScan es + FROM vn.expeditionScan es JOIN vn.expedition e ON e.id = es.expeditionFk - JOIN vn.ticket t ON t.id = e.ticketFk + JOIN vn.ticket t ON t.id = e.ticketFk WHERE t.routeFk = vRouteFk; - + SELECT COUNT(*) INTO vEtiquetasLeidasSorter - FROM srt.expedition e + FROM srt.expedition e JOIN vn.expedition ve ON ve.id = e.id LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id - JOIN vn.ticket t ON t.id = ve.ticketFk + JOIN vn.ticket t ON t.id = ve.ticketFk WHERE t.routeFk = vRouteFk AND e.created != e.updated - AND ISNULL(es.expeditionFk); - - + AND ISNULL(es.expeditionFk); + + SELECT e.ticketFk ticket, t.nickname cliente, a.city ciudad, @@ -53289,17 +53921,17 @@ BEGIN vEtiquetasTotales AS etiquetasTotales, vEtiquetasEscaneadas AS etiquetasEscaneadas, vEtiquetasLeidasSorter AS etiquetasSorter - FROM vn.expedition e - JOIN vn.ticket t ON t.id = e.ticketFk - JOIN vn.address a ON a.id = t.addressFk - JOIN vn.province p ON p.id = a.provinceFk - JOIN vn.`zone`z ON z.id = t.zoneFk - LEFT JOIN vn.route r ON r.id = t.routeFk - LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk - LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id - LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk + FROM vn.expedition e + JOIN vn.ticket t ON t.id = e.ticketFk + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.`zone`z ON z.id = t.zoneFk + LEFT JOIN vn.route r ON r.id = t.routeFk + LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk + LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id + LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk WHERE e.id = vExpeditionFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -53320,14 +53952,14 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `faultsReview`(vWarehouseFk INT) BEGIN DECLARE vCalcVisibleFk INT; - + CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk); - + DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadar; - + CREATE TEMPORARY TABLE tmp.itemShelvingRadar (PRIMARY KEY (itemFk)) - ENGINE = MEMORY + ENGINE = MEMORY SELECT iss.itemFk, i.size, i.subName producer, @@ -53340,7 +53972,7 @@ BEGIN LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk WHERE iss.warehouseFk = vWarehouseFk GROUP BY iss.itemFk; - + SELECT ishr.*, sub.longName, CAST(visible - upstairs - downstairs AS DECIMAL(10,0)) AS nicho, CAST(sub.fault AS DECIMAL(10,0)) as faltas @@ -53355,7 +53987,7 @@ BEGIN AND t.warehouseFk = vWarehouseFk ) sub ON sub.itemFk = ishr.itemFk ; - + END ;; DELIMITER ; @@ -53429,81 +54061,81 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -53521,38 +54153,38 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -53578,8 +54210,8 @@ DECLARE vTicketFk INT; DECLARE vSaleFk INT; DECLARE vClonTicket INT DEFAULT 0; -DECLARE cur1 CURSOR FOR -SELECT s.ticketFk, s.id +DECLARE cur1 CURSOR FOR +SELECT s.ticketFk, s.id FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk JOIN vn.item i ON i.id = s.itemFk @@ -53595,17 +54227,17 @@ OPEN cur1; FETCH cur1 INTO vTicketFk, vSaleFk; WHILE done = 0 DO - + SELECT t.id INTO vClonTicket FROM vn.ticket t JOIN (SELECT addressFk, shipped FROM vn.ticket WHERE id = vTicketFk) sub USING(addressFk, shipped) WHERE t.warehouseFk = 44 LIMIT 1; - + SELECT vTicketFk, vClonTicket; - + IF vClonTicket = 0 THEN - + INSERT INTO ticket ( clientFk, shipped, @@ -53633,12 +54265,12 @@ FETCH cur1 INTO vTicketFk, vSaleFk; zonePrice, zoneBonus, routeFk - + FROM ticket WHERE id = vTicketFk; SET vClonTicket = LAST_INSERT_ID(); - + SELECT 'lstID', vClonTicket; /* INSERT INTO ticketObservation(ticketFk, observationTypeFk, description) @@ -53648,20 +54280,20 @@ FETCH cur1 INTO vTicketFk, vSaleFk; WHERE t.id = vClonTicket; */ INSERT INTO ticketLog - SET originFk = vTicketFk, userFk = account.myUser_getId(), `action` = 'insert', + SET originFk = vTicketFk, userFk = account.myUser_getId(), `action` = 'insert', description = CONCAT('Ha creado el ticket:', ' ', vClonTicket, ' clonando el ', vTicketFk); - + END IF; - + UPDATE vn.sale SET ticketFk = vClonTicket WHERE id = vSaleFk; SET vClonTicket = 0; - + SET done = 0; FETCH cur1 INTO vTicketFk, vSaleFk; - + END WHILE; CLOSE cur1; @@ -53686,8 +54318,8 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `getDayExpeditions`() BEGIN - SELECT - e.expeditions_id as expeditionFk, + SELECT + e.expeditions_id as expeditionFk, date_format(e.odbc_date,'%Y-%m-%d') as expeditionDate, e.ticket_id as ticketFk, t.routeFk as routeFk @@ -53736,12 +54368,12 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `getItemUbication`(vItemFk VARCHAR(22)) BEGIN - + /* * @deprecated Utilizar itemShelving_getInfo - * + * */ - + CALL itemshelving_getInfo(vItemFk); END ;; @@ -53790,7 +54422,7 @@ BEGIN SELECT DATE_SUB(util.VN_CURDATE(), INTERVAL yearsToDelete YEAR) INTO vDated FROM vn.greugeConfig; - + INSERT INTO vn.greuge(clientFk, description, amount, shipped, created, greugeTypeFk) SELECT clientFk, 'Suma agrupada', SUM(amount), MAX(shipped), MAX(created), greugeTypeFk FROM vn.greuge @@ -53823,8 +54455,8 @@ DECLARE done BOOL DEFAULT FALSE; DECLARE vTicketFk INT; DECLARE rs CURSOR FOR - SELECT id FROM vn.ticket - WHERE shipped = util.yesterday() + SELECT id FROM vn.ticket + WHERE shipped = util.yesterday() AND clientFk = 400 AND warehouseFk IN (1,44); @@ -53835,13 +54467,13 @@ OPEN rs; FETCH rs INTO vTicketFk; WHILE NOT done DO - + INSERT INTO vn.inventoryFailure(dated, itemFk, quantity, value, warehouseFk, throwerFk) - SELECT t.shipped, - s.itemFk, - s.quantity, + SELECT t.shipped, + s.itemFk, + s.quantity, b.buyingValue + b.freightValue + b.packageValue + b.comissionValue, - t.warehouseFk, + t.warehouseFk, w.id FROM vn.ticket t JOIN vn.sale s ON s.ticketFk = t.id @@ -53852,7 +54484,7 @@ WHILE NOT done DO AND s.quantity > 0; FETCH rs INTO vTicketFk; - + END WHILE; @@ -54010,7 +54642,7 @@ proc: BEGIN JOIN entry e ON e.id = b.entryFk JOIN travel tr ON tr.id = e.travelFk WHERE tr.warehouseInFk = vWh - AND tr.landed BETWEEN vDateLastInventory + AND tr.landed BETWEEN vDateLastInventory AND vDateYesterday AND NOT isRaid GROUP BY b.itemFk; @@ -54065,7 +54697,7 @@ proc: BEGIN inv.price3 = b.price3, inv.minPrice = b.minPrice, inv.producer = p.name; - + INSERT INTO buy( itemFk, quantity, buyingValue, @@ -54099,15 +54731,15 @@ proc: BEGIN FROM tmp.inventory; SELECT vWh, count(*), util.VN_NOW() FROM tmp.inventory; - + -- Actualizamos el campo lastUsed de vn.item UPDATE vn.item i JOIN tmp.inventory i2 ON i2.itemFk = i.id SET i.lastUsed = util.VN_NOW() WHERE i2.quantity; - + -- DROP TEMPORARY TABLE tmp.inventory; - + END LOOP; CLOSE cWarehouses; @@ -54121,11 +54753,11 @@ proc: BEGIN SELECT e.id as entryId, t.id as travelId FROM vn.travel t - JOIN vn.entry e ON e.travelFk = t.id + JOIN vn.entry e ON e.travelFk = t.id WHERE e.supplierFk = 4 AND t.shipped <= TIMESTAMPADD(DAY, -2, TIMESTAMPADD(DAY, -10, util.VN_CURDATE())) AND (DAY(t.shipped) <> 1 OR shipped < TIMESTAMPADD(MONTH, -12, util.VN_CURDATE())); - + DELETE e FROM vn.entry e JOIN tmp.entryToDelete tmp ON tmp.entryId = e.id; @@ -54187,7 +54819,7 @@ BEGIN b.id AS buyFk, b.entryFk, b.isIgnored, - b.price2, + b.price2, b.price3, b.stickers, b.packing, @@ -54201,20 +54833,20 @@ BEGIN s.id AS supplierFk, s.name AS supplier FROM itemType it - RIGHT JOIN (entry e + RIGHT JOIN (entry e LEFT JOIN supplier s ON s.id = e.supplierFk RIGHT JOIN buy b ON b.entryFk = e.id LEFT JOIN item i ON i.id = b.itemFk - LEFT JOIN ink ON ink.id = i.inkFk + LEFT JOIN ink ON ink.id = i.inkFk LEFT JOIN travel tr ON tr.id = e.travelFk LEFT JOIN warehouse w ON w.id = tr.warehouseInFk LEFT JOIN origin o ON o.id = i.originFk ) ON it.id = i.typeFk LEFT JOIN edi.ekt ek ON b.ektFk = ek.id WHERE (b.packageFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO'; - + DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOk; - CREATE TEMPORARY TABLE tmp.lastEntryOk + CREATE TEMPORARY TABLE tmp.lastEntryOk (PRIMARY KEY (buyFk)) SELECT i.id AS itemFk, @@ -54224,7 +54856,7 @@ BEGIN b.id AS buyFk, b.entryFk, b.isIgnored, - b.price2, + b.price2, b.price3, b.stickers, b.packing, @@ -54238,11 +54870,11 @@ BEGIN s.id AS supplierFk, s.name AS supplier FROM itemType it - RIGHT JOIN (entry e + RIGHT JOIN (entry e LEFT JOIN supplier s ON s.id = e.supplierFk RIGHT JOIN buy b ON b.entryFk = e.id LEFT JOIN item i ON i.id = b.itemFk - LEFT JOIN ink ON ink.id = i.inkFk + LEFT JOIN ink ON ink.id = i.inkFk LEFT JOIN travel tr ON tr.id = e.travelFk LEFT JOIN warehouse w ON w.id = tr.warehouseInFk LEFT JOIN origin o ON o.id = i.originFk @@ -54250,34 +54882,34 @@ BEGIN LEFT JOIN edi.ekt ek ON b.ektFk = ek.id WHERE b.packageFk != "--" AND b.price2 != 0 AND b.packing != 0 AND b.buyingValue > 0 AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-2,util.VN_CURDATE())) ORDER BY tr.landed DESC; - + DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOkGroup; - CREATE TEMPORARY TABLE tmp.lastEntryOkGroup + CREATE TEMPORARY TABLE tmp.lastEntryOkGroup (INDEX (warehouseFk,itemFk)) SELECT * FROM tmp.lastEntryOk tmp GROUP BY tmp.itemFk,tmp.warehouseFk; - + UPDATE buy b JOIN tmp.lastEntry lt ON lt.buyFk = b.id JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk SET b.packageFk = eo.packageFk WHERE b.packageFk = "--"; - + UPDATE buy b JOIN tmp.lastEntry lt ON lt.buyFk = b.id JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk SET b.price2 = eo.price2 WHERE b.price2 = 0 ; - + UPDATE buy b JOIN tmp.lastEntry lt ON lt.buyFk = b.id JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk SET b.packing = eo.packing WHERE b.packing = 0; - + UPDATE buy b JOIN tmp.lastEntry lt ON lt.buyFk = b.id JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk SET b.buyingValue = eo.buyingValue WHERE b.buyingValue = 0; - + DROP TEMPORARY TABLE tmp.lastEntry; DROP TEMPORARY TABLE tmp.lastEntryOk; DROP TEMPORARY TABLE tmp.lastEntryOkGroup; @@ -54315,7 +54947,7 @@ BEGIN JOIN item i ON i.id = s.itemFk GROUP BY i.expenceFk HAVING amount != 0; - + INSERT INTO invoiceOutExpence(invoiceOutFk, expenceFk, amount) SELECT vInvoice, tst.expenceFk, @@ -54323,7 +54955,7 @@ BEGIN FROM ticketToInvoice t JOIN ticketService ts ON ts.ticketFk = t.id JOIN ticketServiceType tst ON tst.id = ts.ticketServiceTypeFk - HAVING amount != 0; + HAVING amount != 0; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54341,19 +54973,19 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromAddress`(vMaxTicketDate DATETIME,vAddress INT,vCompany INT) -BEGIN +BEGIN DECLARE vMinDateTicket DATE DEFAULT TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()); - + SET vMaxTicketDate = vn2008.DAYEND(vMaxTicketDate); - + DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`; - + CREATE TEMPORARY TABLE `ticketToInvoice` (PRIMARY KEY (`id`)) ENGINE = MEMORY SELECT Id_Ticket id FROM vn2008.Tickets WHERE (Fecha BETWEEN vMinDateTicket - AND vMaxTicketDate) AND Id_Consigna = vAddress + AND vMaxTicketDate) AND Id_Consigna = vAddress AND Factura IS NULL AND empresa_id = vCompany; END ;; @@ -54373,12 +55005,12 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromClient`( - IN vMaxTicketDate datetime, - IN vClientFk INT, + IN vMaxTicketDate datetime, + IN vClientFk INT, IN vCompanyFk INT) BEGIN DECLARE vMinTicketDate DATE; - + SET vMinTicketDate = util.firstDayOfYear(vMaxTicketDate - INTERVAL 1 YEAR); SET vMaxTicketDate = util.dayend(vMaxTicketDate); @@ -54408,10 +55040,10 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromTicket`(IN vTicket INT) -BEGIN +BEGIN DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`; - + CREATE TEMPORARY TABLE `ticketToInvoice` (PRIMARY KEY (`id`)) ENGINE = MEMORY @@ -54440,10 +55072,10 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS newInvoiceIn; CREATE TEMPORARY TABLE newInvoiceIn - SELECT + SELECT i.*, YEAR(i.booked) datedYear, - CONCAT('s/fra',RIGHT(i.supplierRef,8),':',LEFT(s.name, 10)) conceptWithSupplier, + CONCAT('s/fra',RIGHT(i.supplierRef,8),':',LEFT(s.name, 10)) conceptWithSupplier, (cc.id = c.id) isSameCountry, cit.id invoicesCount FROM invoiceIn i @@ -54456,7 +55088,7 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS newSupplier; CREATE TEMPORARY TABLE newSupplier - SELECT + SELECT s.*, REPLACE(s.account,' ','') supplierAccount, IF(c.CEE < 2, TRUE, FALSE) isUeeMember @@ -54469,11 +55101,11 @@ BEGIN CALL util.throw('INACTIVE_PROVIDER'); END IF; - SELECT IFNULL(MAX(i.serialNumber) + 1,1) + SELECT IFNULL(MAX(i.serialNumber) + 1,1) INTO vSerialNumber FROM invoiceIn i JOIN newInvoiceIn n - WHERE i.serial LIKE n.serial + WHERE i.serial LIKE n.serial AND YEAR(i.booked) = n.datedYear AND i.companyFk = n.companyFk GROUP BY i.companyFk; @@ -54502,7 +55134,7 @@ BEGIN CALL invoiceInBookingCommon(vInvoiceInId,vSerialNumber); - SELECT SUM(iit.taxableBase * IF( i.serial= 'R' AND ti.Iva <> 'HP DEVENGADO 21 ISP', 1 +(ti.PorcentajeIva/100),1)), + SELECT SUM(iit.taxableBase * IF( i.serial= 'R' AND ti.Iva <> 'HP DEVENGADO 21 ISP', 1 +(ti.PorcentajeIva/100),1)), SUM(iit.foreignValue * IF( i.serial= 'R', 1 + (ti.PorcentajeIva/100),1)), iit.taxableBase/iit.foreignValue INTO vTotalAmount, vTotalAmountDivisa, vRate @@ -54525,7 +55157,7 @@ BEGIN CLAVE, empresa_id ) - SELECT + SELECT vBookNumber, n.bookEntried, s.supplierAccount, @@ -54536,7 +55168,7 @@ BEGIN n.invoicesCount, vInvoiceInId, n.companyFk - FROM newInvoiceIn n + FROM newInvoiceIn n JOIN newSupplier s; -- Línea de Gastos @@ -54546,7 +55178,7 @@ BEGIN CONTRA, EURODEBE, EUROHABER, - CONCEPTO, + CONCEPTO, CAMBIO, DEBEME, HABERME, @@ -54566,7 +55198,7 @@ BEGIN n.invoicesCount NFACTICK, n.companyFk empresa_id FROM newInvoiceIn n - JOIN newSupplier s + JOIN newSupplier s JOIN invoiceInTax iit ON iit.invoiceInFk = n.id JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = iit.expenceFk WHERE e.name != 'Suplidos Transitarios nacionales' @@ -54577,13 +55209,13 @@ BEGIN INSERT INTO XDiario( ASIEN, FECHA, SUBCTA, - CONTRA, + CONTRA, EURODEBE, BASEEURO, - CONCEPTO, - FACTURA, + CONCEPTO, + FACTURA, IVA, - AUXILIAR, + AUXILIAR, SERIE, TIPOOPE, FECHA_EX, @@ -54632,34 +55264,34 @@ BEGIN n.booked FECREGCON, n.companyFk FROM newInvoiceIn n - JOIN newSupplier s + JOIN newSupplier s JOIN invoiceInTax it ON n.id = it.invoiceInFk JOIN sage.TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk 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 + 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 + ) 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 XDiario( ASIEN, FECHA, SUBCTA, - CONTRA, + CONTRA, EUROHABER, BASEEURO, - CONCEPTO, - FACTURA, + CONCEPTO, + FACTURA, IVA, - AUXILIAR, + AUXILIAR, SERIE, TIPOOPE, FECHA_EX, @@ -54705,37 +55337,37 @@ BEGIN s.nif AS TERNIF, s.name AS TERNOM, n.companyFk - FROM newInvoiceIn n - JOIN newSupplier s + FROM newInvoiceIn n + JOIN newSupplier s JOIN invoiceInTax it ON n.id = it.invoiceInFk JOIN sage.TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = it.transactionTypeSageFk - JOIN invoiceInSerial iis ON iis.code = n.serial + JOIN invoiceInSerial iis ON iis.code = n.serial JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = it.expenceFk WHERE ti.Iva = 'HP DEVENGADO 21 ISP' OR MID(s.account, 4, 1) = '1' GROUP BY ti.PorcentajeIva, e.id; - - -- Actualización del registro original + + -- Actualización del registro original UPDATE invoiceIn ii JOIN newInvoiceIn ni ON ii.id = ni.id SET ii.serialNumber = vSerialNumber, ii.isBooked = TRUE; - + -- Problemas derivados de la precisión en los decimales al calcular los impuestos - UPDATE XDiario - SET EURODEBE = EURODEBE - + 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 + SELECT SUM(IFNULL(ROUND(EURODEBE, 2),0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) difference FROM XDiario WHERE ASIEN = vBookNumber )sub ) - WHERE ASIEN = vBookNumber + WHERE ASIEN = vBookNumber AND EURODEBE <> 0 ORDER BY id DESC LIMIT 1; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54753,46 +55385,46 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_general_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -54814,9 +55446,9 @@ BEGIN DELETE FROM invoiceInDueDay WHERE invoiceInFk = vInvoiceInFk; - + CALL invoiceInDueDay_calculate(vInvoiceInFk); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54855,7 +55487,7 @@ BEGIN CALL vn2008.recibidaIvaInsert(vInvoiceInFk); CALL vn2008.recibidaVencimientoReplace(vInvoiceInFk); - + FETCH rs INTO vInvoiceInFk; END WHILE; @@ -54900,7 +55532,7 @@ BEGIN CALL invoiceInTax_getFromEntries(vInvoiceInFk); CALL invoiceInDueDay_calculate(vInvoiceInFk); - + FETCH rs INTO vInvoiceInFk; END WHILE; @@ -54932,7 +55564,7 @@ BEGIN SELECT MAX(rr.dated) INTO vDated FROM referenceRate rr JOIN invoiceIn ii ON ii.id = vId - WHERE rr.dated <= ii.issued + WHERE rr.dated <= ii.issued AND rr.currencyFk = ii.currencyFk ; IF vDated THEN @@ -54941,13 +55573,13 @@ BEGIN WHERE dated = vDated; END IF; - SELECT id INTO vExpenceFk - FROM vn.expence - WHERE `name` = 'Adquisición mercancia Extracomunitaria' - GROUP BY id + SELECT id INTO vExpenceFk + FROM vn.expence + WHERE `name` = 'Adquisición mercancia Extracomunitaria' + GROUP BY id LIMIT 1; - - DELETE FROM invoiceInTax + + DELETE FROM invoiceInTax WHERE invoiceInFk = vId; INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, foreignValue, taxTypeSageFk, transactionTypeSageFk) @@ -54961,9 +55593,9 @@ BEGIN JOIN entry e ON e.invoiceInFk = ii.id JOIN supplier s ON s.id = e.supplierFk JOIN buy b ON b.entryFk = e.id - LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk + LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk AND rr.dated = ii.issued - WHERE ii.id = vId + WHERE ii.id = vId HAVING taxableBase IS NOT NULL; END ;; DELIMITER ; @@ -54994,15 +55626,15 @@ BEGIN DECLARE vCountry INT; DECLARE vTaxArea VARCHAR(15); DECLARE vSpainCountryCode INT DEFAULT 1; - + SELECT id INTO vInvoiceFk - FROM invoiceOut + FROM invoiceOut WHERE ref = vInvoiceRef; - - UPDATE invoiceOut + + UPDATE invoiceOut SET hasPdf = 0 WHERE id = vInvoiceFk; - + SELECT s.countryFk INTO vCountry FROM supplier s JOIN invoiceOut io ON io.companyFk = s.id @@ -55011,30 +55643,30 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS ticketToInvoice; CREATE TEMPORARY TABLE ticketToInvoice - SELECT id - FROM ticket + SELECT id + FROM ticket WHERE refFk = vInvoiceRef; CALL invoiceExpenceMake(vInvoiceFk); - + CALL invoiceTaxMake(vInvoiceFk,vTaxArea); - + UPDATE invoiceOut io JOIN ( SELECT SUM(amount) AS total - FROM invoiceOutExpence + FROM invoiceOutExpence WHERE invoiceOutFk = vInvoiceFk ) base JOIN ( SELECT SUM(vat) AS total - FROM invoiceOutTax + FROM invoiceOutTax WHERE invoiceOutFk = vInvoiceFk ) vat SET io.amount = base.total + vat.total WHERE io.id = vInvoiceFk; - + CALL vn.invoiceOutBooking(vInvoiceFk); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -55079,7 +55711,7 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS rs; CREATE TEMPORARY TABLE rs - SELECT + SELECT c.accountingAccount AS clientBookingAccount, io.amount as totalAmount, CONCAT('n/fra ', io.ref) as simpleConcept, @@ -55113,19 +55745,19 @@ BEGIN WHERE io.id = vInvoice; CALL vn.ledger_next(vBookNumber); - + -- Linea del cliente INSERT INTO XDiario( ASIEN, FECHA, - SUBCTA, + SUBCTA, EURODEBE, - CONCEPTO, + CONCEPTO, FECHA_EX, FECHA_OP, empresa_id ) - SELECT + SELECT vBookNumber AS ASIEN, rs.FECHA, rs.clientBookingAccount AS SUBCTA, @@ -55141,14 +55773,14 @@ BEGIN ASIEN, FECHA, SUBCTA, - CONTRA, + CONTRA, EUROHABER, - CONCEPTO, + CONCEPTO, FECHA_EX, FECHA_OP, empresa_id ) - SELECT + SELECT vBookNumber AS ASIEN, rs.FECHA, ioe.expenceFk AS SUBCTA, @@ -55162,8 +55794,8 @@ BEGIN JOIN invoiceOutExpence ioe WHERE ioe.invoiceOutFk = vInvoice; - SELECT GROUP_CONCAT(`name` SEPARATOR ',') - INTO vExpenceConcept + SELECT GROUP_CONCAT(`name` SEPARATOR ',') + INTO vExpenceConcept FROM expence e JOIN invoiceOutExpence ioe ON ioe.expenceFk = e.id WHERE ioe.invoiceOutFk = vInvoice; @@ -55173,7 +55805,7 @@ BEGIN ASIEN, FECHA, SUBCTA, - CONTRA, + CONTRA, EUROHABER, BASEEURO, CONCEPTO, @@ -55201,7 +55833,7 @@ BEGIN TIPORECTIF, empresa_id ) - SELECT + SELECT vBookNumber AS ASIEN, rs.FECHA, iot.pgcFk AS SUBCTA, @@ -55221,11 +55853,11 @@ BEGIN rs.FECHA_OP, rs.FECHA_EX, rs.TIPOOPE, - rs.NFACTICK, + rs.NFACTICK, rs.TERIDNIF, rs.TERNIF, rs.TERNOM, - pgc.mod340 AS L340, + pgc.mod340 AS L340, pgc.cplusTrascendency477Fk AS TIPOCLAVE, pgc.cplusTaxBreakFk as TIPOEXENCI, rs.TIPONOSUJE, @@ -55233,13 +55865,13 @@ BEGIN rs.TIPORECTIF, rs.companyFk AS empresa_id FROM rs - JOIN invoiceOutTax iot + JOIN invoiceOutTax iot JOIN pgc ON pgc.code = iot.pgcFk LEFT JOIN pgcEqu pe ON pe.vatFk = iot.pgcFk -- --------------- Comprueba si la linea es de iva con rec.equiv. asociado - LEFT JOIN pgc pgce ON pgce.code = pe.equFk + LEFT JOIN pgc pgce ON pgce.code = pe.equFk LEFT JOIN pgcEqu pe2 ON pe2.equFk = iot.pgcFk -- --------------- Comprueba si la linea es de rec.equiv. WHERE iot.invoiceOutFk = vInvoice; - + UPDATE invoiceOut SET booked = util.VN_CURDATE() WHERE id = vInvoice; @@ -55271,7 +55903,7 @@ BEGIN DECLARE done BOOL DEFAULT FALSE; - DECLARE rs CURSOR FOR + DECLARE rs CURSOR FOR SELECT io.id FROM invoiceOut io WHERE RIGHT(ref,7) BETWEEN 1724215 AND 1724224 @@ -55286,15 +55918,15 @@ BEGIN WHILE NOT done DO CALL invoiceOutBooking(vInvoice); - + FETCH rs INTO vInvoice ; - + SET vContador = vContador + 1; - + IF vContador MOD 50 = 0 THEN - + SELECT CONCAT(vContador, ' de momento') AS FACTURAS_ASENTADAS; - + END IF; END WHILE; @@ -55324,14 +55956,14 @@ BEGIN DECLARE vAsien INTEGER; DECLARE vSendMail BOOL; DECLARE vBody TEXT; - + SELECT ASIEN INTO vAsien - FROM XDiario + FROM XDiario WHERE SERIE = SUBSTRING(vRef, 1, 1) AND FACTURA = SUBSTRING(vRef, 2, LENGTH(vRef)-1) LIMIT 1; - SELECT IF(enlazado OR enlazadoSage, TRUE, FALSE), + SELECT IF(enlazado OR enlazadoSage, TRUE, FALSE), CONCAT( ' @@ -55340,7 +55972,7 @@ BEGIN - ', + ', GROUP_CONCAT( CONCAT(' @@ -55353,14 +55985,14 @@ BEGIN ) SEPARATOR ' ' ), '
FECHACONCEPTO EURODEBE EUROHABER
', IFNULL(FECHA,''), '
' - ) + ) INTO vSendMail, vBody - FROM XDiario + FROM XDiario WHERE ASIEN = vAsien; - DELETE FROM XDiario + DELETE FROM XDiario WHERE ASIEN = vAsien; - + IF vSendMail THEN CALL mail_insert( 'administracion@verdnatura.es', @@ -55378,7 +56010,7 @@ BEGIN SET refFk = NULL WHERE refFk = vRef; - DELETE + DELETE FROM invoiceOut WHERE ref = vRef; @@ -55401,7 +56033,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutListByCompany`(vCompany INT, vStarted DATE, vEnded DATE) BEGIN -SELECT +SELECT c.socialName as RazonSocial, c.fi as NIF, io.ref as Factura, @@ -55413,7 +56045,7 @@ SELECT pgc.rate as Tipo, iot.vat as Cuota, pgc.name as Concepto - + FROM vn.invoiceOut io JOIN vn.invoiceOutTax iot ON iot.invoiceOutFk = io.id JOIN vn.client c ON c.id = io.clientFk @@ -55454,10 +56086,10 @@ BEGIN DECLARE done BOOL DEFAULT FALSE; - DECLARE rs CURSOR FOR + DECLARE rs CURSOR FOR SELECT id,ref FROM invoiceOut io - + WHERE issued >= '2017-07-01' AND companyFk = 1381 AND io.amount IS NULL @@ -55472,37 +56104,37 @@ BEGIN WHILE NOT done DO - SELECT s.countryFk + SELECT s.countryFk INTO vCountry FROM supplier s JOIN invoiceOut io ON io.companyFk = s.id WHERE io.id = vInvoice; - + SELECT IF(c.isEqualizated AND i.taxAreaFk = 'NATIONAL','EQU',i.taxAreaFk) INTO vTaxArea FROM invoiceOutSerial i - JOIN invoiceOut io ON io.serial = i.code + JOIN invoiceOut io ON io.serial = i.code JOIN client c ON c.id = io.clientFk WHERE io.id = vInvoice; - + DROP TEMPORARY TABLE IF EXISTS ticketToInvoice; CREATE TEMPORARY TABLE ticketToInvoice - SELECT id - FROM ticket + SELECT id + FROM ticket WHERE refFk = vInvoiceRef; CALL invoiceExpenceMake(vInvoice); CALL invoiceTaxMake(vInvoice,vCountry,vTaxArea); - + FETCH rs INTO vInvoice ,vInvoiceRef; - + SET vContador = vContador + 1; - + IF vContador MOD 50 = 0 THEN - + SELECT CONCAT(vContador, ' de momento') AS FACTURAS_ASENTADAS; - + END IF; END WHILE; @@ -55528,34 +56160,34 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_exportationFromClient`( - vMaxTicketDate DATETIME, - vClientFk INT, - vCompanyFk INT) + vMaxTicketDate DATETIME, + vClientFk INT, + vCompanyFk INT) BEGIN /** * Genera tabla temporal ticketToInvoice necesaría para el proceso de facturación - * Los abonos quedan excluidos en las exportaciones - * - * @param vMaxTicketDate Fecha hasta la cual cogera tickets para facturar + * Los abonos quedan excluidos en las exportaciones + * + * @param vMaxTicketDate Fecha hasta la cual cogerá tickets para facturar * @param vClientFk Id del cliente a facturar * @param vCompanyFk Id de la empresa desde la que se factura */ - DECLARE vMinTicketDate DATE; - SET vMinTicketDate = util.firstDayOfYear(vMaxTicketDate - INTERVAL 1 YEAR); - SET vMaxTicketDate = util.dayend(vMaxTicketDate); + DECLARE vMinTicketDate DATE; + SET vMinTicketDate = util.firstDayOfYear(vMaxTicketDate - INTERVAL 1 YEAR); + SET vMaxTicketDate = util.dayend(vMaxTicketDate); - DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`; - CREATE TEMPORARY TABLE `ticketToInvoice` - (PRIMARY KEY (`id`)) - ENGINE = MEMORY - SELECT t.id - FROM ticket t - JOIN agencyMode am ON am.id = t.agencyModeFk - WHERE t.clientFk = vClientFk - AND t.refFk IS NULL - AND t.companyFk = vCompanyFk - AND (t.shipped BETWEEN vMinTicketDate AND vMaxTicketDate) - AND am.`code` <> 'refund'; + DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`; + CREATE TEMPORARY TABLE `ticketToInvoice` + (PRIMARY KEY (`id`)) + ENGINE = MEMORY + SELECT t.id + FROM ticket t + JOIN agencyMode am ON am.id = t.agencyModeFk + WHERE t.clientFk = vClientFk + AND t.refFk IS NULL + AND t.companyFk = vCompanyFk + AND t.shipped BETWEEN vMinTicketDate AND vMaxTicketDate + AND (am.`code` IS NULL OR am.`code` <> 'refund'); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -55587,27 +56219,27 @@ BEGIN * @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 vCompanyFk INT; + DECLARE vInterCompanyFk INT; + DECLARE vClientFk 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; + DECLARE vNewInvoiceInFk INT; + DECLARE vIsInterCompany BOOL DEFAULT FALSE; + DECLARE vIsCEESerial BOOL DEFAULT FALSE; SET vInvoiceDate = IFNULL(vInvoiceDate,util.VN_CURDATE()); SELECT t.clientFk, t.companyFk - INTO vClient, vCompany + INTO vClientFk, vCompanyFk FROM ticketToInvoice tt JOIN ticket t ON t.id = tt.id LIMIT 1; @@ -55638,8 +56270,7 @@ BEGIN THEN -- el trigger añade el siguiente Id_Factura correspondiente a la vSerial - INSERT INTO invoiceOut - ( + INSERT INTO invoiceOut( ref, serial, issued, @@ -55648,21 +56279,20 @@ BEGIN 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; - + SELECT + 1, + vSerial, + vInvoiceDate, + vClientFk, + getDueDate(vInvoiceDate, dueDay), + vCompanyFk, + IF(vSerial = vCorrectingSerial, + vCplusCorrectingInvoiceTypeFk, + IF(vSerial = vSimplifiedSerial, + vCplusSimplifiedInvoiceTypeFk, + vCplusStandardInvoiceTypeFk)) + FROM client + WHERE id = vClientFk; SET vNewInvoiceId = LAST_INSERT_ID(); @@ -55695,12 +56325,12 @@ BEGIN UPDATE invoiceOut io JOIN ( - SELECT SUM(amount) AS total + SELECT SUM(amount) total FROM invoiceOutExpence WHERE invoiceOutFk = vNewInvoiceId ) base JOIN ( - SELECT SUM(vat) AS total + SELECT SUM(vat) total FROM invoiceOutTax WHERE invoiceOutFk = vNewInvoiceId ) vat @@ -55708,23 +56338,18 @@ BEGIN 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; - + + SELECT COUNT(*), id + INTO vIsInterCompany, vInterCompanyFk + FROM company + WHERE clientFk = vClientFk; + 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; + SELECT vCompanyFk, vNewRef, vInvoiceDate, vInterCompanyFk; - SET vNewInvoiceInId = LAST_INSERT_ID(); + SET vNewInvoiceInFk = LAST_INSERT_ID(); DROP TEMPORARY TABLE IF EXISTS tmp.ticket; CREATE TEMPORARY TABLE tmp.ticket @@ -55738,59 +56363,77 @@ BEGIN 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 + INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk) + SELECT vNewInvoiceInFk, + @vTaxableBaseServices, + sub.expenceFk, + sub.taxTypeSageFk, + sub.transactionTypeSageFk FROM ( - SELECT @vTaxableBaseServices := SUM(tst.taxableBase) taxableBase, i.expenceFk, i.taxTypeSageFk , i.transactionTypeSageFk, @vTaxCodeGeneral := i.taxClassCodeFk + 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 + JOIN 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 + INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk) + SELECT vNewInvoiceInFk, + 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 + JOIN invoiceOutTaxConfig i ON i.taxClassCodeFk = tt.code WHERE !i.isService GROUP BY tt.pgcFk HAVING taxableBase ORDER BY tt.priority; - CALL invoiceInDueDay_calculate(vNewInvoiceInId); + CALL invoiceInDueDay_calculate(vNewInvoiceInFk); + + SELECT COUNT(*) INTO vIsCEESerial + FROM invoiceOutSerial + WHERE code = vSerial; - INSERT INTO invoiceInIntrastat ( - invoiceInFk, - intrastatFk, - amount, - stems, - countryFk, - net) - SELECT - vNewInvoiceInId, + IF vIsCEESerial THEN + + INSERT INTO invoiceInIntrastat ( + invoiceInFk, + intrastatFk, + amount, + stems, + countryFk, + net) + SELECT + vNewInvoiceInFk, i.intrastatFk, - CAST(sv.eurosValue AS DECIMAL (10, 2)), - CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL (10, 2)), + SUM(CAST((s.quantity * s.price * (100 - s.discount) / 100 ) AS DECIMAL(10, 2))), + SUM(CAST(IFNULL(i.stems, 1) * s.quantity AS DECIMAL(10, 2))), su.countryFk, - CAST(SUM(IFNULL(sv.physicalWeight, sv.weight)) AS DECIMAL(10, 2)) + CAST(SUM(IFNULL(i.stems, 1) + * s.quantity + * IF(ic.grams, ic.grams, IFNULL(i.weightByPiece, 0)) / 1000) AS DECIMAL(10, 2)) FROM sale s - LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id - LEFT JOIN ticket t ON s.ticketFk = t.id - LEFT JOIN supplier su ON su.id = t.companyFk - LEFT JOIN item i ON i.id = s.itemFk - JOIN invoiceOut iOut ON iOut.ref = t.refFk - WHERE iOut.`ref` = vNewRef + JOIN ticket t ON s.ticketFk = t.id + JOIN supplier su ON su.id = t.companyFk + JOIN item i ON i.id = s.itemFk + LEFT JOIN itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk + WHERE t.refFk = vNewRef GROUP BY i.intrastatFk; + END IF; 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 ; @@ -55809,17 +56452,17 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_newFromClient`( - IN vClientFk INT, - IN vSerial CHAR(2), + IN vClientFk INT, + IN vSerial CHAR(2), IN vMaxShipped DATE, - IN vCompanyFk INT, + IN vCompanyFk INT, IN vTaxArea VARCHAR(25), - IN vRef VARCHAR(25), + IN vRef VARCHAR(25), OUT vInvoiceId INT) BEGIN /** * Factura los tickets de un cliente hasta una fecha dada - * @param vClientFk Id del cliente a facturar + * @param vClientFk Id del cliente a facturar * @param vSerial Serie de factura * @param vMaxShipped Fecha hasta la cual cogera tickets para facturar * @param vCompanyFk Id de la empresa desde la que se factura @@ -55838,11 +56481,11 @@ BEGIN IF NOT vIsRefEditable THEN CALL util.throw('serial non editable'); END IF; - END IF; + END IF; SELECT COUNT(*) INTO vIsExportation FROM vn.invoiceOutSerial - WHERE taxAreaFk = 'WORLD' + WHERE taxAreaFk = 'WORLD' AND `code` = vSerial; IF vIsExportation THEN @@ -55855,7 +56498,7 @@ BEGIN UPDATE invoiceOut SET `ref` = vRef - WHERE id = vInvoiceId + WHERE id = vInvoiceId AND vRef IS NOT NULL; IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN @@ -55884,7 +56527,7 @@ BEGIN * Factura un ticket * @param vTicketFk Id del ticket * @param vSerial Serie de factura - * @param vTaxArea Area de la factura en caso de querer forzarlo, + * @param vTaxArea Area de la factura en caso de querer forzarlo, * en la mayoria de los casos poner NULL * @return vInvoiceId */ @@ -55899,11 +56542,11 @@ BEGIN IF NOT vIsRefEditable THEN CALL util.throw('serial non editable'); END IF; - - UPDATE invoiceOut + + UPDATE invoiceOut SET `ref` = vRef WHERE id = vInvoiceId; - END IF; + END IF; IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN CALL invoiceOutBooking(vInvoiceId); @@ -55936,14 +56579,14 @@ BEGIN */ DELETE FROM invoiceOutTax WHERE invoiceOutFk = vInvoice; - + DROP TEMPORARY TABLE IF EXISTS tmp.ticket; CREATE TEMPORARY TABLE tmp.ticket (KEY (ticketFk)) ENGINE = MEMORY SELECT id ticketFk FROM ticketToInvoice; - + CALL ticket_getTax(vTaxArea); INSERT INTO invoiceOutTax( @@ -55960,7 +56603,7 @@ BEGIN GROUP BY pgcFk HAVING BASE ORDER BY priority; - + DROP TEMPORARY TABLE tmp.ticket; DROP TEMPORARY TABLE tmp.ticketTax; DROP TEMPORARY TABLE tmp.ticketAmount; @@ -55985,7 +56628,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemBarcode_update`(vItemFk INT,vCo BEGIN IF vDelete THEN DELETE FROM vn.itemBarcode WHERE itemFk = vItemFk AND code = vCode; -ELSE +ELSE INSERT INTO vn.itemBarcode(itemFk,code) VALUES (vItemFk,vCode); END IF; @@ -56007,8 +56650,8 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemFreight_Show`(vItemFk INT, vWarehouseFk INT) BEGIN - - SELECT cm3 Volumen_Entrada, + + SELECT cm3 Volumen_Entrada, cm3delivery Volumen_Salida, p.volume Volumen_del_embalaje, p.width Ancho_del_embalaje, @@ -56021,11 +56664,11 @@ BEGIN b.id buyFk, b.entryFk, w.name warehouseFk - FROM vn.itemCost ic - JOIN vn.item i ON i.id = ic.itemFk - LEFT JOIN cache.last_buy lb ON lb.item_id = ic.itemFk AND lb.warehouse_id = ic.warehouseFk - LEFT JOIN vn.buy b ON b.id = lb.buy_id - LEFT JOIN vn.packaging p ON p.id = b.packageFk + FROM vn.itemCost ic + JOIN vn.item i ON i.id = ic.itemFk + LEFT JOIN cache.last_buy lb ON lb.item_id = ic.itemFk AND lb.warehouse_id = ic.warehouseFk + LEFT JOIN vn.buy b ON b.id = lb.buy_id + LEFT JOIN vn.packaging p ON p.id = b.packageFk LEFT JOIN vn.warehouse w ON w.id = ic.warehouseFk WHERE ic.itemFk = vItemFk AND ic.warehouseFk = vWarehouseFk; @@ -56049,33 +56692,33 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemFuentesBalance`(vDaysInFuture I BEGIN /* Se utiliza para calcular la necesidad de mover mercancia entre el almacén de fuentes y el nuestro - * + * * @param vDaysInFuture Rango de dias para calcular entradas y salidas - * + * */ - + DECLARE vWarehouseFk INT; SELECT s.warehouseFk INTO vWarehouseFk - FROM vn.sector s + FROM vn.sector s WHERE s.code = 'FUENTES_PICASSE'; - + CALL cache.stock_refresh(FALSE); - SELECT i.id itemFk, + SELECT i.id itemFk, i.longName, i.size, i.subName, - v.amount - IFNULL(fue.Fuentes,0) - IFNULL(alb.albenfruit,0) as visible, - fue.Fuentes, + v.amount - IFNULL(fue.Fuentes,0) - IFNULL(alb.albenfruit,0) as visible, + fue.Fuentes, alb.Albenfruit, - 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) + 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.Fuentes,0) - IFNULL(alb.albenfruit,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 + 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 Fuentes FROM vn.itemShelving ish @@ -56083,7 +56726,7 @@ BEGIN JOIN vn.parking p ON p.id = sh.parkingFk JOIN vn.sector s ON s.id = p.sectorFk WHERE s.code = 'FUENTES_PICASSE' - GROUP BY ish.itemFk + GROUP BY ish.itemFk ) fue ON fue.itemFk = i.id LEFT JOIN ( SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS Albenfruit @@ -56092,7 +56735,7 @@ BEGIN JOIN vn.parking p ON p.id = sh.parkingFk JOIN vn.sector s ON s.id = p.sectorFk WHERE s.code = 'ALBENFRUIT' - GROUP BY ish.itemFk + GROUP BY ish.itemFk ) alb ON alb.itemFk = i.id LEFT JOIN cache.stock v ON i.id = v.item_id AND v.warehouse_id = vWarehouseFk LEFT JOIN ( @@ -56117,9 +56760,9 @@ BEGIN AND warehouse_id = vWarehouseFk GROUP BY item_id ) mov ON mov.item_id = i.id - WHERE (v.amount OR fue.Fuentes OR alb.Albenfruit) + WHERE (v.amount OR fue.Fuentes OR alb.Albenfruit) AND i.itemPackingTypeFk = 'H' - AND ic.shortLife + AND ic.shortLife ; END ;; @@ -56141,7 +56784,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementFromTicket`(vTicket INT) BEGIN /** - * Llama a itemPlacementUpdateVisible + * Llama a itemPlacementUpdateVisible * de los articulos de la tabla temporal tmp.itemPlacement(itemFk) * @treturn tmp.itemPlacement * @param vTicket Id del Ticket @@ -56155,9 +56798,9 @@ BEGIN FROM ticket t JOIN sale s ON s.ticketFk = t.id WHERE t.id = vTicket; - + CALL itemPlacementUpdateVisible(); - + DROP TEMPORARY TABLE tmp.itemPlacement; END ;; DELIMITER ; @@ -56190,7 +56833,7 @@ BEGIN CAST(FLOOR(LEAST(ish.stock,quantity) / ish.packing) AS DECIMAL(10,0)), ' x ', ish.packing, - IF ( + IF ( LEAST(ish.stock,quantity) MOD ish.packing, CONCAT(' + ',CAST(LEAST(ish.stock,quantity) MOD ish.packing AS DECIMAL(10,0))), '' @@ -56221,7 +56864,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementSupplyCloseOrder`(vId INT, vQuantity INT) BEGIN - UPDATE vn.itemPlacementSupply + UPDATE vn.itemPlacementSupply SET priority = 10 WHERE id = vId; @@ -56247,7 +56890,7 @@ BEGIN DECLARE vId INT; DECLARE vLastParkingFk INT; DECLARE vNextParkingFk INT; - + SELECT sh.parkingFk INTO vLastParkingFk FROM vn.itemShelvingPlacementSupply isps JOIN vn.itemShelving ish ON ish.id = isps.itemShelvingFk @@ -56255,9 +56898,9 @@ BEGIN WHERE isps.userFk = getUser() ORDER BY isps.created DESC LIMIT 1; - + SET vNextParkingFk = vn.itemShelvingPlacementSupply_ClosestGet(vLastParkingFk); - + SELECT ipsl.id INTO vId FROM vn.itemPlacementSupplyList ipsl JOIN vn.itemShelvingPlacementSupplyStock ispss ON ispss.itemFk = ipsl.itemFk @@ -56266,13 +56909,13 @@ BEGIN AND ipsl.sectorFk = vSector ORDER BY ipsl.repoUserFk DESC, ipsl.priority DESC, (ispss.parkingFk = vNextParkingFk) DESC, ispss.parking DESC, ipsl.created LIMIT 1; - + UPDATE vn.itemPlacementSupply SET repoUserFk = getUser() WHERE id = vId; - - SELECT * FROM vn.itemPlacementSupplyList - WHERE id = vId + + SELECT * FROM vn.itemPlacementSupplyList + WHERE id = vId AND sectorFk = vSector; END ;; @@ -56347,20 +56990,20 @@ BEGIN * @param vItemFk item id * @param vTicketFk ticket id * @param vShowType mostrar tipos - */ + */ DECLARE vWarehouseFk INT; DECLARE vShipped DATE; DECLARE vCalcFk INT; DECLARE vTypeFk INT; - - + + DECLARE vTag1 VARCHAR(25); DECLARE vTag5 VARCHAR(25); DECLARE vTag6 VARCHAR(25); DECLARE vTag7 VARCHAR(25); DECLARE vTag8 VARCHAR(25); - + DECLARE vValue1 VARCHAR(50); DECLARE vValue5 VARCHAR(50); DECLARE vValue6 VARCHAR(50); @@ -56370,16 +57013,16 @@ BEGIN SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped FROM vn.ticket WHERE id = vTicketFk; - + SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1 FROM vn.item i LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1 LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk WHERE i.id = vItemFk; - + CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped); - + SELECT i.id itemFk, i.longName, i.subName, @@ -56412,7 +57055,7 @@ BEGIN ORDER BY counter DESC, (t1.name = vTag1 COLLATE utf8_general_ci) DESC, (it1.value = vValue1 COLLATE utf8_general_ci) DESC, - (i.tag6 = vTag6 COLLATE utf8_general_ci) DESC, + (i.tag6 = vTag6 COLLATE utf8_general_ci) DESC, (i.value6 = vValue6 COLLATE utf8_general_ci) DESC, (i.tag5 = vTag5 COLLATE utf8_general_ci) DESC, (i.value5 = vValue5 COLLATE utf8_general_ci) DESC, @@ -56420,7 +57063,7 @@ BEGIN (i.value7 = vValue7 COLLATE utf8_general_ci) DESC, (i.tag8 = vTag8 COLLATE utf8_general_ci) DESC, (i.value8 = vValue8 COLLATE utf8_general_ci) DESC; - + END ;; DELIMITER ; @@ -56446,7 +57089,7 @@ BEGIN * @param vSaleFk id de la tabla sale * @param vMateFk articulo sustituto * @ param vQuantity cantidad que se va a sustituir - */ + */ DECLARE vTicketFk INT; DECLARE vItemFk INT; DECLARE vWarehouseFk SMALLINT; @@ -56455,41 +57098,41 @@ BEGIN DECLARE vBox INT; DECLARE vPacking INT; DECLARE vRoundQuantity INT DEFAULT 1; - + SELECT s.ticketFk, LEAST(s.quantity, vQuantity), s.itemFk,t.shipped,t.warehouseFk INTO vTicketFk, vQuantity, vItemFk,vDate,vWarehouseFk FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk WHERE s.id = vSaleFk; - + UPDATE vn.sale SET quantity = quantity - vQuantity WHERE id = vSaleFk; - + CALL vn.buyUltimate(vWarehouseFk, vDate); - + SELECT `grouping`, groupingMode, packing INTO vGrouping,vBox,vPacking FROM buy b JOIN tmp.buyUltimate tmp ON b.id = tmp.buyFk WHERE tmp.itemFk = vMateFk AND tmp.WarehouseFk = vWarehouseFk; - + IF vBox = 2 AND vPacking > 0 THEN SET vRoundQuantity = vPacking; END IF; IF vBox = 1 AND vGrouping > 0 THEN SET vRoundQuantity = vGrouping; END IF; - + INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept) SELECT vTicketFk, vMateFk, CEIL(vQuantity / vRoundQuantity) * vRoundQuantity, CONCAT('+ ',i.longName) FROM vn.item i WHERE id = vMateFk; - + SELECT LAST_INSERT_ID() INTO vSaleFk; - + CALL vn.sale_calculateComponent(vSaleFk, NULL); - + INSERT INTO vn.itemProposal(itemFk, mateFk, counter) VALUES(vItemFk, vMateFk, 1) ON DUPLICATE KEY UPDATE counter = counter + 1; @@ -56518,13 +57161,13 @@ BEGIN DECLARE vCalcFk INT; DECLARE vTypeFk INT; DECLARE vResultsMax INT DEFAULT 10; - + DECLARE vTag1 VARCHAR(25); DECLARE vTag5 VARCHAR(25); DECLARE vTag6 VARCHAR(25); DECLARE vTag7 VARCHAR(25); DECLARE vTag8 VARCHAR(25); - + DECLARE vValue1 VARCHAR(50); DECLARE vValue5 VARCHAR(50); DECLARE vValue6 VARCHAR(50); @@ -56534,16 +57177,16 @@ BEGIN SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped FROM vn.ticket WHERE id = vTicketFk; - + SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1 - FROM vn.item i + FROM vn.item i LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1 LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk WHERE i.id = vItemFk; - + CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped); - + SELECT i.id itemFk, i.longName, i.subName, @@ -56561,7 +57204,7 @@ BEGIN (i.value8 <=> vValue8 COLLATE utf8_general_ci) match8, a.available, IFNULL(ip.counter,0) counter - FROM vn.item i + FROM vn.item i JOIN cache.available a ON a.item_id = i.id LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1 @@ -56575,7 +57218,7 @@ BEGIN (it1.value = vValue1 COLLATE utf8_general_ci) DESC, (i.tag5 = vTag5 COLLATE utf8_general_ci) DESC, (i.value5 = vValue5 COLLATE utf8_general_ci) DESC, - (i.tag6 = vTag6 COLLATE utf8_general_ci) DESC, + (i.tag6 = vTag6 COLLATE utf8_general_ci) DESC, (i.value6 = vValue6 COLLATE utf8_general_ci) DESC, (i.tag7 = vTag7 COLLATE utf8_general_ci) DESC, (i.value7 = vValue7 COLLATE utf8_general_ci) DESC, @@ -56611,7 +57254,7 @@ BEGIN CREATE TEMPORARY TABLE tmp.item SELECT vItem id; - + CALL item_refreshTags(); DROP TEMPORARY TABLE tmp.item; @@ -56634,24 +57277,24 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemSale_byWeek`(vWeek INT, IN vYear INT, vItemFk INT, vWarehouseFk INT) BEGIN - + DECLARE vStarted DATE; DECLARE vEnded DATETIME; SELECT MIN(dated), util.dayEnd(MAX(dated)) INTO vStarted, vEnded - FROM `time` t + FROM `time` t WHERE CONCAT(vYear, LPAD(vWeek, 2, 0)) = t.period; SELECT t.shipped, w.name warehouse, - s.ticketFk, + s.ticketFk, c.quality, t.nickname client, - am.name agencyName, + am.name agencyName, wk.code salesPerson, s.itemFk, - IFNULL(CONCAT(ig.longName,' ',ig.`size`,' ',ig.subName), s.concept) AS concept, - s.quantity, + IFNULL(CONCAT(ig.longName,' ',ig.`size`,' ',ig.subName), s.concept) AS concept, + s.quantity, s.price, s.priceFixed, s.discount, @@ -56661,15 +57304,15 @@ BEGIN wk.id salesPersonFk FROM sale s JOIN ticket t ON t.id = s.ticketFk - JOIN warehouse w ON w.id = t.warehouseFk + JOIN warehouse w ON w.id = t.warehouseFk JOIN address a ON a.id = t.addressFk LEFT JOIN agencyMode am ON am.id = t.agencyModeFk JOIN `client` c ON c.id = a.clientFk - LEFT JOIN worker wk ON wk.id = c.salesPersonFk + LEFT JOIN worker wk ON wk.id = c.salesPersonFk LEFT JOIN ticketLastState tls ON tls.ticketFk = t.id - LEFT JOIN saleBuy sb ON sb.saleFk = s.id - LEFT JOIN buy b ON b.id = sb.buyFk - LEFT JOIN item ig ON ig.id = b.itemOriginalFk + LEFT JOIN saleBuy sb ON sb.saleFk = s.id + LEFT JOIN buy b ON b.id = sb.buyFk + LEFT JOIN item ig ON ig.id = b.itemOriginalFk WHERE s.itemFk = vItemFk AND t.shipped BETWEEN vStarted AND vEnded AND IF(vWarehouseFk = 0, w.hasComission , t.warehouseFk = vWarehouseFk) @@ -56696,9 +57339,9 @@ BEGIN DECLARE vItemFk INT; SELECT vn.barcodeToItem(vBarcode) INTO vItemFk; - + UPDATE vn.item SET minimum = min WHERE id = vItemFk; - + END ;; @@ -56720,8 +57363,8 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemSearchShelving`(`vShelvingFk` VARCHAR(3)) BEGIN SELECT p.`column` AS col , p.`row` - FROM vn.shelving s - JOIN parking p ON s.parkingFk = p.id + FROM vn.shelving s + JOIN parking p ON s.parkingFk = p.id WHERE s.`code` = vShelvingFk COLLATE utf8_general_ci; END ;; DELIMITER ; @@ -56762,36 +57405,36 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingLog_get`(vShelvingFk VARCHAR(10) ) BEGIN - + /** * Devuelve el log de los item en cada carro * - * @param vShelvingFk Matrícula del carro - * + * @param vShelvingFk Matrícula del carro + * */ - - SELECT isl.itemShelvingFk, - isl.created, - isl.accion, - isl.itemFk, - isl.shelvingFk, - isl.quantity, + + SELECT isl.itemShelvingFk, + isl.created, + isl.accion, + isl.itemFk, + isl.shelvingFk, + isl.quantity, isl.visible, - isl.available, - isl.grouping, - isl.packing, - isl.stars, - item.longName, - item.size, - item.subName, - worker.code, + isl.available, + isl.grouping, + isl.packing, + isl.stars, + item.longName, + item.size, + item.subName, + worker.code, isl.accion - FROM item - JOIN itemShelvingLog isl ON item.id = isl.itemFk + FROM item + JOIN itemShelvingLog isl ON item.id = isl.itemFk JOIN worker ON isl.workerFk = worker.id WHERE shelvingFk = vShelvingFk OR isl.itemFk = vShelvingFk ORDER BY isl.created DESC; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -56810,7 +57453,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingMakeFromDate`(IN `vShelvingFk` VARCHAR(8), IN `vBarcode` VARCHAR(22), IN `vQuantity` INT, IN `vPackagingFk` VARCHAR(10), IN `vGrouping` INT, IN `vPacking` INT, IN `vWarehouseFk` INT, `vCreated` VARCHAR(22)) BEGIN - + DECLARE vItemFk INT; SELECT vn.barcodeToItem(vBarcode) INTO vItemFk; @@ -56829,9 +57472,9 @@ BEGIN END IF; - IF (SELECT COUNT(*) FROM vn.itemShelving - WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk - AND itemFk = vItemFk + IF (SELECT COUNT(*) FROM vn.itemShelving + WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk + AND itemFk = vItemFk AND packing = vPacking) = 1 THEN UPDATE vn.itemShelving @@ -56861,8 +57504,8 @@ BEGIN 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 IF; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -56883,9 +57526,9 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingMatch`(vEntryFk INT, vA BEGIN DECLARE vTravelFk INT; - - SELECT travelFk INTO vTravelFk - FROM entry + + SELECT travelFk INTO vTravelFk + FROM entry WHERE id = vEntryFk; SELECT i.id, i.longName, i.size, i.subName, b.stickers, ish.etiquetas, b.printed @@ -56898,7 +57541,7 @@ BEGIN GROUP BY itemFk ) b ON b.itemFk = i.id LEFT JOIN ( - SELECT itemFk, sum(cast(visible / packing AS DECIMAL(10,0))) AS etiquetas + SELECT itemFk, sum(cast(visible / packing AS DECIMAL(10,0))) AS etiquetas FROM itemShelving ish JOIN shelving sh ON sh.code = ish.shelvingFk LEFT JOIN parking pk ON pk.id = sh.parkingFk @@ -56938,7 +57581,7 @@ BEGIN UPDATE vn.itemShelving SET visible = visible - vQuantity WHERE id = vItemShelvingFk; - + END ;; DELIMITER ; @@ -56961,47 +57604,47 @@ BEGIN DECLARE vVisibleCache INT; DECLARE vWarehouseFk INT; - + SELECT warehouseFk INTO vWarehouseFk FROM vn.sector WHERE id = vSectorFk; CALL cache.visible_refresh (vVisibleCache, FALSE, vWarehouseFk); - - SELECT t.id as ticketFk, - CAST(s.quantity AS DECIMAL(10,0)) as Cantidad, - s.itemFk, - s.concept, - v.visible - GREATEST(0,iss.visible) + IFNULL(sub3.transit,0) as Nicho, + + SELECT t.id as ticketFk, + CAST(s.quantity AS DECIMAL(10,0)) as Cantidad, + s.itemFk, + s.concept, + v.visible - GREATEST(0,iss.visible) + IFNULL(sub3.transit,0) as Nicho, i.subName, - GREATEST(0,iss.visible - IFNULL(sub3.transit,0)) as Altillo, + GREATEST(0,iss.visible - IFNULL(sub3.transit,0)) as Altillo, s.id as saleFk, IFNULL(sub3.transit,0) transit, v.visible, s.isPicked, s.reserved, t.shipped, tst.productionOrder, mm.Id_Movimiento - FROM vn.ticket t + FROM vn.ticket t JOIN vn.ticketState tst ON tst.ticketFk = t.id JOIN vn.sale s ON s.ticketFk = t.id JOIN vn.item i ON i.id = s.itemFk JOIN cache.visible v ON s.itemFk = v.item_id AND v.calc_id = vVisibleCache LEFT JOIN vn2008.Movimientos_mark mm ON mm.Id_Movimiento = s.id AND mm.stateFk = 26 - JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id + JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id LEFT JOIN - (SELECT itemFk, sum(saldo) as transit - FROM vn.itemPlacementSupplyList - WHERE saldo > 0 + (SELECT itemFk, sum(saldo) as transit + FROM vn.itemPlacementSupplyList + WHERE saldo > 0 AND sectorFk = vSectorFk GROUP BY itemFk) sub3 ON sub3.itemFk = i.id - WHERE v.visible + IFNULL(sub3.transit,0) - GREATEST(0,iss.visible) < s.quantity + WHERE v.visible + IFNULL(sub3.transit,0) - GREATEST(0,iss.visible) < s.quantity AND IFNULL(sub3.transit,0) < s.quantity - AND s.isPicked = FALSE + AND s.isPicked = FALSE AND s.reserved = FALSE - AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE()) + AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE()) AND tst.isPreviousPreparable = TRUE AND t.warehouseFk = vWarehouseFk AND iss.sectorFk = vSectorFk AND mm.Id_Movimiento IS NULL ORDER BY itemFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57020,7 +57663,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingRadar`(vSectorFk INT) proc:BEGIN - + DECLARE vCalcVisibleFk INT; DECLARE vCalcAvailableFk INT; DECLARE hasFatherSector BOOLEAN; @@ -57028,25 +57671,25 @@ proc:BEGIN DECLARE vWarehouseFk INT DEFAULT 0; DECLARE vSonSectorFk INT; DECLARE vWorkerFk INT; - - SELECT s.workerFk - INTO vWorkerFk + + SELECT s.workerFk + INTO vWorkerFk FROM vn.sector s WHERE s.id = vSectorFk; - + IF IFNULL(vWorkerFk,0) THEN - + CALL vn.itemShelvingRadar_Urgent(vWorkerFk); LEAVE proc; - + end if; - - + + SELECT w.id, s.warehouseFk INTO vBuyerFk, vWarehouseFk - FROM vn.worker w + FROM vn.worker w JOIN vn.sector s ON s.code = w.code WHERE s.id = vSectorFk; - + SELECT s.id INTO vSectorFk FROM vn.sector s WHERE s.warehouseFk = vWarehouseFk @@ -57056,21 +57699,21 @@ proc:BEGIN SELECT COUNT(*) INTO hasFatherSector FROM vn.sector WHERE sonFk = vSectorFk; - + SELECT warehouseFk, sonFk INTO vWarehouseFk, vSonSectorFk FROM vn.sector WHERE id = vSectorFk; - + CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk); CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE()); - + DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadar; - + IF hasFatherSector THEN - + CREATE TEMPORARY TABLE tmp.itemShelvingRadar (PRIMARY KEY (itemFk)) - ENGINE = MEMORY + ENGINE = MEMORY SELECT * FROM ( SELECT iss.itemFk, i.longName, @@ -57081,7 +57724,7 @@ proc:BEGIN SUM(IF(iss.sectorFk = vSectorFk, IFNULL(iss.visible,0), 0)) downstairs, IF(it.isPackaging, null, IFNULL(v.visible,0)) as visible, vSectorFk as sectorFk - + FROM vn.itemShelvingStock iss JOIN vn.sector s ON s.id = iss.sectorFk JOIN vn.item i on i.id = iss.itemFk @@ -57090,11 +57733,11 @@ proc:BEGIN LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk WHERE vSectorFk IN (iss.sectorFk, s.sonFk) AND it.workerFk != 3366 - + GROUP BY iss.itemFk - + UNION ALL - + SELECT v.item_id, i.longName, i.size, @@ -57104,7 +57747,7 @@ proc:BEGIN 0 downstairs, IF(it.isPackaging, NULL, v.visible) visible, vSectorFk as sectorFk - FROM cache.visible v + FROM cache.visible v JOIN vn.item i on i.id = v.item_id JOIN vn.itemType it ON it.id = i.typeFk AND vBuyerFk IN (0,it.workerFk) LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id AND iss.warehouseFk = vWarehouseFk @@ -57113,8 +57756,8 @@ proc:BEGIN AND iss.itemFk IS NULL AND it.isInventory ) sub GROUP BY itemFk; - - SELECT ishr.*, + + SELECT ishr.*, CAST(visible - upstairs - downstairs AS DECIMAL(10,0)) AS nicho, CAST(downstairs - IFNULL(notPickedYed,0) AS DECIMAL(10,0)) as pendiente FROM tmp.itemShelvingRadar ishr @@ -57129,13 +57772,13 @@ proc:BEGIN ) sub ON sub.itemFk = ishr.itemFk ORDER BY i.typeFk, i.longName ; - - + + ELSE - + CREATE TEMPORARY TABLE tmp.itemShelvingRadar (PRIMARY KEY (itemFk)) - ENGINE = MEMORY + ENGINE = MEMORY SELECT iss.itemFk, 0 `hour`, 0 `minute`, @@ -57147,7 +57790,7 @@ proc:BEGIN IFNULL(a.available,0) available, IFNULL(v.visible - iss.visible,0) dayEndVisible, IFNULL(v.visible - iss.visible,0) firstNegative, - IFNULL(v.visible - iss.visible,0) itemPlacementVisible, + IFNULL(v.visible - iss.visible,0) itemPlacementVisible, IFNULL(i.minimum * b.packing,0) itemPlacementSize, ips.onTheWay, iss.visible itemShelvingStock, @@ -57161,13 +57804,13 @@ proc:BEGIN LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk LEFT JOIN (SELECT itemFk, sum(saldo) as onTheWay - FROM vn.itemPlacementSupplyList - WHERE saldo > 0 + FROM vn.itemPlacementSupplyList + WHERE saldo > 0 GROUP BY itemFk ) ips ON ips.itemFk = i.id - WHERE IFNULL(iss.sectorFk,0) IN (0, vSectorFk) - OR iss.sectorFk = vSectorFk; - /* + WHERE IFNULL(iss.sectorFk,0) IN (0, vSectorFk) + OR iss.sectorFk = vSectorFk; + /* UPDATE tmp.itemShelvingRadar isr JOIN vn.itemShelvingStock iss ON iss.itemFk = isr.itemFk SET isr.dayEndVisible = isr.dayEndVisible + iss.visible, @@ -57178,10 +57821,10 @@ proc:BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.itemOutTime; CREATE TEMPORARY TABLE tmp.itemOutTime SELECT *,SUM(amount) quantity - FROM + FROM (SELECT item_id itemFk, - amount, - IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) as hours, + amount, + IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) as hours, IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) as minutes FROM vn2008.item_out io JOIN tmp.itemShelvingRadar isr ON isr.itemFk = io.item_id @@ -57189,23 +57832,23 @@ proc:BEGIN JOIN vn.ticketState ts on ts.ticketFk = io.ticketFk JOIN vn.state s ON s.id = ts.stateFk LEFT JOIN vn.zone z ON z.id = t.zoneFk - LEFT JOIN (SELECT DISTINCT saleFk - FROM vn.saleTracking st - WHERE st.created > util.VN_CURDATE() + LEFT JOIN (SELECT DISTINCT saleFk + FROM vn.saleTracking st + WHERE st.created > util.VN_CURDATE() AND st.isChecked ) stPrevious ON `stPrevious`.`saleFk` = io.saleFk WHERE t.warehouseFk = vWarehouseFk - AND s.isPicked = 0 - AND NOT io.Reservado + AND s.isPicked = 0 + AND NOT io.Reservado AND stPrevious.saleFk IS NULL - AND io.dat >= util.VN_CURDATE() + AND io.dat >= util.VN_CURDATE() AND io.dat < util.VN_CURDATE()+1 ) sub GROUP BY itemFk, hours, minutes; - + INSERT INTO tmp.itemShelvingRadar (itemFk) SELECT itemFk FROM tmp.itemOutTime - ON DUPLICATE KEY UPDATE dayEndVisible = dayEndVisible + quantity, + ON DUPLICATE KEY UPDATE dayEndVisible = dayEndVisible + quantity, firstNegative = if (firstNegative < 0, firstNegative, firstNegative + quantity), `hour` = ifnull(if (firstNegative > 0 , `hour`, hours),0), `minute` = ifnull(if (firstNegative > 0, `minute`, minutes),0); @@ -57215,13 +57858,13 @@ proc:BEGIN dayEndVisible = 0, firstNegative = 0 WHERE itemPlacementVisible = - itemShelvingStock; - */ + */ SELECT * FROM tmp.itemShelvingRadar; END IF; DROP TEMPORARY TABLE tmp.itemShelvingRadar; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57245,24 +57888,24 @@ BEGIN DECLARE vCalcVisibleFk INT; DECLARE vCalcAvailableFk INT; DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(util.VN_CURDATE()); - + CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1); CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE()); - + DROP TEMPORARY TABLE IF EXISTS tmp.item; CREATE TEMPORARY TABLE tmp.item ENGINE = MEMORY SELECT DISTINCT itemFk - FROM vn.buy + FROM vn.buy WHERE entryFk = vEntryFk; - + DROP TEMPORARY TABLE IF EXISTS tmp.item2; CREATE TEMPORARY TABLE tmp.item2 ENGINE = MEMORY SELECT * FROM tmp.item; - - SELECT i.id as itemFk, + + SELECT i.id as itemFk, i.minimum, CAST(IFNULL(v.visible,0) - IFNULL(iss.visible,0) AS DECIMAL(10,0)) as enNicho, CAST(IFNULL(a.available,0) AS DECIMAL(10,0)) as disponible, @@ -57282,11 +57925,11 @@ BEGIN AND IFNULL(tst.productionOrder,0) < 5 GROUP BY s.itemFK ) ts ON ts.itemFk = i.id; - - + + DROP TEMPORARY TABLE tmp.item; DROP TEMPORARY TABLE tmp.item2; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57310,34 +57953,34 @@ BEGIN DECLARE vCalcVisibleFk INT; DECLARE vCalcAvailableFk INT; DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(util.VN_CURDATE()); - + CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1); CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE()); - + DROP TEMPORARY TABLE IF EXISTS tmp.item; CREATE TEMPORARY TABLE tmp.item ENGINE = MEMORY SELECT DISTINCT itemFk - FROM vn.buy + FROM vn.buy WHERE entryFk = vEntryFk; - + DROP TEMPORARY TABLE IF EXISTS tmp.item2; CREATE TEMPORARY TABLE tmp.item2 ENGINE = MEMORY SELECT * FROM tmp.item; - - SELECT i.id as itemFk, + + SELECT i.id as itemFk, CAST(IFNULL(iss.visible,0) - IFNULL(v.visible,0) AS DECIMAL(10,0)) as outShelving FROM vn.item i JOIN tmp.item ti ON ti.itemFk = i.id LEFT JOIN cache.visible v ON v.calc_id = vCalcVisibleFk AND v.item_id = i.id LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id; - - + + DROP TEMPORARY TABLE tmp.item; DROP TEMPORARY TABLE tmp.item2; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57364,7 +58007,7 @@ BEGIN CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk); - SELECT * FROM + SELECT * FROM (SELECT sub.itemFk, sub.longName, CONCAT(DATE_FORMAT(sub2.etd,'%H:%i'), ' salen ', CAST(sub2.pendiente AS DECIMAL(10,0)), ' unidades.') `size`, @@ -57382,14 +58025,14 @@ BEGIN 0 upstairs, SUM(IFNULL(iss.visible,0)) downstairs, IF(it.isPackaging, null, IFNULL(v.visible,0)) visible, - IFNULL(iss.sectorFk,0) sectorFk + IFNULL(iss.sectorFk,0) sectorFk FROM itemShelvingStock iss JOIN sector s ON s.id = iss.sectorFk JOIN item i on i.id = iss.itemFk JOIN itemType it ON it.id = i.typeFk LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = @vCalcVisibleFk WHERE s.warehouseFk = vWarehouseFk - GROUP BY itemFk + GROUP BY itemFk ) sub LEFT JOIN (SELECT s.itemFk, SUM(s.quantity) pendiente, MIN(zc.`hour`) etd FROM sale s LEFT JOIN saleTracking st ON st.saleFk = s.id @@ -57401,8 +58044,8 @@ BEGIN AND ISNULL(st.saleFk) AND ct.code IN ('normal', 'trust') GROUP BY s.itemFk - ) sub2 ON sub2.itemFk = sub.itemFk - UNION ALL + ) sub2 ON sub2.itemFk = sub.itemFk + UNION ALL SELECT v.item_id , i.longName, CONCAT(DATE_FORMAT(sub5.etd,'%H:%i'), ' salen ', CAST(sub5.pendiente AS DECIMAL(10,0)), ' unidades.') `size`, @@ -57416,7 +58059,7 @@ BEGIN FROM cache.visible v JOIN item i ON i.id = v.item_id JOIN itemType it ON it.id = i.typeFk - LEFT JOIN itemShelvingStock iss ON iss.itemFk = v.item_id + LEFT JOIN itemShelvingStock iss ON iss.itemFk = v.item_id LEFT JOIN (SELECT s.itemFk , SUM(s.quantity) pendiente, MIN(zc.`hour`) etd FROM sale s LEFT JOIN saleTracking st ON st.saleFk = s.id @@ -57430,7 +58073,7 @@ BEGIN GROUP BY s.itemFk ) sub5 ON sub5.itemFk = v.item_id WHERE v.calc_id = @vCalcVisibleFk - AND ISNULL(iss.itemFk) + AND ISNULL(iss.itemFk) ) sub3 WHERE nicho ORDER BY LEFT(producer,3), etd, producer; @@ -57454,10 +58097,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSale_Add`(vItemShelving BEGIN /** * Añade línea a itemShelvingSale y regulariza el carro - * + * * @param vItemShelvingFk Id itemShelving * @param vSaleFk Id de sale - * @param vQuantity cantidad a regularizar + * @param vQuantity cantidad a regularizar */ INSERT INTO itemShelvingSale(itemShelvingFk, saleFk, @@ -57552,7 +58195,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT) BEGIN - + /** * Añade registro o lo actualiza si ya existe. @@ -57564,7 +58207,7 @@ BEGIN * @param vGrouping el grouping del producto en itemShelving, NULL para coger el de la ultima compra * @param vPacking el packing del producto, NULL para coger el de la ultima compra * @param vWarehouseFk indica el sector - * + * **/ DECLARE vItemFk INT; @@ -57574,21 +58217,21 @@ BEGIN IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN INSERT IGNORE INTO parking(code) VALUES(vShelvingFk); - INSERT INTO shelving(code, parkingFk) + INSERT INTO shelving(code, parkingFk) SELECT vShelvingFk, id - FROM parking + FROM parking WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci; END IF; - IF (SELECT COUNT(*) FROM itemShelving - WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk - AND itemFk = vItemFk + IF (SELECT COUNT(*) FROM itemShelving + WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk + AND itemFk = vItemFk AND packing = vPacking) = 1 THEN UPDATE itemShelving SET visible = visible+vQuantity - WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking; + WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking; ELSE CALL cache.last_buy_refresh(FALSE); @@ -57661,6 +58304,66 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_addList` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_addList`(vShelvingFk VARCHAR(3), vList TEXT, vIsChecking BOOL, vWarehouseFk INT) +BEGIN +/* Recorre cada elemento en la colección vList. + * Si el parámetro isChecking = FALSE, llama a itemShelving_add. + * + * Cuando es TRUE sólo inserta los elementos de la colección que no están ya en + * ese shelving, actualizando los valores del campo vn.itemShelving.isChecked + * + * param vShelvingFk Identificador de vn.shelving + * param vList JSON array con esta estructura: '[value1, value2, ...]' + * param vIsChecking Define si hay que añadir o comprobar los items + * param vWarehouseFk Identificador de vn.warehouse + */ + DECLARE vListLength INT DEFAULT JSON_LENGTH(vList); + DECLARE vCounter INT DEFAULT 0; + DECLARE vBarcode VARCHAR(22); + DECLARE vPath VARCHAR(6); + DECLARE vItemFk INT; + DECLARE vIsChecked BOOL; + + WHILE vCounter < vListLength DO + SET vPath = CONCAT('$[',vCounter,']'); + SET vBarcode = JSON_EXTRACT(vList,vPath); + SET vIsChecked = NULL; + IF vIsChecking THEN + SELECT barcodeToItem(vBarcode) INTO vItemFk; + + SELECT COUNT(*) INTO vIsChecked + FROM vn.itemShelving + WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk + AND itemFk = vItemFk; + END IF; + + IF NOT (vIsChecking AND vIsChecked) THEN + CALL vn.itemShelving_add(vShelvingFk, vBarcode, 1, NULL, NULL, NULL, vWarehouseFk); + END IF; + + UPDATE vn.itemShelving + SET isChecked = vIsChecked + WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk + AND itemFk = vItemFk; + + SET vCounter = vCounter + 1; + END WHILE; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `itemShelving_BuyerGet` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -57673,7 +58376,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_BuyerGet`( ) BEGIN SELECT * FROM vn.buyer; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57700,15 +58403,15 @@ proc:BEGIN * @return Lista de articulos */ DECLARE vCalcVisibleFk INT; - + IF vBuyerFk = 103 THEN -- hay que arreglarlo despues de la campaña PAK 23/04/2022 - CALL vn.itemShelvingRadar_Urgent(); + CALL vn.itemShelvingRadar_Urgent(); LEAVE proc; END IF; CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk); - SELECT * FROM + SELECT * FROM (SELECT sub.itemFk, sub.longName, CONCAT('Hoy saldrán ', CAST(sub2.pendiente AS DECIMAL(10,0)), ' unidades.') `size`, @@ -57725,7 +58428,7 @@ proc:BEGIN 0 upstairs, SUM(IFNULL(iss.visible,0)) downstairs, IF(it.isPackaging, null, IFNULL(v.visible,0)) visible, - IFNULL(iss.sectorFk,0) sectorFk + IFNULL(iss.sectorFk,0) sectorFk FROM itemShelvingStock iss JOIN sector s ON s.id = iss.sectorFk JOIN item i on i.id = iss.itemFk @@ -57733,19 +58436,19 @@ proc:BEGIN LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk WHERE s.warehouseFk = vWarehouseFk AND it.workerFk = vBuyerFk - GROUP BY itemFk + GROUP BY itemFk ) sub LEFT JOIN (SELECT s.itemFk, SUM(s.quantity) pendiente FROM sale s LEFT JOIN saleTracking st ON st.saleFk = s.id - JOIN ticket t ON t.id = s.ticketFk + JOIN ticket t ON t.id = s.ticketFk JOIN client c on c.id = t.clientFk JOIN clientType ct ON ct.id = c.clientTypeFk WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) AND ISNULL(st.saleFk) AND ct.code IN ('normal', 'trust') GROUP BY s.itemFk - ) sub2 ON sub2.itemFk = sub.itemFk - UNION ALL + ) sub2 ON sub2.itemFk = sub.itemFk + UNION ALL SELECT v.item_id , i.longName, CONCAT('Hoy saldrán ', CAST(sub5.pendiente AS DECIMAL(10,0)), ' unidades.') `size`, @@ -57758,11 +58461,11 @@ proc:BEGIN FROM cache.visible v JOIN item i ON i.id = v.item_id JOIN itemType it ON it.id = i.typeFk - LEFT JOIN itemShelvingStock iss ON iss.itemFk = v.item_id + LEFT JOIN itemShelvingStock iss ON iss.itemFk = v.item_id LEFT JOIN (SELECT s.itemFk , SUM(s.quantity) pendiente FROM sale s LEFT JOIN saleTracking st ON st.saleFk = s.id - JOIN ticket t ON t.id = s.ticketFk + JOIN ticket t ON t.id = s.ticketFk JOIN client c on c.id = t.clientFk JOIN clientType ct ON ct.id = c.clientTypeFk WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) @@ -57771,7 +58474,7 @@ proc:BEGIN GROUP BY s.itemFk ) sub5 ON sub5.itemFk = v.item_id WHERE v.calc_id = vCalcVisibleFk - AND ISNULL(iss.itemFk) + AND ISNULL(iss.itemFk) AND it.workerFk = vBuyerFk ) sub3 WHERE nicho @@ -57792,32 +58495,30 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_get`(IN vShelvingFk VARCHAR(8)) +CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_get`(IN vSelf VARCHAR(8)) BEGIN /** - * Lista artículos de itemshelving - * - * @param vShelvingFk matrícula del carro - * - **/ - - SELECT ish.itemFk as item, - IFNULL(i.longName, CONCAT(i.name, ' ', i.size)) as description, - ish.visible as visible, - ceil(ish.visible/ish.packing) as stickers, - ish.packing as packing, - ish.grouping, - IF (p.column IS NULL, "", p.column) as col, - IF (p.row IS NULL, "", p.row) as row, - IF (p.code IS NULL, "", p.code) as code, - ish.id, - s.priority +* Lista artículos de itemshelving +* +* @param vSelf matrícula del carro +**/ + SELECT ish.itemFk item, + IFNULL(i.longName, CONCAT(i.name, ' ', i.size)) description, + ish.visible, + CEIL(ish.visible/ish.packing) stickers, + ish.packing, + ish.grouping, + IF (p.column IS NULL, '', p.column) col, + IF (p.row IS NULL, '', p.row) row, + IF (p.code IS NULL, '', p.code) code, + ish.id, + s.priority, + ish.isChecked FROM itemShelving ish JOIN item i ON i.id = ish.itemFk - INNER JOIN shelving s ON vShelvingFk = s.code COLLATE utf8_unicode_ci - LEFT JOIN parking p ON s.parkingFk = p.id - WHERE ish.shelvingFk COLLATE utf8_unicode_ci = vShelvingFk; - + JOIN shelving s ON vSelf = s.code COLLATE utf8_unicode_ci + LEFT JOIN parking p ON s.parkingFk = p.id + WHERE ish.shelvingFk COLLATE utf8_unicode_ci = vSelf; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57835,24 +58536,24 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_getAlternatives`(vShelvingFk VARCHAR(10)) -BEGIN -/** - * Devuelve un listado de posibles ubicaciones alternativas a ubicar los item de la matricula - * del carro que se le ha pasado. - * - * @param vShelvingFk matricula del carro - */ - SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder - FROM itemShelving is2 - JOIN shelving sh ON sh.code = is2.shelvingFk - JOIN parking p ON p.id = sh.parkingFk - JOIN sector s ON s.id = p.sectorFk - LEFT JOIN worker w ON w.sectorFk = s.id AND w.id = account.myUser_getId() - JOIN warehouse wh ON wh.id = s.warehouseFk - JOIN itemShelving is3 ON is3.itemFk = is2.itemFk AND is3.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci - WHERE is2.shelvingFk <> vShelvingFk COLLATE utf8_unicode_ci - GROUP BY is2.id - ORDER BY p.pickingOrder DESC; +BEGIN +/** + * Devuelve un listado de posibles ubicaciones alternativas a ubicar los item de la matricula + * del carro que se le ha pasado. + * + * @param vShelvingFk matricula del carro + */ + SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder + FROM itemShelving is2 + JOIN shelving sh ON sh.code = is2.shelvingFk + JOIN parking p ON p.id = sh.parkingFk + JOIN sector s ON s.id = p.sectorFk + LEFT JOIN worker w ON w.sectorFk = s.id AND w.id = account.myUser_getId() + JOIN warehouse wh ON wh.id = s.warehouseFk + JOIN itemShelving is3 ON is3.itemFk = is2.itemFk AND is3.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci + WHERE is2.shelvingFk <> vShelvingFk COLLATE utf8_unicode_ci + GROUP BY is2.id + ORDER BY p.pickingOrder DESC; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57908,35 +58609,35 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_getSaleDate`(vShelvingFk VARCHAR(3)) BEGIN - + /* Devuelve la minima fecha en que se necesita cada producto en esa matricula. - * + * * @param vShelvingFk Matrícula del carro o pallet */ - + DECLARE vWarehouseFk INT; SELECT warehouseFk INTO vWarehouseFk FROM shelving s - JOIN parking p ON s.parkingFk = p.id + JOIN parking p ON s.parkingFk = p.id JOIN sector st ON st.id = p.sectorFk WHERE s.code = vShelvingFk COLLATE utf8_unicode_ci; - + DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingDistinct; CREATE TEMPORARY TABLE tmp.itemShelvingDistinct (PRIMARY KEY (itemFk)) ENGINE = MEMORY SELECT itemFk, SUM(visible) visible - FROM vn.itemShelving + FROM vn.itemShelving WHERE shelvingFk = vShelvingFk COLLATE utf8_unicode_ci - GROUP BY itemFk; - + GROUP BY itemFk; + DROP TEMPORARY TABLE IF EXISTS tmp.item; CREATE TEMPORARY TABLE tmp.item (PRIMARY KEY (itemFk)) ENGINE = MEMORY SELECT * FROM tmp.itemShelvingDistinct; - + DROP TEMPORARY TABLE IF EXISTS tmp.stockByDay; CREATE TEMPORARY TABLE tmp.stockByDay (index (itemFk, dated)) @@ -57947,16 +58648,16 @@ BEGIN FROM ( SELECT * FROM ( SELECT t2.* FROM ( - SELECT item_id itemFk, amount, util.VN_CURDATE() dated - FROM cache.stock + SELECT item_id itemFk, amount, util.VN_CURDATE() dated + FROM cache.stock WHERE warehouse_id = vWarehouseFk UNION ALL SELECT ish.itemFk, - sum(visible), util.VN_CURDATE() - FROM vn.itemShelving ish - JOIN shelving sh ON sh.code = ish.shelvingFk - JOIN parking p ON sh.parkingFk = p.id + FROM vn.itemShelving ish + JOIN shelving sh ON sh.code = ish.shelvingFk + JOIN parking p ON sh.parkingFk = p.id JOIN sector s ON s.id = p.sectorFk - WHERE s.isReserve + WHERE s.isReserve GROUP BY ish.itemFk UNION ALL SELECT item_id, sum(iei.amount), dat @@ -57965,9 +58666,9 @@ BEGIN AND warehouse_id = vWarehouseFk AND isVirtualStock = FALSE GROUP BY item_id, dat - UNION ALL + UNION ALL SELECT item_id, sum(ieo.amount), dat - FROM vn2008.item_entry_out ieo + FROM vn2008.item_entry_out ieo WHERE dat >= util.VN_CURDATE() AND warehouse_id = vWarehouseFk GROUP BY item_id, dat @@ -57978,11 +58679,11 @@ BEGIN WHERE io.dat >= util.VN_CURDATE() AND io.warehouse_id = vWarehouseFk GROUP BY io.item_id, io.dat - ) t2 + ) t2 JOIN tmp.itemShelvingDistinct ish ON ish.itemFk = t2.itemFk) t order by t.itemFk, DATE(t.dated), t.amount DESC) t3; - - SELECT sbd.itemFk, i.longName, DATE(dated) dated, ish.visible amount, sbd.stock + + SELECT sbd.itemFk, i.longName, DATE(dated) dated, ish.visible amount, sbd.stock FROM tmp.stockByDay sbd JOIN vn.item i ON i.id = sbd.itemFk JOIN tmp.itemShelvingDistinct ish ON ish.itemFk = sbd.itemFk @@ -58010,46 +58711,46 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 ; - +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 */ ; @@ -58077,9 +58778,9 @@ BEGIN * @param vGrouping el grouping del producto en itemShelving */ UPDATE itemShelving - SET visible = vVisible, - packing = vPacking, - grouping = vGrouping + SET visible = vVisible, + packing = vPacking, + grouping = vGrouping WHERE id = vShelf; END ;; @@ -58106,34 +58807,34 @@ BEGIN * @param vDated max date to filter * @param vItemFk item id **/ - + DECLARE vIsLogifloraDay BOOLEAN; SET vDated = TIMESTAMP(DATE(vDated), '00:00:00'); SELECT vn.isLogifloraDay(vDated, vWarehouseFk) INTO vIsLogifloraDay ; - + DROP TEMPORARY TABLE IF EXISTS tmp.itemList; CREATE TEMPORARY TABLE tmp.itemList (UNIQUE INDEX i USING HASH (itemFk)) ENGINE = MEMORY SELECT itemFk, SUM(quantity) stock, SUM(quantity) visible, SUM(quantity) available FROM ( - SELECT itemFk, quantity + SELECT itemFk, quantity FROM itemTicketOut WHERE shipped >= util.VN_CURDATE() AND shipped < vDated AND warehouseFk = vWarehouseFk AND (vItemFk IS NULL OR itemFk = vItemFk) UNION ALL - SELECT itemFk, quantity + SELECT itemFk, quantity FROM itemEntryIn i - LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk + LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk WHERE i.landed >= util.VN_CURDATE() AND i.landed < vDated AND i.warehouseInFk = vWarehouseFk AND (vItemFk IS NULL OR i.itemFk = vItemFk) AND (ISNULL(wf.entryFk) OR vIsLogifloraDay) UNION ALL - SELECT itemFk, quantity + SELECT itemFk, quantity FROM itemEntryOut WHERE shipped >= util.VN_CURDATE() AND shipped < vDated AND warehouseOutFk = vWarehouseFk @@ -58144,7 +58845,7 @@ BEGIN CALL `cache`.stock_refresh (FALSE); INSERT INTO tmp.itemList (itemFk,stock,visible,available) - SELECT item_id,amount,amount,amount + SELECT item_id,amount,amount,amount FROM `cache`.stock WHERE warehouse_id = vWarehouseFk AND (vItemFk IS NULL OR vItemFk = item_id) ON DUPLICATE KEY UPDATE @@ -58170,7 +58871,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagMake`(vItemFk INT) BEGIN -/* * Crea los tags usando la tabla plantilla itemTag +/* * Crea los tags usando la tabla plantilla itemTag * y si no existe a partir de la ficha del artículo. * @param vItemFk El item al que se le añaden los tags */ @@ -58180,33 +58881,33 @@ BEGIN DECLARE vProducer VARCHAR(50); DECLARE vOrigin VARCHAR(20); DECLARE vTypeFk INTEGER; - - DELETE FROM itemTag + + DELETE FROM itemTag WHERE itemFk = vItemFk; - - SELECT typeFk INTO vTypeFk + + SELECT typeFk INTO vTypeFk FROM item WHERE id = vItemFk; - + INSERT INTO itemTag(itemFk, tagFk, value, priority) SELECT vItemFk, itt.tagFk, NULL, itt.priority FROM itemTag it LEFT JOIN itemTypeTag itt ON itt.itemTypeFk = vTypeFk WHERE it.itemFk = vItemFk; - + IF (SELECT COUNT(*) FROM itemTag WHERE itemFk = vItemFk LIMIT 1) = 0 THEN - SELECT ik.name, i.size, i.category, p.name, o.name + SELECT ik.name, i.size, i.category, p.name, o.name INTO vInk, vSize, vCategory, vProducer, vOrigin FROM item i LEFT JOIN ink ik ON ik.id = i.inkFk LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible LEFT JOIN origin o ON o.id = i.originFk WHERE i.id = vItemFk; - + INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) VALUES(vItemFk, 1, vInk, 1); - + INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) VALUES (vItemFk, 8, vSize, 2); @@ -58215,11 +58916,11 @@ BEGIN INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) VALUES(vItemFk, 37, vProducer, 4); - + INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) VALUES(vItemFk, 35, vOrigin, 5); END IF; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -58240,12 +58941,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReorder`(itemTypeFk INT) BEGIN SET @isTriggerDisabled = TRUE; - + -- No se puede usar temporary porque da error Error Code: 1137. No puedo reabrir tabla: 'i DROP TABLE IF EXISTS tmp.item; CREATE TABLE tmp.item SELECT DISTINCT i.id - FROM vn.item i + FROM vn.item i WHERE i.typeFk = itemTypeFk; UPDATE itemTag it @@ -58254,8 +58955,8 @@ BEGIN JOIN itemTypeTag itt ON itt.itemTypeFk = item.typeFk AND itt.tagFk = it.tagFk SET it.priority = itt.priority WHERE itt.itemTypeFk = itemTypeFk; - - CALL item_refreshTags(); + + CALL item_refreshTags(); SET @isTriggerDisabled = FALSE; @@ -58280,12 +58981,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReorderByName`(vName VARCHAR BEGIN SET @isTriggerDisabled = TRUE; - + -- No se puede usar temporary porque da error Error Code: 1137. No puedo reabrir tabla: 'i DROP TABLE IF EXISTS tmp.item; CREATE TABLE tmp.item SELECT DISTINCT i.id - FROM vn.item i + FROM vn.item i WHERE i.`name` LIKE CONCAT(vName,'%'); UPDATE itemTag it @@ -58294,8 +58995,8 @@ BEGIN JOIN itemTypeTag itt ON itt.itemTypeFk = item.typeFk AND itt.tagFk = it.tagFk SET it.priority = itt.priority WHERE itt.itemTypeFk = itemTypeFk; - - CALL item_refreshTags(); + + CALL item_refreshTags(); SET @isTriggerDisabled = FALSE; @@ -58317,37 +59018,37 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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); - +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 */ ; @@ -58372,9 +59073,9 @@ BEGIN SELECT DISTINCT id FROM vn.itemCategory WHERE merchandise <> FALSE; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN + DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN RESIGNAL; END; @@ -58385,45 +59086,45 @@ BEGIN INNER JOIN bs.ventas v ON v.Id_Movimiento = s.id WHERE v.fecha BETWEEN TIMESTAMPADD(DAY, - 7, util.VN_CURDATE()) AND util.VN_CURDATE() GROUP BY s.itemFk; - + DROP TABLE IF EXISTS tmp.topSeller; - CREATE TEMPORARY TABLE tmp.topSeller - ( + CREATE TEMPORARY TABLE tmp.topSeller + ( `id` int(11) NOT NULL DEFAULT '0', `typeFk` smallint(5) unsigned NOT NULL, `itemCategoryFk` int(10) unsigned NOT NULL, `total` bigint(21) NOT NULL DEFAULT '0' ) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - + OPEN rs; read_loop: LOOP FETCH rs INTO vCategoryFk; - + IF vDone THEN LEAVE read_loop; END IF; - + INSERT INTO tmp.topSeller SELECT tsm.itemFk, tsm.typeFk, it.categoryFk, tsm.total FROM tmp.topSellerMin tsm INNER JOIN vn.itemType it ON it.id = tsm.typeFk WHERE it.categoryFk = vCategoryFk ORDER BY tsm.itemFk ,tsm.total DESC - LIMIT 5; + LIMIT 5; END LOOP; CLOSE rs; - + SELECT i.name ,i.id, i.image, i.typeFk, it.categoryFk AS itemCategoryFk, ic.name AS itemCategoryName, it.name AS itemTypeName, ts.total FROM tmp.topSeller ts INNER JOIN vn.item i ON i.id = ts.id INNER JOIN vn.itemType it ON it.id = ts.typeFk INNER JOIN vn.itemCategory ic ON ic.id = it.categoryFk; - + DROP TABLE IF EXISTS topSellerMin; DROP TABLE IF EXISTS tmp.topSeller; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -58440,62 +59141,62 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` 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) = util.VN_CURDATE() - AND a.isDefaultAddress - LIMIT 1; - - CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk); - - IF vTicketFk IS NULL THEN - - CALL ticket_add( - vClientFk, - util.VN_CURDATE(), - vWarehouseFk, - vCompanyVnlFk, - NULL, - NULL, - NULL, - util.VN_CURDATE(), - account.myUser_getId(), - FALSE, - vTicketFk); - END IF; - - INSERT INTO sale(ticketFk, itemFk, concept, quantity) - SELECT vTicketFk, - vItemFk, - CONCAT(longName,' ',getWorkerCode(), ' ', LEFT(CAST(util.VN_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; - +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) = util.VN_CURDATE() + AND a.isDefaultAddress + LIMIT 1; + + CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk); + + IF vTicketFk IS NULL THEN + + CALL ticket_add( + vClientFk, + util.VN_CURDATE(), + vWarehouseFk, + vCompanyVnlFk, + NULL, + NULL, + NULL, + util.VN_CURDATE(), + account.myUser_getId(), + FALSE, + vTicketFk); + END IF; + + INSERT INTO sale(ticketFk, itemFk, concept, quantity) + SELECT vTicketFk, + vItemFk, + CONCAT(longName,' ',getWorkerCode(), ' ', LEFT(CAST(util.VN_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 */ ; @@ -58536,7 +59237,7 @@ SET tag6 = t.name, value6 = it.value WHERE it.priority = 2 AND (vItem IS NULL OR vItem = it.itemFk); -UPDATE item i +UPDATE item i JOIN itemTag it ON it.itemFk = i.id JOIN tag t ON t.id = it.tagFk SET tag7 = t.name, value7 = it.value @@ -58572,14 +59273,9 @@ BEGIN * Elimina todos los items repetidos y los * sustituye por el que tiene menor id */ - DECLARE vItemFrom INT; - DECLARE vItemEnd INT; DECLARE vItemOld INT; DECLARE vItemNew INT; - DECLARE vCurrentItem INT; - DECLARE vQuantity INT; DECLARE vCounter INT DEFAULT 0; - DECLARE vIsStop BOOL DEFAULT FALSE; DECLARE vDone BOOL DEFAULT FALSE; DECLARE curItemClean CURSOR FOR SELECT i.id idOld, @@ -58636,23 +59332,7 @@ BEGIN ORDER BY i.id; DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET vDone = TRUE; - - SELECT itemFrom INTO vItemFrom - FROM vn.itemCleanLog - ORDER BY created DESC - LIMIT 1; - - IF vItemFrom IS NULL THEN - SELECT MIN(id) INTO vItemFrom - FROM vn.item i - WHERE isFloramondo; - END IF; - - SELECT quantity - INTO vQuantity - FROM vn.itemCleanConfig; - - SET vItemEnd = vItemFrom + vQuantity; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; SET @isModeInventory:= TRUE; @@ -58660,7 +59340,7 @@ BEGIN curItemClean: LOOP FETCH curItemClean INTO vItemOld, vItemNew; - + START TRANSACTION; # Deletes @@ -58688,7 +59368,7 @@ BEGIN DELETE FROM vn.itemProposal WHERE itemFk = vItemOld; - + SET @isTriggerDisabled := TRUE; DELETE FROM vn.itemTag WHERE itemFk = vItemOld; @@ -58755,20 +59435,17 @@ BEGIN COMMIT; - SELECT isStop INTO vIsStop - FROM vn.itemCleanConfig; - - IF vIsStop OR vItemOld > vItemEnd OR vDone THEN + IF vDone THEN LEAVE curItemClean; END IF; - + SET vCounter = vCounter + 1; END LOOP; CLOSE curItemClean; - - INSERT INTO itemCleanLog (itemFrom, itemDeleted) - VALUES (vItemOld, vCounter); + + INSERT INTO itemCleanLog (itemDeleted) + VALUES (vCounter); SET @isModeInventory:= FALSE; END ;; @@ -58914,7 +59591,7 @@ BEGIN `in` AS invalue, `out`, @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance, - @currentLineFk := IF (@shipped < util.VN_CURDATE() + @currentLineFk := IF (@shipped < util.VN_CURDATE() OR (@shipped = util.VN_CURDATE() AND (isPicked OR alertLevel >= 2)), lineFk,@currentLineFk) lastPreparedLineFk, isTicket, @@ -58942,7 +59619,7 @@ BEGIN 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 = + JOIN alertLevel al ON al.id = CASE WHEN tr.landed < util.VN_CURDATE() THEN 3 WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3 @@ -58950,7 +59627,7 @@ BEGIN END JOIN state st ON st.code = al.code WHERE tr.landed >= vDateInventory - AND vWarehouse = tr.warehouseInFk + AND vWarehouse = tr.warehouseInFk AND b.itemFk = vItemId AND e.isExcludedFromAvailable = FALSE AND e.isRaid = FALSE @@ -58976,7 +59653,7 @@ BEGIN 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 = + JOIN alertLevel al ON al.id = CASE WHEN tr.shipped < util.VN_CURDATE() THEN 3 WHEN tr.shipped = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3 @@ -59013,7 +59690,7 @@ BEGIN 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 = + JOIN alertLevel al ON al.id = CASE WHEN t.shipped < util.VN_CURDATE() THEN 3 WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN 0 @@ -59021,7 +59698,7 @@ BEGIN 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 + LEFT JOIN claimBeginning cb ON s.id = cb.saleFk WHERE t.shipped >= vDateInventory AND s.itemFk = vItemId AND vWarehouse =t.warehouseFk @@ -59133,7 +59810,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getLack`(IN vForce BOOLEAN, IN BEGIN /** * Calcula una tabla con el máximo negativo visible para cada producto y almacen - * + * * @param vForce Fuerza el recalculo del stock * @param vDays Numero de dias a considerar **/ @@ -59142,31 +59819,31 @@ BEGIN CALL item_getMinacum(NULL, util.VN_CURDATE(), vDays, NULL); CALL item_getMinETD(); - SELECT i.id itemFk, + SELECT i.id itemFk, i.longName, w.id warehouseFk, - p.`name` producer, + p.`name` producer, i.`size`, i.category, - w.name warehouse, + w.name warehouse, SUM(IFNULL(sub.amount,0)) lack, i.inkFk, - IFNULL(im.timed, util.midnight()) timed - FROM (SELECT item_id, - warehouse_id, + IFNULL(im.timed, util.midnight()) timed + FROM (SELECT item_id, + warehouse_id, amount FROM cache.stock WHERE amount > 0 UNION ALL - SELECT itemFk, - warehouseFk, + SELECT itemFk, + warehouseFk, amount FROM tmp.itemMinacum ) sub JOIN warehouse w ON w.id = sub.warehouse_id JOIN item i ON i.id = sub.item_id - LEFT JOIN producer p ON p.id = i.producerFk - JOIN itemType it ON it.id = i.typeFk + LEFT JOIN producer p ON p.id = i.producerFk + JOIN itemType it ON it.id = i.typeFk JOIN itemCategory ic ON ic.id = it.categoryFk LEFT JOIN tmp.itemMinETD im ON im.itemFk = i.id WHERE w.isForTicket @@ -59287,12 +59964,12 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getMinETD`() BEGIN - + /* Devuelve una tabla temporal con la primera ETD, para todos los artículos con salida hoy. - * + * * @return tmp.itemMinETD(itemFk, timed) */ - + DECLARE vMidnight DATETIME DEFAULT util.midnight(); DROP TEMPORARY TABLE IF EXISTS tmp.itemMinETD; @@ -59303,7 +59980,7 @@ BEGIN SELECT s.itemFk, MIN(TIME(IFNULL(z.`hour`,vMidnight))) timed FROM ticket t JOIN sale s ON s.ticketFk = t.id - LEFT JOIN `zone` z ON z.id = t.zoneFk + LEFT JOIN `zone` z ON z.id = t.zoneFk WHERE t.shipped BETWEEN util.VN_CURDATE() AND vMidnight GROUP BY s.itemFk; END ;; @@ -59333,33 +60010,33 @@ BEGIN * @param vWarehouseFk warehouse id * @param vDate fecha para revisar disponible * @param vIsShowedByType para mostrar solo artículos de ese tipo - */ + */ DECLARE vCalcFk INT; DECLARE vTypeFk INT; - + DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; DECLARE vTag7 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; DECLARE vTag8 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; - + DECLARE vValue1 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; DECLARE vValue5 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; DECLARE vValue6 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; - + SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1 FROM vn.item i LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1 LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk WHERE i.id = vItemFk; - + CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDate); - + SELECT i.id itemFk, i.longName, i.subName, @@ -59392,7 +60069,7 @@ BEGIN ORDER BY counter DESC, (t1.name = vTag1) DESC, (it1.value = vValue1) DESC, - (i.tag6 = vTag6) DESC, + (i.tag6 = vTag6) DESC, (i.value6 = vValue6) DESC, (i.tag5 = vTag5) DESC, (i.value5 = vValue5) DESC, @@ -59401,7 +60078,7 @@ BEGIN (i.tag8 = vTag8) DESC, (i.value8 = vValue8) DESC LIMIT 30; - + END ;; DELIMITER ; @@ -59422,18 +60099,18 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `item_GetVisible`(vWarehouse SMALLINT, vItem INT) BEGIN DECLARE vTomorrow DATETIME DEFAULT TIMESTAMPADD(DAY, 1, util.VN_CURDATE()); - + INSERT INTO vn2008.tmp_item (item_id, visible) SELECT item_id, SUM(amount) amount FROM ( - SELECT i.itemFk AS item_id, quantity AS amount + SELECT i.itemFk AS item_id, quantity AS amount FROM itemTicketOut i - LEFT JOIN ticketState ts ON ts.ticketFk = i.ticketFk + LEFT JOIN ticketState ts ON ts.ticketFk = i.ticketFk JOIN state s ON s.id = ts.stateFk - LEFT JOIN (SELECT DISTINCT saleFk - FROM saleTracking st + LEFT JOIN (SELECT DISTINCT saleFk + FROM saleTracking st JOIN state s ON s.id = st.stateFk - WHERE st.created > util.VN_CURDATE() + WHERE st.created > util.VN_CURDATE() AND (s.isPicked OR st.isChecked) ) stPrevious ON `stPrevious`.`saleFk` = i.saleFk WHERE i.warehouseFk = vWarehouse @@ -59441,7 +60118,7 @@ BEGIN AND (s.isPicked OR i.reserved OR stPrevious.saleFk ) AND i.shipped >= util.VN_CURDATE() AND i.shipped < vTomorrow UNION ALL - SELECT iei.itemFk, quantity + SELECT iei.itemFk, quantity FROM itemEntryIn iei WHERE (iei.isReceived != FALSE /*OR ip.modificationDate > util.VN_CURDATE()*/) AND iei.landed >= util.VN_CURDATE() AND iei.landed < vTomorrow @@ -59449,7 +60126,7 @@ BEGIN AND (vItem IS NULL OR iei.itemFk = vItem) AND iei.isVirtualStock is FALSE UNION ALL - SELECT itemFk, quantity + SELECT itemFk, quantity FROM itemEntryOut WHERE isDelivered != FALSE AND shipped >= util.VN_CURDATE() AND shipped < vTomorrow @@ -59482,7 +60159,7 @@ BEGIN * * @param temporary table tmp.item(id) del articulo **/ - + DECLARE done INT DEFAULT FALSE; DECLARE vItemFk INT; DECLARE cur1 CURSOR FOR SELECT id FROM tmp.item; @@ -59492,13 +60169,13 @@ BEGIN OPEN cur1; read_loop: LOOP - + FETCH cur1 INTO vItemFk; - + IF done THEN LEAVE read_loop; END IF; - + UPDATE item i LEFT JOIN itemTag it1 ON it1.priority = 1 AND it1.itemFk = i.id LEFT JOIN itemTag it2 ON it2.priority = 2 AND it2.itemFk = i.id @@ -59513,54 +60190,54 @@ BEGIN LEFT JOIN tagAbbreviation ta2 ON ta2.`value` = it2.`value` AND ta2.tagFk IS NULL LEFT JOIN itemTag it3 ON it3.priority = 3 AND it3.itemFk = i.id LEFT JOIN tagAbbreviation ta3 ON ta3.`value` = it3.`value` - SET i.`name` = CONCAT_WS(' ', - IFNULL(ta1.abbreviation,it1.`value`), - IFNULL(ta2.abbreviation,it2.`value`), + SET i.`name` = CONCAT_WS(' ', + IFNULL(ta1.abbreviation,it1.`value`), + IFNULL(ta2.abbreviation,it2.`value`), IF(i.isFloramondo,'',IFNULL(ta3.abbreviation,it3.`value`))) WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 4 SET i.subName = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 5 LEFT JOIN tag t ON t.id = it.tagFk SET tag5 = t.name, value5 = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 6 LEFT JOIN tag t ON t.id = it.tagFk SET tag6 = t.name, value6 = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 7 - LEFT JOIN tag t ON t.id = it.tagFk + LEFT JOIN tag t ON t.id = it.tagFk SET i.tag7 = t.name, i.value7 = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 8 LEFT JOIN tag t ON t.id = it.tagFk SET tag8 = t.name, value8 = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 9 LEFT JOIN tag t ON t.id = it.tagFk SET tag9 = t.name, value9 = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 10 LEFT JOIN tag t ON t.id = it.tagFk SET tag10 = t.name, value10 = it.`value` WHERE i.id = vItemFk; - -- Al insertar el tag color se modifica también el antiguo campo color + -- Al insertar el tag color se modifica también el antiguo campo color UPDATE item i JOIN tag t ON t.overwrite = 'inkFk' JOIN itemTag it ON it.itemFk = i.id AND it.tagFk = t.id @@ -59575,7 +60252,7 @@ BEGIN JOIN origin o ON o.`name` = it.`value` SET i.originFk = o.id WHERE i.id = vItemFk; - + -- Al insertar el tag medida se modifica también en la tabla item UPDATE item i JOIN tag t ON t.overwrite = 'size' @@ -59590,28 +60267,28 @@ BEGIN JOIN producer p ON p.`name` = it.`value` SET i.producerFk = p.id WHERE i.id = vItemFk; - + -- Al insertar el tag tallos se modifica también en la tabla item UPDATE item i JOIN tag t ON t.overwrite = 'stems' JOIN itemTag it ON it.itemFk = i.id AND it.tagFk = t.id SET i.stems = it.`value` WHERE i.id = vItemFk; - + -- Al insertar el tag categoria se modifica también en la tabla item UPDATE item i JOIN tag t ON t.overwrite = 'category' JOIN itemTag it ON it.itemFk = i.id AND it.tagFk = t.id SET i.category = it.`value` WHERE i.id = vItemFk; - + -- Comprueba si existe un genérico y lo asigna CALL vn.item_setGeneric(vItemFk); - + END LOOP; CLOSE cur1; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -59635,7 +60312,7 @@ BEGIN * * @param temporary table tmp.item(id) del articulo **/ - + DECLARE done INT DEFAULT FALSE; DECLARE vItemFk INT; DECLARE cur1 CURSOR FOR SELECT id FROM tmp.item; @@ -59645,13 +60322,13 @@ BEGIN OPEN cur1; read_loop: LOOP - + FETCH cur1 INTO vItemFk; - + IF done THEN LEAVE read_loop; END IF; - + UPDATE item i LEFT JOIN itemTag it1 ON it1.priority = 1 AND it1.itemFk = i.id LEFT JOIN itemTag it2 ON it2.priority = 2 AND it2.itemFk = i.id @@ -59666,54 +60343,54 @@ BEGIN LEFT JOIN tagAbbreviation ta2 ON ta2.`value` = it2.`value` LEFT JOIN itemTag it3 ON it3.priority = 3 AND it3.itemFk = i.id LEFT JOIN tagAbbreviation ta3 ON ta3.`value` = it3.`value` - SET i.`name` = CONCAT_WS(' ', - IFNULL(ta1.abbreviation,it1.`value`), - IFNULL(ta2.abbreviation,it2.`value`), + SET i.`name` = CONCAT_WS(' ', + IFNULL(ta1.abbreviation,it1.`value`), + IFNULL(ta2.abbreviation,it2.`value`), IF(i.isFloramondo,'',IFNULL(ta3.abbreviation,it3.`value`))) WHERE i.id = vItemFk; - + UPDATE item i JOIN tmp.itemToRefresh tmpI ON tmpI.id = i.id LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 4 SET i.subName = it.`value`; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 5 LEFT JOIN tag t ON t.id = it.tagFk SET tag5 = t.name, value5 = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 6 LEFT JOIN tag t ON t.id = it.tagFk SET tag6 = t.name, value6 = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 7 - LEFT JOIN tag t ON t.id = it.tagFk + LEFT JOIN tag t ON t.id = it.tagFk SET i.tag7 = t.name, i.value7 = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 8 LEFT JOIN tag t ON t.id = it.tagFk SET tag8 = t.name, value8 = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 9 LEFT JOIN tag t ON t.id = it.tagFk SET tag9 = t.name, value9 = it.`value` WHERE i.id = vItemFk; - + UPDATE item i LEFT JOIN itemTag it ON it.itemFk = i.id AND it.priority = 10 LEFT JOIN tag t ON t.id = it.tagFk SET tag10 = t.name, value10 = it.`value` WHERE i.id = vItemFk; - -- Al insertar el tag color se modifica también el antiguo campo color + -- Al insertar el tag color se modifica también el antiguo campo color UPDATE item i JOIN tag t ON t.overwrite = 'inkFk' JOIN itemTag it ON it.itemFk = i.id AND it.tagFk = t.id @@ -59728,7 +60405,7 @@ BEGIN JOIN origin o ON o.`name` = it.`value` SET i.originFk = o.id WHERE i.id = vItemFk; - + -- Al insertar el tag medida se modifica también en la tabla item UPDATE item i JOIN tag t ON t.overwrite = 'size' @@ -59743,18 +60420,18 @@ BEGIN JOIN producer p ON p.`name` = it.`value` SET i.producerFk = p.id WHERE i.id = vItemFk; - + -- Al insertar el tag tallos se modifica también en la tabla item UPDATE item i JOIN tag t ON t.overwrite = 'stems' JOIN itemTag it ON it.itemFk = i.id AND it.tagFk = t.id SET i.stems = it.`value` WHERE i.id = vItemFk; - + END LOOP; CLOSE cur1; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -59772,21 +60449,21 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -59804,47 +60481,47 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `item_setGeneric`(vSelf INT) -BEGIN -/** - * Asigna el código genérico a un item, salvo que sea un código de item genérico. - * - * @param vSelf identificador de vn.item - */ - DECLARE vGenericFk INT; - - SELECT itemFk INTO vGenericFk - FROM ( - SELECT itemFk, (sum(matches) = maxMatches) `match` - FROM ( - SELECT ga.id gaid, - ga.itemFk, - (it.value <=> ga.origin) - + (it.value <=> ga.color) - + (it.value <=> ga.quality) - + (it.value <=> ga.numFlores) - + (it.value <=> ga.category) - + (it.value <=> ga.productor) matches, - !ISNULL(ga.origin) - +!ISNULL(ga.color) - +!ISNULL(ga.quality) - +!ISNULL(ga.numFlores) - +!ISNULL(ga.category) - +!ISNULL(ga.productor) maxMatches - FROM vn.item i - JOIN vn.itemTag it ON it.itemFk = i.id - JOIN vn.genericAllocation ga - ON (i.typeFk = ga.typeFk OR ga.typeFk IS NULL) - AND (i.longName = ga.longName OR ga.longName IS NULL) - AND (i.`size` = ga.`size` OR ga.`size` IS NULL) - AND i.id != ga.itemFk - WHERE i.id = vSelf - AND NOT i.isFloramondo) sub - GROUP BY gaid - HAVING `match`) sub2; - - UPDATE vn.item - SET genericFk = vGenericFk - WHERE id = vSelf; +BEGIN +/** + * Asigna el código genérico a un item, salvo que sea un código de item genérico. + * + * @param vSelf identificador de vn.item + */ + DECLARE vGenericFk INT; + + SELECT itemFk INTO vGenericFk + FROM ( + SELECT itemFk, (sum(matches) = maxMatches) `match` + FROM ( + SELECT ga.id gaid, + ga.itemFk, + (it.value <=> ga.origin) + + (it.value <=> ga.color) + + (it.value <=> ga.quality) + + (it.value <=> ga.numFlores) + + (it.value <=> ga.category) + + (it.value <=> ga.productor) matches, + !ISNULL(ga.origin) + +!ISNULL(ga.color) + +!ISNULL(ga.quality) + +!ISNULL(ga.numFlores) + +!ISNULL(ga.category) + +!ISNULL(ga.productor) maxMatches + FROM vn.item i + JOIN vn.itemTag it ON it.itemFk = i.id + JOIN vn.genericAllocation ga + ON (i.typeFk = ga.typeFk OR ga.typeFk IS NULL) + AND (i.longName = ga.longName OR ga.longName IS NULL) + AND (i.`size` = ga.`size` OR ga.`size` IS NULL) + AND i.id != ga.itemFk + WHERE i.id = vSelf + AND NOT i.isFloramondo) sub + GROUP BY gaid + HAVING `match`) sub2; + + UPDATE vn.item + SET genericFk = vGenericFk + WHERE id = vSelf; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -59862,19 +60539,19 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb3_general_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `item_updatePackingShelve`(vSelf INT, vPacking INT) -BEGIN - +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; - + * 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 */ ; @@ -59892,15 +60569,15 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -59924,9 +60601,9 @@ BEGIN DECLARE vHasNotInventory BOOLEAN DEFAULT FALSE; DECLARE vInventoried2 DATE; DECLARE vDateDayEnd DATETIME; - + SET vDateDayEnd = util.dayEnd(vDated); - + SELECT landed INTO vInventoried FROM travel tr JOIN entry E ON E.travelFk = tr.id @@ -59936,7 +60613,7 @@ BEGIN LIMIT 1; SET vHasNotInventory = IF (vInventoried is null, TRUE, FALSE); - + IF vHasNotInventory THEN SELECT landed INTO vInventoried2 @@ -59957,13 +60634,13 @@ BEGIN CREATE TEMPORARY TABLE inv (warehouseFk SMALLINT, Id_Article BIGINT, - cantidad INT, + cantidad INT, coste DOUBLE DEFAULT 0, total DOUBLE DEFAULT 0, Almacen VARCHAR(20), PRIMARY KEY (Almacen, Id_Article) USING HASH) ENGINE = MEMORY; - + IF vHasNotInventory = TRUE THEN INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen) @@ -60040,7 +60717,7 @@ BEGIN AND it.isInventory ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + s.quantity * IF(vHasNotInventory,0,1); - END IF; + END IF; -- Mercancia en transito INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen) @@ -60058,7 +60735,7 @@ BEGIN AND t.isInventory AND e.isConfirmed ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + (b.quantity); - + CALL vn.buyUltimate(NULL,vDateDayEnd); UPDATE inv i @@ -60073,20 +60750,20 @@ BEGIN IF vIsDetailed THEN SELECT inv.warehouseFk, - i.id itemFk, - i.longName , - i.size, - inv.Cantidad, + i.id itemFk, + i.longName , + i.size, + inv.Cantidad, tp.name Tipo, - ic.name Reino, - inv.coste, + ic.name Reino, + inv.coste, cast(inv.total as decimal(10,2)) total, almacen FROM inv JOIN warehouse w on w.id = warehouseFk JOIN item i ON i.id = inv.Id_Article JOIN itemType tp ON tp.id = i.typeFk - JOIN itemCategory ic ON ic.id = tp.categoryFk + JOIN itemCategory ic ON ic.id = tp.categoryFk WHERE w.valuatedInventory and inv.total > 0 order by inv.total desc; @@ -60133,37 +60810,37 @@ BEGIN * @param vConcept descripcion * @param vAmount cantidad que se compensa * @param vCompany empresa - * @param vOriginalAccount cuenta contable desde la cual se compensa - * - */ + * @param vOriginalAccount cuenta contable desde la cual se compensa + * + */ DECLARE vNewBookEntry INT; DECLARE vIsClientCompensation INT; DECLARE vClientFk INT; DECLARE vSupplierFk INT; DECLARE vIsOriginalAClient BOOL; DECLARE vPayMethodCompensation INT; - + CALL ledger_next(vNewBookEntry); SELECT COUNT(id) INTO vIsOriginalAClient FROM client WHERE accountingAccount LIKE vOriginalAccount COLLATE utf8_general_ci; - SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation - FROM client + SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation + FROM client WHERE accountingAccount LIKE vCompensationAccount COLLATE utf8_general_ci; - + SET @vAmount1:= 0.0; SET @vAmount2:= 0.0; - INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) - VALUES ( vNewBookEntry, - vDated, - vOriginalAccount, - vCompensationAccount, - vConcept, + INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) + VALUES ( vNewBookEntry, + vDated, + vOriginalAccount, + vCompensationAccount, + vConcept, @vAmount1:= IF( - (vIsOriginalAClient AND vAmount > 0) OR - (NOT vIsOriginalAClient AND vAmount < 0), - 0, + (vIsOriginalAClient AND vAmount > 0) OR + (NOT vIsOriginalAClient AND vAmount < 0), + 0, ABS(vAmount) ), @vAmount2:= IF(@vAmount1, @@ -60172,20 +60849,20 @@ BEGIN ), vCompanyFk ), - ( vNewBookEntry, - vDated, - vCompensationAccount, - vOriginalAccount, - vConcept, + ( vNewBookEntry, + vDated, + vCompensationAccount, + vOriginalAccount, + vConcept, @vAmount2, @vAmount1, vCompanyFk); - + IF vIsClientCompensation THEN IF vIsOriginalAClient THEN SET vAmount = -vAmount; END IF; - INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate) + INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate) VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientFk, TRUE); ELSE IF NOT vIsOriginalAClient THEN @@ -60193,7 +60870,7 @@ BEGIN END IF; SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci; SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation'; - + INSERT INTO payment (received, dueDated, supplierFk, amount, bankFk, payMethodFk, concept, companyFk, isConciliated) VALUES(vDated, vDated, vSupplierFk, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE); END IF; @@ -60215,10 +60892,10 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ledger_next`(OUT vNewBookEntry INT) BEGIN - + UPDATE vn.ledgerConfig SET lastBookEntry = LAST_INSERT_ID(lastBookEntry + 1); SET vNewBookEntry = LAST_INSERT_ID(); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -60245,7 +60922,7 @@ BEGIN * @param vEntity Nombre que hace referencia a la tabla. * @param descripcion Descripción de la acción realizada por el usuario */ - + CALL logAddWithUser(vOriginFk, account.myUser_getId(), vActionCode, vEntity, vDescription); END ;; DELIMITER ; @@ -60313,15 +60990,15 @@ BEGIN * @param vEntity Nombre que hace referencia a la tabla. */ DECLARE vTableName VARCHAR(45); - + SET vTableName = CONCAT(vEntity, 'Log'); - + SET @qryLog := CONCAT( 'SELECT ot.id, ot.originFk, ot.userFk, u.name, ot.action, ot.creationDate, ot.description FROM ', vTableName, ' AS ot', ' INNER JOIN account.user u ON u.id = ot.userFk', ' WHERE ot.originFk = ', vOriginFk, ' ORDER BY ot.creationDate DESC' ); - + PREPARE stmt FROM @qryLog; EXECUTE stmt; END ;; @@ -60346,9 +61023,9 @@ BEGIN SET @buildingOrder := 0; SET @route := 0; set @cajas := 0; - + UPDATE tmp.sorter - SET buildingOrder = @buildingOrder := IF(@route = @route := routeFk, @buildingOrder, 0) + 1 + SET buildingOrder = @buildingOrder := IF(@route = @route := routeFk, @buildingOrder, 0) + 1 where date(created) = vDate order by routeFk, created, weight DESC; @@ -60366,23 +61043,23 @@ set @cajas := 0; UPDATE tmp.sorter SET lungGrow = IF(palletOrder = 0, -13, lungGrow); - + DELETE FROM tmp.lungSize WHERE dia = vDate; - + INSERT INTO tmp.lungSize(dia, hora,size) select vDate,hora, @cajas := @cajas + cajas as size from ( select IF(lungGrow BETWEEN -12 AND -1, ETD,time_format(created,"%H:%i")) as hora, sum(if(lungGrow <= 0, lungGrow, 1)) as cajas, @cajas := 0 - from tmp.sorter + from tmp.sorter where date(created) = vDate group by hora ) sub; - + SELECT * FROM tmp.lungSize WHERE dia = vDate; - - + + END ;; @@ -60403,23 +61080,23 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_add`(vPlate VARCHAR(10), vWorkerFk INT) BEGIN - + /** * Inserta registro si el vWorkerFk no ha registrado nada en las últimas 12 horas * @param vPlate número de matrícula - * @param vWorkerFk id del worker - * -*/ - UPDATE vn.machineWorker mw - JOIN vn.machine m ON m.id = mw.machineFk + * @param vWorkerFk id del worker + * +*/ + UPDATE vn.machineWorker mw + JOIN vn.machine m ON m.id = mw.machineFk SET mw.outTimed = util.VN_NOW() WHERE (mw.workerFk = vWorkerFk OR m.plate = vPlate) AND ISNULL(mw.outTimed); - + INSERT INTO machineWorker (machineFk, workerFk) SELECT m.id, vWorkerFk FROM machine m - WHERE m.plate= vPlate; + WHERE m.plate= vPlate; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -60439,21 +61116,21 @@ DELIMITER ;; 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, + * Obtiene historial de la matrícula vPlate que el trabajador vWorkerFk escanea, * si es jefe de producción muestra el historial completo. - * + * * @param vPlate número de matrícula - * @param vWorkerFk id del trabajador - * + * @param vWorkerFk id del trabajador + * */ DECLARE vWorkerName VARCHAR(255) DEFAULT account.user_getNameFromId(vWorkerFk); - SELECT mw.inTimed,account.user_getNameFromId(mw.workerFk) as workerName, mw.outTimed + SELECT mw.inTimed,account.user_getNameFromId(mw.workerFk) as workerName, mw.outTimed FROM machineWorker mw JOIN machine m ON m.plate = vPlate WHERE mw.machineFk = m.id AND mw.workerFk = IF(account.user_hasRole(vWorkerName, 'coolerAssist'), mw.workerFk, vWorkerFk) - ORDER BY mw.inTimed DESC; + ORDER BY mw.inTimed DESC; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -60472,13 +61149,13 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_update`(vPlate VARCHAR(10), vWorkerFk INT) BEGIN - + /** - * Actualiza el registro correspondiente si el vWorkerFk se ha registrado en las últimas horas (campo maxHours de machineWorkerConfig) con vPlate, - * + * Actualiza el registro correspondiente si el vWorkerFk se ha registrado en las últimas horas (campo maxHours de machineWorkerConfig) con vPlate, + * * @param vPlate número de matrícula - * @param vWorkerFk id del trabajador - * + * @param vWorkerFk id del trabajador + * */ DECLARE vMachineFk INT(10); @@ -60487,24 +61164,24 @@ BEGIN SELECT m.id INTO vMachineFk FROM machine m WHERE m.plate = vPlate; - + SELECT maxHours INTO vMaxHours FROM machineWorkerConfig; - IF (SELECT COUNT(*) + IF (SELECT COUNT(*) FROM machineWorker m WHERE m.workerFk = vWorkerFk - AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed)) THEN - + AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed)) THEN + UPDATE machineWorker m SET m.outTimed = CURRENT_TIMESTAMP() - WHERE m.workerFk = vWorkerFk - AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) + WHERE m.workerFk = vWorkerFk + AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed) AND m.machineFk = vMachineFk; - + END IF; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -60522,22 +61199,22 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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,util.VN_NOW()) - AND ISNULL(mw.outTimed) - AND mw.workerFk = vWorkerFk; - +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,util.VN_NOW()) + AND ISNULL(mw.outTimed) + AND mw.workerFk = vWorkerFk; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -60545,14 +61222,14 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `mail_insert` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb4 */ ; /*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `mail_insert`( vReceiver VARCHAR(255), @@ -60563,12 +61240,12 @@ BEGIN /** * Inserta en la tabla vn.mail * - * @param vReceiver Receptor del correo + * @param vReceiver Receptor del correo * @param vReplyTo A quién contestar el correo * @param vSubject Título del correo * @param vBody Cuerpo del correo */ - + DECLARE vIsRepeated BOOLEAN; SELECT COUNT(*) INTO vIsRepeated @@ -60585,7 +61262,7 @@ BEGIN `receiver` = vReceiver, `replyTo` = vReplyTo, `subject` = vSubject, - `body` = vBody; + `body` = IFNULL(vBody,vSubject); END IF; @@ -60609,12 +61286,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `makeNewItem`() BEGIN DECLARE newItemFk INT; - + SELECT getNewItemId() INTO newItemFk; - + INSERT INTO item(id,name,typeFk,originFk) SELECT newItemFk, 'Nuevo artículo', 78,39; - + SELECT newItemFk; @@ -60642,34 +61319,34 @@ BEGIN DECLARE vMinute INT DEFAULT 0; DECLARE vBoxes INT; - + DROP TEMPORARY TABLE IF EXISTS vn.pcsDay; CREATE TEMPORARY TABLE vn.pcsDay SELECT 0 as hh, 0 as mm, 0 as boxes; - + -- Creamos una tabla soporte para acumular las cajas a lo largo del dia WHILE vHour < 24 DO - + WHILE vMinute < 59 DO - + SET vMinute = vMinute + 1; - + INSERT INTO vn.pcsDay(hh,mm) VALUES(vHour, vMinute); - + END WHILE; - + SET vMinute = -1; SET vHour = vHour + 1; - + END WHILE; - + -- Acumulamos UPDATE vn.pcsDay pd LEFT JOIN (SELECT * FROM vn.pcs_graf WHERE dia = vDated) pg USING(hh,mm) SET pd.boxes = pd.boxes + pg.box; - + SELECT * FROM vn.pcsDay; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -60692,7 +61369,7 @@ BEGIN * Recalcula el mana consumido por un trabajador * * @param vWorkerFk Id Trabajador - */ + */ DECLARE vWorkerIsExcluded BOOLEAN; DECLARE vFromDated DATE; DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,util.VN_CURDATE()); @@ -60701,32 +61378,32 @@ BEGIN DECLARE vClaimMana INT; DECLARE vManaBank INT; DECLARE vManaGreugeType INT; - + SELECT COUNT(*) INTO vWorkerIsExcluded FROM workerManaExcluded WHERE workerFk = vWorkerFk; - + IF NOT vWorkerIsExcluded THEN - SELECT id INTO vMana + SELECT id INTO vMana FROM `component` WHERE code = 'mana'; - - SELECT id INTO vAutoMana + + SELECT id INTO vAutoMana FROM `component` WHERE code = 'autoMana'; - - SELECT id INTO vClaimMana + + SELECT id INTO vClaimMana FROM `component` WHERE code = 'manaClaim'; - - SELECT id INTO vManaBank + + SELECT id INTO vManaBank FROM `bank` WHERE code = 'mana'; - - SELECT id INTO vManaGreugeType + + SELECT id INTO vManaGreugeType FROM `greugeType` WHERE code = 'mana'; - SELECT max(dated) INTO vFromDated + SELECT max(dated) INTO vFromDated FROM clientManaCache; - + REPLACE workerMana (workerFk, amount) - SELECT vWorkerFk, sum(mana) FROM + SELECT vWorkerFk, sum(mana) FROM ( SELECT s.quantity * sc.value as mana FROM ticket t @@ -60747,8 +61424,8 @@ BEGIN FROM greuge g JOIN client c ON c.id = g.clientFk WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType - AND g.shipped > vFromDated and g.shipped < util.VN_CURDATE() - UNION ALL + AND g.shipped > vFromDated and g.shipped < util.VN_CURDATE() + UNION ALL SELECT cc.mana FROM clientManaCache cc JOIN client c ON c.id = cc.clientFk @@ -60775,20 +61452,20 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqlConnectionsSorter_kill`() BEGIN /** - * Elimina conexiones del usuario sorter con tiempo >= 30seg. Asociado al evento con el mismo nombre - */ - + * Elimina conexiones del usuario sorter con tiempo >= 30seg. Asociado al evento con el mismo nombre + */ + DECLARE vDone INT DEFAULT 0; DECLARE vProcesId INT; DECLARE vCursor CURSOR FOR - SELECT p.id + SELECT p.id FROM information_schema.processlist p - WHERE USER = 'sorter' + WHERE USER = 'sorter' AND TIME >= 30; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + OPEN vCursor; l: LOOP @@ -60825,7 +61502,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqlPreparedCount_check`() BEGIN DECLARE vPreparedCount INTEGER; - SELECT VARIABLE_VALUE INTO vPreparedCount + SELECT VARIABLE_VALUE INTO vPreparedCount FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE '%prepared_stmt_count%'; @@ -60833,7 +61510,7 @@ BEGIN CALL `vn`.`mail_insert`('cau@verdnatura.es', NULL, 'Problemas BBDD prepared_stmt_count', - CONCAT('Existen problemas con el servicio de Logiflora, prepared_stmt_count con valor: ', + CONCAT('Existen problemas con el servicio de Logiflora, prepared_stmt_count con valor: ', vPreparedCount, ', está próximo a exceder su límite. \r\n Hay que reiniciar el servicio LF.VMP.Service del servidor a3.') ); @@ -60860,37 +61537,37 @@ BEGIN DECLARE newShelving VARCHAR(3); DECLARE vCode VARCHAR(3); - + SELECT MAX(code) INTO vCode FROM vn.shelving WHERE isPrinted = FALSE; - + SET @a1 := ASCII(MID(vCode,1,1)); SET @a2 := ASCII(MID(vCode,2,1)); SET @a3 := ASCII(MID(vCode,3,1)) + 1; - + IF @a3 > 90 THEN - + SET @a3 = 65; SET @a2 = @a2 + 1; - + IF @a2 > 90 THEN - + SET @a2 = 65; SET @a1 = @a1 + 1; - + IF @a1 > 90 THEN - + SET @a1 = 65; - + END IF; - + END IF; - + END IF; SET newShelving = CHAR(@a1,@a2,@a3 USING utf8); - + INSERT INTO vn.shelving(code) VALUES(newShelving); END ;; @@ -60919,18 +61596,18 @@ BEGIN * @param descripcion Texto de la observacion */ DECLARE vTableName VARCHAR(45); - + SET vTableName = CONCAT(vTableCode,'Observation'); - + IF ISNULL(vTableName) THEN CALL util.throw('CODE_NOT_FOUND'); END IF; - + SET @qryLog := CONCAT( 'INSERT INTO ', vTableName, ' (originFk, userFk, description)', ' VALUES (', vOriginFk, ', ', account.myUser_getId(), ', "', vDescription, '")' ); - + PREPARE stmt FROM @qryLog; EXECUTE stmt; DEALLOCATE PREPARE stmt; @@ -60960,15 +61637,15 @@ BEGIN DECLARE vDeliveryMethod INT; DECLARE vClient INT; - + SELECT deliveryMethodFk INTO vDeliveryMethod - FROM vn.agencyMode + FROM vn.agencyMode WHERE id = vAgencyMode; - + SELECT clientFk INTO vClient FROM vn.address WHERE id = vAddress; - + INSERT INTO hedera.order(date_send,customer_id,delivery_method_id,agency_id,address_id,source_app) VALUES( vLanded,vClient ,vDeliveryMethod,vAgencyMode ,vAddress ,vSourceApp); @@ -60994,7 +61671,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `orderDelete`(IN vId INT) BEGIN DELETE FROM hedera.`order` where id = vId; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -61021,7 +61698,7 @@ BEGIN DECLARE vOrderId INT; CALL vn.orderCreate(vLanded,vAgencyMode,vAddress,vSourceApp,vOrderId); SELECT vOrderId; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -61041,7 +61718,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `orderListVolume`(IN vOrderId INT) BEGIN - SELECT + SELECT o.id, o.itemFk, i.description, @@ -61067,7 +61744,7 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `packageInvoicing`( +CREATE DEFINER=`root`@`localhost` PROCEDURE `packageInvoicing`( IN vClient INT, IN vDate DATE, IN vCompany INT, @@ -61086,20 +61763,20 @@ BEGIN SET vGraceDays = IF(vIsAllInvoiceable ,0, 30); SET vGraceDate = TIMESTAMPADD(DAY, - vGraceDays, vDate); - - /* Clientes especiales: + + /* Clientes especiales: 3240 MADEFLOR 992 JAVIER FELIU 4 TONI VENDRELL */ - + IF vClient IN (992, 3240, 4) THEN - + SET vGraceDays = 365; - + END IF; /* Fin clientes especiales */ - + SET vDateEnd = DATE_ADD(vDate, INTERVAL 1 DAY); DROP TEMPORARY TABLE IF EXISTS tmp.packageToInvoice; @@ -61123,22 +61800,22 @@ BEGIN FROM tmp.packageToInvoice GROUP BY itemFk HAVING totalQuantity > 0; - + SELECT COUNT(*) INTO vIsInvoiceable FROM tmp.packageToInvoicePositives; IF vIsInvoiceable THEN - CALL ticket_add(vClient, + CALL ticket_add(vClient, vDateEnd, - vWarehouse, - vCompany, - NULL, - NULL, - NULL, - vDateEnd, - account.myUser_getId(), + vWarehouse, + vCompany, + NULL, + NULL, + NULL, + vDateEnd, + account.myUser_getId(), TRUE, vNewTicket); @@ -61147,44 +61824,44 @@ BEGIN packagingFk, quantity, pvp) - SELECT vNewTicket, - pti.packagingFk, - - SUM(pti.quantity) AS totalQuantity, + SELECT vNewTicket, + pti.packagingFk, + - SUM(pti.quantity) AS totalQuantity, pti.price FROM tmp.packageToInvoice pti - LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk - WHERE ptip.itemFK IS NOT NULL + LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk + WHERE ptip.itemFK IS NOT NULL OR vIsAllInvoiceable GROUP BY packagingFk HAVING totalQuantity; INSERT INTO sale( ticketFk, - itemFk, - concept, - quantity, + itemFk, + concept, + quantity, price ) - SELECT vNewTicket, - pti.itemFk, - i.name as concept, - sum(pti.quantity) as totalQuantity, + SELECT vNewTicket, + pti.itemFk, + i.name as concept, + sum(pti.quantity) as totalQuantity, pti.price FROM tmp.packageToInvoice pti JOIN item i ON i.id = pti.itemFk LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk - WHERE ptip.itemFK IS NOT NULL + WHERE ptip.itemFK IS NOT NULL OR vIsAllInvoiceable GROUP BY pti.itemFk HAVING totalQuantity; - + INSERT INTO saleComponent(saleFk, componentFk, value) SELECT id, vComponentCost, price FROM sale WHERE ticketFk = vNewTicket; - + END IF; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -61210,7 +61887,7 @@ BEGIN WHERE mm.valor = 1 -- Listo para imprimir AND mm.stateFk = 9 -- Encajando AND m.Id_Ticket = ticketFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -61232,15 +61909,15 @@ BEGIN DECLARE valueFk INT; DECLARE encajando INT DEFAULT 9; - - SELECT valor INTO valueFk - FROM vn2008.Movimientos_mark - WHERE Id_Movimiento = saleFk + + SELECT valor INTO valueFk + FROM vn2008.Movimientos_mark + WHERE Id_Movimiento = saleFk AND stateFk = encajando; - + SET valueFk = (IFNULL(valueFk,0) + 1) MOD 3; - - REPLACE vn2008.Movimientos_mark(Id_Movimiento, valor, Id_Trabajador, stateFk) + + REPLACE vn2008.Movimientos_mark(Id_Movimiento, valor, Id_Trabajador, stateFk) VALUES(saleFk,valueFk,account.myUser_getId(),encajando); @@ -61314,34 +61991,34 @@ BEGIN DECLARE vLetters VARCHAR(26) DEFAULT 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; DECLARE vMaxId INT; DECLARE vCode VARCHAR(8); - + SET vColumn = vFromColumn; SET vRow = vFromRow; SET vCode = CONCAT(LPAD(vColumn,3,'0'),'-',IF(vIsLetterMode, MID(vLetters, vRow, 1), LPAD(vRow, 2,'0'))); - + SELECT MAX(id) INTO vMaxId FROM vn.parking; WHILE vColumn <= vToColumn DO - + WHILE vRow <= vToRow DO - + INSERT IGNORE INTO vn.parking(`column`, `row`, sectorFk, `code`, pickingOrder) VALUES (vColumn, vRow, vSectorFk, vCode, vColumn * 100 + vRow ) ON DUPLICATE KEY UPDATE `code` = vCode; - + SET vRow = vRow + 1; SET vCode = CONCAT(LPAD(vColumn,3,'0'),'-',IF(vIsLetterMode, MID(vLetters, vRow, 1), LPAD(vRow, 2,'0'))); - + END WHILE; - + SET vRow = vFromRow; SET vColumn = vColumn + 1; - + SET vCode = CONCAT(LPAD(vColumn,3,'0'),'-',IF(vIsLetterMode, MID(vLetters, vRow, 1), LPAD(vRow, 2,'0'))); - + END WHILE; - + SELECT * FROM vn.parking WHERE `column` BETWEEN vFromColumn AND vToColumn; END ;; @@ -61366,59 +62043,59 @@ BEGIN DECLARE vRow INT; DECLARE vCode VARCHAR(8); DECLARE i INT; - + IF vToRow < vFromRow THEN - + SET vRow = vFromRow; - + WHILE vRow >= vToRow DO - + SET i = 1; - + WHILE i <= vTrolleysByLine DO - + SET vCode = CONCAT(vLetter,'-', LPAD(vRow,2,'0'),'-', i); - + INSERT IGNORE INTO vn.parking( sectorFk, `code`, pickingOrder) VALUES (vSectorFk, vCode, vPickingOrder + (i * 10)) ON DUPLICATE KEY UPDATE `code` = vCode; - + SET i = i + 1; - + END WHILE; - + SET vRow = vRow - 1; - + END WHILE; ELSE - + SET vRow = vFromRow; - + WHILE vRow <= vToRow DO - + SET i = 1; - + WHILE i <= vTrolleysByLine DO - + SET vCode = CONCAT(vLetter,'-', LPAD(vRow,2,'0'),'-', i); - + INSERT IGNORE INTO vn.parking( sectorFk, `code`, pickingOrder) VALUES (vSectorFk, vCode, vPickingOrder + (i * 10) ) ON DUPLICATE KEY UPDATE `code` = vCode; - + SET i = i + 1; - + END WHILE; - + SET vRow = vRow + 1; - + END WHILE; - - + + END IF; - - + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -61442,28 +62119,28 @@ BEGIN DECLARE vColumn INT; DECLARE vLetters VARCHAR(200); DECLARE vLettersLength INT; - + SET vColumn = vStart; SET vRow = 1; SET vLetters = 'ABCDEF'; SET vLettersLength = LENGTH(vLetters); - + WHILE vColumn <= vEnd DO - + REPLACE vn.parking(`column`, `row`, `code`, sectorFk) VALUES(vColumn, vRow, CONCAT(vColumn,MID(vLetters,vRow,1)), vSectorFk); - + SET vRow = vRow + 1; - + IF vRow > vLettersLength THEN - + SET vRow = 1; SET vColumn = vColumn + 1; - + END IF; - + END WHILE; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -61481,29 +62158,29 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -61521,18 +62198,18 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; +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 */ ; @@ -61550,25 +62227,25 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 util.VN_CURDATE() AND vEndingDate - OR ( - ts.alertLevel < 3 - AND t.shipped >= vStartingDate - AND t.shipped < util.VN_CURDATE() - ) - ); +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 util.VN_CURDATE() AND vEndingDate + OR ( + ts.alertLevel < 3 + AND t.shipped >= vStartingDate + AND t.shipped < util.VN_CURDATE() + ) + ); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -61661,14 +62338,14 @@ BEGIN /** * Comprueba si la impresora pertenece al sector * - * @param vLabelerFk id de la impresora + * @param vLabelerFk id de la impresora * @param vSector sector a comprobar */ DECLARE isPrinterInNewSector BOOL; IF vLabelerFk IS NOT NULL THEN SELECT COUNT(sectorFK) INTO isPrinterInNewSector - FROM vn.printer p + FROM vn.printer p WHERE id = vLabelerFk AND sectorFk = vSector; IF !isPrinterInNewSector THEN @@ -62069,7 +62746,7 @@ BEGIN `yearMonth` INT ) ENGINE = MEMORY; - + WHILE vDated <= vEnded DO INSERT INTO tmp.rangeDate SET `dated` = vDated, @@ -62079,7 +62756,7 @@ BEGIN `day` = DAY(vDated), `week` = WEEK(vDated, 1), `yearMonth` = YEAR(vDated) * 100 + MONTH(vDated); - + SET vDated = DATE_ADD(vDated, INTERVAL 1 DAY); END WHILE; END ;; @@ -62090,87 +62767,6 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `rankingTeamByQuarter` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `rankingTeamByQuarter`(vYear INT, vQuarter INT) -BEGIN - - DECLARE vMinimumSalesByQuarter INT; - - SELECT minimumSalesByQuarter INTO vMinimumSalesByQuarter - FROM commissionConfig; - - DROP TEMPORARY TABLE IF EXISTS tmp.rankingTeam; - CREATE TEMPORARY TABLE tmp.rankingTeam - (PRIMARY KEY(departmentFk)) ENGINE = MEMORY - SELECT - (sub1.importe - sub2.importe) / IF ((sub1.importe - sub2.importe) > 0,sub3.countPeople,1) AS diferencia, - CONCAT(sub1.name, - '(', - sub1.peopleMinSale, - '/', - sub3.countPeople, - ')') AS teamPeople, - sub1.departmentFk AS departmentFk - FROM - (((SELECT - SUM(sub.importe) AS importe, - sub.name AS name, - sub.año AS año, - sub.departmentFk AS departmentFk, - COUNT(*) peopleMinSale - FROM - (SELECT - SUM(v.portfolioWeight) AS importe, - d.`name`, - v.año, - wd.departmentFk - FROM (((bs.vendedores v - JOIN `account`.`user` u ON (u.id = v.Id_Trabajador)) - JOIN vn.workerDepartment wd ON (wd.workerFk = u.id)) - JOIN vn.department d ON (d.id = wd.departmentFk)) - WHERE v.año = vYear - AND d.name LIKE 'EQUIPO%' - AND CEIL(v.mes / 3) = vQuarter - GROUP BY v.Id_Trabajador - HAVING importe >= vMinimumSalesByQuarter) sub - GROUP BY sub.departmentFk) sub1 - JOIN (SELECT - SUM(v.portfolioWeight) AS importe, - d.name, - wd.departmentFk - FROM (((bs.vendedores v - JOIN account.user u ON (u.id = v.Id_Trabajador)) - JOIN vn.workerDepartment wd ON (wd.workerFk = u.id)) - JOIN vn.department d ON (d.id = wd.departmentFk)) - WHERE v.año = vYear - 1 - AND d.name LIKE 'EQUIPO%' - AND CEIL(v.mes / 3) = vQuarter - GROUP BY wd.departmentFk - ORDER BY SUM(v.importe) DESC LIMIT 10000000000000000000) sub2 ON (sub1.name = sub2.name)) - JOIN (SELECT COUNT(0) AS countPeople, - wd.departmentFk AS departmentFk - FROM - (vn.salesPersonSince sps - JOIN vn.workerDepartment wd ON (sps.workerFk = wd.workerFk)) - WHERE - CONCAT(YEAR(sps.started), QUARTER(sps.started)) <= CONCAT(vYear - 1, vQuarter) - GROUP BY wd.departmentFk) sub3 ON (sub3.departmentFk = sub1.departmentFk)) - ORDER BY (sub1.importe - sub2.importe) / sub3.countPeople DESC; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `rate_getPrices` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -62187,7 +62783,7 @@ BEGIN * @param vDated fecha para la cual calcula la tarifa * @param vWarehouseFk warehouse para el cual calcula la tafia * @return tmp.rate(rate0, rate1, rate2, rate3) - */ + */ DROP TEMPORARY TABLE IF EXISTS tRate; CREATE TEMPORARY TABLE tRate SELECT rate0, rate1, rate2, rate3 @@ -62195,13 +62791,13 @@ BEGIN WHERE dated <= vDated AND warehouseFk = vWarehouseFk ORDER BY dated DESC; - + DROP TEMPORARY TABLE IF EXISTS tmp.rate; CREATE TEMPORARY TABLE tmp.rate ENGINE = MEMORY SELECT * FROM ( - SELECT * FROM tRate + SELECT * FROM tRate UNION ALL SELECT rate0, rate1, rate2, rate3 FROM rateConfig ) sub2 @@ -62234,13 +62830,13 @@ BEGIN WHERE dated <= vLanded AND warehouseFk = vWarehouseFk ORDER BY dated DESC; - + DROP TEMPORARY TABLE IF EXISTS tmp.rate; CREATE TEMPORARY TABLE tmp.rate ENGINE = MEMORY SELECT * FROM ( - SELECT * FROM tRate + SELECT * FROM tRate UNION ALL SELECT rate0, rate1, rate2, rate3 FROM rateConfig ) sub2 @@ -62274,7 +62870,7 @@ BEGIN CALL cache.available_refresh(vCalc, FALSE, vWarehouseFk, vDate); DROP TEMPORARY TABLE IF EXISTS tmp.recipeCook; - + CREATE TEMPORARY TABLE tmp.recipeCook SELECT *, @counter := IF(@element = element COLLATE utf8_general_ci , @counter + 1, 1) as counter, @@ -62292,22 +62888,22 @@ BEGIN IFNULL((i.inkFk = r.inkFk ) ,0) + IFNULL((i.size = r.size) ,0) + IFNULL((i.name LIKE CONCAT('%',r.name,'%')) ,0) - + IFNULL((i.longName LIKE CONCAT('%',r.longName,'%')),0) + + IFNULL((i.longName LIKE CONCAT('%',r.longName,'%')),0) + IFNULL((i.typeFk = r.typeFk),0) as matches, i.typeFk, rl.previousSelected - FROM vn.recipe r + FROM vn.recipe r JOIN vn.item i ON (IFNULL(i.name LIKE CONCAT('%',r.name,'%'), 0) OR IFNULL(i.longName LIKE CONCAT('%',r.longName,'%'),0)) OR i.typeFk <=> r.typeFk JOIN cache.available a ON a.item_id = i.id AND a.calc_id = vCalc LEFT JOIN (SELECT recipe_ItemFk, element as log_element, selected_ItemFk, count(*) as previousSelected FROM vn.recipe_log - GROUP BY recipe_ItemFk, element, selected_ItemFk) rl ON rl.recipe_ItemFk = r.itemFk + GROUP BY recipe_ItemFk, element, selected_ItemFk) rl ON rl.recipe_ItemFk = r.itemFk AND rl.log_element = r.element AND rl.selected_ItemFk = i.id WHERE r.itemFk = vItemFk - AND a.available > vBunchesQuantity * r.quantity + AND a.available > vBunchesQuantity * r.quantity UNION ALL SELECT 100 itemFk, CONCAT('? ',r.element,' ',IFNULL(r.size,''),' ',IFNULL(r.inkFk,'')) as longName, @@ -62324,15 +62920,15 @@ BEGIN WHERE r.itemFk = vItemFk GROUP BY r.element ) sub - + ORDER BY element, matches DESC, previousSelected DESC; - - SELECT * + + SELECT * FROM tmp.recipeCook WHERE counter < 6 - OR itemFk = 100 + OR itemFk = 100 ; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -62357,71 +62953,71 @@ BEGIN DECLARE vShipped DATE; DECLARE vEntryFk INT; DECLARE vTravelFk INT; - + CALL cache.last_buy_refresh(FALSE); - - SELECT warehouseFk, shipped + + SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped - FROM vn.ticket + FROM vn.ticket WHERE id = vTicketFk; UPDATE vn.ticket t JOIN vn.item i ON i.id = vItemFk SET t.nickname = CONCAT(vQuantity,' ',i.longName) WHERE t.id = vTicketFk; - + SELECT b.buyingValue INTO vLastCost FROM vn.buy b JOIN cache.last_buy lb ON lb.buy_id = b.id WHERE lb.item_id = vItemFk ORDER BY (lb.warehouse_id = vWarehouseFk) DESC LIMIT 1; - + INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price) SELECT vTicketFk, 98, - vQuantity, i.longName, vLastCost FROM vn.item i WHERE i.id = vItemFk; - /* + /* SELECT tr.id INTO vTravelFk FROM vn.travel tr JOIN vn.warehouse w ON w.id = tr.warehouseOutFk WHERE tr.warehouseInFk = vWarehouseFk AND tr.landed = vShipped AND w.name = 'Confeccion'; - + IF IFNULL(vTravelFk,0) = 0 THEN - + INSERT INTO vn.travel(shipped, landed, warehouseInFk, warehouseOutFk, agencyFk) SELECT vShipped, vShipped, vWarehouseFk, w.id, am.id - FROM vn.warehouse w - JOIN vn.agencyMode am + FROM vn.warehouse w + JOIN vn.agencyMode am WHERE w.name = 'Confeccion' AND am.name = 'DIRECTO PROVEEDOR'; - + SET vTravelFk = LAST_INSERT_ID(); - - END IF; - + + END IF; + SELECT e.id INTO vEntryFk FROM vn.entry e JOIN vn.supplier s ON s.id = supplierFk WHERE e.travelFk = vTravelFk AND s.name = 'Confeccion Natural' AND e.isRaid = FALSE; - + IF IFNULL(vEntryFk,0) = 0 THEN - + INSERT INTO vn.entry(supplierFk, evaNotes, travelFk, companyFk) SELECT s.id, t.nickname, vTravelFk, c.id FROM vn.supplier s JOIN vn.ticket t ON t.id = vTicketFk - JOIN vn.company c ON c.code = 'VNL' + JOIN vn.company c ON c.code = 'VNL' WHERE s.name = 'Confeccion Natural'; - + SET vEntryFk = LAST_INSERT_ID(); - + END IF; - + INSERT INTO vn.buy(entryFk, itemFk, quantity, buyingValue, packageFk, packing, grouping) SELECT vEntryFk, b.itemFk, vQuantity, b.buyingValue, b.packageFk, b.packing, b.grouping FROM cache.last_buy lb @@ -62448,7 +63044,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `refund`(IN vOriginTicket INT, OUT vNewTicket INT) BEGIN - + DECLARE vDone BIT DEFAULT 0; DECLARE vCustomer MEDIUMINT; DECLARE vWarehouse TINYINT; @@ -62463,26 +63059,26 @@ BEGIN DECLARE vSaleNew INT; DECLARE vSaleMain INT; DECLARE vZoneFk INT; - + DECLARE vRsMainTicket CURSOR FOR SELECT id, itemFk, - quantity, concept, price, discount - FROM vn.sale + FROM vn.sale WHERE ticketFk = vOriginTicket; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1; - + SELECT id INTO vRefundAgencyMode FROM agencyMode WHERE `name` = 'ABONO'; - SELECT clientFk, warehouseFk, companyFk, addressFk + SELECT clientFk, warehouseFk, companyFk, addressFk INTO vCustomer, vWarehouse, vCompany, vAddress - FROM ticket + FROM ticket WHERE id = vOriginTicket; - - SELECT id INTO vZoneFk + + SELECT id INTO vZoneFk FROM zone WHERE agencyModeFk = vRefundAgencyMode LIMIT 1; - + INSERT INTO vn2008.Tickets ( Id_Cliente, Fecha, @@ -62509,26 +63105,26 @@ BEGIN SET vNewTicket = LAST_INSERT_ID(); - SET vDone := 0; + 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 + + 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; + CLOSE vRsMainTicket; END ;; DELIMITER ; @@ -62563,12 +63159,12 @@ BEGIN * usar vn.saleTracking_Replace * */ - - REPLACE INTO vn2008.Movimientos_mark(Id_Movimiento, valor, original_quantity, Id_Trabajador, stateFk) + + REPLACE INTO vn2008.Movimientos_mark(Id_Movimiento, valor, original_quantity, Id_Trabajador, stateFk) VALUES(idMovimiento,detalle,originalQuantity,idTrabajador,stateFk); - /*INSERT INTO vn.ticketLog (originFk, userFk, action , description) + /*INSERT INTO vn.ticketLog (originFk, userFk, action , description) VALUES(originFk, userFk, actionString, description);*/ - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -62585,54 +63181,58 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `reportLabelCollection_get`(vParam INT) -BEGIN -/** - * Obtiene los datos de etiquetas a partir de de un ticket o colección. - * - * @param vParam Ticket/Colección del que sacar los datos - */ - DECLARE vIsCollection BOOL; - - SELECT IF(id, TRUE, FALSE) INTO vIsCollection - FROM vn.collection c - WHERE id = vParam; - - SELECT c.itemPackingTypeFk, - CONCAT(tc.collectionFk, ' ', LEFT(cc.code, 4)) color, - CONCAT(tc.collectionFk, ' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-', tc.`level`) levelV, - tc.ticketFk, - LEFT(COALESCE(et.description, zo.name, am.name),12) agencyDescription, - am.name, - t.clientFk, - CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 , - CAST(IF(ic.code = 'plant', CONCAT(MAX(i.`size`),' cm'), COUNT(*)) AS CHAR) size, - w.code workerCode, - tt.labelCount, - IF(HOUR(t.shipped), TIME(t.shipped), TIME(zo.`hour`)) agencyHour, - t.shipped, - COUNT(*) lineCount, - t.nickName - FROM ticket t - JOIN ticketCollection tc ON tc.ticketFk = t.id - JOIN collection c ON c.id = tc.collectionFk - LEFT JOIN collectionColors cc ON cc.shelve = tc.`level` - AND cc.wagon = tc.wagon - AND cc.trainFk = c.trainFk - JOIN sale s ON s.ticketFk = t.id - LEFT JOIN saleVolume sv ON sv.saleFk = s.id - JOIN item i ON i.id = s.itemFk - JOIN itemType it ON it.id = i.typeFk - JOIN itemCategory ic ON ic.id = it.categoryFk - JOIN worker w ON w.id = c.workerFk - JOIN agencyMode am ON am.id = t.agencyModeFk - LEFT JOIN ticketTrolley tt ON tt.ticket = t.id - LEFT JOIN `zone` zo ON t.zoneFk = zo.id - LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk - LEFT JOIN expeditionTruck et ON et.id = rm.expeditionTruckFk - WHERE IF(vIsCollection, tc.collectionFk = vParam, tc.ticketFk = vParam) - GROUP BY t.id - ORDER BY cc.`code`; +CREATE DEFINER=`root`@`localhost` PROCEDURE `reportLabelCollection_get`( + vParam INT, + vLabelCount INT +) +BEGIN +/** + * Obtains tag data from a ticket or collection. + * + * @param vParam Ticket/Collection from which data is to be taken. + * @param vLabelCount number of times the collection has been printed. + */ + DECLARE vIsCollection BOOL; + + SELECT IF(id, TRUE, FALSE) INTO vIsCollection + FROM vn.collection c + WHERE id = vParam; + + SELECT c.itemPackingTypeFk, + CONCAT(tc.collectionFk, ' ', LEFT(cc.code, 4)) color, + CONCAT(tc.collectionFk, ' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-', tc.level) levelV, + tc.ticketFk, + LEFT(COALESCE(et.description, zo.name, am.name),12) agencyDescription, + am.name, + t.clientFk, + CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 , + CAST(IF(ic.code = 'plant', CONCAT(MAX(i.size), ' cm'), COUNT(*)) AS CHAR) size, + w.code workerCode, + IF(vLabelCount IS NULL, tt.labelCount, vLabelCount) labelCount, + IF(HOUR(t.shipped), TIME(t.shipped), TIME(zo.hour)) agencyHour, + t.shipped, + COUNT(*) lineCount, + t.nickName + FROM ticket t + JOIN ticketCollection tc ON tc.ticketFk = t.id + JOIN collection c ON c.id = tc.collectionFk + LEFT JOIN collectionColors cc ON cc.shelve = tc.level + AND cc.wagon = tc.wagon + AND cc.trainFk = c.trainFk + JOIN sale s ON s.ticketFk = t.id + LEFT JOIN saleVolume sv ON sv.saleFk = s.id + JOIN item i ON i.id = s.itemFk + JOIN itemType it ON it.id = i.typeFk + JOIN itemCategory ic ON ic.id = it.categoryFk + JOIN worker w ON w.id = c.workerFk + JOIN agencyMode am ON am.id = t.agencyModeFk + LEFT JOIN ticketTrolley tt ON tt.ticket = t.id + LEFT JOIN zone zo ON t.zoneFk = zo.id + LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk + LEFT JOIN expeditionTruck et ON et.id = rm.expeditionTruckFk + WHERE IF(vIsCollection, tc.collectionFk = vParam, tc.ticketFk = vParam) + GROUP BY t.id + ORDER BY cc.code; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -62649,71 +63249,86 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `report_print`( - vReportName VARCHAR(100), - vPrinterFk INT, - vUserFk INT, - vParams JSON, - vPriorityName VARCHAR(100) +CREATE DEFINER=`root`@`localhost` PROCEDURE `report_print`( + vReportName VARCHAR(100), + vPrinterFk INT, + vUserFk INT, + vParams JSON, + vPriorityName VARCHAR(100) ) -BEGIN -/** - * Inserts in the print queue the report to be printed and the necessary parameters for this - * one taking into account the paper size of both the printer and the report. - * - * @param vReportName the report to be printed. - * @param vPrinterFk the printer selected. - * @param vUserFk user id. - * @param vParams Json with report parameters. - * @param vPriorityName the printing priority. - */ - DECLARE vI INT DEFAULT 0; - DECLARE vKeys TEXT DEFAULT JSON_KEYS(vParams); - DECLARE vLength INT DEFAULT JSON_LENGTH(vKeys); - DECLARE vKey VARCHAR(255); - DECLARE vVal VARCHAR(255); - DECLARE vPrintQueueFk INT; - DECLARE vIsTheReportReal INT; - DECLARE vReportSize VARCHAR(255); - DECLARE vIsThePrinterReal INT; - DECLARE vPrinteSize VARCHAR(255); - - SELECT id, paperSizeFk INTO vIsTheReportReal, vReportSize FROM report WHERE name = vReportName; - SELECT id, paperSizeFk INTO vIsThePrinterReal, vPrinteSize FROM printer WHERE id = vPrinterFk; - - IF vIsThePrinterReal IS NULL THEN - CALL util.throw('printerNotExists'); - END IF; - - IF vIsTheReportReal IS NULL THEN - CALL util.throw('reportNotExists'); - END IF; - - IF vReportSize <> vPrinteSize THEN - CALL util.throw('incorrectSize'); - END IF; - - START TRANSACTION; - INSERT INTO printQueue - SET printerFk = vPrinterFk, - priorityFk = (SELECT qp.id FROM queuePriority qp WHERE qp.code = vPriorityName), - reportFk = (SELECT r.id FROM report r WHERE r.name = vReportName), - workerFk = vUserFk; - - SET vPrintQueueFk = LAST_INSERT_ID(); - - WHILE vI < vLength DO - SET vKey = JSON_VALUE(vKeys, CONCAT('$[', vI ,']')); - SET vVal = JSON_VALUE(vParams, CONCAT('$.', vKey)); - - INSERT INTO printQueueArgs - SET printQueueFk = vPrintQueueFk, - name = vKey, - value = vVal; - - SET vI = vI + 1; - END WHILE; - COMMIT; +BEGIN +/** + * Inserts in the print queue the report to be printed and the necessary parameters for this + * one taking into account the paper size of both the printer and the report. + * + * @param vReportName the report to be printed. + * @param vPrinterFk the printer selected. + * @param vUserFk user id. + * @param vParams JSON with report parameters. + * @param vPriorityName the printing priority. + */ + DECLARE vI INT DEFAULT 0; + DECLARE vKeys TEXT DEFAULT JSON_KEYS(vParams); + DECLARE vLength INT DEFAULT JSON_LENGTH(vKeys); + DECLARE vKey VARCHAR(255); + DECLARE vVal VARCHAR(255); + DECLARE vPrintQueueFk INT; + DECLARE vReportSize VARCHAR(255); + DECLARE vIsThePrinterReal INT; + DECLARE vPrinteSize VARCHAR(255); + DECLARE vPriorityFk INT; + DECLARE vReportFk INT; + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + ROLLBACK; + RESIGNAL; + END; + + SELECT id, paperSizeFk INTO vReportFk, vReportSize + FROM report + WHERE name = vReportName; + + SELECT id, paperSizeFk INTO vIsThePrinterReal, vPrinteSize + FROM printer + WHERE id = vPrinterFk; + + SELECT id INTO vPriorityFk + FROM queuePriority + WHERE code = vPriorityName; + + IF vIsThePrinterReal IS NULL THEN + CALL util.throw('printerNotExists'); + END IF; + + IF vReportFk IS NULL THEN + CALL util.throw('reportNotExists'); + END IF; + + IF vReportSize <> vPrinteSize THEN + CALL util.throw('incorrectSize'); + END IF; + + START TRANSACTION; + INSERT INTO printQueue + SET printerFk = vPrinterFk, + priorityFk = vPriorityFk, + reportFk = vReportFk, + workerFk = vUserFk; + + SET vPrintQueueFk = LAST_INSERT_ID(); + + WHILE vI < vLength DO + SET vKey = JSON_VALUE(vKeys, CONCAT('$[', vI ,']')); + SET vVal = JSON_VALUE(vParams, CONCAT('$.', vKey)); + + INSERT INTO printQueueArgs + SET printQueueFk = vPrintQueueFk, + name = vKey, + value = vVal; + + SET vI = vI + 1; + END WHILE; + COMMIT; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -62732,16 +63347,16 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `riskAllClients`(maxRiskDate DATE) BEGIN - + DROP TEMPORARY TABLE IF EXISTS tmp.client_list; CREATE TEMPORARY TABLE tmp.client_list (PRIMARY KEY (Id_Cliente)) ENGINE = MEMORY SELECT id Id_Cliente, null grade FROM vn.client; - + CALL vn2008.risk_vs_client_list(maxRiskDate); - - SELECT + + SELECT c.RazonSocial, c.Id_Cliente, c.Credito, @@ -62753,7 +63368,7 @@ BEGIN JOIN tmp.risk r ON r.Id_Cliente = c.Id_Cliente JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente GROUP BY c.Id_cliente; - + DROP TEMPORARY TABLE IF EXISTS tmp.risk; DROP TEMPORARY TABLE IF EXISTS tmp.client_list; END ;; @@ -62812,25 +63427,25 @@ BEGIN DECLARE vM3 INT; DECLARE vKg INT; DECLARE vMatricula varchar(50); - + SELECT sum(packages) as bultos INTO vPackages - FROM vn.ticket t + FROM vn.ticket t WHERE routeFk = vRouteFk; - + SELECT SUM(sv.physicalVolume), SUM(sv.physicalWeight) INTO vM3, vKg FROM vn.saleVolume sv WHERE sv.routeFk = vRouteFk; - + SELECT v.numberPlate as matricula INTO vMatricula - FROM vn.route r + FROM vn.route r JOIN vn.vehicle v ON r.vehicleFk = v.id WHERE r.id = vRouteFk; - + SELECT vRouteFk as Ruta, - vPackages as Bultos, + vPackages as Bultos, vM3 as m3, vKg as Kg, vMatricula as Matricula; @@ -62860,12 +63475,12 @@ BEGIN SET vDate = TIMESTAMPADD(DAY,-1,vDate); DROP TEMPORARY TABLE IF EXISTS tmp.routesMonitor; - + CREATE TEMPORARY TABLE tmp.routesMonitor (INDEX (routeFk)) ENGINE = MEMORY SELECT DISTINCT(t.routeFk) routeFk - FROM vn.ticket t + FROM vn.ticket t WHERE t.shipped BETWEEN vDate AND vDateEND AND t.routeFk IS NOT NULL; @@ -62876,7 +63491,7 @@ BEGIN UPDATE routesMonitor rm JOIN route r ON r.id = rm.routeFk JOIN agencyMode a ON a.id = r.agencyModeFk - SET rm.`name` = a.name, + SET rm.`name` = a.name, rm.ticketFree = 0, rm.ticketProduction = 0, rm.ticketPacked = 0, @@ -62893,7 +63508,7 @@ BEGIN ) sub ON sub.routeFk = rm.routeFk SET rm.ticketFree = sub.ticketFree; - UPDATE routesMonitor rm + UPDATE routesMonitor rm JOIN(SELECT t.routeFk, COUNT(*) AS ticketPacked FROM vn.ticket t JOIN tmp.routesMonitor rm ON rm.routeFk = t.routeFk @@ -62901,7 +63516,7 @@ BEGIN JOIN ticketTracking tt ON tt.id = ts.ticketTrackingFk JOIN state s ON s.id = tt.stateFk AND s.alertLevel = 2 GROUP BY t.routeFk - ) sub ON sub.routeFk = rm.routeFk + ) sub ON sub.routeFk = rm.routeFk SET rm.ticketPacked = sub.ticketPacked; UPDATE routesMonitor rm @@ -62928,7 +63543,7 @@ BEGIN JOIN( SELECT t.routeFk, SUM(sv.volume) AS m3 FROM vn.ticket t JOIN tmp.routesMonitor rm ON rm.routeFk = t.routeFk - JOIN vn.saleVolume sv ON sv.ticketFk = t.id + JOIN vn.saleVolume sv ON sv.ticketFk = t.id GROUP BY t.routeFk ) sub ON sub.routeFk = rm.routeFk SET rm.m3 = sub.m3; @@ -62938,15 +63553,15 @@ BEGIN FROM vn.ticket t JOIN tmp.routesMonitor rm ON rm.routeFk = t.routeFk JOIN vn.expedition e ON e.ticketFk = t.id - JOIN vn.packaging pk ON pk.id = e.packagingFk + JOIN vn.packaging pk ON pk.id = e.packagingFk GROUP BY t.routeFk - ) sub ON sub.routeFk = rm.routeFk - SET rm.m3boxes = sub.m3boxes; + ) sub ON sub.routeFk = rm.routeFk + SET rm.m3boxes = sub.m3boxes; UPDATE routesMonitor rm - JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk + JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk SET rm.etd = et.ETD; - + DROP TEMPORARY TABLE tmp.routesMonitor; END ;; DELIMITER ; @@ -62967,11 +63582,11 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `routeSetOk`( vRouteFk INT) BEGIN - + UPDATE vn.route r SET r.isOk = 1 WHERE r.id = vRouteFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -63036,17 +63651,17 @@ proc: BEGIN IF vIsFreelance THEN INSERT INTO routeCommission ( - routeFk, - workCenterFk, - freelanceYearlyM3, - cat4m3, + routeFk, + workCenterFk, + freelanceYearlyM3, + cat4m3, cat5m3 ) SELECT vSelf, r.commissionWorkCenterFk, rc.freelanceM3 * IF( - IFNULL(r.m3, 0) >= rc.freelanceMinM3, - IFNULL(r.m3, 0), + IFNULL(r.m3, 0) >= rc.freelanceMinM3, + IFNULL(r.m3, 0), 0), rc.distributionCat4M3 * IFNULL(r.m3, 0), rc.distributionCat5M3 * IFNULL(r.m3, 0) @@ -63058,20 +63673,20 @@ proc: BEGIN AND r.commissionWorkCenterFk; ELSE INSERT INTO routeCommission ( - routeFk, - workCenterFk, - km, - m3, - yearlyKm, - yearlyM3, - cat4m3, + routeFk, + workCenterFk, + km, + m3, + yearlyKm, + yearlyM3, + cat4m3, cat5m3 ) SELECT vSelf, r.commissionWorkCenterFk, - (r.kmEnd - r.kmStart) * + (r.kmEnd - r.kmStart) * IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight), - IFNULL(r.m3, 0) * + IFNULL(r.m3, 0) * IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4), (r.kmEnd - r.kmStart) * rc.kmYearly, IFNULL(r.m3, 0) * rc.m3Yearly, @@ -63108,7 +63723,7 @@ proc: BEGIN /** * Recalculates modified route. */ - + DECLARE vDone BOOL; DECLARE vRouteFk INT; @@ -63117,7 +63732,7 @@ proc: BEGIN DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN DO RELEASE_LOCK('vn.route_doRecalc'); @@ -63165,62 +63780,62 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 - 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 - (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; +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 + 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 + (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 */ ; @@ -63360,7 +63975,7 @@ BEGIN AND rm.año = vYear AND rm.mes = vMonth; - -- Coste PRACTICO de cada bulto, de acuerdo con los componentes de tipo AGENCIA en cada linea de venta + -- Coste PRACTICO de cada bulto, de acuerdo con los componentes de tipo AGENCIA en cada linea de venta UPDATE bi.rutasBoard r JOIN ( SELECT t.routeFk, sum(s.quantity * sc.value) practicoTotal @@ -63372,7 +63987,7 @@ BEGIN JOIN component c ON c.id = sc.componentFk JOIN componentType ct ON ct.id = c.typeFk WHERE ct.type = 'agencia' - AND tm.year = vYear + AND tm.year = vYear AND tm.month = vMonth GROUP BY r.id ) sub ON sub.routeFk = r.Id_Ruta @@ -63381,7 +63996,7 @@ BEGIN -- Coste TEORICO de una caja "virtual" para cada ruta, teniendo en cuenta que hay carros, pallets, etc UPDATE bi.rutasBoard r JOIN ( - SELECT t.routeFk, + SELECT t.routeFk, SUM(t.zonePrice/ ebv.ratio)/ count(*) AS BultoTeoricoMedio FROM ticket t JOIN route r ON r.id = t.routeFk @@ -63391,7 +64006,7 @@ BEGIN JOIN address ad ON ad.id = t.addressFk JOIN client c ON c.id = ad.clientFk LEFT JOIN zone z ON z.id = t.zoneFk - WHERE tm.year = vYear + WHERE tm.year = vYear AND tm.month = vMonth AND z.isVolumetric = FALSE GROUP BY t.routeFk) sub ON r.Id_Ruta = sub.routeFk @@ -63400,7 +64015,7 @@ BEGIN -- Coste VOLUMETRICO TEORICO de una caja "virtual" para cada ruta UPDATE bi.rutasBoard r JOIN ( - SELECT t.routeFk, + SELECT t.routeFk, SUM(freight) AS BultoTeoricoMedio FROM ticket t JOIN route r ON r.id = t.routeFk @@ -63408,7 +64023,7 @@ BEGIN JOIN saleVolume sf ON sf.ticketFk = t.id JOIN client c ON c.id = t.clientFk JOIN zone z ON z.id = t.zoneFk - WHERE tm.year = vYear + WHERE tm.year = vYear AND tm.month = vMonth AND z.isVolumetric != FALSE GROUP BY t.routeFk) sub ON r.Id_Ruta = sub.routeFk @@ -63417,14 +64032,14 @@ BEGIN -- La diferencia entre el teorico y el practico se deberia de cobrar en greuges, cada noche UPDATE bi.rutasBoard r JOIN ( - SELECT t.routeFk, + SELECT t.routeFk, Sum(g.amount) AS greuge FROM ticket t JOIN route r ON r.id = t.routeFk JOIN time tm ON tm.dated = r.created JOIN greuge g ON g.ticketFk = t.id JOIN greugeType gt ON gt.id = g.greugeTypeFk - WHERE tm.year = vYear + WHERE tm.year = vYear AND tm.month = vMonth AND gt.name = 'Diferencia portes' GROUP BY t.routeFk) sub ON r.Id_Ruta = sub.routeFk @@ -63446,28 +64061,28 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -63485,16 +64100,16 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `saleGroup_add`(vSectorFk INT) -BEGIN -/** - * Añade un nuevo registro a la tabla y devuelve su id. - * - * @param vSectorFk Identificador de vn.sector - */ - INSERT INTO vn.saleGroup(userFk, sectorFk) - VALUES (account.myUser_getId(), vSectorFk); - - SELECT LAST_INSERT_ID(); +BEGIN +/** + * Añade un nuevo registro a la tabla y devuelve su id. + * + * @param vSectorFk Identificador de vn.sector + */ + INSERT INTO vn.saleGroup(userFk, sectorFk) + VALUES (account.myUser_getId(), vSectorFk); + + SELECT LAST_INSERT_ID(); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -63590,19 +64205,19 @@ BEGIN IF vClientTypeFk <> 'handMaking' THEN SELECT t.id INTO vNewTicket - FROM ticket t + FROM ticket t JOIN ticketState ts ON ts.ticketFk = t.id WHERE t.addressFk = vAddressFk - AND t.warehouseFk = vWarehouseFk + AND t.warehouseFk = vWarehouseFk AND t.agencyModeFk = vAgencyModeFk AND t.landed <=> vLanded - AND t.shipped BETWEEN vShipped AND vShippedDayEnd + AND t.shipped BETWEEN vShipped AND vShippedDayEnd AND t.refFk IS NULL AND t.id <> vTicketOriginalFk AND IFNULL(ts.alertLevel,0) = 0 - LIMIT 1; + LIMIT 1; END IF; - + IF vNewTicket IS NULL THEN CALL vn.ticket_Clone(vTicketOriginalFk, vNewTicket); END IF; @@ -63611,33 +64226,33 @@ BEGIN SELECT vNewTicket, account.myUser_getId(), s.id FROM state s WHERE s.code = 'FIXING'; - + SELECT COUNT(id) INTO hasAlreadyItem FROM sale s WHERE s.ticketFk = vNewTicket AND s.itemFk = vItemFk; - + IF hasAlreadyItem = FALSE THEN - - INSERT INTO sale(ticketFk, itemFk, concept, quantity, price, discount) + + INSERT INTO sale(ticketFk, itemFk, concept, quantity, price, discount) SELECT vNewTicket, itemFk, concept, vQuantity, price, discount FROM sale s WHERE s.id = vSaleFk; - + SELECT LAST_INSERT_ID() INTO vNewSale; - + INSERT INTO saleComponent(saleFk, componentFk, `value`) SELECT vNewSale, componentFk, `value` - FROM saleComponent + FROM saleComponent WHERE saleFk = vSaleFk; - + ELSE - UPDATE sale + UPDATE sale SET quantity = quantity + vQuantity WHERE ticketFk = vNewTicket AND itemFk = vItemFk; END IF; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -63716,41 +64331,41 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `saleSplit`(vSaleFk INT, vQuantity INT) BEGIN - + DECLARE vNewSaleFk INT; - - INSERT INTO vn.sale(itemFk, - concept, - price, - discount, - quantity, - ticketFk, + + INSERT INTO vn.sale(itemFk, + concept, + price, + discount, + quantity, + ticketFk, isPriceFixed) - SELECT s.itemFk, - i.longName, - s.price, - s.discount, + SELECT s.itemFk, + i.longName, + s.price, + s.discount, vQuantity, - s.ticketFk, - s.isPriceFixed + s.ticketFk, + s.isPriceFixed FROM vn.sale s JOIN vn.item i ON i.id = s.itemFk WHERE s.id = vSaleFk; - + UPDATE vn.sale s JOIN vn.item i ON i.id = s.itemFk SET s.quantity = s.quantity - vQuantity, s.concept = i.longName WHERE s.id = vSaleFk; - + SELECT LAST_INSERT_ID() INTO vNewSaleFk; - - INSERT INTO vn.saleComponent( saleFk, - componentFk, + + INSERT INTO vn.saleComponent( saleFk, + componentFk, value) - SELECT vNewSaleFk, - componentFk, + SELECT vNewSaleFk, + componentFk, value - FROM vn.saleComponent + FROM vn.saleComponent WHERE saleFk = vSaleFk; END ;; @@ -63779,9 +64394,9 @@ BEGIN JOIN itemType it ON it.id = i.typeFk WHERE s.ticketFk = vTicketFk AND it.isMergeable - GROUP BY s.itemFk, s.price, s.discount; + GROUP BY s.itemFk, s.price, s.discount; - UPDATE vn.sale s + UPDATE vn.sale s JOIN salesToPreserve stp ON stp.id = s.id SET quantity = newQuantity WHERE s.ticketFk = vTicketFk; @@ -63830,17 +64445,17 @@ BEGIN OPEN cCur; myLoop: LOOP - + SET vDone = FALSE; - + FETCH cCur INTO vTicketFk; IF vDone THEN LEAVE myLoop; END IF; - + CALL vn.sales_merge(vTicketFk); - + END LOOP; CLOSE cCur; @@ -63852,38 +64467,36 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `saleTracking_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 = utf8mb3 */ ; -/*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `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; - +BEGIN + +/** Inserta en vn.saleTracking las lineas de una previa + * + * @param vSaleGroupFk Identificador de vn.saleGroup + */ + + REPLACE vn.saleTracking(saleFk, + isChecked, + workerFk, + stateFk) + SELECT sgd.saleFk , + TRUE, + account.myUser_getId(), + 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 */ ; @@ -63891,31 +64504,30 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `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 = utf8mb3 */ ; -/*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `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; - +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, stateFk) + SELECT sgd.saleFk, TRUE, account.myUser_getId(), s.id + FROM vn.saleGroupDetail sgd + JOIN vn.state s ON s.code = 'PREPARED' + WHERE sgd.saleGroupFk = vSaleGroupFk; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -63923,41 +64535,39 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `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 = utf8mb3 */ ; -/*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `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; - +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, + stateFk) + SELECT sgd.saleFk, + TRUE, + sc.userFk, + 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 */ ; @@ -63983,9 +64593,9 @@ BEGIN DELETE st.* FROM vn.saleTracking st JOIN vn.state s ON s.id = st.stateFk - WHERE st.saleFk = vSaleFk + WHERE st.saleFk = vSaleFk AND s.code = vState COLLATE utf8_unicode_ci; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -64002,30 +64612,35 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_new`( vSaleFK INT, - vIsChecked BOOLEAN, - vOriginalQuantity INT, - vWorkerFk INT, - vAction VARCHAR(50), +CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_new`( vSaleFK INT, + vIsChecked BOOLEAN, + vOriginalQuantity INT, + vWorkerFk INT, + vAction VARCHAR(50), vState VARCHAR(50)) BEGIN +/** + * Modifica registro de saleTracking - REPLACE vn.saleTracking(saleFk, - isChecked, - originalQuantity, - workerFk, - actionFk, - stateFk) + * @param vSaleFK Identificador del registro a modificar + * @param vIsChecked Indica si la línea ha sido pulsada + * @param vOriginalQuantity Cantidad original + * @param vWorkerFk Identificador del trabajador + * @param vAction Identificador de la acción realizada + * @param vState Identificador del estado a modificar + */ + REPLACE vn.saleTracking(saleFk, + isChecked, + originalQuantity, + workerFk, + stateFk) SELECT vSaleFk, vIsChecked, vOriginalQuantity, IFNULL(vWorkerFk, vn.getUser()), - a.accion_id, s.id - FROM vncontrol.accion a - JOIN vn.state s - WHERE s.code = vState COLLATE utf8_unicode_ci - AND a.accion = vAction COLLATE utf8_unicode_ci; + FROM vn.state s + WHERE s.code = vState COLLATE utf8_unicode_ci; END ;; DELIMITER ; @@ -64045,7 +64660,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_Replace`(vSaleFk INT, vIsChecked INT, vOriginalQuantity INT, vStateFk INT) BEGIN - REPLACE vn.saleTracking(saleFk, isChecked, originalQuantity, stateFk) + REPLACE vn.saleTracking(saleFk, isChecked, originalQuantity, stateFk) VALUES(vSaleFk, vIsChecked, vOriginalQuantity, vStateFk); END ;; DELIMITER ; @@ -64065,26 +64680,26 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_updateIsChecked`(vSaleFk INT, vIsChecked BOOL) BEGIN - + /** * 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 + + DELETE FROM vn.itemShelvingSale WHERE saleFk = vSaleFk; - + END IF; END ;; @@ -64110,15 +64725,15 @@ proc: BEGIN * * @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 ; @@ -64165,7 +64780,7 @@ BEGIN GROUP BY s.id; DECLARE CONTINUE HANDLER FOR NOT FOUND - SET v_done = TRUE; + SET v_done = TRUE; DROP TEMPORARY TABLE IF EXISTS tmp.coste; @@ -64173,7 +64788,7 @@ BEGIN CREATE TEMPORARY TABLE tmp.coste (PRIMARY KEY (id)) ENGINE = MEMORY SELECT s.id - FROM sale s + FROM sale s JOIN item i ON i.id = s.itemFk JOIN itemType tp ON tp.id = i.typeFk JOIN itemCategory ic ON ic.id = tp.categoryFk @@ -64192,17 +64807,17 @@ BEGIN IF v_done THEN LEAVE l; END IF; - + SELECT ticketFk, concept INTO vTicketFk, vConcept FROM sale WHERE id = vSaleFk; - + CALL sale_calculateComponent(vSaleFk, 1); END LOOP; CLOSE vCur; - DROP TEMPORARY TABLE tmp.coste; + DROP TEMPORARY TABLE tmp.coste; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -64220,115 +64835,115 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 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, - MIN(iss.created) picked - 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 - LIMIT 10000000000000000000) 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, - tmp.ticket2; +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 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, + MIN(iss.created) picked + 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 + LIMIT 10000000000000000000) 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, + tmp.ticket2; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -64372,10 +64987,10 @@ BEGIN DELETE tt.* FROM tmp.sale_getProblems tt JOIN vn.ticketObservation tto ON tto.ticketFk = tt.ticketFk - JOIN vn.observationType ot ON ot.id = tto.observationTypeFk - WHERE ot.code = 'administrative' + JOIN vn.observationType ot ON ot.id = tto.observationTypeFk + WHERE ot.code = 'administrative' AND tto.description = 'Miriam'; - + DROP TEMPORARY TABLE IF EXISTS tmp.sale_problems; CREATE TEMPORARY TABLE tmp.sale_problems ( ticketFk INT(11), @@ -64406,7 +65021,7 @@ BEGIN -- Too Little INSERT INTO tmp.sale_problems(ticketFk, isTooLittle) - SELECT tp.ticketFk, TRUE + SELECT tp.ticketFk, TRUE FROM tmp.sale_getProblems tp JOIN vn.ticket t ON t.id = tp.ticketFk JOIN (SELECT t.addressFk, SUM(sv.litros) litros, t.totalWithoutVat @@ -64489,25 +65104,25 @@ BEGIN -- Disponible: no va a haber suficiente producto para preparar todos los pedidos CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, vDate); - - -- Faltas: visible, disponible y ubicado son menores que la cantidad vendida + + -- Faltas: visible, disponible y ubicado son menores que la cantidad vendida CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk); INSERT INTO tmp.sale_problems(ticketFk, itemShortage, saleFk) SELECT ticketFk, problem, saleFk FROM ( - SELECT tl.ticketFk, - LEFT(CONCAT('F: ',GROUP_CONCAT(i.id, ' ', i.longName, ' ')),250) problem, + SELECT tl.ticketFk, + LEFT(CONCAT('F: ',GROUP_CONCAT(i.id, ' ', i.longName, ' ')),250) 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 - JOIN vn.itemCategory ic ON ic.id = it.categoryFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk LEFT JOIN cache.visible v ON v.item_id = i.id AND v.calc_id = vVisibleCache LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache - LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk + LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk WHERE IFNULL(v.visible,0) < s.quantity AND IFNULL(av.available ,0) < s.quantity AND IFNULL(issw.visible, 0) < s.quantity @@ -64520,7 +65135,7 @@ BEGIN AND t.warehouseFk = vWarehouseFk GROUP BY tl.ticketFk) sub ON DUPLICATE KEY UPDATE itemShortage = sub.problem, saleFk = sub.saleFk; - + -- Inventario: Visible suficiente, pero ubicado menor a la cantidad vendida INSERT INTO tmp.sale_problems(ticketFk, itemLost, saleFk) SELECT ticketFk, problem, saleFk @@ -64533,7 +65148,7 @@ BEGIN JOIN vn.itemType it on it.id = i.typeFk JOIN vn.itemCategory ic ON ic.id = it.categoryFk LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache - LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk + LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk WHERE IFNULL(v.visible,0) >= s.quantity AND IFNULL(issw.visible, 0) < s.quantity AND s.quantity > 0 @@ -64546,7 +65161,7 @@ BEGIN AND t.warehouseFk = vWarehouseFk GROUP BY tl.ticketFk) sub ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk; - + -- Retraso: Disponible suficiente, pero no visible ni ubicado INSERT INTO tmp.sale_problems(ticketFk, itemDelay, saleFk) SELECT ticketFk, problem, saleFk @@ -64560,7 +65175,7 @@ BEGIN JOIN vn.itemCategory ic ON ic.id = it.categoryFk LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache - LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk + LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk WHERE IFNULL(v.visible,0) < s.quantity AND IFNULL(av.available ,0) >= s.quantity AND IFNULL(issw.visible, 0) < s.quantity @@ -64577,7 +65192,7 @@ BEGIN END WHILE; CLOSE vCursor; - + INSERT INTO tmp.sale_problems(ticketFk, isTaxDataChecked) SELECT DISTINCT tl.ticketFk, FALSE FROM tmp.ticket_list tl @@ -64607,16 +65222,16 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_getProblemsByTicket`(IN vTicketFk INT, IN vIsTodayRelative TINYINT(1)) BEGIN /** - * Calcula los problemas de cada venta + * Calcula los problemas de cada venta * para un conjunto de tickets. * * @return Problems result */ DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems; - CREATE TEMPORARY TABLE tmp.sale_getProblems + CREATE TEMPORARY TABLE tmp.sale_getProblems (INDEX (ticketFk)) ENGINE = MEMORY - SELECT t.id ticketFk, t.clientFk, t.warehouseFk, t.shipped + SELECT t.id ticketFk, t.clientFk, t.warehouseFk, t.shipped FROM ticket t WHERE t.id = vTicketFk; @@ -64644,24 +65259,24 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_general_ci */ ; DELIMITER ;; 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; +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 */ ; @@ -64680,56 +65295,56 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_recalcComponent`(vOption INT) proc: BEGIN -/** +/** * Actualiza los componentes * * @table tmp.recalculateSales - */ - DECLARE vShipped DATE; + */ + DECLARE vShipped DATE; DECLARE vWarehouseFk SMALLINT; DECLARE vAgencyModeFk INT; DECLARE vAddressFk INT; DECLARE vTicketFk BIGINT; DECLARE vItemFk BIGINT; - DECLARE vLanded DATE; + DECLARE vLanded DATE; DECLARE vIsEditable BOOLEAN; DECLARE vZoneFk 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; - + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + OPEN vCur; l: LOOP SET vDone = FALSE; - FETCH vCur INTO vSale; - + FETCH vCur INTO vSale; + IF vDone THEN LEAVE l; END IF; - - SELECT t.refFk IS NULL, - s.ticketFk, - s.itemFk , - t.zoneFk, - t.warehouseFk, - t.shipped, - t.addressFk, - t.agencyModeFk, + + SELECT t.refFk IS NULL, + 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, + INTO vIsEditable, + vTicketFk, + vItemFk, + vZoneFk, + vWarehouseFk, + vShipped, + vAddressFk, + vAgencyModeFk, vLanded FROM ticket t JOIN sale s ON s.ticketFk = t.id @@ -64737,59 +65352,59 @@ proc: BEGIN 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) + 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); - + + -- 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 + 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_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 ticketComponentUpdateSale(vOption); CALL catalog_componentPurge(); - + DROP TEMPORARY TABLE tmp.buyUltimate; DROP TEMPORARY TABLE tmp.sale; - + END LOOP; - CLOSE vCur; + CLOSE vCur; END ;; DELIMITER ; @@ -64808,31 +65423,31 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -64864,58 +65479,55 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `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 collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollectionSaleGroup_add`(vSaleGroupFk INT, vSectorCollectionFk INT) BEGIN - - /** - * 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 - */ - + +/** + * 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 + 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.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 + 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 */ ; @@ -64933,27 +65545,27 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; 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 +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 + 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)) - AND sc.created > util.VN_CURDATE(); - + AND sc.created > util.VN_CURDATE(); + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -65015,30 +65627,30 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; 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 BOOL; - 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 - AND sc.created >= util.VN_CURDATE(); - - IF NOT hasEmptyCollections THEN - INSERT INTO vn.sectorCollection(userFk, sectorFk) - VALUES(vUserFk, vSectorFk); - END IF; +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 BOOL; + 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 + AND sc.created >= util.VN_CURDATE(); + + IF NOT hasEmptyCollections THEN + INSERT INTO vn.sectorCollection(userFk, sectorFk) + VALUES(vUserFk, vSectorFk); + END IF; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -65174,7 +65786,7 @@ BEGIN SELECT s.warehouseFk FROM vn.sector s WHERE s.id = vSectorFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -65269,10 +65881,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingChange`(IN `vShelvingO` VAR BEGIN UPDATE vn.itemShelving - SET shelvingFk = vShelvingD COLLATE utf8_unicode_ci - WHERE shelvingFk = vShelvingO COLLATE utf8_unicode_ci; - - + SET shelvingFk = vShelvingD COLLATE utf8_unicode_ci + WHERE shelvingFk = vShelvingO COLLATE utf8_unicode_ci; + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -65291,16 +65903,16 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingLog_get`(shelvingFk VARCHAR(10)) BEGIN - + /* Lista el log de un carro - * + * * @param shelvingFk matrícula del carro - * + * */ - + SELECT originFk, name, creationDate, description FROM shelvingLog sl - JOIN account.user u ON u.id = sl.userFk + JOIN account.user u ON u.id = sl.userFk WHERE sl.originFk = shelvingFk COLLATE utf8_general_ci ORDER BY creationDate DESC; @@ -65323,22 +65935,22 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingParking_get`(vShelvingFk VARCHAR(10), vWarehouseFk INT, vDayRange INT) BEGIN - -SELECT s.itemFk, + +SELECT s.itemFk, s.concept, - CAST(SUM(s.quantity) AS DECIMAL(10,0)) as sinServir, - CAST(IFNULL(ist.visible,0) AS DECIMAL(10,0)) as aparcado + CAST(SUM(s.quantity) AS DECIMAL(10,0)) as sinServir, + CAST(IFNULL(ist.visible,0) AS DECIMAL(10,0)) as aparcado FROM vn.sale s LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id JOIN vn.ticket t ON t.id = s.ticketFk LEFT JOIN vn.itemShelvingStock ist ON ist.itemFk = s.itemFk AND ist.warehouseFk = vWarehouseFk JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk AND ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci - WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), util.VN_CURDATE())) + WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), util.VN_CURDATE())) AND iss.saleFk IS NULL AND t.warehouseFk = vWarehouseFk GROUP BY s.itemFk HAVING sinServir > aparcado; - + END ;; DELIMITER ; @@ -65383,12 +65995,12 @@ BEGIN DELETE FROM vn.shelving WHERE length(code) > 3 AND parked < TIMESTAMPADD(WEEK,-1,util.VN_CURDATE()); - + DELETE FROM vn.itemShelving WHERE visible <= 0 AND created < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE()); - DELETE ish.* + DELETE ish.* FROM vn.itemShelving ish JOIN vn.shelving sh ON sh.code = ish.shelvingFk WHERE sh.parkingFk IS NULL @@ -65396,12 +66008,12 @@ BEGIN UPDATE vn.shelving sh LEFT JOIN vn.itemShelving its ON its.shelvingFk = sh.`code` - SET isPrinted = 0, + SET isPrinted = 0, parkingFk = NULL WHERE its.id IS NULL - AND sh.isRecyclable - AND ( sh.parked IS NULL - OR + AND sh.isRecyclable + AND ( sh.parked IS NULL + OR sh.parked < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE()) ); @@ -65422,88 +66034,88 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 util.VN_CURDATE() AND util.dayend(vDated) - AND warehouse_id = vWarehouseFk - GROUP BY item_id - ) sale ON sale.item_id = i.id - LEFT JOIN ( - SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as compra - FROM vn2008.item_entry_in - WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated) - 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 util.VN_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 < util.VN_CURDATE())) - AND ish.visible - GROUP BY ish.shelvingFk - HAVING lineas = spam OR isSpam; - - DROP TEMPORARY TABLE tmp.stock; - +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 util.VN_CURDATE() AND util.dayend(vDated) + AND warehouse_id = vWarehouseFk + GROUP BY item_id + ) sale ON sale.item_id = i.id + LEFT JOIN ( + SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as compra + FROM vn2008.item_entry_in + WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated) + 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 util.VN_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 < util.VN_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 */ ; @@ -65578,20 +66190,20 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `solunionRiskRequest`() BEGIN - + DROP TEMPORARY TABLE IF EXISTS tmp.client_list; CREATE TEMPORARY TABLE tmp.client_list (PRIMARY KEY (Id_Cliente)) ENGINE = MEMORY - SELECT * FROM (SELECT cc.client Id_Cliente, ci.grade FROM vn.creditClassification cc + SELECT * FROM (SELECT cc.client Id_Cliente, ci.grade FROM vn.creditClassification cc JOIN vn.creditInsurance ci ON cc.id = ci.creditClassification WHERE dateEnd IS NULL ORDER BY ci.creationDate DESC LIMIT 10000000000000000000) t1 GROUP BY Id_Cliente; - + CALL vn2008.risk_vs_client_list(util.VN_CURDATE()); - - SELECT + + SELECT c.Id_Cliente, c.Cliente, c.Credito credito_vn, c.creditInsurance solunion, cast(r.risk as DECIMAL(10,0)) riesgo_vivo, cast(c.creditInsurance - r.risk as decimal(10,0)) margen_vivo, f.Consumo consumo_anual, c.Vencimiento, ci.grade @@ -65601,7 +66213,7 @@ BEGIN JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente JOIN bi.facturacion_media_anual f ON c.Id_Cliente = f.Id_Cliente GROUP BY Id_cliente; - + DROP TEMPORARY TABLE IF EXISTS tmp.risk; DROP TEMPORARY TABLE IF EXISTS tmp.client_list; END ;; @@ -65622,19 +66234,26 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `stockBuyedByWorker`(vDate DATE, vWorker INT) BEGIN +/** + * Calculates the space reserved by buyers of the same container + * + * @param vdate date of container delivery + * @param vWorker buyer reserving space in the container + */ DECLARE vVolume DECIMAL(10,2); - DECLARE vWarehouse INT DEFAULT 7; + DECLARE vWarehouseFk INT; + DECLARE vCompressionRatio DECIMAL(1,1); CALL stockTraslation(vDate); - SELECT volume INTO vVolume FROM vn.packaging WHERE id = 'cc' LIMIT 1; + SELECT warehosueFk, conversionCoefficient INTO vWarehouseFk, vCompressionRatio FROM auctionConfig; + SELECT volume INTO vVolume FROM vn.packaging WHERE id = 'cc'; - SELECT - b.entryFk Id_Entrada, + SELECT b.entryFk Id_Entrada, i.id Id_Article, i.name Article, ti.amount Cantidad, - (0.6 * ( ti.amount / b.packing ) * vn.buy_getVolume(b.id))/vVolume buyed, + (vCompressionRatio * (ti.amount / b.packing) * vn.buy_getVolume(b.id))/vVolume buyed, b.packageFk id_cubo, b.packing FROM tmp_item ti @@ -65642,9 +66261,9 @@ BEGIN JOIN itemType it ON i.typeFk = it.id JOIN itemCategory ic ON ic.id = it.categoryFk JOIN worker w ON w.id = it.workerFk - JOIN tmp.buyUltimate bu ON bu.itemFk = i.id AND bu.warehouseFk = vWarehouse + JOIN tmp.buyUltimate bu ON bu.itemFk = i.id AND bu.warehouseFk = vWarehouseFk JOIN buy b ON b.id = bu.buyFk - WHERE ic.display <> 0 AND w.id = vWorker; + WHERE ic.display AND w.id = vWorker; DROP TEMPORARY TABLE tmp.buyUltimate, @@ -65674,15 +66293,15 @@ BEGIN */ CALL vn.stockTraslation(vDated); - DELETE - FROM vn.stockBuyed + DELETE + FROM vn.stockBuyed WHERE `date` = vDated; INSERT INTO vn.stockBuyed(`user`, buyed, `date`, description) - SELECT it.workerFk, - SUM(( ti.amount / b.packing ) * vn.buy_getVolume(b.id)) / vc.palletM3 / 1000000 buyed, + SELECT it.workerFk, + SUM(( ti.amount / b.packing ) * vn.buy_getVolume(b.id)) / vc.palletM3 / 1000000 buyed, vDated, - u.name + u.name FROM tmp_item ti JOIN vn.item i ON i.id = ti.item_id JOIN vn.itemType it ON it.id = i.typeFk @@ -65694,18 +66313,18 @@ BEGIN JOIN account.`user` u ON u.id = it.workerFk WHERE ic.display != 0 GROUP BY it.workerFk; - + INSERT INTO stockBuyed(buyed, `date`, description) SELECT SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000), vDated, IF(c.country = 'España',p.name,c.country) destiny FROM vn.itemTicketOut ito - JOIN vn.ticket t ON t.id = ito.ticketFk - JOIN vn.address a ON a.id = t.addressFk - JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.ticket t ON t.id = ito.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.warehouse wh ON wh.id = t.warehouseFk JOIN vn.itemCost ic ON ic.itemFk = ito.itemFk AND ic.warehouseFk = t.warehouseFk JOIN vn.volumeConfig vc - WHERE ito.shipped BETWEEN vDated AND util.dayend(vDated) + WHERE ito.shipped BETWEEN vDated AND util.dayend(vDated) AND wh.code = 'VNH' GROUP BY destiny; @@ -65719,22 +66338,22 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `stockTraslation` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb4 */ ; /*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_general_ci */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `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 - **/ +/** + * 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; @@ -65744,21 +66363,21 @@ BEGIN CREATE TEMPORARY TABLE tmp_item (UNIQUE INDEX i USING HASH (item_id)) ENGINE = MEMORY - SELECT item_id, SUM(amount) amount + SELECT item_id, SUM(amount) amount FROM vn2008.item_entry_in - WHERE dat = vDate - AND vDate >= util.VN_CURDATE() + WHERE dat = vDate + AND vDate >= util.VN_CURDATE() AND warehouse_id = vWarehouse AND isVirtualStock is FALSE - GROUP BY item_id + GROUP BY item_id HAVING amount != 0; CALL `cache`.stock_refresh (FALSE); INSERT INTO tmp_item (item_id,amount) - SELECT item_id,s.amount + SELECT item_id,s.amount FROM `cache`.stock s - WHERE warehouse_id = vWarehouse + WHERE warehouse_id = vWarehouse ON DUPLICATE KEY UPDATE amount = tmp_item.amount + VALUES(amount); CALL buyUltimate(vWarehouse,vDate); @@ -65786,10 +66405,10 @@ BEGIN DECLARE vBossId INT; DECLARE vDone BOOL; DECLARE workerCur CURSOR FOR - SELECT workerFk - FROM tmp.subordinate + SELECT workerFk + FROM tmp.subordinate WHERE NOT isChecked; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; DECLARE EXIT HANDLER FOR 1062 BEGIN @@ -65797,29 +66416,29 @@ BEGIN END; DROP TEMPORARY TABLE IF EXISTS tmp.subordinate; - + CREATE TEMPORARY TABLE tmp.subordinate (PRIMARY KEY (workerFk)) ENGINE = MEMORY SELECT vBossFk AS workerFk, 0 AS isChecked; - + WHILE (SELECT COUNT(*) FROM tmp.subordinate WHERE NOT isChecked) > 0 DO OPEN workerCur; workerLoop: LOOP SET vDone = FALSE; FETCH workerCur INTO vBossId; - + IF vDone THEN LEAVE workerLoop; END IF; - - INSERT INTO tmp.subordinate - SELECT id, 0 - FROM worker + + INSERT INTO tmp.subordinate + SELECT id, 0 + FROM worker WHERE bossFk = vBossId; - - UPDATE tmp.subordinate + + UPDATE tmp.subordinate SET isChecked = 1 WHERE workerFk = vBossId; END LOOP; @@ -65859,13 +66478,13 @@ BEGIN -- Calcula el balance inicial y final de cada proveedor INSERT INTO openingBalance SELECT MAX(dueDated), - supplierFk, - companyFk, + supplierFk, + companyFk, sum(amount) eurAmount, sum(divisa) foreignAmount FROM ( SELECT p.dueDated, - p.supplierFk, + p.supplierFk, p.companyFk, p.amount, p.divisa @@ -65881,7 +66500,7 @@ BEGIN SELECT iidd.dueDated, ii.supplierFk, ii.companyFk, - - iidd.amount, + - iidd.amount, - iidd.foreignValue FROM invoiceIn ii JOIN invoiceInDueDay iidd ON ii.id = iidd.invoiceInFk @@ -65889,14 +66508,14 @@ BEGIN JOIN company co ON co.id = ii.companyFk WHERE iidd.dueDated > '2014-12-31' AND iidd.dueDated <= vEnded - AND ii.isBooked AND co.`code` = 'VNL' + AND ii.isBooked AND co.`code` = 'VNL' AND c.`code` <> 'EUR' UNION ALL SELECT se.dueDated, se.supplierFk, se.companyFk, - - se.amount, + - se.amount, 0 FROM supplierExpense se JOIN currency c ON c.id = se.currencyFk @@ -65906,7 +66525,7 @@ BEGIN AND co.`code` = 'VNL' AND c.`code` <> 'EUR' ) sub GROUP BY companyFk, supplierFk; - + SELECT ob.dueDated , ob.supplierFk , ob.companyFk @@ -65993,7 +66612,7 @@ BEGIN SELECT MAX(`row`) INTO vMaxRow FROM tmp.supplierPackagingList; - + DROP TEMPORARY TABLE IF EXISTS tmp.supplierPackaging; CREATE TEMPORARY TABLE tmp.supplierPackaging( supplierFk INT, @@ -66007,7 +66626,7 @@ BEGIN warehouse INT, buyingValue INT, balance INT); - + l1: LOOP IF vCounter = vMaxRow THEN @@ -66016,12 +66635,12 @@ BEGIN 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, @@ -66049,9 +66668,9 @@ BEGIN WHERE supplierFk = vSupplierFk AND landed >= vFromDated AND itemFk = vItemFk - + UNION ALL - + SELECT vSupplierFk, itemFk, longName, @@ -66131,7 +66750,7 @@ BEGIN - SUM(iid.amount) mysql, 0 sage FROM invoiceInDueDay iid - JOIN invoiceIn ii ON ii.id = iid.invoiceInFk + JOIN invoiceIn ii ON ii.id = iid.invoiceInFk WHERE IFNULL(ii.bookEntried, ii.issued) BETWEEN vDateFrom AND vDateTo AND ii.isBooked GROUP BY ii.id @@ -66270,15 +66889,15 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketBoxesView`(IN vTicketFk INT) BEGIN - - SELECT s.id, - s.itemFk, - s.concept, - floor(s.quantity / b.packing) as Cajas, - b.packing, - s.isPicked, + + SELECT s.id, + s.itemFk, + s.concept, + floor(s.quantity / b.packing) as Cajas, + b.packing, + s.isPicked, i.size - FROM ticket t + FROM ticket t JOIN sale s ON s.ticketFk = t.id JOIN item i ON i.id = s.itemFk JOIN cache.last_buy lb on lb.warehouse_id = t.warehouseFk AND lb.item_id = s.itemFk @@ -66289,7 +66908,7 @@ BEGIN AND p.isBox GROUP BY s.itemFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -66311,7 +66930,7 @@ BEGIN DECLARE vDateStart DATETIME DEFAULT DATE(vDate); DECLARE vDateEnd DATETIME DEFAULT util.dayEnd(vDate); - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketBuiltTime; CREATE TEMPORARY TABLE tmp.ticketBuiltTime @@ -66324,7 +66943,7 @@ BEGIN SELECT ticketFk, builtTime FROM ( - SELECT + SELECT Id_Ticket as ticketFk, odbc_date as builtTime FROM @@ -66332,13 +66951,13 @@ BEGIN WHERE odbc_date BETWEEN vDateStart AND vDateEnd ORDER BY Id_Ticket, odbc_date DESC LIMIT 10000000000000000000 - ) sub + ) sub GROUP BY ticketFk ) sub2 ON sub2.ticketFk = t.id WHERE t.shipped BETWEEN vDate AND util.dayEnd(vDate) AND t.clientFk NOT IN (50,400,200) AND t.companyFk = 442 - + ; END ;; @@ -66375,10 +66994,10 @@ BEGIN DECLARE vZoneFk INT; REPLACE INTO orderTicket(orderFk,ticketFk) - SELECT orderFk, vTicketNew - FROM orderTicket + SELECT orderFk, vTicketNew + FROM orderTicket WHERE ticketFk = vTicketOld; - + SELECT t.clientFk, t.warehouseFk, date(t.shipped), t.addressFk, t.agencyModeFk, t.landed, a.agencyFk, t.zoneFk INTO vClient, vWarehouse, vShipped, vAddress, vAgencyMode, vLanded, vAgency, vZoneFk FROM agencyMode a @@ -66388,47 +67007,47 @@ BEGIN IF vLanded IS NULL THEN CALL zone_getLanded(vShipped, vAddress, vAgency, vWarehouse, TRUE); UPDATE ticket t - JOIN tmp.zoneGetLanded zgl ON t.warehouseFk = zgl.warehouseFk + JOIN tmp.zoneGetLanded zgl ON t.warehouseFk = zgl.warehouseFk SET t.landed = zgl.landed, t.zoneFk = zgl.zoneFk WHERE t.id = vTicketNew; - + SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1; DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetLanded; END IF; -- rellena la tabla tmp.buyUltimate con la ultima compra - CALL buyUltimate(vWarehouse, vShipped); + CALL buyUltimate(vWarehouse, vShipped); DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot; - CREATE TEMPORARY TABLE tmp.ticketLot + CREATE TEMPORARY TABLE tmp.ticketLot SELECT vWarehouse 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 = vTicketOld GROUP BY s.itemFk; - - CALL catalog_componentPrepare(); + + CALL catalog_componentPrepare(); CALL catalog_componentCalculate(vZoneFk, vAddress, vShipped, vWarehouse); -- Bionizamos lineas con Preu = 0 DROP TEMPORARY TABLE IF EXISTS tmp.sale; CREATE TEMPORARY TABLE tmp.sale (PRIMARY KEY (saleFk)) ENGINE = MEMORY - SELECT s.id saleFk, vWarehouse warehouseFk + SELECT s.id saleFk, vWarehouse warehouseFk FROM sale s JOIN ticket t on t.id = s.ticketFk WHERE s.ticketFk = vTicketNew AND s.price = 0; - + CALL ticketComponentUpdateSale(1); -- Bionizamos lineas con Preu > 0 DROP TEMPORARY TABLE IF EXISTS tmp.sale; CREATE TEMPORARY TABLE tmp.sale (PRIMARY KEY (saleFk)) ENGINE = MEMORY - SELECT s.id saleFk, vWarehouse warehouseFk - FROM sale s + SELECT s.id saleFk, vWarehouse warehouseFk + FROM sale s JOIN ticket t on t.id = s.ticketFk WHERE s.ticketFk = vTicketNew AND s.price > 0; - + CALL ticketComponentUpdateSale(6); -- Log @@ -66436,11 +67055,11 @@ BEGIN -- Limpieza CALL catalog_componentPurge(); - DROP TEMPORARY TABLE IF EXISTS - tmp.buyUltimate, - tmp.sale, + DROP TEMPORARY TABLE IF EXISTS + tmp.buyUltimate, + tmp.sale, tmp.zoneGetLanded; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -66463,12 +67082,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculateFromType`( vLanded D vTypeFk INT) BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.item; - CREATE TEMPORARY TABLE tmp.item - (INDEX (itemFk)) - ENGINE = MEMORY + CREATE TEMPORARY TABLE tmp.item + (INDEX (itemFk)) + ENGINE = MEMORY SELECT id itemFk FROM vn.item WHERE typeFk = vTypeFk; - + CALL catalog_calculate(vLanded, vAddressFk, vAgencyModeFk); DROP TEMPORARY TABLE tmp.item; DROP TEMPORARY TABLE tmp.ticketLot; @@ -66490,7 +67109,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculatePurge`() BEGIN - DROP TEMPORARY TABLE + DROP TEMPORARY TABLE tmp.ticketCalculateItem, tmp.ticketComponentPrice, tmp.ticketComponent, @@ -66514,56 +67133,56 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketClon`(vTicketFk INT, vNewShipped DATE) BEGIN - + DECLARE done INT DEFAULT FALSE; - DECLARE vNewTicketFk INT; + DECLARE vNewTicketFk INT; DECLARE vOldSaleFk INT; DECLARE vNewSaleFk INT; - + DECLARE cur1 CURSOR FOR SELECT id FROM vn.sale WHERE ticketFk = vTicketFk; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; - + SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE()); - + CALL vn.ticket_Clone(vTicketFk, vNewTicketFk); - - UPDATE vn.ticket + + UPDATE vn.ticket SET landed = TIMESTAMPADD(DAY, DATEDIFF(vNewShipped, shipped), landed), shipped = vNewShipped WHERE id = vNewTicketFk; - + OPEN cur1; - + read_loop: LOOP - + FETCH cur1 INTO vOldSaleFk; - + IF done THEN LEAVE read_loop; END IF; - + INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed) SELECT vNewTicketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed FROM vn.sale WHERE id = vOldSaleFk; - + SELECT max(id) INTO vNewSaleFk FROM vn.sale WHERE ticketFk = vNewTicketFk; - + INSERT INTO vn.saleComponent(saleFk, componentFk, value, isGreuge) SELECT vNewSaleFk, componentFk, value, isGreuge FROM vn.saleComponent WHERE saleFk = vOldSaleFk; - + END LOOP; CLOSE cur1; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -66585,18 +67204,18 @@ BEGIN DECLARE vShipped DATE; DECLARE vMaxDated DATE; - - SELECT shipped, TIMESTAMPADD(YEAR,1,shipped) + + SELECT shipped, TIMESTAMPADD(YEAR,1,shipped) INTO vShipped, vMaxDated FROM vn.ticket WHERE id = vTicketFk; - + WHILE vShipped <= vMaxDated DO - + SET vShipped = TIMESTAMPADD(WEEK, 1, vShipped); - + CALL vn.ticketClon(vTicketFk, vShipped); - + END WHILE; END ;; @@ -66618,10 +67237,10 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCollection_get`(vTicketFk INT) BEGIN - SELECT tc.collectionFk + SELECT tc.collectionFk FROM vn.ticketCollection tc WHERE ticketFk = vTicketFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -66639,19 +67258,19 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -66689,18 +67308,18 @@ BEGIN END; START TRANSACTION; - + IF (SELECT addressFk FROM ticket WHERE id = vTicketFk) <> vAddressFk THEN - - UPDATE ticket t + + UPDATE ticket t JOIN address a ON a.id = vAddressFk SET t.nickname = a.nickname WHERE t.id = vTicketFk; - + END IF; - + UPDATE ticket t - SET + SET t.clientFk = vClientFk, t.agencyModeFk = vAgencyModeFk, t.addressFk = vAddressFk, @@ -66711,12 +67330,12 @@ BEGIN t.isDeleted = vIsDeleted WHERE t.id = vTicketFk; - + IF vHasToBeUnrouted THEN UPDATE ticket t SET t.routeFk = NULL WHERE t.id = vTicketFk; END IF; - + IF vOption <> 8 THEN DROP TEMPORARY TABLE IF EXISTS tmp.sale; CREATE TEMPORARY TABLE tmp.sale @@ -66758,104 +67377,104 @@ BEGIN DECLARE vComponentFk INT; DECLARE vRenewComponents BOOLEAN; DECLARE vKeepPrices BOOLEAN; - + CASE vOption - WHEN 1 THEN + WHEN 1 THEN SET vRenewComponents = TRUE; SET vKeepPrices = FALSE; WHEN 2 THEN - SELECT id INTO vComponentFk FROM component WHERE `code` = 'debtCollection'; + SELECT id INTO vComponentFk FROM component WHERE `code` = 'debtCollection'; SET vRenewComponents = TRUE; SET vKeepPrices = TRUE; - WHEN 3 THEN - SELECT id INTO vComponentFk FROM component WHERE `code` = 'mana'; + WHEN 3 THEN + SELECT id INTO vComponentFk FROM component WHERE `code` = 'mana'; + SET vRenewComponents = TRUE; + SET vKeepPrices = TRUE; + WHEN 4 THEN + SELECT id INTO vComponentFk FROM component WHERE `code` = 'buyerDiscount'; SET vRenewComponents = TRUE; SET vKeepPrices = TRUE; - WHEN 4 THEN - SELECT id INTO vComponentFk FROM component WHERE `code` = 'buyerDiscount'; - SET vRenewComponents = TRUE; - SET vKeepPrices = TRUE; - /* WHEN 5 THEN + /* WHEN 5 THEN SET vComponentFk = 35; SET vRenewComponents = TRUE; SET vKeepPrices = TRUE;*/ - WHEN 6 THEN + WHEN 6 THEN SELECT id INTO vComponentFk FROM component WHERE `code` = 'imbalance'; SET vRenewComponents = TRUE; SET vKeepPrices = TRUE; WHEN 7 THEN REPLACE INTO saleComponent(saleFk, componentFk, value) - SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.8, 3) + SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.8, 3) FROM sale s JOIN tmp.sale tmps ON tmps.saleFk = s.id - LEFT JOIN saleComponent sc ON sc.saleFk = s.id + LEFT JOIN saleComponent sc ON sc.saleFk = s.id AND sc.componentFk NOT IN (28, 29) GROUP BY s.id; - + REPLACE INTO saleComponent(saleFk, componentFk, value) - SELECT s.id, 29, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.2, 3) + SELECT s.id, 29, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.2, 3) FROM sale s JOIN tmp.sale tmps ON tmps.saleFk = s.id - LEFT JOIN saleComponent sc ON sc.saleFk = s.id + LEFT JOIN saleComponent sc ON sc.saleFk = s.id AND sc.componentFk NOT IN (28, 29) GROUP BY s.id; - + SET vRenewComponents = FALSE; SET vKeepPrices = FALSE; WHEN 8 THEN - DELETE sc.* + DELETE sc.* FROM tmp.sale tmps JOIN saleComponent sc ON sc.saleFk = tmps.saleFk; - + REPLACE INTO saleComponent(saleFk, componentFk, value) - SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100)), 3) + SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100)), 3) FROM sale s JOIN tmp.sale tmps ON tmps.saleFk = s.id; - + SET vRenewComponents = FALSE; SET vKeepPrices = FALSE; - WHEN 9 THEN + WHEN 9 THEN SET vRenewComponents = TRUE; SET vKeepPrices = TRUE; END CASE; IF vRenewComponents THEN - DELETE sc.* - FROM tmp.sale tmps + DELETE sc.* + FROM tmp.sale tmps JOIN saleComponent sc ON sc.saleFk = tmps.saleFk JOIN `component` c ON c.id = sc.componentFk WHERE c.isRenewable; - + REPLACE INTO saleComponent(saleFk, componentFk, value) SELECT s.id, tc.componentFk, tc.cost - FROM sale s + FROM sale s JOIN tmp.sale tmps ON tmps.saleFk = s.id JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk - LEFT JOIN saleComponent sc ON sc.saleFk = s.id - AND sc.componentFk = tc.componentFk - LEFT JOIN `component` c ON c.id = tc.componentFk + LEFT JOIN saleComponent sc ON sc.saleFk = s.id + AND sc.componentFk = tc.componentFk + LEFT JOIN `component` c ON c.id = tc.componentFk WHERE IF(sc.componentFk IS NULL AND NOT c.isRenewable, FALSE, TRUE); - - -- Añadir componente venta por paquete + + -- Añadir componente venta por paquete DROP TEMPORARY TABLE IF EXISTS tmp.sale2; CREATE TEMPORARY TABLE tmp.sale2 (PRIMARY KEY (saleFk)) - ENGINE = MEMORY + ENGINE = MEMORY SELECT * FROM tmp.sale; - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent2; CREATE TEMPORARY TABLE tmp.ticketComponent2 - SELECT * FROM tmp.ticketComponent; - - REPLACE INTO saleComponent(saleFk, componentFk, value) + SELECT * FROM tmp.ticketComponent; + + REPLACE INTO saleComponent(saleFk, componentFk, value) SELECT t.id, t.componentFk, t.cost FROM ( SELECT s.id, tc.componentFk, tc.cost, MOD(s.quantity, b.packing) as resto FROM vn.sale s JOIN tmp.sale tmps ON tmps.saleFk = s.id - JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND tmps.warehouseFk = lb.warehouse_id + JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND tmps.warehouseFk = lb.warehouse_id JOIN vn.buy b ON b.id = buy_id JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk - JOIN `component` c ON c.id = tc.componentFk AND c.code = 'salePerPackage' + JOIN `component` c ON c.id = tc.componentFk AND c.code = 'salePerPackage' LEFT JOIN ( SELECT s.id FROM vn.sale s @@ -66866,8 +67485,8 @@ BEGIN ) tp ON tp.id = s.id WHERE tp.id IS NULL HAVING resto <> 0) t; - - DROP TEMPORARY TABLE IF EXISTS + + DROP TEMPORARY TABLE IF EXISTS tmp.sale2, tmp.ticketComponent2; END IF; @@ -66885,26 +67504,26 @@ BEGIN UPDATE sale s JOIN item i on i.id = s.itemFk JOIN itemType it on it.id = i.typeFk - JOIN (SELECT SUM(sc.value) sumValue, sc.saleFk + JOIN (SELECT SUM(sc.value) sumValue, sc.saleFk FROM saleComponent sc JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk GROUP BY sc.saleFk) sc ON sc.saleFk = s.id SET s.price = sumValue / ((100 - s.discount) / 100) - WHERE it.code != 'PRT' ; - + WHERE it.code != 'PRT' ; + REPLACE INTO saleComponent(saleFk, componentFk, value) SELECT s.id, 21, ROUND((s.price * (100 - s.discount) / 100) - SUM(value), 3) saleValue FROM sale s JOIN tmp.sale tmps ON tmps.saleFk = s.id LEFT JOIN saleComponent sc ON sc.saleFk = s.id WHERE sc.componentFk != 21 - GROUP BY s.id + GROUP BY s.id HAVING ROUND(saleValue, 4) <> 0; END IF; - + UPDATE sale s JOIN ( - SELECT SUM(sc.value) sumValue, sc.saleFk + SELECT SUM(sc.value) sumValue, sc.saleFk FROM saleComponent sc JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk JOIN `component` c ON c.id = sc.componentFk @@ -66918,10 +67537,10 @@ BEGIN JOIN sale s on s.id = sc.saleFk JOIN item i ON i.id = s.itemFk JOIN itemType it ON it.id = i.typeFk - WHERE it.code = 'PRT'; - + WHERE it.code = 'PRT'; + INSERT INTO saleComponent(saleFk, componentFk, value) - SELECT s.id, 15, s.price + SELECT s.id, 15, s.price FROM sale s JOIN tmp.sale tmps ON tmps.saleFk = s.id JOIN item i ON i.id = s.itemFK @@ -67057,24 +67676,24 @@ BEGIN CREATE TEMPORARY TABLE tmp.ticket ENGINE = MEMORY SELECT vTicketFk ticketFk; - + CALL vn.ticket_getTax(NULL); - SELECT + SELECT tt.ticketFk, CAST(tt.taxableBase AS DECIMAL(10, 2)) AS taxableBase, CAST(tt.rate * tt.taxableBase / 100 AS DECIMAL(10, 2)) AS tax, - pgc.*, + pgc.*, CAST(IF(pe.equFk IS NULL, taxableBase, 0) AS DECIMAL(10, 2)) AS Base, pgc.rate / 100 as vatPercent FROM tmp.ticketTax tt JOIN vn.pgc ON pgc.code = tt.pgcFk LEFT JOIN vn.pgcEqu pe ON pe.equFk = pgc.code; - + DROP TEMPORARY TABLE tmp.ticket; DROP TEMPORARY TABLE tmp.ticketTax; DROP TEMPORARY TABLE tmp.ticketAmount; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -67112,29 +67731,29 @@ BEGIN JOIN ticket t ON t.id = tmpTicket.ticketFk; CALL addressTaxArea (); - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax; CREATE TEMPORARY TABLE tmp.ticketTax (INDEX (ticketFk)) ENGINE = MEMORY SELECT tmpTicket.ticketFk, bp.pgcFk, - SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2) + SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2) ) AS taxableBase, SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2) ) * pgc.rate / 100 AS tax, tc.code - + FROM tmp.ticket tmpTicket JOIN sale s ON s.ticketFk = tmpTicket.ticketFk JOIN item i ON i.id = s.itemFk JOIN ticket t ON t.id = tmpTicket.ticketFk JOIN supplier su ON su.id = t.companyFk - JOIN tmp.addressTaxArea ata + JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk - JOIN itemTaxCountry itc + JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = su.countryFk - JOIN bookingPlanner bp + JOIN bookingPlanner bp ON bp.countryFk = su.countryFk AND bp.taxAreaFk = ata.areaFk AND bp.taxClassFk = itc.taxClassFk @@ -67142,7 +67761,7 @@ BEGIN JOIN taxClass tc ON tc.id = bp.taxClassFk GROUP BY tmpTicket.ticketFk, pgc.code HAVING taxableBase != 0; - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount; CREATE TEMPORARY TABLE tmp.ticketAmount (INDEX (ticketFk)) @@ -67153,7 +67772,7 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany; DROP TEMPORARY TABLE IF EXISTS tmp.addressTaxArea; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -67190,7 +67809,7 @@ BEGIN FROM tmp.ticket t LEFT JOIN tmp.ticketAmount ta ON t.ticketFk = ta.ticketFk GROUP BY ticketFk; - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount; DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax; END ;; @@ -67256,25 +67875,25 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; +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 */ ; @@ -67298,18 +67917,18 @@ BEGIN DECLARE vParked DATETIME; DECLARE vLevel INT; DECLARE vCollectionFk INT; - - SELECT IFNULL(`level`,0), IFNULL(collectionFk,0) + + SELECT IFNULL(`level`,0), IFNULL(collectionFk,0) INTO vLevel, vCollectionFk FROM vn.ticketCollection WHERE ticketFk = vTicketFk LIMIT 1; - - SELECT created, parkingFk + + SELECT created, parkingFk INTO vParked, vParkingFk FROM vn.ticketParking WHERE ticketFk = vTicketFk; - + SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia FROM vn.ticketParking tp JOIN vn.parking p ON p.id = tp.parkingFk @@ -67336,7 +67955,7 @@ BEGIN AND sc.isPackagingArea AND tp.created < vParked AND t.packages <=> 0); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -67357,7 +67976,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketNotInvoicedByClient`(vClientF BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.ticket; - + CREATE TEMPORARY TABLE tmp.ticket SELECT id ticketFk FROM ticket @@ -67367,7 +67986,7 @@ BEGIN CALL vn.ticketGetTotal; - SELECT c.id, + SELECT c.id, c.name as Cliente, t.shipped as Fecha, t.id as Id_Ticket, @@ -67378,7 +67997,7 @@ BEGIN DROP TEMPORARY TABLE tmp.ticket, - tmp.ticketTotal; + tmp.ticketTotal; END ;; DELIMITER ; @@ -67397,22 +68016,22 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_general_ci */ ; 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! '; - +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); - + ON DUPLICATE KEY UPDATE description = CONCAT(vDescription, ticketObservation.description); + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -67430,66 +68049,66 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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); +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 */ ; @@ -67540,11 +68159,11 @@ DELIMITER ;; 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, - quantity, - price, - ticketFk, - buyerCode, + INSERT INTO vn.ticketRequest(description, + quantity, + price, + ticketFk, + buyerCode, requesterFk) VALUES(vDescription, vQuantity, @@ -67552,7 +68171,7 @@ BEGIN vTicketFk, vBuyerCode, vn.getUser()); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -67570,29 +68189,29 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -67611,25 +68230,25 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketStateUpdate`(vTicketFk INT, vStateCode VARCHAR(45)) BEGIN - + /* * @deprecated:utilizar ticket_setState */ - + DECLARE vAlertLevel INT; - SELECT s.alertLevel INTO vAlertLevel + 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 - + + 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 + FROM vn.state WHERE `code` = vStateCode collate utf8_unicode_ci; - + END IF; END ;; @@ -67732,36 +68351,36 @@ BEGIN DECLARE vCountry INT; DECLARE vTaxArea VARCHAR(15); DECLARE vSpainCountryCode INT DEFAULT 1; - - SELECT id - INTO vInvoice - FROM vn.invoiceOut + + SELECT id + INTO vInvoice + FROM vn.invoiceOut WHERE ref = vInvoiceRef; - - SELECT s.countryFk + + SELECT s.countryFk INTO vCountry FROM vn.supplier s JOIN vn.invoiceOut io ON io.companyFk = s.id WHERE io.id = vInvoice; - + SELECT IF( - c.isEqualizated - AND c.countryFk = vSpainCountryCode + c.isEqualizated + AND c.countryFk = vSpainCountryCode AND i.taxAreaFk = 'NATIONAL', 'EQU', i.taxAreaFk ) INTO vTaxArea FROM vn.invoiceOutSerial i - JOIN vn.invoiceOut io ON io.serial = i.code + JOIN vn.invoiceOut io ON io.serial = i.code JOIN vn.client c ON c.id = io.clientFk WHERE io.id = vInvoice; - + DROP TEMPORARY TABLE IF EXISTS vn.ticketToInvoice; CREATE TEMPORARY TABLE vn.ticketToInvoice - SELECT id - FROM vn.ticket + SELECT id + FROM vn.ticket WHERE refFk = vInvoiceRef; END ;; @@ -67823,6 +68442,8 @@ BEGIN DECLARE vPrice DECIMAL(10,2); DECLARE vBonus DECIMAL(10,2); DECLARE vIsActive BOOL; + DECLARE vNickname VARCHAR(100); + DECLARE vNewInstance JSON; IF vClientId IS NULL THEN CALL util.throw ('CLIENT_NOT_ESPECIFIED'); @@ -67888,8 +68509,29 @@ BEGIN JOIN agencyMode am ON am.id = a.agencyModeFk WHERE a.id = vAddressFk; + SELECT a.nickname INTO vNickname + FROM address a + WHERE a.id = vAddressFk; + SET vNewTicket = LAST_INSERT_ID(); + SET vNewInstance = JSON_OBJECT( + 'clientFk', vClientId, + 'shipped', vShipped, + 'addressFk', vAddressFk, + 'agencyModeFk', vAgencyModeFk, + 'nickname', vNickname, + 'warehouseFk', vWarehouseFk, + 'routeFk', vRouteFk, + 'companyFk', vCompanyFk, + 'landed', vlanded, + 'zoneFk', vZoneFk, + 'zonePrice', vPrice, + 'zoneBonus', vBonus + ); + CALL util.log_addWithUser('vn', 'ticket', + 'Ticket', vNewTicket, vNewTicket, 'insert', NULL, vNewInstance, vUserId); + INSERT INTO ticketObservation(ticketFk, observationTypeFk, description) SELECT vNewTicket, ao.observationTypeFk, ao.description FROM addressObservation ao @@ -67904,9 +68546,6 @@ BEGIN 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() @@ -67930,21 +68569,21 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; - +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 */ ; @@ -67952,30 +68591,29 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `ticket_canAdvance` */; /*!50003 SET @saved_cs_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 character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_canAdvance`(vDated DATE, vWarehouseFk INT) +CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_canAdvance`(vDateFuture DATE, vDateToAdvance DATE, vWarehouseFk INT) BEGIN /** * Devuelve los tickets y la cantidad de lineas de venta que se pueden adelantar. * - * @param vDated Fecha de los tickets que se quieren adelantar. + * @param vDateFuture Fecha de los tickets que se quieren adelantar. + * @param vDateToAdvance Fecha a cuando se quiere adelantar. * @param vWarehouseFk Almacén */ + DECLARE vDateInventory DATE; - DECLARE vDateToAdvance DATE; SELECT inventoried INTO vDateInventory FROM vn.config; - SET vDateToAdvance = TIMESTAMPADD(DAY,-1,vDated); - DROP TEMPORARY TABLE IF EXISTS tmp.stock; CREATE TEMPORARY TABLE tmp.stock (itemFk INT PRIMARY KEY, @@ -67988,52 +68626,70 @@ BEGIN SELECT itemFk, quantity FROM vn.itemTicketOut WHERE shipped >= vDateInventory - AND shipped < vDated + AND shipped < vDateFuture AND warehouseFk = vWarehouseFk UNION ALL SELECT itemFk, quantity FROM vn.itemEntryIn WHERE landed >= vDateInventory - AND landed < vDated + AND landed < vDateFuture AND isVirtualStock = FALSE AND warehouseInFk = vWarehouseFk UNION ALL SELECT itemFk, quantity FROM vn.itemEntryOut WHERE shipped >= vDateInventory - AND shipped < vDated + AND shipped < vDateFuture AND warehouseOutFk = vWarehouseFk ) t GROUP BY itemFk HAVING amount != 0; - SELECT s.ticketFk ticketFuture, + DROP TEMPORARY TABLE IF EXISTS tmp.filter; + CREATE TEMPORARY TABLE tmp.filter + (INDEX (id)) + SELECT s.ticketFk futureId, + t2.ticketFk id, sum((s.quantity <= IFNULL(st.amount,0))) hasStock, count(DISTINCT s.id) saleCount, - st.name tfState, - GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) tfIpt, - t2.ticketFk, t2.state, - t2.ipt + t2.stateCode, + st.name futureState, + st.code futureStateCode, + GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) futureIpt, + t2.ipt, + t.workerFk, + CAST(sum(litros) AS DECIMAL(10,0)) liters, + CAST(count(*) AS DECIMAL(10,0)) `lines`, + t2.shipped, + t.shipped futureShipped, + t2.totalWithVat, + t.totalWithVat futureTotalWithVat FROM vn.ticket t JOIN vn.ticketState ts ON ts.ticketFk = t.id JOIN vn.state st ON st.id = ts.stateFk - LEFT JOIN (SELECT + JOIN vn.saleVolume sv ON t.id = sv.ticketFk + JOIN (SELECT t2.id ticketFk, t2.addressFk, st.name state, - GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt + st.code stateCode, + GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt, + t2.shipped, + t2.totalWithVat FROM vn.ticket t2 JOIN vn.sale s ON s.ticketFk = t2.id JOIN vn.item i ON i.id = s.itemFk JOIN vn.ticketState ts ON ts.ticketFk = t2.id JOIN vn.state st ON st.id = ts.stateFk + LEFT JOIN vn.itemPackingType ipt ON ipt.code = i.itemPackingTypeFk WHERE t2.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance) AND t2.warehouseFk = vWarehouseFk GROUP BY t2.id) t2 ON t2.addressFk = t.addressFk JOIN vn.sale s ON s.ticketFk = t.id JOIN vn.item i ON i.id = s.itemFk + LEFT JOIN vn.itemPackingType ipt ON ipt.code = i.itemPackingTypeFk LEFT JOIN tmp.stock st ON st.itemFk = s.itemFk - WHERE t.shipped BETWEEN vDated AND util.dayend(vDated) + WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture) AND t.warehouseFk = vWarehouseFk GROUP BY t.id; @@ -68045,20 +68701,103 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ticket_canbePostponed` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_canbePostponed`(vOriginDated DATE, vFutureDated DATE, vWarehouseFk INT) +BEGIN +/** + * Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro + * + * @param vOriginDated Fecha en cuestión + * @param vFutureDated Fecha en el futuro a sondear + * @param vWarehouseFk Identificador de vn.warehouse + */ + DROP TEMPORARY TABLE IF EXISTS tmp.filter; + CREATE TEMPORARY TABLE tmp.filter + (INDEX (id)) + SELECT sv.ticketFk id, + sub2.id futureId, + GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt, + CAST(sum(litros) AS DECIMAL(10,0)) liters, + CAST(count(*) AS DECIMAL(10,0)) `lines`, + st.name state, + sub2.iptd futureIpt, + sub2.state futureState, + t.clientFk, + t.warehouseFk, + ts.alertLevel, + t.shipped, + sub2.shipped futureShipped, + t.workerFk, + st.code stateCode, + sub2.code futureStateCode + FROM vn.saleVolume sv + JOIN vn.sale s ON s.id = sv.saleFk + JOIN vn.item i ON i.id = s.itemFk + 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.state st ON st.id = ts.stateFk + 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, + st.name state, + st.code code, + GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd + FROM vn.ticket t + JOIN vn.ticketState ts ON ts.ticketFk = t.id + JOIN vn.state st ON st.id = ts.stateFk + JOIN vn.sale s ON s.ticketFk = t.id + JOIN vn.item i ON i.id = s.itemFk + WHERE t.shipped BETWEEN vFutureDated + AND util.dayend(vFutureDated) + AND t.warehouseFk = vWarehouseFk + GROUP BY t.id + ) sub + GROUP BY sub.addressFk + ) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id + WHERE t.shipped BETWEEN vOriginDated AND util.dayend(vOriginDated) + AND t.warehouseFk = vWarehouseFk + AND al.code = 'FREE' + AND tp.ticketFk IS NULL + GROUP BY sv.ticketFk + HAVING futureId; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `ticket_canMerge` */; /*!50003 SET @saved_cs_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 character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; DELIMITER ;; 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 @@ -68172,12 +68911,12 @@ DELIMITER ;; 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 + * Comprueba que no hay ningún ticket pendiente de revisar de alguna colección que haya revisado el trabajador * @param vWorkerFk id del user * @param vTicketFk número de ticket escaneada - * + * */ - + SELECT t.id FROM ticket t JOIN sale s ON s.ticketFk = t.id @@ -68197,11 +68936,11 @@ BEGIN )sub ON sub.collectionFk = tc.collectionFk JOIN ticketState ts ON ts.ticketFk = t.id JOIN state s2 ON s2.id = ts.stateFk - WHERE s2.code IN ('ON_PREPARATION', 'PREPARED', 'PREVIOUS_PREPARATION', 'OK PREVIOUS') + WHERE s2.code IN ('ON_PREPARATION', 'PREPARED', 'PREVIOUS_PREPARATION', 'OK PREVIOUS') AND t.shipped >= util.VN_CURDATE() AND s.quantity <>0 LIMIT 1; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -68224,7 +68963,7 @@ BEGIN /** * Comprueba que los tickets entre un rango de fechas tienen componentes * - * @param vShippedFrom rango inicial de fecha + * @param vShippedFrom rango inicial de fecha * @param vShippedTo rango final de fecha */ DECLARE v_done BOOL DEFAULT FALSE; @@ -68243,9 +68982,9 @@ BEGIN AND clt.isActive != 0 AND ic.merchandise != 0 GROUP BY s.id; - + DECLARE CONTINUE HANDLER FOR NOT FOUND - SET v_done = TRUE; + SET v_done = TRUE; DROP TEMPORARY TABLE IF EXISTS tmp.coste; @@ -68264,7 +69003,7 @@ BEGIN JOIN componentType ct ON ct.id = c.typeFk AND ct.id = 1 WHERE t.shipped >= vShippedFrom AND ic.merchandise != 0; - + OPEN vCur; l: LOOP @@ -68278,8 +69017,8 @@ BEGIN CALL sale_calculateComponent(vSaleFk, 1); END LOOP; - CLOSE vCur; - DROP TEMPORARY TABLE tmp.coste; + CLOSE vCur; + DROP TEMPORARY TABLE tmp.coste; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -68303,7 +69042,7 @@ BEGIN * * @param vOriginalTicket ticket Original * @param vNewTicket ticket creado - */ + */ DECLARE vStateFk INT; INSERT INTO ticket ( @@ -68320,7 +69059,7 @@ BEGIN zoneBonus, routeFk, priority, - hasPriority + hasPriority ) SELECT clientFk, @@ -68336,29 +69075,29 @@ BEGIN zoneBonus, routeFk, priority, - hasPriority + hasPriority FROM ticket WHERE id = vOriginalTicket; SET vNewTicket = LAST_INSERT_ID(); - + INSERT INTO ticketObservation(ticketFk, observationTypeFk, description) SELECT vNewTicket, ao.observationTypeFk, ao.description FROM addressObservation ao JOIN ticket t ON t.addressFk = ao.addressFk WHERE t.id = vNewTicket; - + INSERT INTO ticketLog - SET originFk = vNewTicket, userFk = account.myUser_getId(), `action` = 'insert', + SET originFk = vNewTicket, userFk = account.myUser_getId(), `action` = 'insert', description = CONCAT('Ha creado el ticket:', ' ', vNewTicket, ' clonando el ', vOriginalTicket); - + INSERT INTO ticketLog - SET originFk = vOriginalTicket, userFk = account.myUser_getId(), `action` = 'insert', + SET originFk = vOriginalTicket, userFk = account.myUser_getId(), `action` = 'insert', description = CONCAT('Ha creado el ticket:', ' ', vNewTicket, ' clonando el ', vOriginalTicket); INSERT INTO vncontrol.inter(Id_Ticket, state_id, Id_Trabajador, odbc_date) SELECT vNewTicket, state_id, Id_Trabajador , odbc_date - FROM vncontrol.inter + FROM vncontrol.inter WHERE Id_Ticket = vOriginalTicket ORDER BY odbc_date; END ;; @@ -68391,16 +69130,16 @@ BEGIN DECLARE vAgencyModeFk 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 + 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(util.VN_CURDATE()) + IF(vWeek < WEEK(util.VN_CURDATE()),1, 0); - + OPEN rsTicket; myLoop: LOOP BEGIN @@ -68416,7 +69155,7 @@ BEGIN LEAVE myLoop; END IF; - SELECT dated INTO vShipment + SELECT dated INTO vShipment FROM `time` WHERE `year` = vYear AND `week` = vWeek AND WEEKDAY(dated) = vWeekDay; @@ -68427,52 +69166,52 @@ BEGIN 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 = vTicketFk AND tClon.isDeleted = FALSE AND DATE(tClon.shipped) = vShipment) > 0 + WHERE tOrig.id = vTicketFk AND tClon.isDeleted = FALSE AND DATE(tClon.shipped) = vShipment) > 0 THEN ITERATE myLoop; END IF; - + IF vAgencyModeFk IS NULL THEN - SELECT agencyModeFk INTO vAgencyModeFk + SELECT agencyModeFk INTO vAgencyModeFk FROM address WHERE clientFk = vClientFk AND isDefaultAddress; END IF; - + CALL vn.zone_getLanded(vShipment, vAddressFk, vAgencyModeFk, vWarehouseFk,FALSE); SET vLanding = NULL; SELECT landed INTO vLanding from tmp.zoneGetLanded LIMIT 1; - + CALL ticket_add( - vClientFk, - vShipment, - vWarehouseFk, - vCompanyFk, - vAddressFk, - vAgencyModeFk, - NULL, - vLanding, - account.myUser_getId(), - FALSE, + vClientFk, + vShipment, + vWarehouseFk, + vCompanyFk, + vAddressFk, + vAgencyModeFk, + NULL, + vLanding, + account.myUser_getId(), + FALSE, 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 = vClientFk; - + SET vSubject = CONCAT('Turnos - No se ha podido clonar correctamente el ticket ', vTicketFk, ' para el dia: ', vShipment); - SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicketFk, - ' para el dia: ', vShipment, - ' porque no hay una zona de envío disponible. Se ha creado el ticket: ', vNewTicket, + SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicketFk, + ' 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 receiver = vSalesPersonEmail + FROM vn.mail + WHERE receiver = vSalesPersonEmail AND subject = vSubject; IF NOT vMailSent THEN @@ -68480,37 +69219,37 @@ BEGIN 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 = vTicketFk; - + FROM vn.sale saleOrig + WHERE saleOrig.ticketFk = vTicketFk; + INSERT IGNORE INTO vn.saleCloned(saleOriginalFk, saleClonedFk) - SELECT saleOriginal.id, saleClon.id + 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 = vTicketFk AND saleClon.ticketFk = vNewTicket; - + INSERT INTO ticketRequest (description,ordered,shipped,quantity,price,itemFk,clientFk,response, - total,buyed,requesterFk,attenderFk,ticketFk) + total,buyed,requesterFk,attenderFk,ticketFk) SELECT description,ordered,shipped,quantity,price,itemFk,clientFk,response, - total,buyed,requesterFk,attenderFk,vNewTicket + total,buyed,requesterFk,attenderFk,vNewTicket FROM ticketRequest WHERE ticketFk =vTicketFk; - + INSERT INTO ticketObservation(ticketFk,observationTypeFk,description) VALUES(vNewTicket,4,CONCAT('turno desde ticket: ',vTicketFk)) - ON DUPLICATE KEY UPDATE description = CONCAT(ticketObservation.description,VALUES(description),' '); - + 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),' '); - + ON DUPLICATE KEY UPDATE description = CONCAT(ticketObservation.description,VALUES(description),' '); + CALL vn.ticketCalculateClon(vNewTicket, vTicketFk); END; END LOOP; CLOSE rsTicket; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -68530,7 +69269,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_close`() BEGIN /** - * Realiza el cierre de todos los + * Realiza el cierre de todos los * tickets de la tabla tmp.ticket_close. * * @table tmp.ticket_close(ticketFk) Identificadores de los tickets a cerrar @@ -68548,7 +69287,7 @@ BEGIN DECLARE cur CURSOR FOR SELECT ticketFk FROM tmp.ticket_close; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN RESIGNAL; @@ -68558,7 +69297,7 @@ BEGIN proc: LOOP SET vDone = FALSE; - + FETCH cur INTO vCurTicketFk; IF vDone THEN @@ -68576,12 +69315,12 @@ BEGIN c.hasToInvoice INTO vClientFk, vIsTaxDataChecked, - vCompanyFk, + vCompanyFk, vShipped, vHasDailyInvoice, vWithPackage, vHasToInvoice - FROM ticket t + FROM ticket t JOIN `client` c ON c.id = t.clientFk JOIN province p ON p.id = c.provinceFk JOIN country co ON co.id = p.countryFk @@ -68590,22 +69329,22 @@ BEGIN INSERT INTO ticketPackaging (ticketFk, packagingFk, quantity) (SELECT vCurTicketFk, p.id, COUNT(*) - FROM expedition e + FROM expedition e JOIN packaging p ON p.itemFk = e.freightItemFk WHERE e.ticketFk = vCurTicketFk AND p.isPackageReturnable AND vWithPackage GROUP BY p.itemFk); -- No retornables o no catalogados - INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed) + INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed) (SELECT e.freightItemFk, vCurTicketFk, i.name, COUNT(*) AS amount, getSpecialPrice(e.freightItemFk, vClientFk), 1 - FROM expedition e + FROM expedition e JOIN item i ON i.id = e.freightItemFk LEFT JOIN packaging p ON p.itemFk = i.id WHERE e.ticketFk = vCurTicketFk AND IFNULL(p.isPackageReturnable, 0) = 0 AND getSpecialPrice(e.freightItemFk, vClientFk) > 0 GROUP BY e.freightItemFk); - + IF(vHasDailyInvoice) AND vHasToInvoice THEN -- Facturacion rapida @@ -68613,10 +69352,10 @@ BEGIN -- Facturar si está contabilizado IF vIsTaxDataChecked THEN CALL invoiceOut_newFromClient( - vClientFk, - (SELECT invoiceSerial(vClientFk, vCompanyFk, 'M')), - vShipped, - vCompanyFk, + vClientFk, + (SELECT invoiceSerial(vClientFk, vCompanyFk, 'M')), + vShipped, + vCompanyFk, NULL, NULL, vNewInvoiceId); @@ -68690,11 +69429,11 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_componentMakeUpdate`(IN vTic IN vLanded DATE, IN vIsDeleted TINYINT(1), IN vHasToBeUnrouted TINYINT(1), IN vOption INT) BEGIN - + /** * Modifica en el ticket los campos que se le pasan por parámetro * y cambia sus componentes - * + * * @param vTicketFk Id del ticket a modificar * @param vClientFk nuevo cliente * @param vNickname nuevo alias @@ -68709,29 +69448,29 @@ BEGIN * @param vHasToBeUnrouted si se le elimina la ruta al ticket * @param vOption opcion para el case del proc ticketComponentUpdateSale */ - + DECLARE vPrice DECIMAL(10,2); DECLARE vBonus DECIMAL(10,2); CALL ticket_componentPreview (vTicketFk, vLanded, vAddressFk, vZoneFk, vWarehouseFk); IF (SELECT addressFk FROM ticket WHERE id = vTicketFk) <> vAddressFk THEN - - UPDATE ticket t + + UPDATE ticket t JOIN address a ON a.id = vAddressFk SET t.nickname = a.nickname WHERE t.id = vTicketFk; - + END IF; CALL zone_getShipped(vLanded, vAddressFk, vAgencyModeFk, TRUE); - SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus + SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus FROM tmp.zoneGetShipped WHERE shipped BETWEEN DATE(vShipped) AND util.dayEnd(vShipped) AND warehouseFk = vWarehouseFk LIMIT 1; - + UPDATE ticket t - SET + SET t.clientFk = vClientFk, t.nickname = vNickname, t.agencyModeFk = vAgencyModeFk, @@ -68746,12 +69485,12 @@ BEGIN t.isDeleted = vIsDeleted WHERE t.id = vTicketFk; - + IF vHasToBeUnrouted THEN UPDATE ticket t SET t.routeFk = NULL WHERE t.id = vTicketFk; END IF; - + IF vOption <> 8 THEN DROP TEMPORARY TABLE IF EXISTS tmp.sale; CREATE TEMPORARY TABLE tmp.sale @@ -68789,7 +69528,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_componentPreview`( vTicketFk INT, - vLanded DATE, + vLanded DATE, vAddressFk INT, vZoneFk INT, vWarehouseFk SMALLINT) @@ -68805,7 +69544,7 @@ BEGIN * * @return tmp.ticketComponentPreview (warehouseFk, itemFk, componentFk, cost) */ - DECLARE vHasDataChanged BOOL DEFAULT FALSE; + DECLARE vHasDataChanged BOOL DEFAULT FALSE; DECLARE vHasAddressChanged BOOL; DECLARE vHasZoneChanged BOOL DEFAULT FALSE; DECLARE vHasWarehouseChanged BOOL DEFAULT FALSE; @@ -68816,8 +69555,8 @@ BEGIN DECLARE vHasChangeAll BOOL DEFAULT FALSE; - SELECT DATE(landed) <> vLanded, - addressFk <> vAddressFk, + SELECT DATE(landed) <> vLanded, + addressFk <> vAddressFk, zoneFk <> vZoneFk, warehouseFk <> vWarehouseFk INTO @@ -68840,15 +69579,15 @@ BEGIN SET vAgencyModeTypeRateFk = 6; END IF; - SELECT TIMESTAMPADD(DAY, -travelingDays, vLanded) INTO vShipped + SELECT TIMESTAMPADD(DAY, -travelingDays, vLanded) INTO vShipped FROM zone WHERE id = vZoneFk; - + CALL buyUltimate(vWarehouseFk, vShipped); - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot; - CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY ( - SELECT + CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY ( + SELECT vWarehouseFk AS warehouseFk, NULL AS available, s.itemFk, @@ -68868,9 +69607,9 @@ BEGIN JOIN sale s ON s.id = sc.saleFk JOIN ticket t ON t.id = s.ticketFk JOIN `component` c ON c.id = sc.componentFk - WHERE s.ticketFk = vTicketFk - AND (c.isRenewable = FALSE - OR + WHERE s.ticketFk = vTicketFk + AND (c.isRenewable = FALSE + OR (NOT vHasChangeAll AND (NOT (c.typeFk <=> vAddressTypeRateFk OR c.typeFk <=> vAgencyModeTypeRateFk)))); @@ -68902,41 +69641,41 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 = util.VN_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; - +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 = util.VN_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 */ ; @@ -68955,52 +69694,52 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_DelayTruckSplit`(vTicketFk INT) BEGIN - + /* * Splita las lineas de ticket que no estan ubicadas - * + * */ - + DECLARE vNewTicketFk INT; DECLARE vTotalLines INT; DECLARE vLinesToSplit INT; DROP TEMPORARY TABLE IF EXISTS tmp.SalesToSplit; - + SELECT COUNT(*) INTO vTotalLines - FROM vn.sale + FROM vn.sale WHERE ticketFk = vTicketFk; - + CREATE TEMPORARY TABLE tmp.SalesToSplit SELECT s.id saleFk FROM vn.ticket t - JOIN vn.sale s ON t.id = s.ticketFk - LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = s.itemFk AND issw.warehouseFk = t.warehouseFk + JOIN vn.sale s ON t.id = s.ticketFk + LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = s.itemFk AND issw.warehouseFk = t.warehouseFk WHERE s.quantity > IFNULL(issw.visible, 0) AND s.quantity > 0 AND s.isPicked = FALSE AND s.reserved = FALSE AND t.id = vTicketFk; - + SELECT COUNT(*) INTO vLinesToSplit FROM tmp.SalesToSplit; - + IF vLinesToSplit = vTotalLines AND vLinesToSplit > 0 THEN - + SET vNewTicketFk = vTicketFk; - + ELSE - + CALL vn.ticket_Clone(vTicketFk, vNewTicketFk); - - UPDATE vn.sale s - JOIN tmp.SalesToSplit sts ON sts.saleFk = s.id + + UPDATE vn.sale s + JOIN tmp.SalesToSplit sts ON sts.saleFk = s.id SET s.ticketFk = vNewTicketFk; - + END IF; - + CALL vn.ticketStateUpdate(vNewTicketFk, 'FIXING'); - + DROP TEMPORARY TABLE tmp.SalesToSplit; END ;; @@ -69372,37 +70111,37 @@ BEGIN * @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 + FROM ticket t WHERE t.id = vTicketFk; - CALL itemStock(vWarehouseFk, vDatedNew, NULL); + 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, + + SELECT s.id, + s.itemFk, + s.quantity, + s.concept, + s.price, s.reserved, - s.discount, - i.image, - i.subName, + 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 + 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; - + DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -69431,10 +70170,10 @@ BEGIN CALL sale_getProblems(vIsTodayRelative); DROP TEMPORARY TABLE IF EXISTS tmp.ticket_problems; - CREATE TEMPORARY TABLE tmp.ticket_problems + CREATE TEMPORARY TABLE tmp.ticket_problems (PRIMARY KEY (ticketFk)) ENGINE = MEMORY - SELECT + SELECT ticketFk, MAX(p.isFreezed) AS isFreezed, MAX(p.risk) AS risk, @@ -69451,7 +70190,7 @@ BEGIN GROUP BY ticketFk; UPDATE tmp.ticket_problems tp - SET tp.totalProblems = + SET tp.totalProblems = ( (tp.isFreezed) + IF(tp.risk, TRUE, FALSE) + @@ -69504,17 +70243,17 @@ BEGIN (saleFk INT PRIMARY KEY, ticketFk INT, problem VARCHAR(1)) ENGINE = MEMORY; - + INSERT INTO tmp.salesToSplit(saleFk, ticketFk, problem) SELECT s.id, s.ticketFk, 'F' FROM vn.ticket t 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.itemCategory ic ON ic.id = it.categoryFk LEFT JOIN cache.visible v ON v.item_id = i.id AND v.calc_id = vVisibleCache LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache - LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk + LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk WHERE IFNULL(v.visible,0) < s.quantity AND IFNULL(av.available ,0) < s.quantity AND IFNULL(issw.visible, 0) < s.quantity @@ -69524,16 +70263,16 @@ BEGIN AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) AND NOT i.generic AND t.warehouseFk = vWarehouseFk; - + INSERT IGNORE INTO tmp.salesToSplit(saleFk, ticketFk, problem) SELECT s.id, s.ticketFk, 'I' - FROM vn.ticket t + FROM vn.ticket t 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 LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache - LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk + LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk WHERE IFNULL(v.visible,0) >= s.quantity AND IFNULL(issw.visible, 0) < s.quantity AND s.quantity > 0 @@ -69543,7 +70282,7 @@ BEGIN AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) AND NOT i.generic AND t.warehouseFk = vWarehouseFk; - + INSERT IGNORE INTO tmp.salesToSplit(saleFk, ticketFk, problem) SELECT s.id, s.ticketFk, 'R' FROM vn.ticket t @@ -69553,7 +70292,7 @@ BEGIN JOIN vn.itemCategory ic ON ic.id = it.categoryFk LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache - LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk + LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk WHERE IFNULL(v.visible,0) < s.quantity AND IFNULL(av.available ,0) >= s.quantity AND IFNULL(issw.visible, 0) < s.quantity @@ -69564,7 +70303,7 @@ BEGIN AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) AND NOT i.generic AND t.warehouseFk = vWarehouseFk; - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketsToSplit; CREATE TEMPORARY TABLE tmp.ticketsToSplit @@ -69585,11 +70324,11 @@ BEGIN JOIN vn.ticket t ON t.id = ss.ticketFk JOIN vn.sale s ON s.id = ss.saleFk JOIN vn.item i ON i.id = s.itemFk - LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk + LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk GROUP BY ss.ticketFk; - - SELECT - ts.*, + + SELECT + ts.*, t.id ticketFuture, st.name state, zc.`hour` tfEtd, @@ -69598,23 +70337,23 @@ BEGIN FROM tmp.ticketsToSplit ts LEFT JOIN vn.ticketState ts2 ON ts2.ticketFk = ts.ticketFk LEFT JOIN vn.state st ON st.id = ts2.stateFk - LEFT JOIN vn.ticket t - ON t.id != ts.ticketFk + LEFT JOIN vn.ticket t + ON t.id != ts.ticketFk AND t.addressFk = ts.addressFk AND t.shipped BETWEEN vDated AND util.dayend(vDated) LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND zc.dated = vDated LEFT JOIN vn.sale s ON s.ticketFk = t.id LEFT JOIN vn.item i ON i.id = s.itemFk - LEFT JOIN vn.ticketState tst ON tst.ticketFk = t.id + LEFT JOIN vn.ticketState tst ON tst.ticketFk = t.id LEFT JOIN vn.state st2 ON st2.id = tst.stateFk - WHERE (t.id IS NULL + WHERE (t.id IS NULL OR (vDated > util.VN_CURDATE()) OR (vDated = util.VN_CURDATE() AND vHour >= zc.`hour`)) AND ts.etd <= vHour GROUP BY ts.ticketFk, t.id ORDER BY ts.etd, ts.ticketFk; - - DROP TEMPORARY TABLE + + DROP TEMPORARY TABLE tmp.ticketsToSplit; END ;; DELIMITER ; @@ -69651,7 +70390,7 @@ BEGIN JOIN ticket t ON t.id = tmpTicket.ticketFk; CALL addressTaxArea (); - + IF vTaxArea > '' THEN UPDATE tmp.addressTaxArea SET areaFk = vTaxArea; @@ -69723,8 +70462,8 @@ BEGIN CREATE TEMPORARY TABLE tmp.ticketAmount (INDEX (ticketFk)) ENGINE = MEMORY - SELECT ticketFk, - taxableBase, + SELECT ticketFk, + taxableBase, SUM(CAST(taxableBase * rate / 100 AS DECIMAL(10, 2))) tax, code FROM tmp.ticketTax @@ -69756,24 +70495,24 @@ BEGIN DECLARE vAddressFk INT; DECLARE vAgencyModeFk INT; DECLARE vWarehouseFk INT; - DECLARE vCursor CURSOR FOR + DECLARE vCursor CURSOR FOR SELECT id, landed, addressFk, agencyModeFk, warehouseFk FROM vn.ticket WHERE shipped > '2020-01-01' AND zoneFk is null; DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET vDone = 1; - + OPEN vCursor; REPEAT FETCH vCursor INTO vFechedTicket, vLanded, vAddressFk, vAgencyModeFk, vWarehouseFk; CALL vn.zone_getShipped (vlanded, vAddressFk, vAgencyModeFk, TRUE); - + UPDATE vn.ticket t JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = vWarehouseFk SET t.zoneFk = zgs.zoneFk WHERE t.id = vFechedTicket; - + UNTIL vDone END REPEAT; DROP TEMPORARY TABLE tmp.zoneGetShipped; - + CLOSE vCursor; END ;; DELIMITER ; @@ -69792,24 +70531,24 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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(util.VN_NOW()) MOD 2000, t.shipped ) - WHERE t.id = vSelf; - +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(util.VN_NOW()) MOD 2000, t.shipped ) + WHERE t.id = vSelf; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -69828,14 +70567,14 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_priceDifference`( vTicketFk INT, - vLanded DATE, + vLanded DATE, vAddressFk INT, vZoneFk INT, vWarehouseFk INT) BEGIN /** * Devuelve las diferencias de precio de los movimientos de un ticket. - * + * * @param vTicketFk Id del ticket * @param vLanded Fecha de recepcion * @param vAddressFk Id del consignatario @@ -69844,26 +70583,26 @@ BEGIN */ CALL vn.ticket_componentPreview(vTicketFk, vLanded, vAddressFk, vZoneFk, vWarehouseFk); - SELECT s.itemFk, - i.name, - i.size, - i.category, - IFNULL(s.quantity, 0) AS quantity, - IFNULL(s.price, 0) AS price, + SELECT s.itemFk, + i.name, + i.size, + i.category, + IFNULL(s.quantity, 0) AS quantity, + IFNULL(s.price, 0) AS price, ROUND(SUM(tc.cost), 2) AS newPrice, s.quantity * (s.price - ROUND(SUM(tc.cost), 2)) difference, s.id AS saleFk FROM sale s - JOIN item i ON i.id = s.itemFk - JOIN ticket t ON t.id = s.ticketFk - LEFT JOIN tmp.ticketComponentPreview tc ON tc.itemFk = s.itemFk + JOIN item i ON i.id = s.itemFk + JOIN ticket t ON t.id = s.ticketFk + LEFT JOIN tmp.ticketComponentPreview tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = vWarehouseFk - LEFT JOIN saleComponent sc ON sc.saleFk = s.id + LEFT JOIN saleComponent sc ON sc.saleFk = s.id AND sc.componentFk = tc.componentFk - LEFT JOIN `component` c ON c.id = tc.componentFk - WHERE t.id = vTicketFk - AND IF(sc.componentFk IS NULL - AND c.classRate IS NOT NULL, FALSE, TRUE) + LEFT JOIN `component` c ON c.id = tc.componentFk + WHERE t.id = vTicketFk + AND IF(sc.componentFk IS NULL + AND c.classRate IS NOT NULL, FALSE, TRUE) GROUP BY s.id ORDER BY s.id; DROP TEMPORARY TABLE tmp.ticketComponentPreview; @@ -69884,28 +70623,28 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; +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 */ ; @@ -69923,91 +70662,91 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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; +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 */ ; @@ -70256,40 +70995,40 @@ proc:BEGIN SELECT COUNT(*) INTO vProblemLines FROM tmp.salesToSplit WHERE ticketFk = vTicketFk; - + SELECT count(*) INTO vTotalLines - FROM vn.sale s + FROM vn.sale s WHERE s.ticketFk = vTicketFk; - + SET vHasFullProblem = (vTotalLines = vProblemLines); -- Ticket completo IF vHasFullProblem THEN - + UPDATE vn.ticket - SET landed = vDated + 1, + SET landed = vDated + INTERVAL 1 DAY, shipped = vDated, nickname = CONCAT('(',DAY(util.VN_CURDATE()),') ', nickname ) WHERE id = vTicketFk; - + SELECT CONCAT("Se ha cambiado el ticket ", vTicketFk, " al dia ", vDated); LEAVE proc; - + END IF; -- Ticket a futuro existe IF vTicketFutureFk THEN - - UPDATE vn.sale s + + UPDATE vn.sale s JOIN tmp.salesToSplit ss ON s.id = ss.saleFk SET s.ticketFk = vTicketFutureFk, s.concept = CONCAT('(s) ', s.concept) WHERE ss.ticketFk = vTicketFk; - - SELECT CONCAT("Se han movido lineas del ticket ", vTicketFk, + + SELECT CONCAT("Se han movido lineas del ticket ", vTicketFk, " al ticket existente ", vTicketFutureFk,"(", vDated,")"); LEAVE proc; - + END IF; -- Ticket nuevo @@ -70297,21 +71036,22 @@ proc:BEGIN UPDATE vn.ticket t JOIN vn.productionConfig pc - SET t.landed = vDated + 1, + SET t.routeFk = IF(t.shipped = vDated , t.routeFk, NULL), + t.landed = vDated + INTERVAL 1 DAY, t.shipped = vDated, t.agencyModeFk = pc.defautlAgencyMode, - t.zoneFk = pc.defaultZone + t.zoneFk = pc.defaultZone WHERE t.id = vTicketFutureFk; - - UPDATE vn.sale s - JOIN tmp.salesToSplit sts ON sts.saleFk = s.id + + UPDATE vn.sale s + JOIN tmp.salesToSplit sts ON sts.saleFk = s.id SET s.ticketFk = vTicketFutureFk, s.concept = CONCAT('(s) ', s.concept) WHERE sts.ticketFk = vTicketFk; CALL vn.ticketStateUpdate(vTicketFutureFk, 'FIXING'); - SELECT CONCAT("Se han movido lineas del ticket ", vTicketFk, + SELECT CONCAT("Se han movido lineas del ticket ", vTicketFk, " al nuevo ticket ", vTicketFutureFk,"(", vDated,")"); END ;; DELIMITER ; @@ -70450,43 +71190,43 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_splitPackingComplete`(vTicketFk INT, vSectorFk INT) BEGIN - + DECLARE vNeedToSplit BOOLEAN; DECLARE vNewTicketFk INT; - + DROP TEMPORARY TABLE IF EXISTS tmpSale; - + CREATE TEMPORARY TABLE tmpSale SELECT DISTINCT s.id - FROM vn.ticket t + FROM vn.ticket t JOIN vn.sale s ON s.ticketFk = t.id - JOIN vn.item i ON i.id = s.itemFk + JOIN vn.item i ON i.id = s.itemFk LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = s.itemFk AND iss.sectorFk = vSectorFk - JOIN vn.packagingConfig pc + JOIN vn.packagingConfig pc WHERE t.id = vTicketFk AND ( s.quantity MOD IFNULL(iss.packing,1) != 0 - OR + OR IFNULL(iss.packing,1) = 1 - OR + OR i.`size` <= pc.previousPreparationMinimumSize ); - - SELECT COUNT(*) + + SELECT COUNT(*) INTO vNeedToSplit - FROM tmpSale; - + FROM tmpSale; + IF vNeedToSplit THEN - + CALL vn.ticket_Clone(vTicketFk, vNewTicketFk); - + UPDATE vn.sale s - JOIN vn.tmpSale ts ON ts.id = s.id + JOIN vn.tmpSale ts ON ts.id = s.id SET s.ticketFk = vNewTicketFk; - + END IF; - + DROP TEMPORARY TABLE tmpSale; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -70517,7 +71257,7 @@ BEGIN WHERE ot.description = 'Peso Aduana' AND t.clientFk = vClientFk AND t.shipped BETWEEN vDated AND util.dayend(vDated); - + SELECT sum(IF(sv.physicalWeight = 0, sv.weight, sv.physicalWeight)) INTO vTheorycalWeight FROM vn.ticket t JOIN vn.sale s ON s.ticketFk = t.id @@ -70526,9 +71266,9 @@ BEGIN JOIN vn.itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk WHERE t.clientFk = vClientFk AND t.shipped BETWEEN vDated AND util.dayend(vDated); - + SET vRatio = vRealWeight / vTheorycalWeight; - + DROP TEMPORARY TABLE IF EXISTS tmp.ticketWeight; CREATE TEMPORARY TABLE tmp.ticketWeight @@ -70549,7 +71289,7 @@ BEGIN AND t.shipped BETWEEN vDated AND util.dayend(vDated) GROUP BY ib.ediBotanic, o.code; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -70576,8 +71316,8 @@ BEGIN * @return tmp.timeBusinessCalculate */ DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate; - CREATE TEMPORARY TABLE tmp.timeBusinessCalculate + (INDEX (departmentFk)) SELECT dated, businessFk, userFk, @@ -70674,16 +71414,16 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.`user`; - CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` + CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` SELECT userFk FROM vn.worker w JOIN account.`user` u ON u.id = w.userFk WHERE userFk IS NOT NULL; - + CALL vn.timeBusiness_calculate(vDatedFrom, vDatedTo); DROP TEMPORARY TABLE tmp.`user`; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -70703,21 +71443,21 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateByDepartment`(vDepartmentFk INT, vDatedFrom DATETIME, vDatedTo DATETIME) BEGIN /** - * @param vDepartmentFk + * @param vDepartmentFk * @param vDatedFrom workerTimeControl * @param vDatedTo workerTimeControl */ DROP TEMPORARY TABLE IF EXISTS tmp.`user`; - + CREATE TEMPORARY TABLE tmp.`user` SELECT DISTINCT b.workerFk userFk - FROM business AS b - WHERE (b.started BETWEEN vDatedFrom AND vDatedTo + FROM business AS b + WHERE (b.started BETWEEN vDatedFrom AND vDatedTo OR IFNULL(b.ended, vDatedTo) BETWEEN vDatedFrom AND vDatedTo OR (b.started <= vDatedFrom AND b.ended >= vDatedTo) ) AND b.departmentFk = vDepartmentFk ORDER BY b.ended DESC; - + CALL timeBusiness_calculate(vDatedFrom, vDatedTo); DROP TEMPORARY TABLE tmp.`user`; @@ -70742,19 +71482,19 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateByUser`(vUser BEGIN /** - * @param vUserFk + * @param vUserFk * @param vDatedFrom workerTimeControl * @param vDatedTo workerTimeControl */ - + DROP TEMPORARY TABLE IF EXISTS tmp.`user`; - + CREATE TEMPORARY TABLE tmp.`user` SELECT id userFk - FROM account.user - WHERE id = vUserFk; + FROM account.user + WHERE id = vUserFk; CALL vn.timeBusiness_calculate(vDatedFrom, vDatedTo); - + DROP TEMPORARY TABLE tmp.`user`; END ;; @@ -70781,17 +71521,17 @@ BEGIN * @param vDatedFrom workerTimeControl * @param vDatedTo workerTimeControl */ - + DROP TEMPORARY TABLE IF EXISTS tmp.`user`; - + CREATE TEMPORARY TABLE tmp.`user` SELECT u.id userFk FROM account.user u JOIN vn.worker w ON w.userFk = u.id WHERE w.id = vWorkerFk; - + CALL vn.timeBusiness_calculate(vDatedFrom, vDatedTo); - + DROP TEMPORARY TABLE tmp.`user`; END ;; @@ -70814,21 +71554,21 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculate`(vDatedFrom D BEGIN /* * @param vDatedFrom - * @param vDatedTo + * @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 vDatedToTomorrow DATETIME; DECLARE vTimeToBreakTime INT; DECLARE vBreakTime INT; - - SELECT DATE_SUB(vDatedFrom, INTERVAL 1 DAY), DATE_ADD(vDatedTo, INTERVAL 1 DAY) + + SELECT DATE_SUB(vDatedFrom, INTERVAL 1 DAY), DATE_ADD(vDatedTo, INTERVAL 1 DAY) INTO vDatedFromYesterday, vDatedToTomorrow; - - SELECT timeToBreakTime, breakTime INTO vTimeToBreakTime, vBreakTime + + SELECT timeToBreakTime, breakTime INTO vTimeToBreakTime, vBreakTime FROM workerTimeControlConfig LIMIT 1; CALL timeControl_getError(vDatedFrom, vDatedTo); @@ -70837,9 +71577,9 @@ BEGIN CREATE TEMPORARY TABLE tmp.workerTimeControl (INDEX (userFk), INDEX (timed)) ENGINE = MEMORY - SELECT DISTINCT(wtc.id), - wtc.userFk, - wtc.timed, + SELECT DISTINCT(wtc.id), + wtc.userFk, + wtc.timed, wtc.direction, TRUE isReal FROM workerTimeControl wtc @@ -70849,10 +71589,10 @@ BEGIN AND tce.id IS NULL ORDER BY wtc.userFk, wtc.timed ASC; - SELECT MAX(id) INTO @vCont + SELECT MAX(id) INTO @vCont FROM tmp.workerTimeControl; - DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux; + DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux; CREATE TEMPORARY TABLE tmp.workerTimeControlAux ( `id` int(11) , `userFk` int(10) unsigned , @@ -70941,7 +71681,7 @@ BEGIN IF(direction='in', @vDated := DATE(wtc.timed), @vDated) dated, wtc.userFk FROM tmp.workerTimeControl wtc - ORDER BY wtc.userFk, wtc.timed, wtc.id + ORDER BY wtc.userFk, wtc.timed, wtc.id LIMIT 10000000000000000000 )sub GROUP BY sub.userFk, sub.dated @@ -70952,9 +71692,9 @@ BEGIN SET @vLastTimed := 0; DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux2; - CREATE TEMPORARY TABLE tmp.workerTimeControlAux2 + CREATE TEMPORARY TABLE tmp.workerTimeControlAux2 SELECT * - FROM tmp.workerTimeControl + FROM tmp.workerTimeControl WHERE timed BETWEEN vDatedFromYesterday AND vDatedTo ORDER BY userFk, timed, id; @@ -71013,16 +71753,16 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.`user`; - CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` + CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` SELECT userFk FROM vn.worker w JOIN account.`user` u ON u.id = w.userFk WHERE userFk IS NOT NULL; - + CALL vn.timeControl_calculate(vDatedFrom, vDatedTo); DROP TEMPORARY TABLE tmp.`user`; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -71042,21 +71782,21 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateByDepartment`(vDepartmentFk INT, vDatedFrom DATETIME, vDatedTo DATETIME) BEGIN /** - * @param vDepartmentFk + * @param vDepartmentFk * @param vDatedFrom workerTimeControl * @param vDatedTo workerTimeControl */ DROP TEMPORARY TABLE IF EXISTS tmp.`user`; - + CREATE TEMPORARY TABLE tmp.`user` SELECT DISTINCT b.workerFk userFk - FROM business AS b - WHERE (b.started BETWEEN vDatedFrom AND vDatedTo + FROM business AS b + WHERE (b.started BETWEEN vDatedFrom AND vDatedTo OR IFNULL(b.ended, vDatedTo) BETWEEN vDatedFrom AND vDatedTo OR (b.started <= vDatedFrom AND b.ended >= vDatedTo) ) AND b.departmentFk = vDepartmentFk ORDER BY b.ended DESC; - + CALL timeControl_calculate(vDatedFrom, vDatedTo); DROP TEMPORARY TABLE tmp.`user`; @@ -71081,19 +71821,19 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateByUser`(vUserF BEGIN /** - * @param vUserFk + * @param vUserFk * @param vDatedFrom workerTimeControl * @param vDatedTo workerTimeControl */ - + DROP TEMPORARY TABLE IF EXISTS tmp.`user`; - + CREATE TEMPORARY TABLE tmp.`user` SELECT id userFk - FROM account.user - WHERE id = vUserFk; + FROM account.user + WHERE id = vUserFk; CALL vn.timeControl_calculate(vDatedFrom, vDatedTo); - + DROP TEMPORARY TABLE tmp.`user`; END ;; @@ -71116,21 +71856,21 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateByWorker`(vWor BEGIN /** - * @param vWorkerFk + * @param vWorkerFk * @param vDatedFrom workerTimeControl * @param vDatedTo workerTimeControl */ - + DROP TEMPORARY TABLE IF EXISTS tmp.`user`; - + CREATE TEMPORARY TABLE tmp.`user` SELECT u.id userFk FROM account.user u JOIN vn.worker w ON w.userFk = u.id WHERE w.id = vWorkerFk; - + CALL vn.timeControl_calculate(vDatedFrom, vDatedTo); - + DROP TEMPORARY TABLE tmp.`user`; END ;; @@ -71153,12 +71893,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_getError`(vDatedFrom DA BEGIN /* * @param vDatedFrom - * @param vDatedTo + * @param vDatedTo * @table tmp.`user`(userFk) * Fichadas incorrectas de las cuales no se puede calcular horas trabajadas * @return tmp.timeControlError (id) */ - DECLARE vDayMaxTime INTEGER; + DECLARE vDayMaxTime INTEGER; SET @journeyCounter := 0; SET @lastUserFk := NULL; @@ -71166,16 +71906,16 @@ BEGIN SELECT dayMaxTime INTO vDayMaxTime FROM workerTimeControlConfig LIMIT 1; - DROP TEMPORARY TABLE IF EXISTS tmp.timeControl; - CREATE TEMPORARY TABLE tmp.timeControl + DROP TEMPORARY TABLE IF EXISTS tmp.timeControl; + CREATE TEMPORARY TABLE tmp.timeControl (INDEX(id), INDEX(journeyCounter)) ENGINE = MEMORY SELECT sub.id, - sub.direction, + sub.direction, sub.timed, IF(sub.direction = 'in' OR @hasOut OR sub.userFk <> @lastUserFk, @journeyCounter := @journeyCounter + 1, @journeyCounter) journeyCounter, - @lastUserFk := sub.userFk workerFk, - IF(sub.direction = 'out', @hasOut:= TRUE, @hasOut:= FALSE) + @lastUserFk := sub.userFk workerFk, + IF(sub.direction = 'out', @hasOut:= TRUE, @hasOut:= FALSE) FROM ( SELECT DISTINCT wtc.id, wtc.direction, @@ -71186,36 +71926,36 @@ BEGIN WHERE wtc.timed BETWEEN DATE_SUB(vDatedFrom, INTERVAL 1 DAY) AND DATE_ADD(vDatedTo, INTERVAL 1 DAY) ORDER BY wtc.userFk, wtc.timed ) sub; - - DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux; + + 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 + DROP TEMPORARY TABLE IF EXISTS tmp.timeControlError; + CREATE TEMPORARY TABLE tmp.timeControlError (INDEX(id)) ENGINE = MEMORY - SELECT id + SELECT id FROM tmp.timeControlAux tca JOIN ( - SELECT journeyCounter, + SELECT journeyCounter, UNIX_TIMESTAMP(MAX(timed)) - UNIX_TIMESTAMP(MIN(timed)) timeWork, - SUM(direction = 'in') totalIn, + 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 + 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; + DROP TEMPORARY TABLE IF EXISTS tmp.timeControl; + DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -71238,7 +71978,7 @@ proc: BEGIN * deprecated call workerTimeControl_check */ CALL vn.workerTimeControl_check(vUserFk,vDated,vTabletFk); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -71256,27 +71996,27 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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(util.VN_NOW(),INTERVAL - 2 DAY) - GROUP BY t.clientFk; - +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(util.VN_NOW(),INTERVAL - 2 DAY) + GROUP BY t.clientFk; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -71295,12 +72035,12 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `travelVolume`(vTravelFk INT) BEGIN - - SELECT w1.name AS ORI, - w2.name AS DES, + + SELECT w1.name AS ORI, + w2.name AS DES, tr.shipped shipment, tr.landed landing, - a.name Agencia, + a.name Agencia, s.name Proveedor, e.id Id_Entrada, e.invoiceNumber Referencia, @@ -71308,18 +72048,18 @@ BEGIN vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.trolleyM3 / 1000000 ,1) AS DECIMAL(10,2)) AS CC, CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) * vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.palletM3 / 1000000,1) AS DECIMAL(10,2)) AS espais - FROM vn.buy b - JOIN vn.entry e ON e.id = b.entryFk - JOIN vn.supplier s ON s.id = e.supplierFk - JOIN vn.travel tr ON tr.id = e.travelFk + FROM vn.buy b + JOIN vn.entry e ON e.id = b.entryFk + JOIN vn.supplier s ON s.id = e.supplierFk + JOIN vn.travel tr ON tr.id = e.travelFk JOIN vn.agencyMode a ON a.id = tr.agencyModeFk - JOIN vn.warehouse w1 ON w1.id = tr.warehouseInFk - JOIN vn.warehouse w2 ON w2.id = tr.warehouseOutFk - JOIN vn.volumeConfig vc - JOIN vn.item i ON i.id = b.itemFk + JOIN vn.warehouse w1 ON w1.id = tr.warehouseInFk + JOIN vn.warehouse w2 ON w2.id = tr.warehouseOutFk + JOIN vn.volumeConfig vc + JOIN vn.item i ON i.id = b.itemFk JOIN vn.itemType it ON it.id = i.typeFk WHERE tr.id = vTravelFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -71375,11 +72115,11 @@ BEGIN * @param vShipped The shipment date * @param vLanded The landing date */ - + IF vLanded < vShipped THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'Landing cannot be lesser than shipment'; - END IF; + END IF; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -71455,146 +72195,85 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; 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, +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, agencyModeFk, `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, - invoiceNumber, - isExcludedFromAvailable, - isConfirmed, - isOrdered, - isRaid, - commission, - created, - evaNotes, - travelFk, - currencyFk, - companyFk, - gestDocFk, - invoiceInFk) - SELECT supplierFk, - invoiceNumber, - isExcludedFromAvailable, - 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, - printedStickers, - isChecked, - weight, - itemOriginalFk) - SELECT vEntryNew, - itemFk, - quantity, - buyingValue, - packageFk, - stickers, - freightValue, - packageValue, - comissionValue, - packing, - `grouping`, - groupingMode, - location, - price1, - price2, - price3, - minPrice, - printedStickers, - isChecked, - weight, - itemOriginalFk - 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 vNewEntryFk INT; + DECLARE vEvaNotes VARCHAR(255); + DECLARE vDone BOOL; + 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 + BEGIN + ROLLBACK; + RESIGNAL; + END; + + START TRANSACTION; + + INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg) + SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, 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; + + l: LOOP + SET vDone = FALSE; + FETCH vRsEntry INTO vAuxEntryFk; + + IF vDone THEN + LEAVE l; + END IF; + + CALL entry_cloneHeader(vAuxEntryFk, vNewEntryFk, vNewTravelFk); + CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk); + + SELECT evaNotes INTO vEvaNotes + FROM entry + WHERE id = vAuxEntryFk; + + UPDATE entry + SET evaNotes = vEvaNotes + WHERE id = vNewEntryFk; + END LOOP; + + SET @isModeInventory = FALSE; + CLOSE vRsEntry; + + COMMIT; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -71639,11 +72318,11 @@ BEGIN SELECT COUNT(*) INTO vTotalEntries FROM entry WHERE travelFk = vTravelFk; - + UPDATE travel SET totalEntries = vTotalEntries WHERE id = vTravelFk; - + DELETE FROM travelRecalc WHERE travelFk = vTravelFk; END LOOP; @@ -71669,7 +72348,7 @@ BEGIN /* * Desplaza al dia siguiente los travels que contengan redadas y avisa a los compradores - * + * */ DECLARE vDone BOOL DEFAULT FALSE; DECLARE vWorkerName VARCHAR(50); @@ -71681,7 +72360,7 @@ BEGIN 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 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 @@ -71689,19 +72368,19 @@ BEGIN GROUP BY u.name; DECLARE CONTINUE HANDLER FOR NOT FOUND - SET vDone = TRUE; + 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,tr.landed FROM travel tr - JOIN entry e ON e.travelFk = tr.id + JOIN entry e ON e.travelFk = tr.id WHERE tr.landed = util.tomorrow() AND e.isRaid GROUP BY tr.id; @@ -71763,7 +72442,7 @@ proc: BEGIN IF vSelf IS NULL THEN LEAVE proc; END IF; - + INSERT IGNORE INTO travelRecalc SET travelFk = vSelf; END ;; DELIMITER ; @@ -71784,12 +72463,11 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_weeklyClone`(vSinceWeek INT, vToWeek INT) BEGIN /** - * Clona los travels plantilla para las semanas pasadas por parámetros + * Clona los traslados plantilla para las semanas pasadas por parámetros. * * @param vSinceWeek Número de semanas en el futuro para empezar a clonar * @param vToWeek Número de semenas en el futuro hasta donde clonar */ - DECLARE vCounter INT; DECLARE vCurrentTravelFk INT; DECLARE vShipped DATE; @@ -71798,10 +72476,11 @@ BEGIN DECLARE vWarehouseOutFk INT; DECLARE vAgencyModeFk INT; DECLARE vRef VARCHAR(255); - DECLARE vDone BOOLEAN DEFAULT FALSE; + DECLARE vNewTravelFk INT; + DECLARE vDone BOOL; DECLARE vRsTravel CURSOR FOR - SELECT travelFk, - @a := TIMESTAMPADD(DAY,vCounter * 7 - WEEKDAY(util.VN_CURDATE()) - 1 + weekDay,util.VN_CURDATE()), + SELECT travelFk, + @a := TIMESTAMPADD(DAY,vCounter * 7 - WEEKDAY(util.VN_CURDATE()) - 1 + weekDay, util.VN_CURDATE()), @a := TIMESTAMPADD(DAY,duration,@a), warehouseOutFk, warehouseInFk, @@ -71810,12 +72489,13 @@ BEGIN FROM travelClonedWeekly WHERE travelFk; - DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; SET vCounter = vSinceWeek; + vWeekLoop :LOOP INSERT IGNORE INTO travel (shipped, landed, warehouseOutFk, warehouseInFk, agencyModeFk, ref, cargoSupplierFk, kg) - SELECT @a := TIMESTAMPADD(DAY, vCounter * 7 - WEEKDAY(util.VN_CURDATE()) - 1 + weekDay,util.VN_CURDATE()), + SELECT @a := TIMESTAMPADD(DAY, vCounter * 7 - WEEKDAY(util.VN_CURDATE()) - 1 + weekDay, util.VN_CURDATE()), @a := TIMESTAMPADD(DAY, duration, @a), warehouseOutFk, warehouseInFk, @@ -71825,22 +72505,31 @@ BEGIN kg FROM travelClonedWeekly WHERE travelFk IS NULL; + OPEN vRsTravel; - FETCH vRsTravel INTO vCurrentTravelFk, vShipped, vLanded, vWarehouseOutFk, vWarehouseInFk, vRef, vAgencyModeFk; - SET vDone = FALSE; - WHILE NOT vDone DO - CALL travel_cloneWithEntries(vCurrentTravelFk, vShipped, vLanded, vWarehouseOutFk, vWarehouseInFk, vRef, vAgencyModeFk, @newTravel); + + l: LOOP + SET vDone = FALSE; FETCH vRsTravel INTO vCurrentTravelFk, vShipped, vLanded, vWarehouseOutFk, vWarehouseInFk, vRef, vAgencyModeFk; - END WHILE; + + IF vDone THEN + LEAVE l; + END IF; + + BEGIN + DECLARE CONTINUE HANDLER FOR SQLEXCEPTION RESIGNAL SQLSTATE '01000'; + CALL travel_cloneWithEntries(vCurrentTravelFk, vShipped, vLanded, vWarehouseOutFk, vWarehouseInFk, vRef, vAgencyModeFk, vNewTravelFk); + END; + END LOOP; + CLOSE vRsTravel; IF vCounter = vToWeek THEN LEAVE vWeekLoop; END IF; + SET vCounter = vCounter + 1; - END LOOP vWeekLoop; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -71858,60 +72547,60 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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); - +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 */ ; @@ -71932,7 +72621,71 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `updatePedidosInternos`(vItemFk INT) BEGIN UPDATE vn.item SET upToDown = 0 WHERE 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 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `vehicle_notifyEvents` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `vehicle_notifyEvents`() +proc:BEGIN +/** + * Query the vehicleEvent table to see if there are any events that need to be notified. + * + */ + DECLARE vEventEarlyDays INT; + DECLARE vHasEvents INT; + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + ROLLBACK; + RESIGNAL; + END; + + SELECT eventEarlyDays INTO vEventEarlyDays + FROM vehicleConfig; + + DROP TEMPORARY TABLE IF EXISTS tEvents; + CREATE TEMPORARY TABLE tEvents + SELECT e.id + FROM vehicleEvent e + JOIN vehicleState s ON e.vehicleStateFk = s.id + WHERE e.finished BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY, vEventEarlyDays, util.VN_CURDATE()) + AND e.notified IS NULL + AND s.hasToNotify; + + SELECT COUNT(id) INTO vHasEvents FROM tEvents; + + IF NOT vHasEvents THEN + LEAVE proc; + END IF; + + START TRANSACTION; + + SELECT util.notification_send('vehicle-event-expired', + JSON_OBJECT('eventIds', JSON_ARRAYAGG(id)), + account.myUser_getId() + ) + FROM tEvents; + + UPDATE vehicleEvent e + JOIN tEvents s ON e.id = s.id + SET e.notified = util.VN_NOW() + WHERE e.id = s.id; + COMMIT; + + DROP TEMPORARY TABLE IF EXISTS tEvents; END ;; DELIMITER ; @@ -71952,21 +72705,21 @@ DELIMITER ; DELIMITER ;; 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 - * + * * @param vSectorFk Identificador de vn.sector - * + * * @return tmp.stockMisfit(itemFk, visible, parked) */ - + DECLARE vCalcVisibleFk INT; DECLARE vWarehouseFk INT; SELECT warehouseFk INTO vWarehouseFk - FROM vn.sector s + FROM vn.sector s WHERE s.id = vSectorFk; - + CALL cache.visible_refresh(vCalcVisibleFk, FALSE, vWarehouseFk); DROP TEMPORARY TABLE IF EXISTS tmp.stockMisfit; @@ -71979,17 +72732,17 @@ BEGIN INSERT INTO tmp.stockMisfit(itemFk, parked) SELECT iss.itemFk , sum(iss.visible ) - FROM vn.itemShelvingStock iss - JOIN vn.sector s ON s.id = iss.sectorFk + FROM vn.itemShelvingStock iss + JOIN vn.sector s ON s.id = iss.sectorFk WHERE vSectorFk IN (s.id, s.sonFk) GROUP BY iss.itemFk; - + INSERT INTO tmp.stockMisfit(itemFk, visible) - SELECT v.item_id , v.visible - FROM cache.visible v - WHERE v.calc_id = vCalcVisibleFk + SELECT v.item_id , v.visible + FROM cache.visible v + WHERE v.calc_id = vCalcVisibleFk ON DUPLICATE KEY UPDATE visible = v.visible; - + DELETE FROM tmp.stockMisfit WHERE visible = parked; @@ -72013,17 +72766,17 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `warehouseFitting`(IN vWhOrigin INT BEGIN DECLARE vCacheVisibleOriginFk INT; DECLARE vCacheVisibleDestinyFk INT; - + CALL cache.visible_refresh(vCacheVisibleOriginFk, FALSE, vWhOrigin); CALL cache.visible_refresh(vCacheVisibleDestinyFk, FALSE, vWhDestiny); - + SELECT i.id itemFk, i.longName, i.size, i.subName, vOrigin.visible AS Origen, vDestiny.visible Destino - + FROM vn.item i JOIN vn.itemType it ON it.id = i.typeFk LEFT JOIN cache.visible vOrigin ON vOrigin.calc_id = vCacheVisibleOriginFk AND vOrigin.item_id = i.id @@ -72052,13 +72805,13 @@ BEGIN DECLARE vWhOrigin INT; DECLARE vWhDestiny INT; - + SELECT warehouseInFk, warehouseOutFk INTO vWhDestiny, vWhOrigin FROM vn.travel WHERE id = vTravelFk; - + CALL vn.warehouseFitting(vWhOrigin, vWhDestiny); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -72122,7 +72875,7 @@ BEGIN * Calcula los días y horas de vacaciones en función de un contrato y año * * @param vYear - * @param vBusinessFk + * @param vBusinessFk * @return tmp.workerCalendarCalculateBusiness (days, hours, daysEnjoyed, hoursEnjoyed) */ DECLARE vStarted DATE; @@ -72134,17 +72887,17 @@ BEGIN DECLARE vPayedHolidays DECIMAL(5,2); DECLARE vDifDays INT; - SELECT IF(b.started < CONCAT(vYear,"-01-01"), CONCAT(vYear,"-01-01"),b.started), - IF(b.ended IS NULL OR YEAR(b.ended)>vYear , CONCAT(vYear,"-12-31"), b.ended), + SELECT IF(b.started < CONCAT(vYear,"-01-01"), CONCAT(vYear,"-01-01"),b.started), + IF(b.ended IS NULL OR YEAR(b.ended)>vYear , CONCAT(vYear,"-12-31"), b.ended), IF(wbt.hasHolidayEntitlement, w.days, 0), c.hours_week, IF(YEAR(b.ended) = vYear, b.payedHolidays, 0) payedHolidays - INTO vStarted, - vEnded, - vDaysHoliday, + INTO vStarted, + vEnded, + vDaysHoliday, vHoursWeek, vPayedHolidays - FROM business b + FROM business b JOIN workerBusinessType wbt ON wbt.id = b.workerBusinessTypeFk JOIN workCenterHoliday w ON w.workcenterFk = b.workcenterFk LEFT JOIN postgresql.calendar_labour_type c ON c.calendar_labour_type_id = b.calendarTypeFk @@ -72152,21 +72905,21 @@ BEGIN 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), + SELECT IFNULL(SUM(holidayEntitlementRate), 0), SUM(-(discountRate - 1)) + vPayedHolidays - INTO vDaysToSubtract, - vDaysHolidayEnjoyed + INTO vDaysToSubtract, + vDaysHolidayEnjoyed FROM workerCalendar w JOIN absenceType a ON a.id = w.absenceTypeFk - WHERE w.businessFk = vBusinessFk + WHERE w.businessFk = vBusinessFk AND YEAR(dated) = vYear; END IF; - CREATE TEMPORARY TABLE tmp.workerCalendarCalculateBusiness + 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, @@ -72194,32 +72947,32 @@ BEGIN /** * Calcula los días y horas de vacaciones en función de un trabajador y año * - * @param vYear - * @param vWorkerFk + * @param vYear + * @param vWorkerFk * @return tmp.workerCalendarCalculateYear (days, hours, daysEnjoyed, hoursEnjoyed) - */ + */ DECLARE vDone BOOL; DECLARE vBusinessFk INT; DECLARE cur CURSOR FOR - SELECT b.id + SELECT b.id FROM business b - WHERE vYear BETWEEN YEAR(b.started) AND IFNULL(YEAR(b.ended), vYear) + WHERE vYear BETWEEN YEAR(b.started) AND IFNULL(YEAR(b.ended), vYear) AND b.workerFk = vWorkerFk; DECLARE CONTINUE HANDLER FOR NOT FOUND - SET vDone = TRUE; - + SET vDone = TRUE; + DROP TEMPORARY TABLE IF EXISTS tmp.workerCalendarCalculateYear; CREATE TEMPORARY TABLE tmp.workerCalendarCalculateYear - (days DEC(5,2), + (days DEC(5,2), hours DEC(5,2), - daysEnjoyed DEC(5,2), - hoursEnjoyed DEC(5,2)) + daysEnjoyed DEC(5,2), + hoursEnjoyed DEC(5,2)) ENGINE = MEMORY; INSERT INTO tmp.workerCalendarCalculateYear VALUES(0, 0, 0, 0); - + OPEN cur; l: LOOP @@ -72232,12 +72985,12 @@ BEGIN CALL workerCalendar_calculateBusiness(vYear, vBusinessFk); UPDATE tmp.workerCalendarCalculateYear w - JOIN tmp.workerCalendarCalculateBusiness wc + JOIN tmp.workerCalendarCalculateBusiness wc SET w.days = w.days + wc.days, w.hours = w.hours + wc.hours, w.daysEnjoyed = w.daysEnjoyed + wc.daysEnjoyed, w.hoursEnjoyed = w.hoursEnjoyed + wc.hoursEnjoyed; - + DROP TEMPORARY TABLE tmp.workerCalendarCalculateBusiness; END LOOP; @@ -72262,7 +73015,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCreate`( vFirstname VARCHAR(50), - vLastName VARCHAR(50), + vLastName VARCHAR(50), vCode CHAR(3), vBossFk INT, vUserFk INT, @@ -72274,7 +73027,7 @@ BEGIN * Create new worker * */ - INSERT INTO worker(id, code, firstName, lastName, userFk, bossFk, fi, birth) + INSERT INTO worker(id, code, firstName, lastName, userFk, bossFk, fi, birth) VALUES (vUserFk, vCode, vFirstname, vLastName, vUserFk, vBossFk, vFi, vBirth); END ;; DELIMITER ; @@ -72341,20 +73094,20 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS tmp.workerDepartmentByDate; CREATE TEMPORARY TABLE tmp.workerDepartmentByDate ENGINE = MEMORY - SELECT w.userFk, - w.lastName name, - w.firstName firstname, - d.name department, + SELECT w.userFk, + w.lastName name, + w.firstName firstname, + d.name department, d.id departmentFk, - b.started, - d.isProduction, + b.started, + d.isProduction, CAST(12 * b.amount / clt.hours_week / 52 AS DECIMAL(10,2)) costeHora, w.fi nif FROM business b JOIN postgresql.calendar_labour_type clt ON clt.calendar_labour_type_id = b.calendarTypeFk JOIN department d ON d.id = b.departmentFk JOIN worker w ON w.id = b.workerFk - WHERE b.started <= vDate + WHERE b.started <= vDate AND (b.ended > vDate OR b.ended IS NULL); END ;; DELIMITER ; @@ -72381,18 +73134,18 @@ mainLabel:BEGIN DELETE FROM account.account WHERE id = vUserId; - UPDATE account.user + UPDATE account.user SET role = 2 - WHERE id = vUserId; + WHERE id = vUserId; - DELETE FROM pbx.sip - WHERE user_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; - + UPDATE `client` c SET c.salesPersonFk = null WHERE c.salesPersonFk = vUserId; @@ -72421,12 +73174,12 @@ BEGIN SELECT b.workerFk FROM business b JOIN vn.worker w ON w.id = b.workerFk - JOIN account.account a ON a.id = b.workerFk - LEFT JOIN (SELECT b.workerFk + JOIN account.account a ON a.id = b.workerFk + LEFT JOIN (SELECT b.workerFk FROM business b WHERE (ended IS NULL OR ended >=util.VN_CURDATE()) )sub ON sub.workerFk = a.id - LEFT JOIN vn.workerDisableExcluded wd ON wd.workerFk = b.workerFk + LEFT JOIN vn.workerDisableExcluded wd ON wd.workerFk = b.workerFk WHERE sub.workerFk IS NULL AND wd.workerFk IS NULL GROUP BY w.id; @@ -72444,7 +73197,7 @@ BEGIN END WHILE; CLOSE rs; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -72508,19 +73261,19 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourney_replace`( - vDatedFrom DATE, - vDatedTo DATE, + vDatedFrom DATE, + vDatedTo DATE, vWorkerFk INT) BEGIN /** - * Actualiza la tabla workerJourney para que actue como caché permanente revisable + * 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 vMaxTimePerDay INT; DECLARE vMinHoursToBreak DECIMAL(10,2); DECLARE vBreakHours DECIMAL(10,2); DECLARE vMonthByYear INT; @@ -72528,57 +73281,57 @@ BEGIN DECLARE vMonthsByYear INT DEFAULT 12; DECLARE vDaysByWeek INT DEFAULT 5; DECLARE vDatedFromYesterday DATETIME; - DECLARE vDatedToTomorrow DATETIME; - - SELECT DATE_SUB(vDatedFrom, INTERVAL 1 DAY), DATE_ADD(vDatedTo, INTERVAL 1 DAY) + DECLARE vDatedToTomorrow DATETIME; + + SELECT DATE_SUB(vDatedFrom, INTERVAL 1 DAY), DATE_ADD(vDatedTo, INTERVAL 1 DAY) INTO vDatedFromYesterday, vDatedToTomorrow; SET vDatedTimeTo = util.dayEnd(vDatedTo); - - SELECT minHoursToBreak, breakHours, maxTimePerDay + + SELECT minHoursToBreak, breakHours, maxTimePerDay INTO vMinHoursToBreak, vBreakHours, vMaxTimePerDay FROM workerTimeControlConfig; DELETE FROM workerJourney - WHERE dated BETWEEN vDatedFrom AND vDatedTo + WHERE dated BETWEEN vDatedFrom AND vDatedTo AND NOT isPaid AND NOT isUpdated - AND (vWorkerFk IS NULL OR userFK = vWorkerFk); + AND (vWorkerFk IS NULL OR userFK = vWorkerFk); - -- Se inserta todos los días del periodo por worker y business en el rango de fechas. + -- 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 b.workerFk, t.dated, b.id - FROM business b + FROM business b JOIN time t ON t.dated BETWEEN b.started AND IFNULL(b.ended,util.VN_CURDATE()) WHERE t.dated BETWEEN vDatedFrom AND vDatedTo AND (vWorkerFk IS NULL OR b.workerFk = vWorkerFk) ORDER BY b.workerFk, t.dated, b.id; - + 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; + 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` + CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` SELECT id userFk FROM worker w; - END IF; + 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, + 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 + + -- NOCTURNIDAD CALL timeControl_getError(vDatedFrom, vDatedTimeTo); SET @vIsOdd := TRUE; @@ -72588,9 +73341,9 @@ BEGIN CREATE TEMPORARY TABLE tmp.workerTimeControl (INDEX (userFk), INDEX (timed)) ENGINE = MEMORY - SELECT DISTINCT(wtc.id), - wtc.userFk, - wtc.timed, + SELECT DISTINCT(wtc.id), + wtc.userFk, + wtc.timed, wtc.direction FROM workerTimeControl wtc JOIN tmp.`user` w ON w.userFk = wtc.userFk @@ -72600,10 +73353,10 @@ BEGIN AND (vWorkerFk IS NULL OR wtc.userFk = vWorkerFk) ORDER BY wtc.userFk, wtc.timed ASC; - SELECT MAX(id) INTO @vCont + SELECT MAX(id) INTO @vCont FROM tmp.workerTimeControl; - DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux; + DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux; CREATE TEMPORARY TABLE tmp.workerTimeControlAux ( `id` int(11) , `userFk` int(10) unsigned , @@ -72625,9 +73378,9 @@ BEGIN DATE(@lastTimed) dated, @lastUserFk lastUserFk, IF(direction ='middle', @vIsOdd := NOT @vIsOdd, FALSE) isOdd, - IF(@vIsOdd - AND @lastDirection = 'middle' - AND (DATE(@lastTimed) <> date(timed) + IF(@vIsOdd + AND @lastDirection = 'middle' + AND (DATE(@lastTimed) <> date(timed) OR @lastUserFk <> userFk), TRUE, FALSE) hasBreak, @lastTimed := wtc.timed, @lastUserFk := userFk, @@ -72641,16 +73394,16 @@ BEGIN SET @lastDirection := NULL; INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction) - SELECT @vCont:= @vCont + 1, - lastUserFk, - DATE_ADD(sub.dated, INTERVAL 1 DAY), + SELECT @vCont:= @vCont + 1, + lastUserFk, + DATE_ADD(sub.dated, INTERVAL 1 DAY), 'middle' FROM (SELECT IF(@lastUserFk <> userFk, @vIsOdd := TRUE, NULL), DATE(@lastTimed) dated, @lastUserFk lastUserFk, IF(direction ='middle', @vIsOdd := NOT @vIsOdd, FALSE) isOdd, - IF(@vIsOdd - AND @lastDirection = 'middle' + IF(@vIsOdd + AND @lastDirection = 'middle' AND (DATE(@lastTimed)<>date(timed) OR @lastUserFk<>userFk), TRUE, FALSE) hasBreak, @lastTimed := wtc.timed, @@ -72663,7 +73416,7 @@ BEGIN -- Cambio de dia INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction) SELECT @vCont:= @vCont + 1, - wtc.userFk, + wtc.userFk, util.dayEnd(date(wtc.timed)), 'out' FROM workerTimeControl wtc @@ -72674,8 +73427,8 @@ BEGIN GROUP BY wtc.userFk, DATE(wtc.timed); INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction) - SELECT @vCont:= @vCont + 1, - wtc.userFk, + SELECT @vCont:= @vCont + 1, + wtc.userFk, DATE_ADD(date(wtc.timed), INTERVAL 1 DAY), 'in' FROM workerTimeControl wtc @@ -72701,8 +73454,8 @@ BEGIN IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed), IF(direction='in', @vDated := DATE(wtc.timed), @vDated ) dated, wtc.userFk, - IF(UNIX_TIMESTAMP(timed)- @vLastTimed < vMaxTimePerDay, - workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed), + IF(UNIX_TIMESTAMP(timed)- @vLastTimed < vMaxTimePerDay, + workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed), 0) NigthlyHours, @lastUserFk := userFk FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction @@ -72715,7 +73468,7 @@ BEGIN ) wtc ORDER BY wtc.userFk, wtc.timed )sub - WHERE sub.dated BETWEEN vDatedFrom AND vDatedTo + 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 @@ -72726,10 +73479,10 @@ BEGIN -- Horas téoricas y precio de la hora ordinaria UPDATE workerJourney wj JOIN business b ON b.id = wj.businessFk - JOIN postgresql.calendar_labour_type cl + JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = b.calendarTypeFk - SET wj.priceOrdinaryHour = - (vMonthsByYear * b.amount) / + SET wj.priceOrdinaryHour = + (vMonthsByYear * b.amount) / (vWeeksByYear * cl.hours_week), wj.contractJourney = cl.hours_week / vDaysByWeek WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo @@ -72737,7 +73490,7 @@ BEGIN AND NOT wj.isPaid AND NOT isUpdated; - -- Precio Extras, Vacaciones y Nocturnas + -- Precio Extras, Vacaciones y Nocturnas UPDATE workerJourney wj JOIN(SELECT MAX(w.dated), t.dated, w.holidayInc, w.nightInc, w.extraInc FROM time t @@ -72756,18 +73509,18 @@ BEGIN -- Elimina el precio de las horas extras para los contratos parciales. UPDATE workerJourney wj JOIN business b ON b.id = wj.businessFk - JOIN postgresql.calendar_labour_type cl + JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = b.calendarTypeFk 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.isPaid AND NOT wj.isUpdated; -- Ausencias UPDATE workerJourney wj - JOIN businessCalendar bc ON bc.businessFk = wj.businessFk + JOIN businessCalendar bc ON bc.businessFk = wj.businessFk AND bc.dated = wj.dated JOIN absenceType ab ON ab.id = bc.absenceTypeFk SET wj.permission = ab.permissionRate * wj.contractJourney, @@ -72782,7 +73535,7 @@ BEGIN UPDATE workerJourney SET holiday = IF(DAYNAME(dated)='sábado', 0, total), contractJourney = 0 - WHERE DAYNAME(dated) IN ('sábado', 'domingo') + WHERE DAYNAME(dated) IN ('sábado', 'domingo') AND dated BETWEEN vDatedFrom AND vDatedTo AND (vWorkerFk IS NULL OR userFk = vWorkerFk) AND NOT isPaid @@ -72791,8 +73544,8 @@ BEGIN -- Festivos por centro de trabajo UPDATE workerJourney wj JOIN calendarHolidays ch ON ch.dated = wj.dated - JOIN business b ON b.id = wj.businessFk - AND b.workcenterFk = ch.workcenterFk + JOIN business b ON b.id = wj.businessFk + AND b.workcenterFk = ch.workcenterFk SET wj.holiday = wj.total, wj.permission = wj.contractJourney, wj.contractJourney = 0 @@ -72802,7 +73555,7 @@ BEGIN AND NOT wj.isUpdated; -- Horas extras - UPDATE workerJourney + UPDATE workerJourney SET extra = lunch + total - contractJourney WHERE dated BETWEEN vDatedFrom AND vDatedTo AND (vWorkerFk IS NULL OR userFk = vWorkerFk) @@ -72831,16 +73584,16 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `workerMistakeType_get`() -BEGIN - -/** - * Obtiene los tipos de error para los trabajadores - */ - - SELECT code, description - FROM workerMistakeType - ORDER BY description; - +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 */ ; @@ -72857,28 +73610,18 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; 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; - +CREATE DEFINER=`root`@`localhost` PROCEDURE `workerMistake_add`(vWorkerFk INT, vWorkerMistakeTypeFk VARCHAR(10)) +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 + * + */ + INSERT INTO vn.workerMistake(userFk, workerMistakeTypeFk) + VALUES(vWorkerFk, vWorkerMistakeTypeFk); + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -72896,28 +73639,28 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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); +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 */ ; @@ -72935,32 +73678,32 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; 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 ; - +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 */ ; @@ -72982,11 +73725,11 @@ BEGIN /*INSERT INTO workerTimeControl(userFk, timed, manual, warehouseFk) VALUES(vUserFk, vDated, FALSE, vWarehouseFk); - + CALL vn.workerTimeControlSOWP(vUserFk , vDated);*/ - + CALL vn.workerTimeControl_add(vUserFk,vWarehouseFk,util.VN_NOW(),FALSE); - + END ;; DELIMITER ; @@ -73012,8 +73755,8 @@ BEGIN * */ - - + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -73090,13 +73833,13 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlSOWP`(IN vUserFk INT, IN vDated DATE) BEGIN SET @order := 0; - - UPDATE workerTimeControl - SET `order` = @order := @order + 1 - WHERE vUserFk =userFk + + UPDATE workerTimeControl + SET `order` = @order := @order + 1 + WHERE vUserFk =userFk AND vDated = DATE(timed) ORDER BY timed; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -73115,8 +73858,8 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_add`(IN vUserFk INT, IN vWarehouseFk INT, IN vTimed DATETIME, IN vIsManual BOOL) BEGIN - - + + SELECT workerTimeControl_add(vUserFk,vWarehouseFk,vTimed,vIsManual); END ;; DELIMITER ; @@ -73205,73 +73948,73 @@ proc: BEGIN DECLARE vTo VARCHAR(50) DEFAULT NULL; DECLARE vUserName VARCHAR(50) DEFAULT NULL; DECLARE vBody VARCHAR(255) DEFAULT NULL; - - SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax + + SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax INTO vDayBreak, vWeekBreak, vWeekScope, vDayWorkMax, vDayStayMax FROM workerTimeControlParams; SELECT MAX(timed) INTO vLastIn - FROM workerTimeControl - WHERE userFk = vUserFk + FROM workerTimeControl + WHERE userFk = vUserFk AND direction = 'in'; - + SELECT MAX(timed) INTO vLastOut - FROM workerTimeControl - WHERE userFk = vUserFk - AND direction = 'out'; + FROM workerTimeControl + WHERE userFk = vUserFk + AND direction = 'out'; SELECT CONCAT(u.name,'@verdnatura.es') INTO vTo FROM account.user u - WHERE u.id = (SELECT bossFk FROM worker WHERE id = vUserFk); - + WHERE u.id = (SELECT bossFk FROM worker WHERE id = vUserFk); + SELECT CONCAT(firstName,' ',lastName) INTO vUserName FROM worker w WHERE w.id = vUserFk; IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA - - -- VERIFICAR DESCANSO DIARIO - IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN + + -- VERIFICAR DESCANSO DIARIO + IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN SELECT "Descansos 12 h" AS problem; -- ENVIAMOS CORREO AL BOSSFK SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 12 h") INTO vBody; CALL mail_insert(vTo,vTo,'error al fichar',vBody); LEAVE proc; - END IF; - + END IF; + -- VERIFICAR FICHADAS IMPARES DEL ÚLTIMO DÍA QUE SE FICHÓ - IF (SELECT MOD(COUNT(*),2) -- <>0 - FROM workerTimeControl + IF (SELECT MOD(COUNT(*),2) -- <>0 + FROM workerTimeControl WHERE userFk = vUserFk AND timed >= vLastIn - ) THEN + ) THEN SELECT "Dias con fichadas impares" AS problem; -- ENVIAMOS CORREO AL BOSSFK SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Dias con fichadas impares") INTO vBody; CALL mail_insert(vTo,vTo,'error al fichar',vBody); - LEAVE proc; + LEAVE proc; END IF; - + -- VERIFICAR VACACIONES SELECT at2.name INTO vCalendarStateType - FROM calendar c + FROM calendar c JOIN business b ON b.id = c.businessFk JOIN absenceType at2 ON at2.id = c.dayOffTypeFk WHERE c.dated = util.VN_CURDATE() AND at2.isAllowedToWork = FALSE AND b.workerFk = vUserFk LIMIT 1; - + IF(LENGTH(vCalendarStateType)) THEN SELECT vCalendarStateType AS problem; -- ENVIAMOS CORREO AL BOSSFK SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Vacaciones") INTO vBody; CALL mail_insert(vTo,vTo,'error al fichar',vBody); - LEAVE proc; - + LEAVE proc; + END IF; - + -- VERIFICAR CONTRATO EN VIGOR IF (SELECT COUNT(*) FROM business b @@ -73283,44 +74026,44 @@ proc: BEGIN -- ENVIAMOS CORREO AL BOSSFK SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"No hay un contrato en vigor") INTO vBody; CALL mail_insert(vTo,vTo,'error al fichar',vBody); - LEAVE proc; - + LEAVE proc; + END IF; -- VERIFICAR DESCANSO SEMANAL SET @vHasBreakWeek:= FALSE; - SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND)); - + SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND)); + DROP TEMPORARY TABLE IF EXISTS tmp.trash; CREATE TEMPORARY TABLE tmp.trash SELECT IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias, @vLastTimed:= UNIX_TIMESTAMP(timed) - FROM workerTimeControl + FROM workerTimeControl WHERE timed>= (util.VN_NOW() - INTERVAL vWeekScope SECOND) AND userFk= vUserFk AND direction IN ('in','out') - ORDER BY timed ASC; - - IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA + ORDER BY timed ASC; + + IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA SELECT "Descansos 36 h" AS problem; -- ENVIAMOS CORREO AL BOSSFK SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 36 h") INTO vBody; CALL mail_insert(vTo,vTo,'error al fichar',vBody); LEAVE proc; END IF; + + DROP TEMPORARY TABLE tmp.trash; - DROP TEMPORARY TABLE tmp.trash; - - ELSE -- DIA ACTUAL - + ELSE -- DIA ACTUAL + -- VERIFICA QUE EL TIEMPO EFECTIVO NO SUPERE EL MÁXIMO - SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) - IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked + SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) - IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked FROM workerTimeControl wtc - WHERE userFk = vUserFk + WHERE userFk = vUserFk AND timed >= vLastIn ORDER BY timed; - IF vTimedWorked > vDayWorkMax THEN + IF vTimedWorked > vDayWorkMax THEN SELECT "Jornadas" AS problem; -- ENVIAMOS CORREO AL BOSSFK SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Jornadas") INTO vBody; @@ -73343,10 +74086,10 @@ proc: BEGIN -- ENVIAMOS CORREO AL BOSSFK SELECT CONCAT(vUserName,' No a podido fichar por el siguiente problema: ',"No perteneces a este departamento.") INTO vBody; CALL mail_insert(vTo,vTo,'error al fichar',vBody); - LEAVE proc; + LEAVE proc; END IF; END IF;*/ - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -73366,7 +74109,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_checkBreak`(vStarted DATE) BEGIN /** - * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas + * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas * El sistema verificará el descanso corto en la siguiente semana * o el largo en las 2 siguientes semanas a partir de la fecha dada * @param vStarted día inicio de la semana en el que se quiere verificar @@ -73377,27 +74120,27 @@ BEGIN DECLARE vShortWeekBreak INT; DECLARE vLongWeekBreak INT; - SELECT util.dayEnd(DATE_ADD(vStarted, INTERVAL shortWeekDays DAY)), + SELECT util.dayEnd(DATE_ADD(vStarted, INTERVAL shortWeekDays DAY)), util.dayEnd(DATE_ADD(vStarted, INTERVAL longWeekDays DAY)), - shortWeekBreak, + shortWeekBreak, longWeekBreak INTO vShortEnded, vLongEnded, vShortWeekBreak, vLongWeekBreak FROM workerTimeControlConfig; - + SET @previousTimed:= UNIX_TIMESTAMP(vStarted); SET @lastUserFk := NULL; - + -- Descanso corto en la semana - + DROP TEMPORARY TABLE IF EXISTS tmp.worker; CREATE TEMPORARY TABLE tmp.worker (PRIMARY KEY(workerFk)) ENGINE = MEMORY SELECT DISTINCT userFk workerFk - FROM workerTimeControl + FROM workerTimeControl WHERE timed BETWEEN vStarted AND vShortEnded AND direction IN ('in', 'out'); - + DROP TEMPORARY TABLE IF EXISTS tmp.worker2; CREATE TEMPORARY TABLE tmp.worker2 (PRIMARY KEY(workerFk)) @@ -73410,28 +74153,28 @@ BEGIN SELECT sub2.userFk workerFk FROM(SELECT sub.userFk, IF(sub.userFk <> @lastUserFk, - @previousTimed:= sub.timed, + @previousTimed:= sub.timed, FALSE), - IF(sub.timed - @previousTimed >= vShortWeekBreak, - TRUE, + IF(sub.timed - @previousTimed >= vShortWeekBreak, + TRUE, FALSE) hasShortWeekBreak, @previousTimed:= sub.timed, @lastUserFk:= sub.userFk FROM ( SELECT userFk, UNIX_TIMESTAMP(timed) timed - FROM workerTimeControl + FROM workerTimeControl WHERE timed BETWEEN vStarted AND vShortEnded AND direction IN ('in', 'out') - UNION + UNION SELECT w.workerFk, UNIX_TIMESTAMP(IFNULL( - MIN(wtc.timed), + MIN(wtc.timed), DATE_ADD(vShortEnded, INTERVAL vShortWeekBreak SECOND))) FROM tmp.worker w - LEFT JOIN workerTimeControl wtc - ON wtc.userFk = w.workerFk - AND wtc.timed BETWEEN vShortEnded - AND DATE_ADD(vShortEnded, INTERVAL vShortWeekBreak SECOND) + LEFT JOIN workerTimeControl wtc + ON wtc.userFk = w.workerFk + AND wtc.timed BETWEEN vShortEnded + AND DATE_ADD(vShortEnded, INTERVAL vShortWeekBreak SECOND) GROUP BY w.workerFk UNION SELECT w.workerFk, @@ -73439,10 +74182,10 @@ BEGIN MAX(wtc.timed), DATE_SUB(vStarted, INTERVAL vShortWeekBreak SECOND))) FROM tmp.worker2 w - LEFT JOIN workerTimeControl wtc - ON wtc.userFk = w.workerFk - AND wtc.timed BETWEEN - DATE_SUB(vStarted, INTERVAL vShortWeekBreak SECOND) + LEFT JOIN workerTimeControl wtc + ON wtc.userFk = w.workerFk + AND wtc.timed BETWEEN + DATE_SUB(vStarted, INTERVAL vShortWeekBreak SECOND) AND vStarted GROUP BY w.workerFk ORDER BY userFk, timed @@ -73452,7 +74195,7 @@ BEGIN GROUP BY sub2.userFk HAVING NOT SUM(hasShortWeekBreak); - -- Descanso largo en las 2 siguientes semanas + -- Descanso largo en las 2 siguientes semanas DROP TEMPORARY TABLE tmp.worker; CREATE TEMPORARY TABLE tmp.worker (PRIMARY KEY(workerFk)) @@ -73472,12 +74215,12 @@ BEGIN (PRIMARY KEY(workerFk)) ENGINE = MEMORY SELECT sub2.userFk workerFk - FROM(SELECT userFk, + FROM(SELECT userFk, IF(userFk <> @lastUserFk, - @previousTimed:= timed, + @previousTimed:= timed, TRUE), - IF(timed - @previousTimed >= vLongWeekBreak, - TRUE, + IF(timed - @previousTimed >= vLongWeekBreak, + TRUE, FALSE) hasLongWeekBreak, @previousTimed:= timed, @lastUserFk:= userFk @@ -73486,24 +74229,24 @@ BEGIN JOIN tmp.workerWithoutShortWeekBreak wws ON wws.workerFk = wtc.userFk WHERE timed BETWEEN vStarted AND vLongEnded AND direction IN ('in', 'out') - UNION + UNION SELECT w.workerFk, - UNIX_TIMESTAMP(IFNULL(MIN(wtc.timed), + UNIX_TIMESTAMP(IFNULL(MIN(wtc.timed), DATE_ADD(vLongEnded, INTERVAL vLongWeekBreak SECOND))) FROM tmp.worker w - LEFT JOIN workerTimeControl wtc - ON wtc.userFk = w.workerFk - AND timed BETWEEN vLongEnded - AND DATE_ADD(vLongEnded, INTERVAL vLongWeekBreak SECOND) + LEFT JOIN workerTimeControl wtc + ON wtc.userFk = w.workerFk + AND timed BETWEEN vLongEnded + AND DATE_ADD(vLongEnded, INTERVAL vLongWeekBreak SECOND) GROUP BY w.workerFk UNION - SELECT w.workerFk, - UNIX_TIMESTAMP(IFNULL(MAX(wtc.timed), + SELECT w.workerFk, + UNIX_TIMESTAMP(IFNULL(MAX(wtc.timed), DATE_SUB(vStarted, INTERVAL vLongWeekBreak SECOND))) FROM tmp.worker2 w - LEFT JOIN workerTimeControl wtc - ON wtc.userFk = w.workerFk - AND timed BETWEEN DATE_SUB(vStarted, INTERVAL vLongWeekBreak SECOND) + LEFT JOIN workerTimeControl wtc + ON wtc.userFk = w.workerFk + AND timed BETWEEN DATE_SUB(vStarted, INTERVAL vLongWeekBreak SECOND) AND vStarted GROUP BY w.workerFk ORDER BY userFk, timed @@ -73530,334 +74273,334 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_clockIn`( - vWorker INT, - vTimed DATETIME, +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 = util.VN_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 BIGINT; - DECLARE vTimedLoopPrevious BIGINT; - DECLARE vHasBreakWeek BOOLEAN DEFAULT FALSE; - DECLARE vManual BOOLEAN DEFAULT TRUE; - DECLARE vDone INT DEFAULT FALSE; - - DECLARE vCursor CURSOR FOR - SELECT UNIX_TIMESTAMP(vTimed) timed - 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(vTimed) timed - 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 = util.VN_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 business b - JOIN postgresql.professional_category pc - ON pc.professional_category_id = b.workerBusinessProfessionalCategoryFk - JOIN workerTimeControlConfig wc ON TRUE - WHERE b.workerFk = vWorker - AND vDated BETWEEN b.started AND IFNULL(b.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(util.VN_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 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 vCursor2; - l:LOOP - FETCH vCursor2 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 vCursor2; - -- VERIFICA DESCANSO LARGO EN LAS PRÓXIMAS 2 SEMANAS - IF NOT vHasBreakWeek THEN - SET vGap = vWeekScope * 2; - SET vTimedLoopPrevious = vTimed; - SET vDone = FALSE; - OPEN vCursor2; - l:LOOP - FETCH vCursor2 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 vCursor2; - 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; +BEGIN +/** + * Verifica si el empleado puede fichar + * @param vWorker Identificador del trabajador + * @param vTimed valor de la fichada, IF vTimed IS NULL vTimed = util.VN_NOW() + * @param 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 BIGINT; + DECLARE vTimedLoopPrevious BIGINT; + DECLARE vHasBreakWeek BOOLEAN DEFAULT FALSE; + DECLARE vManual BOOLEAN DEFAULT TRUE; + DECLARE vDone INT DEFAULT FALSE; + + DECLARE vCursor CURSOR FOR + SELECT UNIX_TIMESTAMP(vTimed) timed + 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(vTimed) timed + 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 = util.VN_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 business b + JOIN postgresql.professional_category pc + ON pc.professional_category_id = b.workerBusinessProfessionalCategoryFk + JOIN workerTimeControlConfig wc ON TRUE + WHERE b.workerFk = vWorker + AND vDated BETWEEN b.started AND IFNULL(b.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(util.VN_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 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 vCursor2; + l:LOOP + FETCH vCursor2 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 vCursor2; + -- VERIFICA DESCANSO LARGO EN LAS PRÓXIMAS 2 SEMANAS + IF NOT vHasBreakWeek THEN + SET vGap = vWeekScope * 2; + SET vTimedLoopPrevious = vTimed; + SET vDone = FALSE; + OPEN vCursor2; + l:LOOP + FETCH vCursor2 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 vCursor2; + 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 */ ; @@ -73880,27 +74623,27 @@ 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') + * Los valores posibles de retorno son ('in', 'inMiddle', 'outMiddle', 'out') */ DECLARE vLastIn DATETIME ; DECLARE vIsMiddleOdd BOOLEAN ; - IF (vTimed IS NULL) THEN + IF (vTimed IS NULL) THEN SET vTimed = util.VN_NOW(); END IF; - + SELECT timed INTO vLastIn - FROM workerTimeControl + FROM workerTimeControl WHERE userFk = vWorkerFk - AND direction = 'in' + AND direction = 'in' AND timed < vTimed ORDER BY timed DESC LIMIT 1; - + SELECT (COUNT(*)mod 2 = 1) INTO vIsMiddleOdd - FROM workerTimeControl + FROM workerTimeControl WHERE userFk = vWorkerFk - AND direction = 'middle' + AND direction = 'middle' AND timed BETWEEN vLastIn AND util.VN_NOW(); DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlDirection; @@ -73949,7 +74692,7 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_getClockIn`( - vUserFk INT, + vUserFk INT, vDated DATE) BEGIN /** @@ -73959,9 +74702,9 @@ BEGIN * @param vDated Fecha proporcionada */ CALL timeControl_calculateByWorker( - vUserFk, + vUserFk, DATE_SUB(vDated, INTERVAL 6 DAY), util.dayEnd(vDated)); - + SET @position := 0; SET @lastDated := NULL; @@ -73978,7 +74721,7 @@ BEGIN MAX(2daysAgoDirection) 2daysAgoDirection, MAX(1daysAgo) 1daysAgo, MAX(1daysAgoDirection) 1daysAgoDirection, - MAX(0daysAgo) 0daysAgo, + MAX(0daysAgo) 0daysAgo, MAX(0daysAgoDirection) 0daysAgoDirection FROM(SELECT IF(daysAgo = 6, timed, '') 6daysAgo, IF(daysAgo = 5, timed, '') 5daysAgo, @@ -73998,7 +74741,7 @@ BEGIN direction, position FROM(SELECT DATEDIFF(vDated, timed) daysAgo, - TIME_FORMAT(timed,'%H:%i') timed, + TIME_FORMAT(timed,'%H:%i') timed, IF(DATE(timed) <> @lastDated, @position := 0, NULL), @position := @position+1 position, @lastDated := DATE(timed), @@ -74010,18 +74753,18 @@ BEGIN LIMIT 10000000000000000000 )sub )sub2 - GROUP BY position) sub3 + GROUP BY position) sub3 JOIN (SELECT MAX(IF(daysAgo = 6, timeWorkSeconds, 0)) 6daysAgoTotal, MAX(IF(daysAgo = 5, timeWorkSeconds, 0)) 5daysAgoTotal, MAX(IF(daysAgo = 4, timeWorkSeconds, 0)) 4daysAgoTotal, MAX(IF(daysAgo = 3, timeWorkSeconds, 0)) 3daysAgoTotal, MAX(IF(daysAgo = 2, timeWorkSeconds, 0)) 2daysAgoTotal, MAX(IF(daysAgo = 1, timeWorkSeconds, 0)) 1daysAgoTotal, - MAX(IF(daysAgo = 0, timeWorkSeconds, 0)) 0daysAgoTotal + MAX(IF(daysAgo = 0, timeWorkSeconds, 0)) 0daysAgoTotal FROM (SELECT DATEDIFF(vDated, dated) daysAgo, timeWorkSeconds FROM tmp.timeControlCalculate) sub4)sub5 ON TRUE; - + DROP TEMPORARY TABLE tmp.timeControlCalculate; END ;; DELIMITER ; @@ -74085,45 +74828,45 @@ BEGIN DECLARE vDirectionPrevious VARCHAR(6); DECLARE vTimedPrevious DATETIME; - SELECT direction INTO vDirectionRemove - FROM vn.workerTimeControl - WHERE userFk = vUserFk + SELECT direction INTO vDirectionRemove + FROM vn.workerTimeControl + WHERE userFk = vUserFk AND timed = vTimed ; IF vDirectionRemove = 'out' THEN - + SELECT timed, direction INTO vTimedPrevious, vDirectionPrevious - FROM vn.workerTimeControl - WHERE userFk = vUserFk + FROM vn.workerTimeControl + WHERE userFk = vUserFk AND timed < vTimed ORDER BY timed DESC - LIMIT 1; - + LIMIT 1; + IF vDirectionPrevious = "middle" THEN - UPDATE vn.workerTimeControl + UPDATE vn.workerTimeControl SET direction = "out" WHERE userFk = vUserFk AND timed = vTimedPrevious; END IF; - + ELSE IF vDirectionRemove = 'in' THEN - UPDATE vn.workerTimeControl + UPDATE vn.workerTimeControl SET direction = "in" WHERE userFk = vUserFk AND timed > vTimed ORDER BY timed ASC - LIMIT 1; + LIMIT 1; END IF; - + END IF; - + DELETE FROM vn.workerTimeControl - WHERE userFk = vUserFk + WHERE userFk = vUserFk AND timed = vTimed; - + CALL vn.workerTimeControlSOWP(vUserFk, vTimed); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -74151,31 +74894,31 @@ proc: BEGIN UPDATE vn.workerTimeControl SET direction = 'middle'; /*2- poner los out*/ -UPDATE vn.workerTimeControl wtc - JOIN +UPDATE vn.workerTimeControl wtc + JOIN (SELECT userFk,MAX(timed) maxTimed FROM (SELECT id, userFk, timed, date(timed) dated - FROM vn.workerTimeControl - ) sub + FROM vn.workerTimeControl + ) sub GROUP BY userFk,dated )sub SET direction = "out" - WHERE wtc.userFk = sub.userFk + WHERE wtc.userFk = sub.userFk AND wtc.timed = sub.maxTimed; - - /*3- poner los in*/ -UPDATE vn.workerTimeControl wtc - JOIN + + /*3- poner los in*/ +UPDATE vn.workerTimeControl wtc + JOIN (SELECT userFk,MIN(timed) maxTimed FROM (SELECT id, userFk, timed, date(timed) dated - FROM vn.workerTimeControl - ) sub + FROM vn.workerTimeControl + ) sub GROUP BY userFk,dated )sub SET direction = "in" - WHERE wtc.userFk = sub.userFk - AND wtc.timed = sub.maxTimed ; - + WHERE wtc.userFk = sub.userFk + AND wtc.timed = sub.maxTimed ; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -74192,7 +74935,11 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` 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. @@ -74252,8 +74999,8 @@ BEGIN SUM(IF(tb.type IS NULL, IF(tc.timeWorkDecimal > 0, FALSE, IF(tb.timeWorkDecimal > 0, TRUE, FALSE)), TRUE))isTeleworkingWeek - FROM tmp.timeBusinessCalculate1 tb - LEFT JOIN tmp.timeControlCalculate1 tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated + FROM tmp.timeBusinessCalculate tb + LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = tb.userFk AND tc.dated = tb.dated GROUP BY tb.userFk HAVING isTeleworkingWeek > 0 )sub ON sub.userFk = u.id @@ -74277,17 +75024,14 @@ BEGIN DROP TABLE IF EXISTS tmp.timeBusinessCalculate; DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate; DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate; - DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate1; - DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate1; DROP TEMPORARY TABLE IF EXISTS tmp.error; CREATE TEMPORARY TABLE tmp.error (workerFk INT); - SELECT CONCAT (MIN(dated), ' 00:00:00'), CONCAT (MAX(dated), ' 23:59:59') INTO vStarted, vEnded + SELECT MIN(dated), util.dayEnd(MAX(dated)) INTO vStarted, vEnded FROM time - WHERE year = vYear AND - week = vWeek; - + WHERE period = CONCAT(vYear, LPAD(vWeek, 2, '0')); + DELETE FROM workerTimeControl WHERE IFNULL(vWorkerFk, userFk) = userFk AND timed BETWEEN vStarted AND vEnded AND @@ -74307,11 +75051,6 @@ BEGIN CALL timeBusiness_calculateByUser(vWorkerFk,vStarted,vEnded); END IF; - CREATE TEMPORARY TABLE tmp.timeControlCalculate1 - SELECT * FROM tmp.timeControlCalculate; - CREATE TEMPORARY TABLE tmp.timeBusinessCalculate1 - SELECT * FROM tmp.timeBusinessCalculate; - SET vTimeWorkDecimalTotal = 0; SET vBody= ''; OPEN vCursor; @@ -74492,8 +75231,6 @@ proc: LOOP DROP TABLE tmp.timeControlCalculate; DROP TABLE tmp.timeBusinessCalculate; - DROP TABLE tmp.timeControlCalculate1; - DROP TABLE tmp.timeBusinessCalculate1; DROP TABLE tmp.error; END ;; DELIMITER ; @@ -74567,7 +75304,7 @@ BEGIN AND w.businessFk 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(vDatedFrom), ' año ', YEAR(vDatedFrom)) , CONCAT(' @@ -74659,7 +75396,7 @@ BEGIN IF (DAYNAME(util.VN_CURDATE()) = 'miércoles') THEN SELECT DATE_SUB(util.VN_CURDATE(), INTERVAL 9 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(), INTERVAL 3 DAY), ' 23:59:59') INTO vDatedFrom, vDatedTo; - + CALL vn.workerTimeControl_sendMailByDepartment(vDatedFrom, vDatedTo, NULL); END IF; END ;; @@ -74709,9 +75446,9 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_weekCheckBreak`(vStarted DATE, vEnded DATE) BEGIN /** - * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas - * El sistema verificará el descanso corto en la siguiente semana - * o el largo en las 2 siguientes semanas a partir de las fechas dadas + * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas + * El sistema verificará el descanso corto en la siguiente semana + * o el largo en las 2 siguientes semanas a partir de las fechas dadas * @param vStarted día inicio para verificar * @param vEnded día final para verificar * @return tmp.workerWithoutWeekBreak (workerFk) @@ -74733,10 +75470,10 @@ BEGIN CALL workerTimeControl_checkBreak(vStarted); INSERT IGNORE INTO tmp.workerWithoutWeekBreakInWeek - SELECT workerFk + SELECT workerFk FROM tmp.workerWithoutWeekBreak; DROP TEMPORARY TABLE IF EXISTS tmp.workerWithoutWeekBreak; - SET vStarted = DATE_ADD(vStarted, INTERVAL 1 DAY); + SET vStarted = DATE_ADD(vStarted, INTERVAL 1 DAY); END WHILE; END ;; @@ -74774,7 +75511,7 @@ BEGIN DECLARE vDepartmentFk INT; DECLARE isEnabled BOOLEAN DEFAULT TRUE; - SELECT COUNT(*) INTO vHasSignedToday + SELECT COUNT(*) INTO vHasSignedToday FROM workerTimeControl WHERE timed >= vDated AND userFk = vUserFk; SET @day := 0; @@ -74787,16 +75524,16 @@ BEGIN SELECT fichada_anterior, fichada_actual, interval_in_minutes, jornadas FROM ( - SELECT @lastTimed fichada_anterior, + SELECT @lastTimed fichada_anterior, timed, CAST(time_to_sec(timediff(timed,@lastTimed )) / 60 AS UNSIGNED) as interval_in_minutes, IF(day(timed) != @day, 1, 0) as jornadas, @day := day(timed) dia_del_mes, - @lastTimed := timed fichada_actual + @lastTimed := timed fichada_actual FROM ( SELECT day(timed) as dayNumber, dayname(timed) as dayName, timed - FROM + FROM (SELECT TIMESTAMPADD(DAY, -11, util.VN_NOW()) as timed, vUserFk as userFk -- Fichada virtual para los en los que no se ha trabajado la semana anterior UNION ALL SELECT timed, userFk @@ -74804,18 +75541,18 @@ BEGIN WHERE userFk = vUserFk AND timed >= TIMESTAMPADD(DAY, -10,vDated) UNION ALL - SELECT IF(vHasSignedToday, '2000-01-01 00:00', util.VN_NOW()) as timed, vUserFk + SELECT IF(vHasSignedToday, '2000-01-01 00:00', util.VN_NOW()) as timed, vUserFk ) sub4 ORDER BY timed ) sub - + ) sub2 WHERE fichada_actual >= TIMESTAMPADD(WEEK, -1, vDated) ) sub3 ; SELECT IFNULL(SUM(impar),0) into vImpares FROM ( - SELECT day(timed) as dayNumber, + SELECT day(timed) as dayNumber, count(*) mod 2 as impar FROM vn.workerTimeControl wtc WHERE userFk = vUserFk @@ -74832,29 +75569,29 @@ BEGIN AND at2.isAllowedToWork = FALSE AND b.workerFk = vUserFk LIMIT 1; - + -- Contrato en vigor SELECT IF(COUNT(*),vCantWork,'Sin contrato') INTO vCantWork FROM business b WHERE b.workerFk = vUserFk AND b.started <= vDated AND IFNULL(b.ended, vDated) >= vDated; - + -- Departamento si vTabletFk es 0 no hacemos comprobacion (Madrid y Vilassar) IF vTabletFk <> '0' THEN -- 1 Obtener el departamento del usuario SELECT wtcu.departmentFk INTO vDepartmentFk FROM workerTimeControlUserInfo wtcu WHERE wtcu.userFk = vUserFk; - -- 2 Comprobar si la tablet pertenece al departamento + -- 2 Comprobar si la tablet pertenece al departamento SELECT COUNT(td.tabletFk) INTO isEnabled FROM tabletDepartment td WHERE td.tabletFk = vTabletFk AND td.departmentFk = vDepartmentFk; - + END IF; - + IF vJornadas IS NOT NULL THEN - + SELECT 'Jornadas' as Item, vJornadas as Cantidad, 'Correcto' AS Análisis UNION ALL SELECT 'Descansos 12 h' as Item, vDescansos12h as Cantidad, IF(vDescansos12h >= vJornadas, 'Correcto','Error: 1 por jornada') as Análisis @@ -74863,9 +75600,9 @@ BEGIN UNION ALL SELECT 'Dias con fichadas impares' as Item, vImpares as Cantidad, IF(vImpares = 0, 'Correcto','Error') as Análisis UNION ALL - SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item, - '' as Cantidad, - IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis + SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item, + '' as Cantidad, + IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis UNION ALL SELECT 'El fichador no pertenece a tu departamento.' as Item, '' as Cantidad, IF(isEnabled, 'Correcto','Error') as Análisis; @@ -74879,7 +75616,7 @@ BEGIN UNION ALL SELECT 'Dias con fichadas impares' as Item, vImpares as Cantidad, 'Correcto' as Análisis UNION ALL - SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item, + SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item, '' as Cantidad, IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis UNION ALL SELECT 'El fichador no pertenece a tu departamento.' as Item, '' as Cantidad, IF(isEnabled, 'Correcto','Error') as Análisis; @@ -74915,7 +75652,7 @@ CALL vn.workerTimeControlSetOrder_by_User_and_dateRange(vUserFk,TIMESTAMPADD(DAY DROP TEMPORARY TABLE IF EXISTS tmp.workerWeekTiming; CREATE TEMPORARY TABLE tmp.workerWeekTiming SELECT orden `orden`, - max(hace7dias) 7_dias_antes, + max(hace7dias) 7_dias_antes, max(hace6dias) 6_dias_antes, max(hace5dias) 5_dias_antes, max(hace4dias) 4_dias_antes, @@ -74945,16 +75682,16 @@ SELECT orden `orden`, )sub2 GROUP BY orden ; - + DROP TEMPORARY TABLE IF EXISTS tmp.workerWeekTiming_Aux; CREATE TEMPORARY TABLE tmp.workerWeekTiming_Aux SELECT * FROM tmp.workerWeekTiming; INSERT INTO tmp.workerWeekTiming( 7_dias_antes,6_dias_antes,5_dias_antes,4_dias_antes,3_dias_antes,2_dias_antes,1_dia_antes,mismo_dia) VALUES('total','','','','','','',''); - + INSERT INTO tmp.workerWeekTiming( orden, 7_dias_antes,6_dias_antes,5_dias_antes,4_dias_antes,3_dias_antes,2_dias_antes,1_dia_antes, mismo_dia) -SELECT 0, +SELECT 0, IFNULL(DATE_FORMAT(SEC_TO_TIME(SUM(IF(orden MOD 2, - TIME_TO_SEC(7_dias_antes), TIME_TO_SEC(7_dias_antes)))),'%H:%i'),''), IFNULL(DATE_FORMAT(SEC_TO_TIME(SUM(IF(orden MOD 2, - TIME_TO_SEC(6_dias_antes), TIME_TO_SEC(6_dias_antes)))),'%H:%i'),''), IFNULL(DATE_FORMAT(SEC_TO_TIME(SUM(IF(orden MOD 2, - TIME_TO_SEC(5_dias_antes), TIME_TO_SEC(5_dias_antes)))),'%H:%i'),''), @@ -74964,7 +75701,7 @@ SELECT 0, IFNULL(DATE_FORMAT(SEC_TO_TIME(SUM(IF(orden MOD 2, - TIME_TO_SEC(1_dia_antes), TIME_TO_SEC(1_dia_antes)))),'%H:%i'),''), '' FROM tmp.workerWeekTiming_Aux; - + INSERT INTO tmp.workerWeekTiming_Aux( orden, 1_dia_antes) SELECT 0, ROUND(( IFNULL(TIME_TO_SEC(7_dias_antes),0) + @@ -74976,158 +75713,19 @@ SELECT 0, ROUND(( IFNULL(TIME_TO_SEC(1_dia_antes),0) ) / 3600,1) FROM tmp.workerWeekTiming - WHERE orden = 0; + WHERE orden = 0; INSERT INTO tmp.workerWeekTiming( 7_dias_antes,6_dias_antes,5_dias_antes,4_dias_antes,3_dias_antes,2_dias_antes,1_dia_antes,mismo_dia) SELECT '','','','','','',1_dia_antes,'' FROM tmp.workerWeekTiming_Aux WHERE orden = 0; - + SELECT 7_dias_antes,6_dias_antes,5_dias_antes,4_dias_antes,3_dias_antes,2_dias_antes,1_dia_antes,mismo_dia FROM tmp.workerWeekTiming; DROP TEMPORARY TABLE tmp.workerWeekTiming; DROP TEMPORARY TABLE tmp.workerWeekTiming_Aux; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `worker_calculateCommission` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `worker_calculateCommission`(vYear INT, vQuarter INT) -BEGIN - - DECLARE vPlusTeamAmount INT; - DECLARE vPlusNewBornAmount INT; - DECLARE vPlusSalesAmount INT; - DECLARE vMinimumSalesByQuarter INT; - DECLARE vPlusTeamRange INT; - DECLARE vPlusNewBornRange INT; - DECLARE vRankingSalesRange INT; - -/* - -- Jerarquia - DROP TEMPORARY TABLE IF EXISTS rankingHierarchy; - CREATE TEMPORARY TABLE rankingHierarchy - SELECT COUNT(*) - 1 teamMembers, wb.bossFk - FROM vn.worker ww - JOIN vn.worker wb ON ww.id = wb.bossFk - GROUP BY wb.bossFk; - */ - - SELECT plusTeamAmount, plusNewBornAmount, plusSalesAmount, minimumSalesByQuarter, plusTeamRange, plusNewBornRange, rankingSalesRange - INTO vPlusTeamAmount, vPlusNewBornAmount, vPlusSalesAmount, vMinimumSalesByQuarter, vPlusTeamRange, vPlusNewBornRange, vRankingSalesRange - FROM commissionConfig; - -- Ventas - DROP TEMPORARY TABLE IF EXISTS rankingSale; - CREATE TEMPORARY TABLE rankingSale - (PRIMARY KEY(workerFk)) ENGINE = MEMORY - SELECT IF(SUM(v.importe) > vMinimumSalesByQuarter, - SUM(IFNULL(v.comision,0)), - 0) as commission, - SUM(v.importe) sales, - v.Id_Trabajador workerFk - FROM bs.vendedores v - WHERE v.año = vYear AND CEIL(mes/3) = vQuarter - GROUP BY v.Id_Trabajador; - - -- Ranking ventas - SET @position:= 0; - DROP TEMPORARY TABLE IF EXISTS rankingSelling; - CREATE TEMPORARY TABLE rankingSelling - (PRIMARY KEY(userFk)) ENGINE = MEMORY - SELECT userFk, @position:= @position + 1 position - FROM ( - SELECT SUM(`v`.`importe`) AS `importe`, - `u`.`name` AS `name`, - `u`.`id` AS `userFk` - FROM - (`bs`.`vendedores` `v` - JOIN `account`.`user` `u` ON (`u`.`id` = `v`.`Id_Trabajador`)) - WHERE - `v`.`año` = vYear - AND CEIL(`v`.`mes` / 3) = vQuarter - AND `u`.`name` NOT IN ('ismaelalcolea' , 'ruben') - GROUP BY `v`.`Id_Trabajador` - ORDER BY SUM(`v`.`importe`) DESC - LIMIT vRankingSalesRange - ) t; - - CALL rankingTeamByQuarter(vYear, vQuarter); - - -- comerciales que computan / total integrantes - DROP TEMPORARY TABLE IF EXISTS teamNames; - CREATE TEMPORARY TABLE teamNames - (PRIMARY KEY(departmentFk)) ENGINE = MEMORY - SELECT DISTINCT departmentFk, teamPeople - FROM tmp.rankingTeam; - - -- Ranking por equipos - DROP TEMPORARY TABLE IF EXISTS rankingTeam; - CREATE TEMPORARY TABLE rankingTeam - (PRIMARY KEY(departmentFk)) ENGINE = MEMORY - SELECT DISTINCT departmentFk - FROM teamNames - LIMIT vPlusTeamRange; - - -- Ranking por nuevos clientes - SET @position:= 0; - DROP TEMPORARY TABLE IF EXISTS rankingNewBorn; - CREATE TEMPORARY TABLE rankingNewBorn - (PRIMARY KEY(userFk)) ENGINE = MEMORY - SELECT userFk, @position:= @position + 1 position - FROM ( - SELECT SUM(amount) AS total, - n.userFk - FROM newBornSales n - WHERE n.dated >= util.quarterFirstDay(vYear, vQuarter) - AND n.firstShipped >= util.quarterFirstDay(vYear -1, vQuarter) - GROUP BY userFk - ORDER BY SUM(amount) DESC - LIMIT vPlusNewBornRange - ) t; - - -- Sumatorio de ventas - SELECT uBoss.`name` as team, - u.`name`, - r.commission, - -- IF(rh.bossFk, 200 + (teamMembers * 30), 0) plusResponsibility, - @plusRankingSellers := ((vRankingSalesRange + 1) - rs.position) * 40 plusRankingSellers, - @plusRankingTeam := IF(rt.departmentFk, vPlusTeamAmount, 0) plusRankingTeam, - @plusRankingNewBorn := ((vPlusNewBornRange + 1) - rnb.position) * vPlusNewBornAmount plusRankingNewBorn, - IFNULL(r.commission,0) + IFNULL(@plusRankingSellers,0) + @plusRankingTeam + IFNULL(@plusRankingNewBorn, 0) total, - sales, rs.position, teamPeople, - vYear year, - vQuarter quarter - FROM rankingSale r - -- LEFT JOIN rankingHierarchy rh ON rh.bossFk = r.workerFk - JOIN account.user u ON u.id = r.workerFk - JOIN vn2008.jerarquia j ON j.worker_id = r.workerFk - LEFT JOIN `account`.`user` uBoss ON uBoss.id = j.boss_id - LEFT JOIN rankingSelling rs ON rs.userFk = r.workerFk - LEFT JOIN workerDepartment wd ON wd.workerFk = r.workerFk - LEFT JOIN rankingTeam rt ON rt.departmentFk = wd.departmentFk AND r.commission - LEFT JOIN teamNames tn ON tn.departmentFk = wd.departmentFk - LEFT JOIN vn.rankingNewBorn rnb ON rnb.userFk = r.workerFk; - - DROP TEMPORARY TABLE tmp.rankingTeam; - DROP TEMPORARY TABLE - rankingSelling, - rankingTeam, - teamNames, - rankingNewBorn, - rankingSale; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -75145,21 +75743,21 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `worker_getFromHasMistake`(vDepartmentFk INT) -BEGIN - -/** - * Obtiene los trabajadores de los departamentos que se les puede poner error - * @param vDepartmentFk id del departamento - * - */ - - SELECT w.id,w.firstName, w.lastName,d.name - FROM worker w - JOIN workerDepartment wd ON wd.workerFk = w.id - JOIN department d ON d.id = wd.departmentFk - WHERE d.id = vDepartmentFk - ORDER BY firstName; - +BEGIN + +/** + * Obtiene los trabajadores de los departamentos que se les puede poner error + * @param vDepartmentFk id del departamento + * + */ + + SELECT w.id,w.firstName, w.lastName,d.name + FROM worker w + JOIN workerDepartment wd ON wd.workerFk = w.id + JOIN department d ON d.id = wd.departmentFk + WHERE d.id = vDepartmentFk + ORDER BY firstName; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -75187,7 +75785,7 @@ BEGIN (PRIMARY KEY (workerFk)) ENGINE = MEMORY SELECT vBoss AS workerFk; - + DROP TEMPORARY TABLE IF EXISTS tmp.workerHierarchyList; CREATE TEMPORARY TABLE tmp.workerHierarchyList (PRIMARY KEY (workerFk)) @@ -75198,7 +75796,7 @@ BEGIN WHILE (SELECT COUNT(*) FROM tmp.workerHierarchyList WHERE NOT isChecked) > 0 DO INSERT INTO tmp.workerHierarchyList - SELECT w.id, 0 + SELECT w.id, 0 FROM worker w JOIN workerHierarchy wh ON wh.workerFk = w.bossFk; @@ -75209,12 +75807,12 @@ BEGIN TRUNCATE workerHierarchy; INSERT INTO workerHierarchy - SELECT workerFk + SELECT workerFk FROM tmp.workerHierarchyList WHERE NOT isChecked; END WHILE; - + DROP TEMPORARY TABLE IF EXISTS workerHierarchy; END ;; DELIMITER ; @@ -75233,17 +75831,17 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `worker_getSector`() -BEGIN - -/** - * Obtiene el sector del usuario conectado -*/ - - SELECT s.id,s.description,s.warehouseFk - FROM sector s - JOIN worker w ON w.sectorFk = s.id - WHERE w.id = account.myUser_getId(); - +BEGIN + +/** + * Obtiene el sector del usuario conectado +*/ + + SELECT s.id,s.description,s.warehouseFk + FROM sector s + JOIN worker w ON w.sectorFk = s.id + WHERE w.id = account.myUser_getId(); + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -75268,7 +75866,7 @@ BEGIN * @param selfFk, credit, debit */ UPDATE worker - SET balance = balance + (IFNULL(vCredit, 0) - IFNULL(vDebit, 0)) + SET balance = IFNULL(balance, 0) + IFNULL(vCredit, 0) - IFNULL(vDebit, 0) WHERE id = vSelfFk; END ;; DELIMITER ; @@ -75326,8 +75924,8 @@ BEGIN DECLARE vDone BOOL; DECLARE vCursor CURSOR FOR - SELECT DISTINCT b.workerFk - FROM business b + SELECT DISTINCT b.workerFk + FROM business b WHERE b.started > vBusinessUpdated AND b.started <= vCurdate OR b.ended >= vBusinessUpdated AND b.ended < vCurdate; @@ -75369,17 +75967,15 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `worker_updateSector`(vSectorFk INT) BEGIN - /** * Actualiza el sector del usuario conectado y borra la impresora asociada al usuario * * @param vSectorFk id del sector -*/ + */ UPDATE worker SET sectorFk = vSectorFk, labelerFk = NULL - WHERE id = account.myUser_getId(); - + WHERE id = account.myUser_getId(); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -75399,10 +75995,10 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `workingHours`(username varchar(255), logon boolean) BEGIN DECLARE userid int(11); - + SELECT vn.getUserId(username) INTO userid; SELECT username, userid; - IF userid IS NOT NULL THEN + IF userid IS NOT NULL THEN IF (logon) THEN CALL vn.workingHoursTimeIn(userid); ELSE @@ -75471,17 +76067,17 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `wrongEqualizatedClient`() BEGIN SELECT clientFk, c.name, c.isActive, c.isTaxDataChecked, count(ie) as num FROM vn.client c - JOIN + JOIN ( - SELECT DISTINCT + SELECT DISTINCT `a`.`clientFk` , a.isEqualizated = 0 as ie - + FROM `vn`.`address` `a` ) sub ON sub.clientFk = c.id WHERE c.hasToInvoiceByAddress = FALSE - + GROUP BY clientFk HAVING num > 1 UNION ALL @@ -75565,27 +76161,27 @@ proc: BEGIN SELECT scope INTO vScope FROM zoneConfig; - + DROP TEMPORARY TABLE IF EXISTS tmp.zone; CREATE TEMPORARY TABLE tmp.zone (INDEX (id)) ENGINE = MEMORY SELECT id FROM zone; - + TRUNCATE TABLE zoneClosure; - + WHILE vCounter <= vScope DO - + CALL zone_getOptionsForShipment(vShipped, TRUE); - + REPLACE zoneClosure(zoneFk, dated, `hour`) - SELECT zoneFk, vShipped, `hour` + SELECT zoneFk, vShipped, `hour` FROM tmp.zoneOption; - + SET vCounter = vCounter + 1; SET vShipped = TIMESTAMPADD(DAY, 1, vShipped); END WHILE; - + -- DROP TEMPORARY TABLE tmp.zone; DO RELEASE_LOCK('vn.zoneClosure_recalc'); END ;; @@ -75679,7 +76275,7 @@ BEGIN OR (vSelf IS NOT NULL AND parentFk = vSelf); DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + SET vSons = 0; OPEN vChildren; @@ -75690,11 +76286,11 @@ BEGIN IF vDone THEN LEAVE myLoop; END IF; - + SET vIndex = vIndex + 1; SET vLft = vIndex; SET vSons = vSons + 1; - + CALL zoneGeo_calcTreeRec( vChildFk, CONCAT(vPath, vChildFk, '/'), @@ -75797,7 +76393,7 @@ proc: BEGIN SELECT isChanged INTO vIsChanged FROM zoneGeoRecalc; - + IF vIsChanged THEN UPDATE zoneGeoRecalc SET isChanged = FALSE; CALL vn.zoneGeo_calcTree; @@ -75985,7 +76581,7 @@ proc:BEGIN * @table tmp.closedZones(zoneFk, warehouseFk); */ DROP TEMPORARY TABLE IF EXISTS tmp.closedZones; - + CREATE TEMPORARY TABLE tmp.closedZones ( `zoneFk` int(11) NOT NULL, `warehouseFk` smallint(6) unsigned NOT NULL, @@ -76027,7 +76623,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getCollisions`() BEGIN /** - * Calcula si para un mismo codigo postal y dia + * Calcula si para un mismo codigo postal y dia * hay mas de una zona configurada y manda correo * */ @@ -76036,16 +76632,16 @@ BEGIN DECLARE vIsDone INT DEFAULT FALSE; DECLARE vTableCollisions TEXT; DECLARE cur1 CURSOR FOR SELECT zoneFk from tmp.zoneOption; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE; DROP TEMPORARY TABLE IF EXISTS tmp.zone; CREATE TEMPORARY TABLE tmp.zone - SELECT z.id + SELECT z.id FROM zone z JOIN agencyMode am ON am.id = z.agencyModeFk JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk - WHERE dm.code IN ('AGENCY','DELIVERY'); + WHERE dm.code IN ('AGENCY','DELIVERY'); CALL zone_getOptionsForShipment(util.VN_CURDATE(),FALSE); @@ -76060,7 +76656,7 @@ BEGIN PRIMARY KEY zoneFkk (zoneFk, geoFk), INDEX(geoFk)) ENGINE = MEMORY; - + OPEN cur1; cur1Loop: LOOP SET vIsDone = FALSE; @@ -76068,40 +76664,40 @@ BEGIN IF vIsDone THEN LEAVE cur1Loop; END IF; - + CALL zone_getLeaves2(vZoneFk, NULL, NULL); - myLoop: LOOP + myLoop: LOOP SET vGeoFk = NULL; - SELECT geoFk INTO vGeoFk + SELECT geoFk INTO vGeoFk FROM tmp.zoneNodes zn WHERE NOT isChecked LIMIT 1; - + IF vGeoFk IS NULL THEN LEAVE myLoop; END IF; - + CALL zone_getLeaves2(vZoneFk, vGeoFk, NULL); UPDATE tmp.zoneNodes - SET isChecked = TRUE + SET isChecked = TRUE WHERE geoFk = vGeoFk; END LOOP; END LOOP; CLOSE cur1; - DELETE FROM tmp.zoneNodes + DELETE FROM tmp.zoneNodes WHERE sons > 0; - + DROP TEMPORARY TABLE IF EXISTS geoCollision; CREATE TEMPORARY TABLE geoCollision SELECT z.agencyModeFk, zn.geoFk, zw.warehouseFk FROM tmp.zoneNodes zn JOIN zone z ON z.id = zn.zoneFk - JOIN zoneWarehouse zw ON z.id = zw.zoneFk + JOIN zoneWarehouse zw ON z.id = zw.zoneFk GROUP BY z.agencyModeFk, zn.geoFk, zw.warehouseFk HAVING count(*) > 1; - + SELECT ' @@ -76111,39 +76707,39 @@ BEGIN ' INTO vTableCollisions; - - INSERT INTO mail (receiver,replyTo,subject,body) + + INSERT INTO mail (receiver,replyTo,subject,body) SELECT 'pepe@verdnatura.es' receiver, 'noreply@verdnatura.es' replyTo, CONCAT('Colisiones en zonas ', util.VN_CURDATE()) subject, CONCAT(vTableCollisions, GROUP_CONCAT(sub.td SEPARATOR ''), '
C.PostalAlmacén Salix
') body - FROM(SELECT + FROM(SELECT CONCAT(' ', zn.name, ' ', zoneFk,' ', z.price,' ', z.name,' ', w.name, ' - ', CONCAT('' - 'https://salix.verdnatura.es/#!/zone/', + 'https://salix.verdnatura.es/#!/zone/', zoneFk, '/location?q=%7B%22search%22:%22', - zn.name, + zn.name, '%22%7D'),' ') td FROM tmp.zoneNodes zn JOIN zone z ON z.id = zn.zoneFk JOIN geoCollision gc ON gc.agencyModeFk = z.agencyModeFk AND zn.geoFk = gc.geoFk JOIN warehouse w ON w.id = gc.warehouseFk) sub; - - DROP TEMPORARY TABLE - geoCollision, + + DROP TEMPORARY TABLE + geoCollision, tmp.zone, tmp.zoneNodes; END ;; @@ -76173,17 +76769,17 @@ BEGIN * @param vAgencyModeFk The agency mode id */ DECLARE vDeliveryMethodFk VARCHAR(255); - + DROP TEMPORARY TABLE IF EXISTS tZone; CREATE TEMPORARY TABLE tZone (id INT PRIMARY KEY) ENGINE = MEMORY; - + SELECT dm.`code` INTO vDeliveryMethodFk FROM agencyMode am JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk WHERE am.id = vAgencyModeFk; - + IF vDeliveryMethodFk = 'PICKUP' THEN INSERT INTO tZone SELECT id @@ -76200,16 +76796,16 @@ BEGIN WHERE z.agencyModeFk = vAgencyModeFk; ELSE INSERT INTO tZone - SELECT t.id + SELECT t.id FROM tmp.zone t JOIN zone z ON z.id = t.id - JOIN agencyMode am ON am.id = z.agencyModeFk + JOIN agencyMode am ON am.id = z.agencyModeFk JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk WHERE dm.`code` IN ('AGENCY', 'DELIVERY'); END IF; DROP TEMPORARY TABLE tmp.zone; END IF; - + SELECT e.zoneFk, e.`type`, e.dated, e.`started`, e.`ended`, e.weekDays FROM tZone t JOIN zoneEvent e ON e.zoneFk = t.id; @@ -76221,7 +76817,7 @@ BEGIN JOIN zoneGeo zg1 ON zg1.id = eg.geoFk JOIN zoneGeo zg2 ON zg2.id = vGeoFk WHERE eg.zoneExclusionFk IS NULL OR zg2.`path` LIKE CONCAT(zg1.`path`,'%'); - + DROP TEMPORARY TABLE tZone; END ;; DELIMITER ; @@ -76250,18 +76846,18 @@ BEGIN DECLARE vChildFk INT DEFAULT vGeoFk; DECLARE vParentFk INT; DECLARE vLevel INT DEFAULT 1; - + DROP TEMPORARY TABLE IF EXISTS tNodes; CREATE TEMPORARY TABLE tNodes (PRIMARY KEY (id)) ENGINE = MEMORY SELECT vGeoFk id, vLevel `level`; - + myLoop: LOOP SELECT parentFk INTO vParentFk FROM zoneGeo WHERE id = vChildFk; - + SET vChildFk = vParentFk; SET vLevel = vLevel + 1; @@ -76269,7 +76865,7 @@ BEGIN SELECT vChildFk, vLevel FROM DUAL WHERE vChildFk IS NOT NULL; - + IF ROW_COUNT() = 0 THEN LEAVE myLoop; END IF; @@ -76369,7 +76965,7 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getLeaves`(vSelf INT, vParentFk INT, vSearch VARCHAR(255)) -BEGIN +BEGIN /** * Devuelve las ubicaciones incluidas en la ruta y que sean hijos de parentFk. * @param vSelf Id de la zona @@ -76383,23 +76979,23 @@ BEGIN CREATE TEMPORARY TABLE tNodes (UNIQUE (id)) ENGINE = MEMORY - SELECT id - FROM zoneGeo + SELECT id + FROM zoneGeo LIMIT 0; IF vIsSearch THEN SET vIsNumber = vSearch REGEXP '^[0-9]+$'; - + INSERT INTO tNodes - SELECT id + SELECT id FROM zoneGeo WHERE (vIsNumber AND `name` = vSearch) OR (!vIsNumber AND `name` LIKE CONCAT('%', vSearch, '%')) LIMIT 1000; - + ELSEIF vParentFk IS NULL THEN INSERT INTO tNodes - SELECT geoFk + SELECT geoFk FROM zoneIncluded WHERE zoneFk = vSelf; END IF; @@ -76408,14 +77004,14 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS tChilds; CREATE TEMPORARY TABLE tChilds ENGINE = MEMORY - SELECT id + SELECT id FROM tNodes; DROP TEMPORARY TABLE IF EXISTS tParents; CREATE TEMPORARY TABLE tParents ENGINE = MEMORY - SELECT id - FROM zoneGeo + SELECT id + FROM zoneGeo LIMIT 0; myLoop: LOOP @@ -76425,27 +77021,27 @@ BEGIN FROM zoneGeo g JOIN tChilds c ON c.id = g.id WHERE g.parentFk IS NOT NULL; - + INSERT IGNORE INTO tNodes - SELECT id + SELECT id FROM tParents; - + IF ROW_COUNT() = 0 THEN LEAVE myLoop; END IF; - + DELETE FROM tChilds; INSERT INTO tChilds - SELECT id + SELECT id FROM tParents; END LOOP; - + DROP TEMPORARY TABLE tChilds, tParents; END IF; IF !vIsSearch THEN INSERT IGNORE INTO tNodes - SELECT id + SELECT id FROM zoneGeo WHERE parentFk <=> vParentFk; END IF; @@ -76478,106 +77074,106 @@ DELIMITER ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getLeaves2`(vSelf INT, vParentFk INT, vSearch VARCHAR(255)) -BEGIN -/** - * Devuelve los geoFk incluidos en la ruta y que sean hijos de parentFk - * @param vSelf Id de la zona - * @param vParentFk Id del geo a calcular - * @param vSearch cadena a buscar - * - * @return tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk) - * - */ - DECLARE vIsNumber BOOL; - DECLARE vIsSearch BOOL DEFAULT vSearch IS NOT NULL AND vSearch != ''; - - DROP TEMPORARY TABLE IF EXISTS tNodes; - CREATE TEMPORARY TABLE tNodes - (UNIQUE (id)) - ENGINE = MEMORY - SELECT id - FROM zoneGeo - LIMIT 0; - - IF vIsSearch THEN - SET vIsNumber = vSearch REGEXP '^[0-9]+$'; - - INSERT INTO tNodes - SELECT id - FROM zoneGeo - WHERE (vIsNumber AND `name` = vSearch) - OR (!vIsNumber AND `name` LIKE CONCAT('%', vSearch, '%')) - LIMIT 1000; - - ELSEIF vParentFk IS NULL THEN - INSERT INTO tNodes - SELECT geoFk - FROM zoneIncluded - WHERE zoneFk = vSelf; - END IF; - - IF vParentFk IS NULL THEN - DROP TEMPORARY TABLE IF EXISTS tChilds; - CREATE TEMPORARY TABLE tChilds - (INDEX(id)) - ENGINE = MEMORY - SELECT id - FROM tNodes; - - DROP TEMPORARY TABLE IF EXISTS tParents; - CREATE TEMPORARY TABLE tParents - (INDEX(id)) - ENGINE = MEMORY - SELECT id - FROM zoneGeo - LIMIT 0; - - myLoop: LOOP - DELETE FROM tParents; - INSERT INTO tParents - SELECT parentFk id - FROM zoneGeo g - JOIN tChilds c ON c.id = g.id - WHERE g.parentFk IS NOT NULL; - - INSERT IGNORE INTO tNodes - SELECT id - FROM tParents; - - IF ROW_COUNT() = 0 THEN - LEAVE myLoop; - END IF; - - DELETE FROM tChilds; - INSERT INTO tChilds - SELECT id - FROM tParents; - END LOOP; - - DROP TEMPORARY TABLE tChilds, tParents; - END IF; - - IF !vIsSearch THEN - INSERT IGNORE INTO tNodes - SELECT id - FROM zoneGeo - WHERE parentFk <=> vParentFk; - END IF; - - INSERT IGNORE INTO tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk) - SELECT g.id, - g.`name`, - g.parentFk, - g.sons, - NOT g.sons OR type = 'country', - vSelf - FROM zoneGeo g - JOIN tNodes n ON n.id = g.id - LEFT JOIN zoneIncluded i ON i.geoFk = g.id AND i.zoneFk = vSelf - WHERE i.isIncluded = TRUE - OR (i.isIncluded IS NULL AND vParentFk IS NOT NULL); - - DROP TEMPORARY TABLE tNodes; +BEGIN +/** + * Devuelve los geoFk incluidos en la ruta y que sean hijos de parentFk + * @param vSelf Id de la zona + * @param vParentFk Id del geo a calcular + * @param vSearch cadena a buscar + * + * @return tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk) + * + */ + DECLARE vIsNumber BOOL; + DECLARE vIsSearch BOOL DEFAULT vSearch IS NOT NULL AND vSearch != ''; + + DROP TEMPORARY TABLE IF EXISTS tNodes; + CREATE TEMPORARY TABLE tNodes + (UNIQUE (id)) + ENGINE = MEMORY + SELECT id + FROM zoneGeo + LIMIT 0; + + IF vIsSearch THEN + SET vIsNumber = vSearch REGEXP '^[0-9]+$'; + + INSERT INTO tNodes + SELECT id + FROM zoneGeo + WHERE (vIsNumber AND `name` = vSearch) + OR (!vIsNumber AND `name` LIKE CONCAT('%', vSearch, '%')) + LIMIT 1000; + + ELSEIF vParentFk IS NULL THEN + INSERT INTO tNodes + SELECT geoFk + FROM zoneIncluded + WHERE zoneFk = vSelf; + END IF; + + IF vParentFk IS NULL THEN + DROP TEMPORARY TABLE IF EXISTS tChilds; + CREATE TEMPORARY TABLE tChilds + (INDEX(id)) + ENGINE = MEMORY + SELECT id + FROM tNodes; + + DROP TEMPORARY TABLE IF EXISTS tParents; + CREATE TEMPORARY TABLE tParents + (INDEX(id)) + ENGINE = MEMORY + SELECT id + FROM zoneGeo + LIMIT 0; + + myLoop: LOOP + DELETE FROM tParents; + INSERT INTO tParents + SELECT parentFk id + FROM zoneGeo g + JOIN tChilds c ON c.id = g.id + WHERE g.parentFk IS NOT NULL; + + INSERT IGNORE INTO tNodes + SELECT id + FROM tParents; + + IF ROW_COUNT() = 0 THEN + LEAVE myLoop; + END IF; + + DELETE FROM tChilds; + INSERT INTO tChilds + SELECT id + FROM tParents; + END LOOP; + + DROP TEMPORARY TABLE tChilds, tParents; + END IF; + + IF !vIsSearch THEN + INSERT IGNORE INTO tNodes + SELECT id + FROM zoneGeo + WHERE parentFk <=> vParentFk; + END IF; + + INSERT IGNORE INTO tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk) + SELECT g.id, + g.`name`, + g.parentFk, + g.sons, + NOT g.sons OR type = 'country', + vSelf + FROM zoneGeo g + JOIN tNodes n ON n.id = g.id + LEFT JOIN zoneIncluded i ON i.geoFk = g.id AND i.zoneFk = vSelf + WHERE i.isIncluded = TRUE + OR (i.isIncluded IS NULL AND vParentFk IS NOT NULL); + + DROP TEMPORARY TABLE tNodes; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -76602,7 +77198,7 @@ BEGIN * @table tmp.zone(id) The zones ids * @param vLanded The delivery date * @return tmp.zoneOption The computed options - */ + */ DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption; CREATE TEMPORARY TABLE tmp.zoneOption ENGINE = MEMORY @@ -76643,13 +77239,13 @@ BEGIN END LIMIT 10000000000000000000 ) t - GROUP BY zoneFk; - + GROUP BY zoneFk; + DELETE t FROM tmp.zoneOption t JOIN zoneExclusion e ON e.zoneFk = t.zoneFk AND e.`dated` = t.landed LEFT JOIN zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id WHERE eg.zoneExclusionFk IS NULL; - + IF NOT vShowExpiredZones THEN DELETE FROM tmp.zoneOption WHERE shipped < util.VN_CURDATE() @@ -76681,7 +77277,7 @@ BEGIN * @return tmp.zoneOption(zoneFk, hour, travelingDays, price, bonus, specificity) The computed options */ DECLARE vHour TIME DEFAULT TIME(util.VN_NOW()); - + DROP TEMPORARY TABLE IF EXISTS tLandings; CREATE TEMPORARY TABLE tLandings (INDEX (eventFk)) @@ -76750,63 +77346,63 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `zone_getPostalCode` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb3 */ ; -/*!50003 SET character_set_results = utf8mb3 */ ; -/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getPostalCode`(vSelf INT) BEGIN /** * Devuelve los códigos postales incluidos en una zona */ - DECLARE vGeoFk INT DEFAULT NULL; + DECLARE vGeoFk INT DEFAULT NULL; - DROP TEMPORARY TABLE IF EXISTS tmp.zoneNodes; - CREATE TEMPORARY TABLE tmp.zoneNodes ( - geoFk INT, - name VARCHAR(100), - parentFk INT, - sons INT, - isChecked BOOL DEFAULT 0, - zoneFk INT, - PRIMARY KEY zoneNodesPk (zoneFk, geoFk), - INDEX(geoFk)) - ENGINE = MEMORY; + DROP TEMPORARY TABLE IF EXISTS tmp.zoneNodes; + CREATE TEMPORARY TABLE tmp.zoneNodes ( + geoFk INT, + name VARCHAR(100), + parentFk INT, + sons INT, + isChecked BOOL DEFAULT 0, + zoneFk INT, + PRIMARY KEY zoneNodesPk (zoneFk, geoFk), + INDEX(geoFk)) + ENGINE = MEMORY; - CALL zone_getLeaves2(vSelf, NULL , NULL); + CALL zone_getLeaves2(vSelf, NULL , NULL); - UPDATE tmp.zoneNodes zn - SET isChecked = 0 - WHERE parentFk IS NULL; + UPDATE tmp.zoneNodes zn + SET isChecked = 0 + WHERE parentFk IS NULL; - myLoop: LOOP - SET vGeoFk = NULL; - SELECT geoFk INTO vGeoFk - FROM tmp.zoneNodes zn - WHERE NOT isChecked - LIMIT 1; + myLoop: LOOP + SET vGeoFk = NULL; + SELECT geoFk INTO vGeoFk + FROM tmp.zoneNodes zn + WHERE NOT isChecked + LIMIT 1; - CALL zone_getLeaves2(vSelf, vGeoFk, NULL); - UPDATE tmp.zoneNodes - SET isChecked = TRUE - WHERE geoFk = vGeoFk; + CALL zone_getLeaves2(vSelf, vGeoFk, NULL); + UPDATE tmp.zoneNodes + SET isChecked = TRUE + WHERE geoFk = vGeoFk; - IF vGeoFk IS NULL THEN - LEAVE myLoop; - END IF; - END LOOP; + IF vGeoFk IS NULL THEN + LEAVE myLoop; + END IF; + END LOOP; - DELETE FROM tmp.zoneNodes - WHERE sons > 0; + DELETE FROM tmp.zoneNodes + WHERE sons > 0; - SELECT zn.geoFk, zn.name - FROM tmp.zoneNodes zn - JOIN zone z ON z.id = zn.zoneFk; + SELECT zn.geoFk, zn.name + FROM tmp.zoneNodes zn + JOIN zone z ON z.id = zn.zoneFk; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -76837,7 +77433,7 @@ BEGIN DECLARE vZoneGeo INT; SELECT address_getGeo(vAddressFk) INTO vZoneGeo; - + CALL vn.zone_getFromGeo(vZoneGeo); CALL vn.zone_getOptionsForLanding(vLanded, vShowExpiredZones); CALL vn.zone_excludeFromGeo(vZoneGeo); @@ -76857,7 +77453,7 @@ BEGIN FROM tmp.zoneOption zo JOIN vn.zoneWarehouse zw ON zw.zoneFk = zo.zoneFk JOIN vn.`zone` z ON z.id = zo.zoneFk - LEFT JOIN tmp.closedZones cz + LEFT JOIN tmp.closedZones cz ON cz.warehouseFk = zw.warehouseFk AND cz.zoneFk = zw.zoneFk AND zo.shipped = util.VN_CURDATE() @@ -76891,9 +77487,9 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getState`(vDated DATE) BEGIN /** * Devuelve las zonas y el estado para la fecha solicitada - * + * * @param vDated Fecha en cuestión - */ + */ DROP TEMPORARY TABLE IF EXISTS tmp.zone; CREATE TEMPORARY TABLE tmp.zone ( @@ -76907,7 +77503,7 @@ BEGIN CALL vn.zone_getOptionsForShipment(vDated, TRUE); CALL vn.zone_getClosed(); - + SELECT zo.zoneFk, zo.`hour`etd, (zo.`hour` <= TIME(util.VN_NOW())) isLate, @@ -76917,11 +77513,11 @@ BEGIN FROM tmp.zoneOption zo JOIN vn.zone z ON z.id = zo.zoneFk JOIN vn.zoneWarehouse zw ON zw.zoneFk = z.id - LEFT JOIN tmp.closedZones cz - ON cz.warehouseFk = zw.warehouseFk + LEFT JOIN tmp.closedZones cz + ON cz.warehouseFk = zw.warehouseFk AND cz.zoneFk = zo.zoneFk; - - DROP TEMPORARY TABLE + + DROP TEMPORARY TABLE tmp.closedZones, tmp.zoneOption, tmp.zone; @@ -76947,21 +77543,21 @@ BEGIN /** * Devuelve el listado de agencias disponibles para la fecha, * dirección y almacén pasados. - * + * * @param vAddress * @param vWarehouse warehouse * @param vLanded Fecha de recogida * @select Listado de agencias disponibles */ - + CALL zone_getFromGeo(address_getGeo(vAddress)); CALL zone_getOptionsForLanding(vLanded, FALSE); - - SELECT am.id agencyModeFk, - am.name agencyMode, - am.description, + + SELECT am.id agencyModeFk, + am.name agencyMode, + am.description, am.deliveryMethodFk, - TIMESTAMPADD(DAY, -zo.travelingDays, vLanded) shipped, + TIMESTAMPADD(DAY, -zo.travelingDays, vLanded) shipped, zw.warehouseFk, z.id zoneFk FROM tmp.zoneOption zo @@ -76971,11 +77567,11 @@ BEGIN WHERE zw.warehouseFk = vWarehouse GROUP BY z.agencyModeFk ORDER BY agencyMode; - + DROP TEMPORARY TABLE tmp.zone, tmp.zoneOption; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -76996,7 +77592,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_upcomingDeliveries`() BEGIN DECLARE vForwardDays INT; - + SELECT forwardDays INTO vForwardDays FROM zoneConfig; CALL util.time_createTable(util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL vForwardDays DAY)); @@ -77012,7 +77608,7 @@ BEGIN JOIN zoneEvent e ON e.zoneFk = z.id JOIN tmp.time ti ON ti.dated BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY, vForwardDays, util.VN_CURDATE()); - DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption; + DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption; CREATE TEMPORARY TABLE tmp.zoneOption ENGINE = MEMORY SELECT * @@ -77053,7 +77649,7 @@ BEGIN JOIN zoneExclusion e ON e.zoneFk = t.zoneFk AND e.`dated` = t.landed LEFT JOIN zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id WHERE eg.zoneExclusionFk IS NULL; - + SELECT MAX(zo.`hour`) `hour`, zg.`name`, zo.shipped, zo.zoneFk FROM tmp.zoneOption zo JOIN `zone` z ON z.id = zo.zoneFk @@ -77064,13 +77660,10 @@ BEGIN WHERE dm.code = 'DELIVERY' GROUP BY shipped, zg.`name` ORDER BY shipped, zg.`name`; - + DROP TEMPORARY TABLE tmp.time, tLandings; 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 */ ; @@ -77165,14 +77758,6 @@ DELIMITER ; -- -- Current Database: `account` -- --- Fix strucuture - -DROP TABLE IF EXISTS `vn`.`zipConfig`; -CREATE TABLE `vn`.`zipConfig` ( - `id` double(10,2) NOT NULL, - `maxSize` int(11) DEFAULT NULL COMMENT 'in MegaBytes', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; USE `account`; @@ -77345,24 +77930,6 @@ USE `bs`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; --- --- Final view structure for view `vendedores` --- - -/*!50001 DROP VIEW IF EXISTS `vendedores`*/; -/*!50001 SET @saved_cs_client = @@character_set_client */; -/*!50001 SET @saved_cs_results = @@character_set_results */; -/*!50001 SET @saved_col_connection = @@collation_connection */; -/*!50001 SET character_set_client = utf8mb4 */; -/*!50001 SET character_set_results = utf8mb4 */; -/*!50001 SET collation_connection = utf8mb4_general_ci */; -/*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */ -/*!50001 VIEW `vendedores` AS select `sp`.`workerFk` AS `Id_Trabajador`,`sp`.`year` AS `año`,`sp`.`month` AS `mes`,`sp`.`amount` AS `importe`,`sp`.`commission` AS `comision`,`sp`.`leasedCommission` AS `comisionArrendada`,`sp`.`cededCommission` AS `comisionCedida`,`sp`.`newCommission` AS `comisionNuevos`,`sp`.`leasedReplacement` AS `sustitucionArrendada`,`sp`.`itemTypeBorrowed` AS `itemTypeBorrowed`,`sp`.`portfolioWeight` AS `portfolioWeight`,`sp`.`updated` AS `updated` from `salesPerson` `sp` */; -/*!50001 SET character_set_client = @saved_cs_client */; -/*!50001 SET character_set_results = @saved_cs_results */; -/*!50001 SET collation_connection = @saved_col_connection */; - -- -- Final view structure for view `ventas` -- @@ -77748,7 +78315,6 @@ USE `hedera`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; - -- -- Final view structure for view `orderTicket` -- @@ -79208,7 +79774,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8mb4_unicode_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */ -/*!50001 VIEW `lastPurchases` AS select `tr`.`landed` AS `landed`,`w`.`id` AS `warehouseFk`,`w`.`name` AS `warehouse`,`i`.`longName` AS `longName`,`i`.`subName` AS `subName`,`e`.`id` AS `entryFk`,`b`.`stickers` AS `stickers`,`b`.`packing` AS `packing`,`e`.`ref` AS `ref`,`b`.`itemFk` AS `itemFk`,`ek`.`pro` AS `pro`,`ek`.`ref` AS `ektRef`,`ek`.`agj` AS `agj` from (((((`vn`.`buy` `b` join `vn`.`entry` `e` on(`e`.`id` = `b`.`entryFk`)) join `vn`.`item` `i` on(`i`.`id` = `b`.`itemFk`)) join `vn`.`travel` `tr` on(`tr`.`id` = `e`.`travelFk`)) join `vn`.`warehouse` `w` on(`w`.`id` = `tr`.`warehouseInFk`)) left join `edi`.`ekt` `ek` on(`ek`.`id` = `b`.`ektFk`)) where `tr`.`landed` between `util`.`yesterday`() and `util`.`tomorrow`() and `e`.`isRaid` = 0 and `b`.`stickers` > 0 */; +/*!50001 VIEW `lastPurchases` AS select `tr`.`landed` AS `landed`,`w`.`id` AS `warehouseFk`,`w`.`name` AS `warehouse`,`i`.`longName` AS `longName`,`i`.`subName` AS `subName`,`e`.`id` AS `entryFk`,`b`.`stickers` AS `stickers`,`b`.`packing` AS `packing`,`e`.`invoiceNumber` AS `ref`,`b`.`itemFk` AS `itemFk`,`ek`.`pro` AS `pro`,`ek`.`ref` AS `ektRef`,`ek`.`agj` AS `agj` from (((((`vn`.`buy` `b` join `vn`.`entry` `e` on(`e`.`id` = `b`.`entryFk`)) join `vn`.`item` `i` on(`i`.`id` = `b`.`itemFk`)) join `vn`.`travel` `tr` on(`tr`.`id` = `e`.`travelFk`)) join `vn`.`warehouse` `w` on(`w`.`id` = `tr`.`warehouseInFk`)) left join `edi`.`ekt` `ek` on(`ek`.`id` = `b`.`ektFk`)) where `tr`.`landed` between `util`.`yesterday`() and `util`.`tomorrow`() and `e`.`isRaid` = 0 and `b`.`stickers` > 0 */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -79861,24 +80427,6 @@ USE `vn`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; --- --- Final view structure for view `ticketTracking__` --- - -/*!50001 DROP VIEW IF EXISTS `ticketTracking__`*/; -/*!50001 SET @saved_cs_client = @@character_set_client */; -/*!50001 SET @saved_cs_results = @@character_set_results */; -/*!50001 SET @saved_col_connection = @@collation_connection */; -/*!50001 SET character_set_client = utf8mb4 */; -/*!50001 SET character_set_results = utf8mb4 */; -/*!50001 SET collation_connection = utf8mb4_unicode_ci */; -/*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */ -/*!50001 VIEW `ticketTracking__` AS select `i`.`inter_id` AS `id`,`i`.`state_id` AS `stateFk`,`i`.`odbc_date` AS `created`,`i`.`Id_Ticket` AS `ticketFk`,`i`.`Id_Trabajador` AS `workerFk` from `vncontrol`.`inter` `i` */; -/*!50001 SET character_set_client = @saved_cs_client */; -/*!50001 SET character_set_results = @saved_cs_results */; -/*!50001 SET collation_connection = @saved_col_connection */; - -- -- Final view structure for view `tr2` -- @@ -80200,6 +80748,4 @@ USE `vncontrol`; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-11-21 7:57:28 - - +-- Dump completed on 2023-02-03 14:29:34