github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 20:36:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

migrations/0095: add factor_purchase_amount to stock_current and stock_current_location_content

Browse Source
This commit is contained in:
Kurt Riddlesperger 2019-10-09 23:11:08 -05:00
parent 1967b6e449
commit dcaad3557f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
migrations/0095.sql
View File

@ -5,6 +5,7 @@ SELECT
IFNULL(s.location_id, p.location_id) AS location_id, IFNULL(s.location_id, p.location_id) AS location_id,
s.product_id, s.product_id,
SUM(s.amount) AS amount, SUM(s.amount) AS amount,
SUM(s.amount / p.qu_factor_purchase_to_stock) as factor_purchase_amount,
SUM(IFNULL(s.price, 0) * s.amount) AS value, SUM(IFNULL(s.price, 0) * s.amount) AS value,
MIN(s.best_before_date) AS best_before_date, MIN(s.best_before_date) AS best_before_date,
IFNULL((SELECT SUM(amount) FROM stock WHERE product_id = s.product_id AND location_id = s.location_id AND open = 1), 0) AS amount_opened IFNULL((SELECT SUM(amount) FROM stock WHERE product_id = s.product_id AND location_id = s.location_id AND open = 1), 0) AS amount_opened
@ -19,6 +20,7 @@ AS
SELECT SELECT
pr.parent_product_id AS product_id, pr.parent_product_id AS product_id,
IFNULL((SELECT SUM(amount) FROM stock WHERE product_id = pr.parent_product_id), 0) AS amount, IFNULL((SELECT SUM(amount) FROM stock WHERE product_id = pr.parent_product_id), 0) AS amount,
IFNULL((SELECT SUM(amount / p.qu_factor_purchase_to_stock) FROM stock s join products p on s.product_id = p.id WHERE s.product_id = pr.parent_product_id), 0) AS factor_purchase_amount,
SUM(s.amount) AS amount_aggregated, SUM(s.amount) AS amount_aggregated,
IFNULL((SELECT SUM(IFNULL(s.price,0) * IFNULL(amount,0)) FROM stock WHERE product_id = pr.parent_product_id),0) AS value, IFNULL((SELECT SUM(IFNULL(s.price,0) * IFNULL(amount,0)) FROM stock WHERE product_id = pr.parent_product_id),0) AS value,
MIN(s.best_before_date) AS best_before_date, MIN(s.best_before_date) AS best_before_date,
@ -39,6 +41,7 @@ UNION
SELECT SELECT
pr.sub_product_id AS product_id, pr.sub_product_id AS product_id,
SUM(s.amount) AS amount, SUM(s.amount) AS amount,
SUM(s.amount / p.qu_factor_purchase_to_stock) as factor_purchase_amount,
SUM(s.amount) AS amount_aggregated, SUM(s.amount) AS amount_aggregated,
SUM(IFNULL(s.price, 0) * s.amount) AS value, SUM(IFNULL(s.price, 0) * s.amount) AS value,
MIN(s.best_before_date) AS best_before_date, MIN(s.best_before_date) AS best_before_date,
@ -48,6 +51,8 @@ SELECT
FROM products_resolved pr FROM products_resolved pr
JOIN stock s JOIN stock s
ON pr.sub_product_id = s.product_id ON pr.sub_product_id = s.product_id
JOIN products p
ON p.id = s.product_id
WHERE pr.parent_product_id != pr.sub_product_id WHERE pr.parent_product_id != pr.sub_product_id
GROUP BY pr.sub_product_id GROUP BY pr.sub_product_id
HAVING SUM(s.amount) > 0; HAVING SUM(s.amount) > 0;

2
services/StockService.php
View File

@ -20,7 +20,7 @@ class StockService extends BaseService
$missingProductsView = 'stock_missing_products'; $missingProductsView = 'stock_missing_products';
} }
$sql = 'SELECT * FROM stock_current WHERE best_before_date IS NOT NULL UNION SELECT id, 0, 0, 0, null, 0, 0, 0 FROM ' . $missingProductsView . ' WHERE id NOT IN (SELECT product_id FROM stock_current)'; $sql = 'SELECT * FROM stock_current WHERE best_before_date IS NOT NULL UNION SELECT id, 0, 0, 0, 0, null, 0, 0, 0 FROM ' . $missingProductsView . ' WHERE id NOT IN (SELECT product_id FROM stock_current)';
} }
return $this->DatabaseService->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ); return $this->DatabaseService->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ);