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

7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
Conversation 0 Commits 636 Files Changed 209 +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 b978833a64 - Show all commits

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

@ -38,11 +38,11 @@ BEGIN
SELECT sm.id, SELECT sm.id,
st.workerFk, st.workerFk,
ROW_NUMBER() OVER(PARTITION BY sm.id ORDER BY s2.`order`) AS rnk ROW_NUMBER() OVER(PARTITION BY sm.id ORDER BY s2.`order`) AS rnk
FROM saleMistake sm FROM vn.saleMistake sm
JOIN saleTracking st ON sm.saleFk = st.saleFk JOIN vn.saleTracking st ON sm.saleFk = st.saleFk
JOIN `state` s2 ON s2.id = st.stateFk JOIN vn.`state` s2 ON s2.id = st.stateFk
JOIN sale s ON s.id = sm.saleFk JOIN vn.sale s ON s.id = sm.saleFk
JOIN ticket t ON t.id = s.ticketFk JOIN vn.ticket t ON t.id = s.ticketFk
WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
AND s2.code IN ('OK', 'PREVIOUS_PREPARATION', 'PREPARED', 'CHECKED') AND s2.code IN ('OK', 'PREVIOUS_PREPARATION', 'PREPARED', 'CHECKED')
) )