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

Merge pull request 'fix: refs #6964 visibleGreaterThanZero' (!3405) from 6964_itemsOLder into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #3405
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
This commit is contained in:
Sergio De la torre 2025-01-31 11:43:41 +00:00
parent 0a9e3d5d54 be93ea3a07
commit 04a65bc1e0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/item/back/methods/item-shelving/getItemsByReviewOrder.js
View File

@ -52,7 +52,9 @@ module.exports = Self => {
JOIN vn.shelving sh ON sh.id = is2.shelvingFk JOIN vn.shelving sh ON sh.id = is2.shelvingFk
LEFT JOIN vn.parking p ON p.id = sh.parkingFk LEFT JOIN vn.parking p ON p.id = sh.parkingFk
LEFT JOIN vn.sector s ON s.id = p.sectorFk LEFT JOIN vn.sector s ON s.id = p.sectorFk
WHERE sh.code = ? AND (? IS NULL OR is2.itemFk = ?) WHERE sh.code = ?
AND (? IS NULL OR is2.itemFk = ?)
AND is2.visible > 0
), ),
itemShelvings AS ( itemShelvings AS (
SELECT is2.itemFk, is2.created, sh.code, p.pickingOrder, p.code AS parkingFk SELECT is2.itemFk, is2.created, sh.code, p.pickingOrder, p.code AS parkingFk
@ -61,15 +63,16 @@ module.exports = Self => {
JOIN vn.shelving sh ON sh.id = is2.shelvingFk AND ai.code <> sh.code JOIN vn.shelving sh ON sh.id = is2.shelvingFk AND ai.code <> sh.code
JOIN vn.parking p ON p.id = sh.parkingFk JOIN vn.parking p ON p.id = sh.parkingFk
JOIN vn.sector s ON s.id = p.sectorFk JOIN vn.sector s ON s.id = p.sectorFk
WHERE is2.visible > 0
), ),
parkingDestiny AS ( parkingDestiny AS (
SELECT ? AS pickingOrder SELECT ? AS pickingOrder
) )
SELECT ish.*, SELECT ish.*,
CASE CASE
WHEN ish.pickingOrder < d.pickingOrder AND aish.created < ish.created WHEN ish.pickingOrder < d.pickingOrder AND aish.created < ish.created
AND ABS(TIMESTAMPDIFF(HOUR, aish.created, ish.created)) > ? THEN "old" AND ABS(TIMESTAMPDIFF(HOUR, aish.created, ish.created)) > ? THEN "old"
WHEN ish.pickingOrder > d.pickingOrder AND aish.created > ish.created WHEN ish.pickingOrder > d.pickingOrder AND aish.created > ish.created
AND ABS(TIMESTAMPDIFF(HOUR, aish.created, ish.created)) > ? THEN "new" AND ABS(TIMESTAMPDIFF(HOUR, aish.created, ish.created)) > ? THEN "new"
END AS itemCreated END AS itemCreated
FROM itemShelvings ish FROM itemShelvings ish
@ -77,8 +80,8 @@ module.exports = Self => {
JOIN currentItemShelving aish ON ish.itemFk = aish.itemFk JOIN currentItemShelving aish ON ish.itemFk = aish.itemFk
WHERE ABS(TIMESTAMPDIFF(HOUR, aish.created, ish.created)) > ? WHERE ABS(TIMESTAMPDIFF(HOUR, aish.created, ish.created)) > ?
AND ( AND (
(ish.pickingOrder < d.pickingOrder AND aish.created < ish.created) (ish.pickingOrder < d.pickingOrder AND aish.created < ish.created)
OR OR
(ish.pickingOrder > d.pickingOrder AND aish.created > ish.created) (ish.pickingOrder > d.pickingOrder AND aish.created > ish.created)
); );
`, `,