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

6964-hasItemOlder #2560

Merged
sergiodt merged 9 commits from 6964-hasItemOlder into test 2024-06-18 14:27:08 +00:00
Conversation 1 Commits 9 Files Changed 8 +7 -8
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 46cd20a1fd - Show all commits

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

@ -17,7 +17,7 @@ module.exports = Self => {
}, },
], ],
returns: { returns: {
type: 'Object', type: 'Array',
root: true root: true
}, },
http: { http: {
@ -31,7 +31,7 @@ module.exports = Self => {
if (typeof options == 'object') if (typeof options == 'object')
Object.assign(myOptions, options); Object.assign(myOptions, options);
const isParkingToReview = await Self.rawSql(` const [isParkingToReview] = await Self.rawSql(`
SELECT COUNT(p.id) parkingToReview SELECT COUNT(p.id) parkingToReview
FROM vn.parking p FROM vn.parking p
JOIN vn.sector s ON s.id = p.sectorFk JOIN vn.sector s ON s.id = p.sectorFk
@ -39,8 +39,9 @@ module.exports = Self => {
WHERE p.code = ? AND s.code = pc.sectorToCode;`, WHERE p.code = ? AND s.code = pc.sectorToCode;`,
[parking], myOptions); [parking], myOptions);
if (isParkingToReview[0]['parkingToReview'] > 0) { if (isParkingToReview['parkingToReview'] < 1) return [];
const result = await Self.rawSql(`
const result = await Self.rawSql(`
WITH tItemShelving AS( WITH tItemShelving AS(
SELECT is2.itemFk, is2.created, p.sectorFK, is2.id SELECT is2.itemFk, is2.created, p.sectorFK, is2.id
FROM vn.itemShelving is2 FROM vn.itemShelving is2
@ -63,9 +64,7 @@ module.exports = Self => {
JOIN tItemInSector tis ON tis.itemFk = ti.itemFk JOIN tItemInSector tis ON tis.itemFk = ti.itemFk
JOIN vn.productionConfig pc JOIN vn.productionConfig pc
WHERE ti.created > tis.created + INTERVAL pc.itemOlderReviewHours HOUR;`, WHERE ti.created > tis.created + INTERVAL pc.itemOlderReviewHours HOUR;`,
[shelvingFk, shelvingFk], myOptions); [shelvingFk, shelvingFk], myOptions);
return result; return result;
} else
return [];
}; };
}; };