7729-devToTest_2430 #2739

Merged
alexm merged 339 commits from 7729-devToTest_2430 into test 2024-07-16 07:11:37 +00:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 61a746c2d8 - Show all commits

View File

@ -56,8 +56,8 @@ BEGIN
CALL util.throw ('ORDER_ROW_UNAVAILABLE');
END IF;
SELECT quantity
FROM vn.itemMinimalQuantity
SELECT quantity INTO vMinQuantity
FROM vn.itemMinimumQuantity
WHERE itemFk = vItem
AND (
util.VN_CURDATE() BETWEEN `started` AND `ended`

View File

@ -103,7 +103,7 @@ module.exports = Self => {
stmt = new ParameterizedSQL(`
WITH minQuantity AS (
SELECT itemFk, quantity, warehouseFk
FROM vn.itemMinimalQuantity
FROM vn.itemMinimumQuantity
WHERE (util.VN_CURDATE() BETWEEN started AND ended
OR (util.VN_CURDATE() >= started AND ended IS NULL))
GROUP BY itemFk, warehouseFk