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

Merge branch 'master' into 8087-fixTrigger
gitea/salix/pipeline/pr-master This commit looks good Details

This commit is contained in:
Robert Ferrús 2024-11-26 08:08:13 +00:00
parent 0cbaac91c2 56b0d254b8
commit 43e39fd127
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/routines/vn/procedures/route_calcCommission.sql
View File

@ -68,7 +68,7 @@ BEGIN
FROM route r FROM route r
JOIN vehicle v ON v.id = r.vehicleFk JOIN vehicle v ON v.id = r.vehicleFk
JOIN routeConfig rc JOIN routeConfig rc
LEFT JOIN workCenterCommission wc ON wc.workCenterFk = r.workCenterFk LEFT JOIN workCenterCommission wc ON wc.workCenterFk = r.commissionWorkCenterFk
WHERE r.id = vSelf WHERE r.id = vSelf
AND r.workerFk AND r.workerFk
AND r.commissionWorkCenterFk; AND r.commissionWorkCenterFk;
@ -100,7 +100,7 @@ BEGIN
FROM route r FROM route r
JOIN vehicle v ON v.id = r.vehicleFk JOIN vehicle v ON v.id = r.vehicleFk
JOIN routeConfig rc JOIN routeConfig rc
LEFT JOIN workCenterCommission wc ON wc.workCenterFk = r.workCenterFk LEFT JOIN workCenterCommission wc ON wc.workCenterFk = r.commissionWorkCenterFk
WHERE r.id = vSelf WHERE r.id = vSelf
AND r.kmStart AND r.kmStart
AND r.kmEnd AND r.kmEnd