verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 68 Releases Wiki Activity

8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
Conversation 0 Commits 383 Files Changed 108 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 669b7cd67f - Show all commits

10
db/routines/vn/procedures/ticket_setState.sql
View File

@ -26,17 +26,17 @@ proc:BEGIN
JOIN ticketTracking tt ON tt.stateFk = s.id JOIN ticketTracking tt ON tt.stateFk = s.id
JOIN ticket t ON t.id = tt.ticketFk JOIN ticket t ON t.id = tt.ticketFk
WHERE tt.ticketFk = vSelf WHERE tt.ticketFk = vSelf
ORDER BY tt.created DESC ORDER BY tt.created DESC, tt.id DESC
LIMIT 1; 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 IF vStateCode = 'OK' AND vZoneFk IS NULL THEN
CALL util.throw('ASSIGN_ZONE_FIRST'); CALL util.throw('ASSIGN_ZONE_FIRST');
END IF; END IF;
SET vCanChangeState = (( SET vCanChangeState = ((
vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR
vTicketAlertLevel < vPackedAlertLevel vTicketAlertLevel < vPackedAlertLevel
) AND NOT ( ) AND NOT (
vTicketStateCode IN ('CHECKED', 'CHECKING') vTicketStateCode IN ('CHECKED', 'CHECKING')
@ -52,8 +52,8 @@ proc:BEGIN
LEAVE proc; LEAVE proc;
END IF; END IF;
INSERT INTO ticketTracking (stateFk, ticketFk, userFk) INSERT INTO ticketTracking (stateFk, ticketFk, userFk, created)
SELECT id, vSelf, vNewWorkerFk SELECT id, vSelf, vNewWorkerFk, util.VN_NOW()
FROM state FROM state
WHERE `code` = vStateCode COLLATE utf8_unicode_ci; WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
ELSE ELSE