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

feat: refs #7704 Major changes #2717

Merged
guillermo merged 18 commits from 7704-itemMinimalQuantity into dev 2024-07-12 07:43:46 +00:00
Conversation 0 Commits 18 Files Changed 21 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90802bd330 - Show all commits

4
db/routines/hedera/procedures/order_addItem.sql
View File

@ -59,8 +59,8 @@ BEGIN
SELECT quantity INTO vMinQuantity
FROM vn.itemMinimumQuantity
WHERE itemFk = vItem
AND (util.VN_CURDATE() >= `started`
AND (util.VN_CURDATE() <= `ended` OR `ended` IS NULL))
AND `started` <= util.VN_CURDATE()
guillermo marked this conversation as resolved Outdated
jgallego commented 2024-07-11 16:22:50 +00:00
Outdated
Review
Copy Link

açò no serà per a hui sera per al dia del pedido, es a dir, si hui fan un pedido per a campanya ha d'agafar si hi ha un min en el futur vShipment

açò no serà per a hui sera per al dia del pedido, es a dir, si hui fan un pedido per a campanya ha d'agafar si hi ha un min en el futur vShipment
AND (`ended` >= util.VN_CURDATE() OR `ended` IS NULL)
AND (warehouseFk = vWarehouse OR warehouseFk IS NULL)
LIMIT 1;

4
modules/order/back/methods/order/catalogFilter.js
View File

@ -104,8 +104,8 @@ module.exports = Self => {
WITH minQuantity AS (
SELECT itemFk, quantity, warehouseFk
FROM vn.itemMinimumQuantity
WHERE (util.VN_CURDATE() BETWEEN started AND ended
OR (util.VN_CURDATE() >= started AND ended IS NULL))
WHERE started <= util.VN_CURDATE()
AND (ended >= util.VN_CURDATE() OR ended IS NULL)
GROUP BY itemFk, warehouseFk
ORDER BY warehouseFk DESC
)