diff --git a/db/routines/vn/procedures/ticket_setState.sql b/db/routines/vn/procedures/ticket_setState.sql index 782783f992..918b830abb 100644 --- a/db/routines/vn/procedures/ticket_setState.sql +++ b/db/routines/vn/procedures/ticket_setState.sql @@ -26,17 +26,17 @@ proc:BEGIN JOIN ticketTracking tt ON tt.stateFk = s.id JOIN ticket t ON t.id = tt.ticketFk WHERE tt.ticketFk = vSelf - ORDER BY tt.created DESC + ORDER BY tt.created DESC, tt.id DESC LIMIT 1; - SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED'; + SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED'; IF vStateCode = 'OK' AND vZoneFk IS NULL THEN CALL util.throw('ASSIGN_ZONE_FIRST'); END IF; SET vCanChangeState = (( - vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR + vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR vTicketAlertLevel < vPackedAlertLevel ) AND NOT ( vTicketStateCode IN ('CHECKED', 'CHECKING') @@ -52,8 +52,8 @@ proc:BEGIN LEAVE proc; END IF; - INSERT INTO ticketTracking (stateFk, ticketFk, userFk) - SELECT id, vSelf, vNewWorkerFk + INSERT INTO ticketTracking (stateFk, ticketFk, userFk, created) + SELECT id, vSelf, vNewWorkerFk, util.VN_NOW() FROM state WHERE `code` = vStateCode COLLATE utf8_unicode_ci; ELSE