Merge branch 'feb' of hc-companies/forecast_api into dev

build/build_forecast.sql

@@ -145,11 +145,11 @@ gld AS (
     WHERE
         (
             --base period orders booked....
-            o.odate BETWEEN '2019-06-01' AND '2020-01-31'
+            o.odate BETWEEN '2019-06-01' AND '2020-02-29'
             --...or any open orders currently booked before cutoff....
-            OR (o.calc_status IN ('OPEN','BACKORDER') and o.odate < '2020-02-01')
+            OR (o.calc_status IN ('OPEN','BACKORDER') and o.odate < '2020-03-01')
             --...or anything that shipped in that period
-            OR o.fspr BETWEEN '2001' AND '2008'
+            OR o.fspr BETWEEN '2001' AND '2009'
         )
         AND fs_line = '41010'
         AND calc_status <> 'CANCELED'
@@ -289,7 +289,7 @@ gld AS (
         LEFT OUTER JOIN gld ss ON
             greatest(least(o.sdate,gld.edat),gld.sdat) + interval '1 year' BETWEEN ss.sdat AND ss.edat
     WHERE
-        o.odate BETWEEN '2019-02-01' AND '2019-05-31'
+        o.odate BETWEEN '2019-03-01' AND '2019-05-31'
         AND fs_line = '41010'
         AND calc_status <> 'CANCELED'
         ------exclude actuals for now and use forecast to get the plug for the rest of the year
@@ -429,7 +429,7 @@ gld AS (
         LEFT OUTER JOIN gld ss ON
             greatest(least(o.sdate,gld.edat),gld.sdat)  BETWEEN ss.sdat AND ss.edat
     WHERE
-        o.odate BETWEEN '2020-02-01' AND '2020-05-31'
+        o.odate BETWEEN '2020-03-01' AND '2020-05-31'
         AND fs_line = '41010'
         AND calc_status <> 'CANCELED'
     GROUP BY

route_sql/new_basket.sql

@@ -72,6 +72,7 @@ target AS (select $$replace_request$$::json def)
 ,REPC AS (
     SELECT
         LTRIM(RTRIM(C.A9)) RCODE
+        ,c.a30 rname
         ,LTRIM(RTRIM(C.A9)) || ' - ' || C.A30 REPP
         ,COALESCE(Q.DIR,'Other') DIRECTOR
     FROM
@@ -105,6 +106,7 @@ target AS (select $$replace_request$$::json def)
     SELECT
         promo
         ,terms
+        ,r_currency
         ,order_month
         ,mseq.s seq
         ,order_date
@@ -125,6 +127,7 @@ target AS (select $$replace_request$$::json def)
     GROUP BY
         promo
         ,terms
+        ,r_currency
         ,order_month
         ,mseq.s
         ,order_date
@@ -150,6 +153,9 @@ target AS (select $$replace_request$$::json def)
         to_char(order_date,'Mon') _month
         ,seq
         ,promo
+        ,terms
+        ,(SELECT r_currency FROM alldates GROUP BY r_currency ORDER BY SUM(value_usd) DESC LIMIT 1) r_currency
+        --should terms be included here?
         ,sum(extract(day from order_date)*value_usd) dom_wa
         --,request_date-order_date rlag
         ,sum((request_date-order_date)*(value_usd)) rlag_wa
@@ -162,6 +168,7 @@ target AS (select $$replace_request$$::json def)
         to_char(order_date,'Mon')
         ,seq
         ,promo
+        ,terms
         --,extract(day from order_date)
         --,request_date-order_date
         --,ship_date - request_date
@@ -188,6 +195,8 @@ target AS (select $$replace_request$$::json def)
         _month
         ,seq
         ,promo
+        ,terms
+        ,r_currency
         ,greatest(least(round((dom_wa/value_usd)::numeric,0)::int,28),1) odom
         ,round((rlag_wa/value_usd)::numeric,0)::int rlag
         ,round((slag_wa/value_usd)::numeric,0)::int slag
@@ -211,6 +220,8 @@ SELECT
     ,x.rlag
     ,x.slag
     ,x.promo
+    ,x.terms
+    ,x.r_currency
 FROM
     targm t
     LEFT OUTER JOIN mmixp x ON
@@ -230,6 +241,8 @@ FROM
 SELECT
         sd.fspr
         ,mxm.promo
+        ,mxm.terms
+        ,mxm.r_currency
         ,jr.bill_cust_descr
         ,jr.ship_cust_descr
         ,(regexp_match(jr.part_descr,'(.*?)(?= - |$)'))[1] part
@@ -268,14 +281,14 @@ SELECT
     b.fspr
     ,i.dplt plnt
     ,b.promo
-    ,bc.bvterm terms
+    ,COALESCE(b.terms,bc.bvterm) terms
     ,b.bill_cust_descr
     ,b.ship_cust_descr
-    ,(SELECT rcode FROM repc WHERE repp = log.doc->'scenario'->>'quota_rep_descr') dsm
+    ,(SELECT max(rcode) FROM repc WHERE rname = log.doc->'scenario'->>'quota_rep_descr') dsm
     ,log.doc->'scenario'->>'quota_rep_descr' quota_rep_descr
-    ,(SELECT director FROM repc WHERE repp = log.doc->'scenario'->>'quota_rep_descr') director
+    ,(SELECT max(director) FROM repc WHERE rname = log.doc->'scenario'->>'quota_rep_descr') director
-    ,CASE bc.BVADR6 WHEN '' THEN bc.BVNAME ELSE bc.BVADR6 END billto_group
+    ,COALESCE(CASE bc.BVADR6 WHEN '' THEN bc.BVNAME ELSE bc.BVADR6 END,b.bill_cust_descr) billto_group
-    ,CASE sc.BVADR6 WHEN '' THEN sc.BVNAME ELSE bc.BVADR6 END shipto_group
+    ,COALESCE(CASE sc.BVADR6 WHEN '' THEN sc.BVNAME ELSE bc.BVADR6 END,b.ship_cust_descr) shipto_group
     ,CASE SUBSTRING(bc.bvclas,2,3) 
         --if the bill to class is ditsributor, then it's either warehouse or drop
         WHEN 'DIS' THEN
@@ -311,12 +324,12 @@ SELECT
     ,seg.segm
     ,CASE WHEN i.majg = '610' THEN 'Fiber' ELSE 'Plastic' END substance
     ,'41010' fs_line          --master data
-    ,bc.bvcurr r_currency          --history cust mix
+    ,b.r_currency          --history cust mix
     ,rx.rate r_rate          --master data
     ,copr.curr c_currency          --master data
     ,cx.rate c_rate          --master data
     ,b.units
-    ,b.value_usd / rx.rate      --b.value is denominated in USD, need to apply currency to get to local
+    ,b.value_usd / COALESCE(rx.rate,1)      --b.value is denominated in USD, need to apply currency to get to local, assume 1 if using a fake customer
     ,b.value_usd value_usd     --b.value is already denominated in usd
     ,COALESCE(im.cgstcs,ip.chstcs, ir.y0stcs)*b.units cost_loc
     ,COALESCE(im.cgstcs,ip.chstcs, ir.y0stcs)*b.units*cx.rate cost_usd
@@ -409,14 +422,14 @@ FROM
     LEFT OUTER JOIN copr ON
         copr.comp = yacomp::text
     LEFT OUTER JOIN rlarp.ffcret cx ON
-        cx.perd = '2008'
+        cx.perd = '2101'
-        AND cx.rtyp = 'MA'
+        AND cx.rtyp = 'BG'
         AND cx.fcur = copr.curr
         AND cx.tcur = 'US'
     LEFT OUTER JOIN rlarp.ffcret rx ON
-        rx.perd = '2008'
+        rx.perd = '2101'
-        AND rx.rtyp = 'MA'
+        AND rx.rtyp = 'BG'
-        AND rx.fcur = bc.bvcurr
+        AND rx.fcur = COALESCE(bc.bvcurr,b.r_currency)
         AND rx.tcur = 'US'
 )
 , ins AS (