7383-testToMaster #2445

Merged
alexm merged 233 commits from 7383-testToMaster into master 2024-05-14 05:44:13 +00:00
1 changed files with 6 additions and 3 deletions
Showing only changes of commit 957b0c71ca - Show all commits

View File

@ -173,7 +173,8 @@ BEGIN
lineFk,
isPicked,
clientType,
claimFk
claimFk,
`order`
FROM tItemDiary
LEFT JOIN alertLevel a ON a.id = tItemDiary.alertLevel;
@ -197,7 +198,8 @@ BEGIN
0 lineFk,
0 isPicked,
0 clientType,
0 claimFk
0 claimFk,
`order`
UNION ALL
SELECT shipped,
alertlevel,
@ -213,7 +215,8 @@ BEGIN
lineFk,
isPicked,
clientType,
claimFk
claimFk,
`order`
FROM tItemDiary
WHERE shipped >= vDate;
END IF;