Merge pull request 'fix: refs #6861 collectionGetTickets' (!3065) from 6861-reserves into master
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3065 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
977ab4264d
|
@ -21,9 +21,8 @@ BEGIN
|
||||||
SELECT tob.ticketFk, tob.description
|
SELECT tob.ticketFk, tob.description
|
||||||
FROM vn.ticketObservation tob
|
FROM vn.ticketObservation tob
|
||||||
JOIN vn.ticketCollection tc ON tc.ticketFk = tob.ticketFk
|
JOIN vn.ticketCollection tc ON tc.ticketFk = tob.ticketFk
|
||||||
LEFT JOIN vn.observationType ot ON ot.id = tob.observationTypeFk
|
JOIN vn.observationType ot ON ot.id = tob.observationTypeFk AND ot.`code` = 'itemPicker'
|
||||||
WHERE ot.`code` = 'itemPicker'
|
WHERE tc.collectionFk = vParamFk OR tc.ticketFk = vParamFk
|
||||||
AND tc.collectionFk = vParamFk OR tc.ticketFk = vParamFk
|
|
||||||
)
|
)
|
||||||
SELECT t.id ticketFk,
|
SELECT t.id ticketFk,
|
||||||
IF(!(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
|
IF(!(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
|
||||||
|
|
Loading…
Reference in New Issue