From f0ec96fe2a0eb6e548b7deb49078edbbf988f88d Mon Sep 17 00:00:00 2001 From: PhilRunninger Date: Tue, 29 Aug 2023 20:02:46 -0400 Subject: [PATCH] Change WHERE clause to remove tag[= or <>]'open-orders' condition. Now that we think we know what we're doing, I'm using a more rigorous approach to defining iterations and tags, and this condition is no longer necessary, and in fact, may be harmful. This I'm removing it. The initial load of data will have these values. iter | tag | purpose --------|-------------|------------------------------------------------- plan | baseline | Adjustments will be made to these values only. actuals | open-orders | Ordered before 2024 season, still open. actuals | booked | Ordered in 2024 season so far --- route_sql/addmonth_vupd.sql | 6 +++--- route_sql/new_basket.sql | 2 +- route_sql/scale_pd.sql | 2 +- route_sql/scale_vd.sql | 4 ++-- route_sql/scale_vupd.sql | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/route_sql/addmonth_vupd.sql b/route_sql/addmonth_vupd.sql index 0419e1e..92f2c0f 100644 --- a/route_sql/addmonth_vupd.sql +++ b/route_sql/addmonth_vupd.sql @@ -18,7 +18,7 @@ target AS (select target_volume vincr, target_price pincr) where_clause -----------------additional params------------------- AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments - AND (order_date <= ship_date OR tag = 'open-orders') + AND order_date <= ship_date ) -- select * from testv -- @@ -126,7 +126,7 @@ target AS (select target_volume vincr, target_price pincr) WHEN 'scale new part' THEN module = 'new basket' END AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments - AND (order_date <= ship_date AND tag <> 'open-orders') + AND order_date <= ship_date GROUP BY promo ,terms @@ -256,7 +256,7 @@ SELECT WHEN 'scale new part' THEN module = 'new basket' END AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments - AND (order_date <= ship_date AND tag <> 'open-orders') + AND order_date <= ship_date GROUP BY --fspr in next step o.plnt diff --git a/route_sql/new_basket.sql b/route_sql/new_basket.sql index 5c4395d..77aabcd 100644 --- a/route_sql/new_basket.sql +++ b/route_sql/new_basket.sql @@ -120,7 +120,7 @@ target AS (select $$replace_request$$::json def) --probably dont want to include adjustments that have blown away volume and good sources of dating info -----------------additional params------------------- AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments - AND (order_date <= ship_date AND tag <> 'open-orders') + AND order_date <= ship_date GROUP BY promo ,terms diff --git a/route_sql/scale_pd.sql b/route_sql/scale_pd.sql index 024743b..2bc422f 100644 --- a/route_sql/scale_pd.sql +++ b/route_sql/scale_pd.sql @@ -55,7 +55,7 @@ target AS (select target_increment incr) where_clause -----------------additional params------------------- AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments - AND (order_date <= ship_date AND tag <> 'open-orders') + AND order_date <= ship_date GROUP BY fspr ,plnt ---master data diff --git a/route_sql/scale_vd.sql b/route_sql/scale_vd.sql index 63ebcd1..feab7e2 100644 --- a/route_sql/scale_vd.sql +++ b/route_sql/scale_vd.sql @@ -12,7 +12,7 @@ target AS (select incr_qty qincr) where_clause -----------------additional params------------------- AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments - AND ( order_date <= ship_date OR tag = 'open-orders') + AND order_date <= ship_date ) -- select * from testv -- @@ -99,7 +99,7 @@ target AS (select incr_qty qincr) WHEN 'scale new part' THEN module = 'new basket' END AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments - AND (order_date <= ship_date AND tag <> 'open-orders') + AND order_date <= ship_date GROUP BY fspr ,plnt ---master data diff --git a/route_sql/scale_vupd.sql b/route_sql/scale_vupd.sql index 92fd614..e88acd9 100644 --- a/route_sql/scale_vupd.sql +++ b/route_sql/scale_vupd.sql @@ -12,7 +12,7 @@ target AS (select target_vol vincr, target_prc pincr) where_clause -----------------additional params------------------- AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments - AND ( order_date <= ship_date OR tag = 'open-orders') + AND order_date <= ship_date ) -- select * from testv -- @@ -99,7 +99,7 @@ target AS (select target_vol vincr, target_prc pincr) WHEN 'scale new part' THEN module = 'new basket' END AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments - AND (order_date <= ship_date AND tag <> 'open-orders') + AND order_date <= ship_date GROUP BY fspr ,plnt ---master data