Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
a002168f61
|
@ -33,7 +33,7 @@ BEGIN
|
|||
LEFT JOIN route r ON r.id = t.routeFk
|
||||
LEFT JOIN worker wo ON wo.id = r.workerFk
|
||||
LEFT JOIN vehicle v ON v.id = r.vehicleFk
|
||||
LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
|
||||
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
|
||||
LEFT JOIN agency ag ON ag.id = am.agencyFk
|
||||
LEFT JOIN supplierAgencyTerm sat ON sat.agencyFk = ag.id
|
||||
AND wo.isFreelance
|
||||
|
@ -42,7 +42,7 @@ BEGIN
|
|||
AND w.code = 'ALG'
|
||||
AND t.id = vSelf
|
||||
GROUP BY t.id;
|
||||
|
||||
|
||||
IF vCmrFk THEN
|
||||
UPDATE cmr c
|
||||
JOIN tTicket t
|
||||
|
|
Loading…
Reference in New Issue