Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
669b7cd67f
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue