7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
4 changed files with 17 additions and 30 deletions
Showing only changes of commit be0e835a37 - Show all commits

16
db/.pullinfo.json Normal file
View File

@ -0,0 +1,16 @@
{
"lastPull": "2024-02-15T08:58:24.000Z",
"shaSums": {
"srt": {
"view": {
"routePalletized": "765f8933a6a5a86dfe8f22825cc77351bc8620cdf1be9d3f25abb130460f3a61",
"ticketPalletized": "c327f3243e717cc607f01d3747967ba68158f90ef1038986b0aa6ae6d5ce7309"
}
},
"vn": {
"view": {
"expeditionPallet_Print": "288cbd6e8289df083ed5eb1a2c808f7a82ba4c90c8ad9781104808a7a54471fb"
}
}
}
}

View File

@ -2818,7 +2818,7 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
(4, 'supplier-pay-method-update', 'A supplier pay method has been updated'),
(5, 'modified-entry', 'An entry has been modified'),
(6, 'book-entry-deleted', 'accounting entries deleted'),
(7, 'zone-included','An email to notify zoneCollisions');
(7, 'zone-included','An email to notify zoneCollisions');
INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
VALUES
(1, 9),

View File

@ -44,18 +44,6 @@ BEGIN
CALL util.exec(CONCAT('CALL `', vSchema ,'`.`', vProcedure ,'`'));
IF vError IS NOT NULL THEN
-- IF vLogMail IS NOT NULL THEN
-- CALL vn.mail_insert(
-- vLogMail,
-- NULL,
-- CONCAT('Nightly task failed (', vSchema, '.', vProcedure, ')'),
-- CONCAT(
-- '[', vErrorCode, '] ', vError, CHAR(13, 10), -- Line break
-- 'See ', SCHEMA(), '.nightTask table for more info.'
-- )
-- );
-- END IF;
UPDATE vn_schedules
SET `error` = vError,
finished = util.VN_NOW(),

View File

@ -1,17 +0,0 @@
DELIMITER $$
CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`zoneCollisions`
ON SCHEDULE EVERY 1 DAY
STARTS CURRENT_TIMESTAMP + INTERVAL 1 DAY
ON COMPLETION NOT PRESERVE
ENABLE
DO BEGIN
DECLARE vEXEC BOOLEAN DEFAULT FALSE;
SELECT COUNT(*)>0 INTO vEXEC from util.vn_schedules;
IF vEXEC THEN
CALL `zone_getCollisions`();
END IF;
END$$
DELIMITER ;