verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

3520_wareshouse_back #2218

Merged
alexm merged 11 commits from 3520_wareshouse_back into dev 2024-03-28 07:16:57 +00:00
Conversation 0 Commits 11 Files Changed 4 +7 -7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2cf572baf8 - Show all commits

14
modules/ticket/back/methods/ticket-collection/hasUncheckedTicket.js
View File

@ -27,13 +27,13 @@ module.exports = Self => {
const result = await Self.rawSql(` const result = await Self.rawSql(`
SELECT tc2.ticketFk SELECT tc2.ticketFk
FROM vn.ticketCollection tc FROM vn.ticketCollection tc
JOIN vn.ticketCollection tc2 ON tc2.collectionFk = tc.collectionFk JOIN vn.ticketCollection tc2 ON tc2.collectionFk = tc.collectionFk
LEFT JOIN vn.ticketState ts ON ts.ticketFk = tc2.ticketFk LEFT JOIN vn.ticketState ts ON ts.ticketFk = tc2.ticketFk
JOIN vn.state s ON s.id = ts.stateFk JOIN vn.state s ON s.id = ts.stateFk
JOIN vn.state s2 ON s2.code = 'CHECKED' JOIN vn.state s2 ON s2.code = 'CHECKED'
WHERE tc.ticketFk = ? AND s.order < s2.id WHERE tc.ticketFk = ? AND s.order < s2.id
LIMIT 1;`, LIMIT 1;`,
[ticketFk], myOptions); [ticketFk], myOptions);
return result.length > 0 && result[0]['ticketFk'] > 0; return result.length > 0 && result[0]['ticketFk'] > 0;
}; };