diff --git a/route_sql/scenario_package.sql b/route_sql/scenario_package.sql index b05aad4..3a04bbf 100644 --- a/route_sql/scenario_package.sql +++ b/route_sql/scenario_package.sql @@ -36,7 +36,7 @@ FROM rlarp.osm_pool WHERE where_clause - AND order_season IN (2021,2022) + AND order_season IN (2023,2024) GROUP BY order_season ,order_month @@ -94,14 +94,14 @@ GROUP BY SELECT order_month ,seq - ,SUM(units) FILTER (WHERE order_season = 2021) "2021 qty" - ,SUM(units) FILTER (WHERE order_season = 2022 AND iter IN ('copy','short ship','bad_ship','plan')) "2022 base qty" - ,SUM(units) FILTER (WHERE order_season = 2022 AND iter NOT IN ('copy','short ship','bad_ship','plan')) "2022 adj qty" - ,SUM(units) FILTER (WHERE order_season = 2022) "2022 tot qty" - ,SUM(value_usd) FILTER (WHERE order_season = 2021) "2021 value_usd" - ,SUM(value_usd) FILTER (WHERE order_season = 2022 AND iter IN ('copy','short ship','bad_ship','plan')) "2022 base value_usd" - ,SUM(value_usd) FILTER (WHERE order_season = 2022 AND iter NOT IN ('copy','short ship','bad_ship','plan')) "2022 adj value_usd" - ,SUM(value_usd) FILTER (WHERE order_season = 2022) "2022 tot value_usd" + ,SUM(units) FILTER (WHERE order_season = 2023) "2023 qty" + ,SUM(units) FILTER (WHERE order_season = 2024 AND iter IN ('copy','short ship','bad_ship','plan')) "2024 base qty" + ,SUM(units) FILTER (WHERE order_season = 2024 AND iter NOT IN ('copy','short ship','bad_ship','plan')) "2024 adj qty" + ,SUM(units) FILTER (WHERE order_season = 2024) "2024 tot qty" + ,SUM(value_usd) FILTER (WHERE order_season = 2023) "2023 value_usd" + ,SUM(value_usd) FILTER (WHERE order_season = 2024 AND iter IN ('copy','short ship','bad_ship','plan')) "2024 base value_usd" + ,SUM(value_usd) FILTER (WHERE order_season = 2024 AND iter NOT IN ('copy','short ship','bad_ship','plan')) "2024 adj value_usd" + ,SUM(value_usd) FILTER (WHERE order_season = 2024) "2024 tot value_usd" FROM months GROUP BY @@ -113,14 +113,14 @@ GROUP BY ,mlist AS ( SELECT mseq.m order_month - ,"2021 qty" - ,"2022 base qty" - ,"2022 adj qty" - ,"2022 tot qty" - ,"2021 value_usd" - ,"2022 base value_usd" - ,"2022 adj value_usd" - ,"2022 tot value_usd" + ,"2023 qty" + ,"2024 base qty" + ,"2024 adj qty" + ,"2024 tot qty" + ,"2023 value_usd" + ,"2024 base value_usd" + ,"2024 adj value_usd" + ,"2024 tot value_usd" FROM mseq LEFT OUTER JOIN mpvt ON