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

route_sql/new_basket.sql

@@ -106,6 +106,7 @@ target AS (select $$replace_request$$::json def)
     SELECT
         promo
         ,terms
+        ,r_currency
         ,order_month
         ,mseq.s seq
         ,order_date
@@ -126,6 +127,7 @@ target AS (select $$replace_request$$::json def)
     GROUP BY
         promo
         ,terms
+        ,r_currency
         ,order_month
         ,mseq.s
         ,order_date
@@ -151,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
@@ -163,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
@@ -189,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
@@ -212,6 +220,8 @@ SELECT
     ,x.rlag
     ,x.slag
     ,x.promo
+    ,x.terms
+    ,x.r_currency
 FROM
     targm t
     LEFT OUTER JOIN mmixp x ON
@@ -231,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
@@ -269,7 +281,7 @@ 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 max(rcode) FROM repc WHERE rname = log.doc->'scenario'->>'quota_rep_descr') dsm
@@ -312,7 +324,7 @@ 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
@@ -410,14 +422,14 @@ FROM
     LEFT OUTER JOIN copr ON
         copr.comp = yacomp::text
     LEFT OUTER JOIN rlarp.ffcret cx ON
-        cx.perd = '2008'
-        AND cx.rtyp = 'MA'
+        cx.perd = '2101'
+        AND cx.rtyp = 'BG'
         AND cx.fcur = copr.curr
         AND cx.tcur = 'US'
     LEFT OUTER JOIN rlarp.ffcret rx ON
-        rx.perd = '2008'
-        AND rx.rtyp = 'MA'
-        AND rx.fcur = bc.bvcurr
+        rx.perd = '2101'
+        AND rx.rtyp = 'BG'
+        AND rx.fcur = COALESCE(bc.bvcurr,b.r_currency)
         AND rx.tcur = 'US'
 )
 , ins AS (