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

Merge pull request 'fix(collection_new): remove agency condition for suitable tickets' (!3171) from hotFix-remove-notOwn-agency-collection-advantage into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #3171
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
Pako Natek 2024-11-11 10:02:42 +00:00
parent a707f9cbff 35f4f161ab
commit b62b33d175
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,8 +173,6 @@ BEGIN
DELETE pb.* DELETE pb.*
FROM tmp.productionBuffer pb FROM tmp.productionBuffer pb
JOIN state s ON s.id = pb.state JOIN state s ON s.id = pb.state
JOIN agencyMode am ON am.id = pb.agencyModeFk
JOIN agency a ON a.id = am.agencyFk
LEFT JOIN ( LEFT JOIN (
SELECT pb.ticketFk, MAX(i.`size`) maxSize SELECT pb.ticketFk, MAX(i.`size`) maxSize
FROM tmp.productionBuffer pb FROM tmp.productionBuffer pb
@ -185,7 +183,7 @@ BEGIN
) sub ON sub.ticketFk = pb.ticketFk ) sub ON sub.ticketFk = pb.ticketFk
JOIN productionConfig pc JOIN productionConfig pc
WHERE pb.shipped <> util.VN_CURDATE() WHERE pb.shipped <> util.VN_CURDATE()
OR (pb.ubicacion IS NULL AND a.isOwn) OR pb.ubicacion IS NULL
OR (NOT s.isPreparable AND NOT s.isPrintable) OR (NOT s.isPreparable AND NOT s.isPrintable)
OR pb.collectionH IS NOT NULL OR pb.collectionH IS NOT NULL
OR pb.collectionV IS NOT NULL OR pb.collectionV IS NOT NULL