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

index.js

@@ -157,9 +157,9 @@ server.get('/list_changes', bodyParser.json(), function (req, res) {
         console.log(new Date().toISOString() + "-------------------------list changes:------------------------------")
         console.log(req.body);
         //parse the where clause into the main sql statement
-        sql = sql.replace(new RegExp("replace_user",'g'),JSON.stringify(req.body))
+        sql = sql.replace(new RegExp("replace_user", 'g'), JSON.stringify(req.body.quota_rep_descr))
             //execute the sql and send the result
-        //console.log(sql);
+        console.log(sql);
         Postgres.FirstRow(sql, [], res)
     };
 })
@@ -480,13 +480,11 @@ function build_where(req, c, w, d, args) {
                 d = d + 1;
             }
             w = w + ")";
-        }
+        } else {
-        else {
             w = w + i + " = '" + req.body.scenario[i] + "'";
         }
         args.push(req.body.scenario[i]);
         c = c + 1;
-    }
+    };
-    ;
     return { c, w, d };
 }

route_sql/build/build_fcpool.sql

@@ -50,13 +50,13 @@ SELECT
     ,plnt
     ,promo
     ,terms
-    ,bill_cust||' - '||bc.bvname bill_custd
+    ,bill_cust||' - '||bc.bvname bill_cust_descr
-    ,ship_cust||' - '||sc.bvname ship_custd
+    ,ship_cust||' - '||sc.bvname ship_cust_descr
     ,dsm
-    ,coalesce(repc.repp,dsm) dsmd
+    ,coalesce(repc.repp,dsm) quota_rep_descr
     ,repc.director
-    ,account bill_dba
+    ,account billto_group
-    ,shipgrp ship_dba
+    ,shipgrp shipto_group
     ,chan
     ,chansub
     ,CASE seg.segm
@@ -69,40 +69,40 @@ SELECT
         ELSE o.chan
     END chan_retail     
     ,part
-    ,part||coalesce(' - '||i.descr,'') partd
+    ,part||coalesce(' - '||i.descr,'') part_descr
-    ,stlcd partgroup
+    ,stlcd part_group
-    ,brnd
+    ,brnd branding
-    ,o.majg||' - '||i.majgd majgd
+    ,o.majg||' - '||i.majgd majg_descr
-    ,o.ming||' - '||i.mingd mingd
+    ,o.ming||' - '||i.mingd ming_descr
-    ,o.majs||' - '||i.majsd majsd
+    ,o.majs||' - '||i.majsd majs_descr
-    ,o.mins||' - '||i.minsd minsd
+    ,o.mins||' - '||i.minsd mins_descr
     ,seg.segm
     ,fs_line
     ,r_currency
     ,r_rate
     ,c_currency
     ,c_rate
-    ,fb_qty
+    ,fb_qty units
-    ,fb_val_loc
+    ,fb_val_loc value_loc
     ,fb_val_loc * r_rate value_usd
-    ,fb_cst_loc
+    ,fb_cst_loc cost_loc
     ,fb_cst_loc * c_rate cost_usd
     ,calc_status
     ,flag
-    ,o.odate
+    ,o.odate order_date
-    ,to_char(CASE WHEN extract(month FROM o.odate) > 6 THEN -5 ELSE 7 END + extract(month FROM o.odate),'FM00')||' - '||to_char(o.odate,'TMMon') omonth
+    ,to_char(CASE WHEN extract(month FROM o.odate) > 6 THEN -5 ELSE 7 END + extract(month FROM o.odate),'FM00')||' - '||to_char(o.odate,'TMMon') order_month
-    ,oseas
+    ,oseas order_season
-    ,rdate
+    ,rdate request_date
-    ,to_char(CASE WHEN extract(month FROM o.rdate) > 6 THEN -5 ELSE 7 END + extract(month FROM o.rdate),'FM00')||' - '||to_char(o.rdate,'TMMon') rmonth
+    ,to_char(CASE WHEN extract(month FROM o.rdate) > 6 THEN -5 ELSE 7 END + extract(month FROM o.rdate),'FM00')||' - '||to_char(o.rdate,'TMMon') request_month
-    ,rseas
+    ,rseas request_season
-    ,sdate
+    ,sdate ship_date
-    ,to_char(CASE WHEN extract(month FROM o.sdate) > 6 THEN -5 ELSE 7 END + extract(month FROM o.sdate),'FM00')||' - '||to_char(o.sdate,'TMMon') smonth
+    ,to_char(CASE WHEN extract(month FROM o.sdate) > 6 THEN -5 ELSE 7 END + extract(month FROM o.sdate),'FM00')||' - '||to_char(o.sdate,'TMMon') ship_month
-    ,sseas
+    ,sseas ship_season
     ,version
     ,iter
     ,null::int logid
     ,null::text "comment"
-    ,null::text iterdet
+    ,null::text module
 FROM
     rlarp.osmf_dev o
     LEFT OUTER JOIN lgdat.cust bc ON
@@ -129,3 +129,13 @@ FROM
         i.item = o.part
     --LIMIT 100
 ) WITH DATA;
+
+CREATE INDEX osm_qr ON rlarp.osm_pool(quota_rep_descr);
+
+
+DROP TABLE IF EXISTS rlarp.osm_log;
+
+CREATE TABLE IF NOT EXISTS rlarp.osm_log(id INT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, doc jsonb);
+
+GRANT ALL ON TABLE rlarp.osm_log TO api;
+GRANT ALL ON TABLE rlarp.osm_pool TO api;

route_sql/build/build_forecast.sql

@@ -552,7 +552,7 @@ SELECT
     ,o.sdate + interval '1 year'    --incremented
     ,o.sseas + 1                    --incremented
     ,'b21' "version"
-    ,'baseline' iter
+    ,'copy' iter
 FROM 
     baseline o
     LEFT OUTER JOIN gld ON

route_sql/get_pool.sql

@@ -6,20 +6,20 @@ SELECT
     ,ship_cust_descr
     ,shipto_group
     ,quota_rep_descr
-    ,director_descr
+    ,director
     ,segm
-    ,mod_chan
+    ,chan
-    ,mod_chansub
+    ,chansub
     ---------product info------------------
     ,majg_descr
     ,ming_descr
     ,majs_descr
     ,mins_descr
-    ,brand
+    --,brand
-    ,part_family
+    --,part_family
     ,part_group
     ,branding
-    ,color
+    --,color
     ,part_descr
     ---------dates-------------------------
     ,order_season
@@ -38,7 +38,7 @@ SELECT
     ,sum(cost_usd) cost_usd
     ,sum(units) units
 FROM
-    rlarp.osm_fcpool
+    rlarp.osm_pool
 WHERE
     quota_rep_descr = 'rep_replace'
 GROUP BY
@@ -48,20 +48,20 @@ GROUP BY
     ,ship_cust_descr
     ,shipto_group
     ,quota_rep_descr
-    ,director_descr
+    ,director
     ,segm
-    ,mod_chan
+    ,chan
-    ,mod_chansub
+    ,chansub
     ---------product info------------------
     ,majg_descr
     ,ming_descr
     ,majs_descr
     ,mins_descr
-    ,brand
+    --,brand
-    ,part_family
+    --,part_family
     ,part_group
     ,branding
-    ,color
+    --,color
     ,part_descr
     ---------dates-------------------------
     ,order_season

route_sql/list_changes.sql

@@ -1,21 +1,37 @@
 WITH
-list AS (
+list AS materialized (
 SELECT
-    iterdef->>'user' "user",
+    l.doc->>'user' "user",
-    iterdef->>'stamp' "stamp",
+    jsonb_path_query_first(l.doc,'$.scenario.quota_rep_descr')->>0 quota_rep_descr,
-    iterdef->>'mesasage' "comment",
+    to_char((l.doc->>'stamp')::timestamptz,'YYYY-MM-DD HH:MI:SS') "stamp",
-    round(SUM(fb_val_loc * r_rate)::numeric,2) sales,
+    l.doc->>'message' "comment",
-    jsonb_pretty(iterdef) def
+    jsonb_pretty(l.doc) def,
+    l.id
 FROM
-    rlarp.osm_fcpool
+    rlarp.osm_log l
 WHERE
-    iterdef IS NOT NULL
+    l.doc @? '$.scenario.quota_rep_descr ? (@ == replace_user)'
-    AND iterdef @> $$replace_user$$::jsonb
+)
-GROUP BY
+,agg as (
-    iterdef->>'user',
+SELECT 
-    iterdef->>'stamp',
+    list.user
-    iterdef->>'message',
+    ,list.quota_rep_descr
-    iterdef
+    ,list.stamp
+    ,list.comment
+    ,list.def
+    ,list.id
+    ,to_char(round(sum(value_usd),2),'$999,999,999D00') sales
+from
+    LIST
+    inner join rlarp.osm_pool on
+        id = logid
+group BY    
+    list.user
+    ,list.quota_rep_descr
+    ,list.stamp
+    ,list.comment
+    ,list.def
+    ,list.id
 )
 SELECT
-    jsonb_agg(row_to_json(list)::jsonb) x from list
+    jsonb_agg(row_to_json(agg)::jsonb ORDER BY agg.stamp desc) x from agg

route_sql/new_basket.sql

@@ -13,6 +13,7 @@ target AS (select $$replace_request$$::json def)
         ,to_char(N1FSYP,'FM0000') FSPR
         ,N1SD01 SDAT
         ,N1ED01 EDAT
+        ,daterange(n1sd01, n1ed01) drange
         ,to_char(N1ED01,'yymm') CAPR
         ,N1ED01 - N1SD01 +1 NDAYS
         ,CASE WHEN EXTRACT(MONTH FROM N1ED01) >= 6 THEN EXTRACT(YEAR FROM N1ED01) + 1 ELSE EXTRACT(YEAR FROM N1ED01) END SSYR
@@ -30,18 +31,18 @@ target AS (select $$replace_request$$::json def)
     SELECT * FROM
     (
         VALUES
-        ('Jun',1,6,-1)
+        ('01 - Jun',1,6,-1)
-        ,('Jul',2,7,-1)
+        ,('02 - Jul',2,7,-1)
-        ,('Aug',3,8,-1)
+        ,('03 - Aug',3,8,-1)
-        ,('Sep',4,9,-1)
+        ,('04 - Sep',4,9,-1)
-        ,('Oct',5,10,-1)
+        ,('05 - Oct',5,10,-1)
-        ,('Nov',6,11,-1)
+        ,('06 - Nov',6,11,-1)
-        ,('Dec',7,12,-1)
+        ,('07 - Dec',7,12,-1)
-        ,('Jan',8,1,0)
+        ,('08 - Jan',8,1,0)
-        ,('Feb',9,2,0)
+        ,('09 - Feb',9,2,0)
-        ,('Mar',10,3,0)
+        ,('10 - Mar',10,3,0)
-        ,('Apr',11,4,0)
+        ,('11 - Apr',11,4,0)
-        ,('May',12,5,0)
+        ,('12 - May',12,5,0)
     ) x(m,s,cal,yr)
 )
 ,SEG AS (
@@ -67,30 +68,6 @@ target AS (select $$replace_request$$::json def)
             ('9TO','Other')
         ) X(GLEC, SEGM)
 )
-,MG AS (
-    SELECT  
-        X.F1, X.MING, X.GRP
-    FROM 
-        (
-            VALUES
-            ('L','000','Branded'),
-            ('L','B10','Branded'),
-            ('L','B11','Branded'),
-            ('L','B52','Branded'),
-            ('L','C10','Branded'),
-            ('L','D12','Branded'),
-            ('L','M11','Branded'),
-            ('L','P12','Branded'),
-            ('L','P13','Branded'),
-            ('L','S10','Branded'),
-            ('L','Y10','Branded'),
-            ('L','Y11','Branded'),
-            ('L','Y12','Branded'),
-            ('P','B10','Branded'),
-            ('P','B11','Branded'),
-            ('P','B52','Branded')
-        ) AS X (F1, MING, GRP)
-)
 ,REPC AS (
     SELECT
         LTRIM(RTRIM(C.A9)) RCODE
@@ -103,46 +80,6 @@ target AS (select $$replace_request$$::json def)
     WHERE
         C.A2 = 'MM'
 )
---MOLD DESCRIPTIONS
-,MD AS (
-    SELECT
-        U.MOLD
-        ,MAX(U.DESCR) DESCR
-    FROM
-        (
-            SELECT
-                SUBSTR(M.AVPART,1,8) MOLD
-                ,MAX(M.AVDES1) DESCR
-            FROM
-                LGDAT.STKMM M
-            WHERE   
-                LENGTH(M.AVPART) > 8
-                AND SUBSTR(M.AVGLED,1,1) <= '2'
-            GROUP BY
-                SUBSTR(M.AVPART,1,8)
-            UNION ALL
-            SELECT
-                SUBSTR(P.AWPART,1,8) MOLD
-                ,MAX(P.AWDES1) DESCR
-            FROM
-                LGDAT.STKMP P
-            WHERE   
-                LENGTH(P.AWPART) > 8
-                AND SUBSTR(P.AWGLED,1,1) <= '2'
-            GROUP BY
-                SUBSTR(P.AWPART,1,8)
-        ) U
-    GROUP BY
-        U.MOLD
-)
-----------------------------------------------------sales major codes----------------------------------------------------------------------------------------------------------------------------------
-,SJ AS (
-    SELECT * FROM LGDAT.MMSL WHERE COALESCE(BSMNCD,'') = ''
-)
-----------------------------------------------------sales minor codes----------------------------------------------------------------------------------------------------------------------------------
-,SI AS (
-    SELECT * FROM LGDAT.MMSL WHERE COALESCE(BSMNCD,'') <> ''
-)
 ,copr AS (
     SELECT
         LTRIM(RTRIM(A9)) AS COMP,
@@ -169,12 +106,12 @@ target AS (select $$replace_request$$::json def)
         ,terms
         ,order_month
         ,mseq.s seq
-        ,orderdate
+        ,order_date
-        ,requestdate
+        ,request_date
-        ,shipdate
+        ,ship_date
         ,sum(value_usd) value_usd
     FROM
-        rlarp.osm_fcpool
+        rlarp.osm_pool
         LEFT OUTER JOIN mseq ON
             mseq.m = order_month
     WHERE
@@ -183,50 +120,52 @@ 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 adj_orderdate <= adj_shipdate
+        AND order_date <= ship_date
     GROUP BY
         promo
         ,terms
         ,order_month
         ,mseq.s
-        ,orderdate
+        ,order_date
-        ,requestdate
+        ,request_date
-        ,shipdate
+        ,ship_date
     HAVING
         sum(value_usd) <> 0
 )
 --select * from alldates
 ,dom AS (
     SELECT
-        extract(day FROM orderdate) DOM
+        extract(day FROM order_date) DOM
         ,sum(value_usd) value_usd
     FROM
         alldates
     GROUP BY
-        extract(day FROM orderdate)
+        extract(day FROM order_date)
 )
+--select * from dom
 ---------------------may want ot look at a top-5 mix solution in the future facilitated by sum() over (order by sales desc)---------------
 ,mmix AS (
     SELECT
-        to_char(orderdate,'Mon') _month
+        to_char(order_date,'Mon') _month
         ,seq
         ,promo
-        ,sum(extract(day from orderdate)*value_usd) dom_wa
+        ,sum(extract(day from order_date)*value_usd) dom_wa
-        --,requestdate-orderdate rlag
+        --,request_date-order_date rlag
-        ,sum((requestdate-orderdate)*(value_usd)) rlag_wa
+        ,sum((request_date-order_date)*(value_usd)) rlag_wa
-        --,shipdate - requestdate slag
+        --,ship_date - request_date slag
-        ,sum((shipdate - requestdate)*(value_usd)) slag_wa
+        ,sum((ship_date - request_date)*(value_usd)) slag_wa
         ,sum(value_usd) value_usd
     FROM
         alldates
     GROUP BY
-        to_char(orderdate,'Mon')
+        to_char(order_date,'Mon')
         ,seq
         ,promo
-        --,extract(day from orderdate)
+        --,extract(day from order_date)
-        --,requestdate-orderdate
+        --,request_date-order_date
-        --,shipdate - requestdate
+        --,ship_date - request_date
 )
+--select * from mmix
 ,targm AS (
     SELECT
         je.key as month
@@ -242,6 +181,7 @@ target AS (select $$replace_request$$::json def)
         LEFT OUTER JOIN mseq ON
             mseq.m = je.key
 )
+--select * from targm
 ,mmixp AS (
     SELECT
         _month
@@ -255,6 +195,7 @@ target AS (select $$replace_request$$::json def)
     FROM
         mmix
 )
+--select * from mmixp 
 --month cross join mix
 ,mxm AS (
 SELECT
@@ -286,114 +227,24 @@ FROM
 --this basemix is probably join going to be part-bill-ship with all master data joined later since it is not known if any original is salvaged
 ,basemix AS (
 SELECT
-        null::text plnt          ---master data 
+        sd.fspr
-        ,0::numeric(11,0) "ddord#"
+        ,mxm.promo
-        ,0::numeric(11,0) "dditm#"
-        ,0::numeric(11,0) "fgbol#"
-        ,0::numeric(11,0) "fgent#"
-        ,0::numeric(9,0) "diinv#"
-        ,0::numeric(3,0) "dilin#"
-        ,mxm.promo          --history 
-        ,null::text return_reas
-        ,null::text terms
-        ,''::text custpo
-        ,'I' dhincr
-        ,null::numeric diext
-        ,null::numeric ditdis
-        ,null::date dcodat
-        ,null::date ddqdat
-        ,null::date dcmdat
-        ,null::date dhidat
-        ,sd.fspr
-        ,null::text remit_to
-        ,null::text bill_class
-        ,(regexp_match(jr.bill_cust_descr,'(.*?)(?= - |$)'))[1] bill_cust
-        ,null:: text bill_rep
-        ,null::text bill_terr
-        ,null::text ship_class
-        ,(regexp_match(jr.ship_cust_descr,'(.*?)(?= - |$)'))[1] ship_cust
-        ,null::text ship_rep
-        ,null::text ship_terr
-        ,null::text quota_rep
-        ,null::text account
-        ,null::text shipgrp
-        ,null::text geo
-        ,null::text chan
-        ,null::text orig_ctry
-        ,null::text orig_prov
-        ,null::text orig_post
-        ,null::text dest_ctry
-        ,null::text dest_prov
-        ,null::text dest_post
-        ,(regexp_match(jr.part_descr,'(.*?)(?= - |$)'))[1] part
-        ,null::text ord_gldc
-        ,null::text majg
-        ,null::text ming
-        ,null::text majs
-        ,null::text mins
-        ,null::text gldc
-        ,null::text glec
-        ,null::text harm
-        ,null::text clss
-        ,null::text brand
-        ,null::text assc
-        ,'41010'::text fs_line
-        ,null::text r_currency
-        ,null::numeric r_rate
-        ,null::text c_currency
-        ,null::numeric c_rate
-        ,0::numeric(15,5) ddqtoi
-        ,0::numeric(15,5) ddqtsi
-        ,0::numeric(15,5) fgqshp
-        ,0::numeric(15,5) diqtsh
-        ,mxm.qty*mxm.momix*jr.mix fb_qty          --history value
-        ,0::numeric fb_cst_loc          --history part mix
-        ,0::numeric fb_cst_loc_cur
-        ,0::numeric fb_cst_loc_fut
-        ,mxm.amount*mxm.momix*jr.mix fb_val_loc          --history value
-        ,0::numeric fb_val_loc_pl
-        ,''::text calc_status
-        ,''::text flag
-        ,make_date(mxm.yr + 2020,mxm.cal,mxm.odom) orderdate
-        ,make_date(mxm.yr + 2020,mxm.cal,mxm.odom) + rlag requestdate
-        ,make_date(mxm.yr + 2020,mxm.cal,mxm.odom) + rlag + slag shipdate
-        ,make_date(mxm.yr + 2020,mxm.cal,mxm.odom) adj_orderdate
-        ,make_date(mxm.yr + 2020,mxm.cal,mxm.odom) + rlag adj_requestdate
-        ,make_date(mxm.yr + 2020,mxm.cal,mxm.odom) + rlag + slag adj_shipdate
-        ,'replace_version' "version"
-        ,'replace_source'||' volume'  iter
-        -----------------------ui columns--------------------------------
-        ,'replace_iterdet' iterdet
-        ,$$replace_iterdef$$::json iterdef
-        ,od.ssyr order_season
-        ,to_char(make_date(mxm.yr + 2020,mxm.cal,mxm.odom),'Mon') order_month
-        ,sd.ssyr ship_season
-        ,to_char(make_date(mxm.yr + 2020,mxm.cal,mxm.odom) + rlag + slag,'Mon') ship_month
-        ,rd.ssyr request_season
-        ,to_char(make_date(mxm.yr + 2020,mxm.cal,mxm.odom) + rlag,'Mon')  request_month
-        ,jr.part_descr part_descr
-        ,null::text part_family
-        ,null::text part_group
-        ,null::text branding
-        ,null::text color
-        ,null::text segm
         ,jr.bill_cust_descr
-        ,null::text billto_group
         ,jr.ship_cust_descr
-        ,null::text shipto_group
+        ,(regexp_match(jr.part_descr,'(.*?)(?= - |$)'))[1] part
-        ,null::text majg_descr
+        ,jr.part_descr
-        ,null::text ming_descr
+        ,substring(jr.part_descr,1,8) part_group
-        ,null::text majs_descr
+        ,mxm.qty*mxm.momix*jr.mix units
-        ,null::text mins_descr
+        ,mxm.amount*mxm.momix*jr.mix value_loc
-        ,null::text mod_chan
+        ,make_date(mxm.yr + 2021,mxm.cal,mxm.odom) order_date
-        ,null::text mod_chansub
+        ,to_char(make_date(mxm.yr + 2021,mxm.cal,mxm.odom),'Mon') order_month
-        ,null::text quota_rep_descr
+        ,od.ssyr order_season
-        ,null::text director_descr
+        ,make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag request_date
-        ,null::numeric value_loc
+        ,to_char(make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag,'Mon')  request_month
-        ,null::numeric value_usd
+        ,rd.ssyr request_season
-        ,null::numeric cost_loc
+        ,make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag + slag ship_date
-        ,null::numeric cost_usd
+        ,to_char(make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag + slag,'Mon') ship_month
-        ,null::numeric units
+        ,sd.ssyr ship_season
         ,jr.mix
     FROM
         target
@@ -401,220 +252,135 @@ SELECT
         JOIN LATERAL json_to_record(ae.e) as jr(part_descr text, bill_cust_descr text, ship_cust_descr text, mix numeric) ON true
         CROSS JOIN mxm
         LEFT OUTER JOIN gld od ON
-            make_date(mxm.yr + 2020,mxm.cal,mxm.odom) BETWEEN od.sdat AND od.edat
+            od.drange @> make_date(mxm.yr + 2021,mxm.cal,mxm.odom)
         LEFT OUTER JOIN gld rd ON
-            make_date(mxm.yr + 2020,mxm.cal,mxm.odom) + rlag BETWEEN rd.sdat AND rd.edat
+            rd.drange @> (make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag)
         LEFT OUTER JOIN gld sd ON
-            make_date(mxm.yr + 2020,mxm.cal,mxm.odom) + rlag + slag BETWEEN sd.sdat AND sd.edat
+            sd.drange @> (make_date(mxm.yr + 2021,mxm.cal,mxm.odom) + rlag + slag)
 )
 --SELECT * FROM basemix
+,log AS (
+    INSERT INTO rlarp.osm_log(doc) SELECT $$replace_iterdef$$::jsonb doc RETURNING *
+)
 ,final AS (
 SELECT
-    COALESCE(m.avdplt,p.awdplt) plnt          --master data 
+    b.fspr
-    ,b."ddord#"
+    ,i.dplt plnt
-    ,b."dditm#"
+    ,b.promo
-    ,b."fgbol#"
+    ,bc.bvterm terms
-    ,b."fgent#"
+    ,b.bill_cust_descr
-    ,b."diinv#"
+    ,b.ship_cust_descr
-    ,b."dilin#"
+    ,(SELECT rcode FROM repc WHERE repp = log.doc->'scenario'->>'quota_rep_descr') dsm
-    ,b.promo          --history 
+    ,log.doc->'scenario'->>'quota_rep_descr' quota_rep_descr
-    ,b.return_reas
+    ,(SELECT director FROM repc WHERE repp = log.doc->'scenario'->>'quota_rep_descr') director
-    ,bc.bvterm terms          --history cust mix
+    ,CASE bc.BVADR6 WHEN '' THEN bc.BVNAME ELSE bc.BVADR6 END billto_group
-    ,b.custpo
+    ,CASE sc.BVADR6 WHEN '' THEN sc.BVNAME ELSE bc.BVADR6 END shipto_group
-    ,b.dhincr
+    ,CASE SUBSTRING(bc.bvclas,2,3) 
-    ,b.diext
+        --if the bill to class is ditsributor, then it's either warehouse or drop
-    ,b.ditdis
+        WHEN 'DIS' THEN
-    ,b.dcodat
+            --if the ship-to is a different name than the bill-to then it's drop, otherwise it's warehouse
-    ,b.ddqdat
+            CASE SUBSTRING(sc.bvclas,2,3)
-    ,b.dcmdat
+                WHEN 'DIS' THEN 'WHS'
-    ,b.dhidat
+                ELSE 'DRP'
-    ,b.fspr
-    ,bc.bvcomp remit_to          --master data 
-    ,bc.bvclas bill_class          --master data 
-    ,b.bill_cust          --history cust mix
-    ,bc.bvsalm bill_rep          --master data 
-    ,bc.bvterr bill_terr          --master data 
-    ,sc.bvclas ship_class          --master data 
-    ,b.ship_cust          --history cust mix
-    ,sc.bvsalm ship_rep          --master data 
-    ,sc.bvterr ship_terr          --master data 
-    --quota rep--------------------------------------------
-    ,RTRIM(
-        COALESCE(
-            --retail items go to currep, or if null go to 90005
-            CASE WHEN COALESCE(avgled,awgled) IN ('1RE','1CU') THEN
-                CASE WHEN bc.bvctry = 'CAN' THEN
-                    --Rachel Bowman
-                    '50300'
-                ELSE
-                    --retail chain got to Mark Wilkinson
-                    CASE COALESCE(cg.cgrp,bc.bvname)
-                        WHEN 'THE HOME DEPOT' THEN '90005'
-                        WHEN 'DO IT BEST' THEN '90005'
-                        WHEN 'ACE HARDWARE' THEN '90005'
-                        WHEN 'ALDI' THEN '90005'
-                        WHEN 'AMAZON.COM' THEN '90005'
-                        WHEN 'GARDEN RIDGE CORP' THEN '90005'
-                        --all other retail goes to Doran Marable
-                        ELSE '50200'
             END
+            --CASE WHEN RTRIM(SUBSTRING(LTRIM(SC.BVADR7)||SC.BVNAME,1,30)) = RTRIM(SUBSTRING(LTRIM(BC.BVADR7)||BC.BVNAME,1,30)) THEN 'DIS' ELSE 'DRP' END
+        --everything else does not involve a distributor and is considered direct
+        ELSE 'DIR'
+    END chan
+    ,CASE SUBSTRING(bc.bvclas,2,3) 
+        WHEN 'DIS' THEN
+            --if the ship-to is a different name than the bill-to then it's drop, otherwise it's warehouse
+            CASE SUBSTRING(sc.bvclas,2,3)
+                WHEN 'DIS' THEN 'WHS'
+                ELSE CASE SUBSTRING(sc.bvclas,1,1) WHEN 'R' THEN 'RDP' ELSE 'DRP' END
             END
-            ELSE
+        WHEN 'MAS' THEN 'RMN'
-                CASE WHEN COALESCE(avming,awming) = 'B52' THEN 
+        WHEN 'NAT' THEN 'RMN'
-                    'PW'
+        ELSE CASE SUBSTRING(sc.bvclas,1,1) WHEN 'R' THEN 'RDI' ELSE 'DIR' END
-                --gdir, ndir go to bill-to rep
+    END chansub
-                ELSE 
+    ,null::text chan_retail
-                    CASE WHEN bc.bvclas IN ('GDIR','NDIR') THEN 
+    ,b.part
-                        bc.bvsalm
+    ,b.part_descr
-                    ELSE
+    ,b.part_group
-                        sc.bvsalm
+    ,i.branding
-                    END
+    ,i.majg||' - '||i.majgd majg_descr
-                END
+    ,i.ming||' - '||i.mingd ming_descr
-            END
+    ,i.majs||' - '||i.majsd majs_descr
-            ,''
+    ,i.mins||' - '||i.minsd mins_descr
-        )
+    ,seg.segm
-    ) quota_rep
+    ,'41010' fs_line          --master data
-    ,coalesce(cg.cgrp,bc.bvname) account
-    ,coalesce(sg.cgrp,sc.bvname) shipgrp
-    ,coalesce(t.geo,'UNDEFINED') geo
-    ,coalesce(c.chan,'UNDEFINED') chan
-    ,ad.qzcryc orig_ctry
-    ,ad.qzprov orig_prov
-    ,ad.qzpost orig_post
-    ,sc.bvctry dest_ctry
-    ,sc.bvprcd dest_prov
-    ,sc.bvpost dest_post
-    ,b.part          --history part mix
-    ,COALESCE(m.avglcd, p.awgldc) ord_gldc          --master data 
-    ,COALESCE(m.avmajg,p.awmajg) majg          --master data 
-    ,COALESCE(m.avming,p.awming) ming          --master data 
-    ,COALESCE(m.avmajs,p.awmajs) majs          --master data 
-    ,COALESCE(m.avmins,p.awmins) mins          --master data 
-    ,COALESCE(m.avglcd,p.awgldc) gldc          --master data 
-    ,COALESCE(m.avgled,p.awgled) glec          --master data 
-    ,COALESCE(m.avharm,p.awharm) harm          --master data 
-    ,COALESCE(m.avclss,p.awclss) clss          --master data 
-    ,SUBSTR(COALESCE(m."avcpt#",p."awvpt#"),1,1) brand          --master data 
-    ,COALESCE(m.avassc,p.awassc) assc          --master data 
-    ,b.fs_line          --master data 
     ,bc.bvcurr r_currency          --history cust mix
     ,rx.rate r_rate          --master data
     ,copr.curr c_currency          --master data
     ,cx.rate c_rate          --master data
-    ,b.ddqtoi
+    ,b.units
-    ,b.ddqtsi
+    ,b.value_loc
-    ,b.fgqshp
+    ,b.value_loc * rx.rate value_usd
-    ,b.diqtsh
+    ,COALESCE(im.cgstcs,ip.chstcs, ir.y0stcs)*b.units cost_loc
-    ,b.fb_qty
+    ,COALESCE(im.cgstcs,ip.chstcs, ir.y0stcs)*b.units*cx.rate cost_loc
-    ,COALESCE(im.cgstcs,ip.chstcs, ir.y0stcs)*b.fb_qty fb_cst_loc
+    ,'CLOSED' calc_status
-    ,COALESCE(im.cgstcs,ip.chstcs, ir.y0stcs)*b.fb_qty fb_cst_loc_cur
+    ,'SHIPMENT' flag
-    ,COALESCE(im.cgstcs,ip.chstcs, ir.y0stcs)*b.fb_qty fb_cst_loc_fut
+    ,b.order_date
-    ,b.fb_val_loc
-    ,b.fb_val_loc_pl
-    ,b.calc_status
-    ,b.flag
-    ,b.orderdate
-    ,b.requestdate
-    ,b.shipdate
-    ,b.adj_orderdate
-    ,b.adj_requestdate
-    ,b.adj_shipdate
-    ,b."version"
-    ,b.iter
-    -----------------------ui columns--------------------------------
-    ,b.iterdet
-    ,b.iterdef
-    ,b.order_season
     ,b.order_month
-    ,b.ship_season
+    ,b.order_season
-    ,b.ship_month
+    ,b.request_date
-    ,b.request_season
     ,b.request_month
-    ,b.part_descr
+    ,b.request_season
-    ,SUBSTR(b.part,1,3)||coalesce(' - '||F.DESCR,'') part_family
+    ,b.ship_date
-    ,SUBSTRING(b.part,1,8)||coalesce(' - '||MD.DESCR,'') part_group
+    ,b.ship_month
-    ,COALESCE(MG.GRP,'Unbranded') branding
+    ,b.ship_season
-    ,CASE WHEN substring(COALESCE(m.avgled, p.awgled),1,1) <= '2' THEN SUBSTRING(b.part,9,3) ELSE '' END color
+    ,'replace_version' "version"
-    ,COALESCE(SEG.SEGM,'Other') segm
+    ,'replace_source'||' volume'  iter
-    ,b.bill_cust_descr
+    ,log.id
-    ,coalesce(cg.cgrp,bc.bvname) billto_group
+    ,log.doc->>'comment' "comment"
-    ,b.ship_cust_descr
+    ,log.doc->>'type' module
-    ,coalesce(sg.cgrp,sc.bvname) shipto_group
-    ,COALESCE(m.avmajg,p.awmajg)||COALESCE(' - '||BQDES,'') majg_descr
-    ,COALESCE(m.avming,p.awming)||COALESCE(' - '||BRDES,'') ming_descr
-    ,COALESCE(m.avmajs,p.awmajs)||COALESCE(' - '||SJ.BSDES1,'') majs_descr
-    ,COALESCE(m.avmins,p.awmins)||COALESCE(' - '||SI.BSDES1,'') mins_descr
-    ,CASE COALESCE(SEG.SEGM,'Other')
-        WHEN 'Retail' THEN c.RETAIL
-        ELSE coalesce(c.chan,'UNDEFINED')
-    END mod_chan
-    ,CASE COALESCE(SEG.SEGM,'Other')
-        WHEN 'Retail' THEN c.RETAILSUB
-        ELSE ''
-    END mod_chansub
-    ,repc.repp quota_rep_descr
-    ,repc.director director_descr
-    ,b.fb_val_loc value_loc
-    ,b.fb_val_loc * rx.rate value_usd
-    ,COALESCE(im.cgstcs,ip.chstcs, ir.y0stcs)*b.fb_qty cost_loc
-    ,COALESCE(im.cgstcs,ip.chstcs, ir.y0stcs)*b.fb_qty*cx.rate cost_usd
-    ,b.fb_qty units
 FROM
     basemix b
-    LEFT OUTER JOIN LGDAT.STKMM M ON
+    CROSS JOIN log
-        M.AVPART = b.PART
+    LEFT OUTER JOIN rlarp.itemmv i ON
-    LEFT OUTER JOIN LGDAT.STKMP P ON
+        i.item = b.part
-        P.AWPART = b.PART
-    LEFT OUTER JOIN lgdat.stka a ON
-        v6part = b.part
-        AND v6plnt = COALESCE(m.avdplt,p.awdplt)
     LEFT OUTER JOIN SEG ON
-        SEG.GLEC = COALESCE(m.avgled,p.awgled)
+        SEG.GLEC = i.glec
         --AND SEG.SEGM <> 'Other'
-    LEFT OUTER JOIN MG ON   
-        MG.F1 = SUBSTR(b.PART,16,1)
-        AND MG.MING = COALESCE(m.avming,p.awming)
-    LEFT OUTER JOIN RLARP.FAMILY F ON
-        F.F3 = SUBSTR(b.PART,1,3)
-    LEFT OUTER JOIN MD ON
-        MD.MOLD = SUBSTR(b.PART,1,8)
     LEFT OUTER JOIN LGDAT.CUST BC ON
-        BC.BVCUST = b.BILL_CUST
+        BC.BVCUST = rtrim(substring(b.bill_cust_descr,1,8))
     LEFT OUTER JOIN LGDAT.CUST SC ON
-        SC.BVCUST = b.SHIP_CUST
+        SC.BVCUST = rtrim(substring(b.ship_cust_descr,1,8))
-    LEFT OUTER JOIN RLARP.FFCHNL c ON
-        c.BILL = bc.bvclas
-        AND c.SHIP = sc.bvclas
-    LEFT OUTER JOIN rlarp.ffterr t ON
-            t.prov = sc.bvprcd AND
-            t.ctry = sc.bvctry
-    LEFT OUTER JOIN RLARP.FFCUST CG ON
-        CG.CUSTN = BC.BVCUST
-    LEFT OUTER JOIN RLARP.FFCUST SG ON
-        SG.CUSTN = SC.BVCUST
     LEFT OUTER JOIN REPC ON
         REPC.RCODE = RTRIM( 
-        COALESCE(
                         --retail items go to currep, or if null go to 90005
-            CASE WHEN COALESCE(avgled,awgled) IN ('1RE','1CU') THEN
+                        CASE WHEN i.glec IN ('1RE','1CU') THEN
                             CASE WHEN bc.bvctry = 'CAN' THEN
                                 --Rachel Bowman
                                 '50300'
                             ELSE
-                    --retail chain got to Mark Wilkinson
+                                --select customers go to select reps
-                    CASE COALESCE(cg.cgrp,bc.bvname)
+                                CASE CASE bc.BVADR6 WHEN '' THEN bc.BVNAME ELSE bc.BVADR6 END
-                        WHEN 'THE HOME DEPOT' THEN '90005'
+                                    ------Alecia Latini-------------------------------
-                        WHEN 'DO IT BEST' THEN '90005'
+                                    WHEN 'DO IT BEST' THEN '90006'
-                        WHEN 'ACE HARDWARE' THEN '90005'
+                                    WHEN 'ACE HARDWARE' THEN '90006'
-                        WHEN 'ALDI' THEN '90005'
+                                    WHEN 'ALDI' THEN '90006'
-                        WHEN 'AMAZON.COM' THEN '90005'
+                                    WHEN 'AMAZON.COM' THEN '90006'
-                        WHEN 'GARDEN RIDGE CORP' THEN '90005'
+                                    WHEN 'GARDEN RIDGE CORP' THEN '90006' --AKA "At Home"
-                        --all other retail goes to Doran Marable
+                                    WHEN 'TRUE VALUE' THEN '90006'
+                                    WHEN 'WAYFAIR' THEN '90006'
+                                    WHEN 'GRIFFIN' THEN '90006'
+                                    WHEN 'WAL-MART' THEN '90006'
+                                    ------Tony Landino--------------------------------
+                                    WHEN 'THE HOME DEPOT' THEN '50802'
+                                    WHEN 'FRED MEYER' THEN '50802'
+                                    WHEN 'MENARDS' THEN '50802'
+                                    WHEN 'KROGER' THEN '50802'
+                                    WHEN 'OCEAN STATE JOBBERS' THEN '50802'
+                                    WHEN 'AURORA WHOLESALE' THEN '50802'
+                                    WHEN 'LEON KORRAL' THEN '50802'
+                                    --all other retail goes to Doran Marable-----------
                                     ELSE '50200'
                                 END
                             END
+                            --minor group b52 goes to dedicated rep
                         ELSE
-                CASE WHEN COALESCE(avming,awming) = 'B52' THEN 
+                            CASE WHEN i.MING = 'B52' THEN 
                                 'PW'
                             --gdir, ndir go to bill-to rep
                             ELSE 
@@ -625,119 +391,58 @@ FROM
                                 END
                             END
                         END
-            ,''
                     )
-    )
-    LEFT OUTER JOIN SI ON
-        SI.BSMJCD = COALESCE(m.avmajs,p.awmajs)
-        AND SI.BSMNCD = COALESCE(m.avmins,p.awmins)
-    LEFT OUTER JOIN SJ ON
-        SJ.BSMJCD = COALESCE(m.avmajs,p.awmajs)
-    LEFT OUTER JOIN LGDAT.MAJG ON
-        BQGRP = COALESCE(m.avmajg,p.awmajg)
-    LEFT OUTER JOIN LGDAT.MMGP ON
-        BRMGRP = COALESCE(m.avming,p.awming)
-        AND BRGRP = COALESCE(m.avmajg,p.awmajg)
     LEFT OUTER JOIN lgdat.icstm im ON
         im.cgpart = b.part
-        AND im.cgplnt = a.v6plnt
+        AND im.cgplnt = i.dplt
     LEFT OUTER JOIN lgdat.icstp ip ON
         ip.chpart = b.part
-        AND ip.chplnt = a.v6plnt
+        AND ip.chplnt = i.dplt
     LEFT OUTER JOIN lgdat.icstr ir ON
         ir.y0part = b.part
-        AND ir.y0plnt = a.v6plnt
+        AND ir.y0plnt = i.dplt
     LEFT OUTER JOIN lgdat.plnt ON
-        yaplnt = a.v6plnt
+        yaplnt = i.dplt
     LEFT OUTER JOIN copr ON
         copr.comp = yacomp::text
     LEFT OUTER JOIN rlarp.ffcret cx ON
-        cx.perd = '1910'
+        cx.perd = '2008'
         AND cx.rtyp = 'MA'
         AND cx.fcur = copr.curr
         AND cx.tcur = 'US'
     LEFT OUTER JOIN rlarp.ffcret rx ON
-        rx.perd = '1910'
+        rx.perd = '2008'
         AND rx.rtyp = 'MA'
         AND rx.fcur = bc.bvcurr
         AND rx.tcur = 'US'
-    LEFT OUTER JOIN LGDAT.ADRS AD ON
-            AD.QZADR = plnt."yaadr#"
 )
-/*
-,clone_part_meta AS (
-    SELECT
-        b.majg          --master data 
-        ,b.ming          --master data 
-        ,b.majs          --master data 
-        ,b.mins          --master data 
-        ,b.gldc          --master data 
-        ,b.glec          --master data 
-        ,b.harm          --master data 
-        ,b.clss          --master data 
-        ,b.brand          --master data 
-        ,b.assc          --master data   
-        ,b.segm     
-        ,b.majg_descr
-        ,b.ming_descr
-        ,b.majs_descr
-        ,b.mins_descr
-        ,b.quota_rep
-        ,sum(fb_val_loc * r_rate) agg
-    FROM
-        rlarp.osm_fcpool b
-    WHERE
-        -----------------scenario----------------------------
-        where_clause
-        --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 adj_orderdate <= adj_shipdate
-    GROUP BY
-        b.majg          --master data 
-        ,b.ming          --master data 
-        ,b.majs          --master data 
-        ,b.mins          --master data 
-        ,b.gldc          --master data 
-        ,b.glec          --master data 
-        ,b.harm          --master data 
-        ,b.clss          --master data 
-        ,b.brand          --master data 
-        ,b.assc          --master data   
-        ,b.segm     
-        ,b.majg_descr
-        ,b.ming_descr
-        ,b.majs_descr
-        ,b.mins_descr
-        ,b.quota_rep
-    ORDER BY
-        agg desc
-)
-*/
 , ins AS (
-    INSERT INTO rlarp.osm_fcpool SELECT * FROM final RETURNING *
+    INSERT INTO rlarp.osm_pool SELECT * FROM final RETURNING *
 )
 ,insagg AS (
     SELECT
+        ---------customer info-----------------
         bill_cust_descr
         ,billto_group
         ,ship_cust_descr
         ,shipto_group
         ,quota_rep_descr
-    ,director_descr
+        ,director
         ,segm
-    ,mod_chan
+        ,chan
-    ,mod_chansub
+        ,chansub
+        ---------product info------------------
         ,majg_descr
         ,ming_descr
         ,majs_descr
         ,mins_descr
-    ,brand
+        --,brand
-    ,part_family
+        --,part_family
         ,part_group
         ,branding
-    ,color
+        --,color
         ,part_descr
+        ---------dates-------------------------
         ,order_season
         ,order_month
         ,ship_season
@@ -747,6 +452,7 @@ SELECT
         ,promo
         ,version
         ,iter
+        --------values-------------------------
         ,sum(value_loc) value_loc
         ,sum(value_usd) value_usd
         ,sum(cost_loc) cost_loc
@@ -755,25 +461,28 @@ SELECT
     FROM
         ins
     GROUP BY
+        ---------customer info-----------------
         bill_cust_descr
         ,billto_group
         ,ship_cust_descr
         ,shipto_group
         ,quota_rep_descr
-    ,director_descr
+        ,director
         ,segm
-    ,mod_chan
+        ,chan
-    ,mod_chansub
+        ,chansub
+        ---------product info------------------
         ,majg_descr
         ,ming_descr
         ,majs_descr
         ,mins_descr
-    ,brand
+        --,brand
-    ,part_family
+        --,part_family
         ,part_group
         ,branding
-    ,color
+        --,color
         ,part_descr
+        ---------dates-------------------------
         ,order_season
         ,order_month
         ,ship_season

route_sql/scale_pd.sql

@@ -2,156 +2,82 @@ WITH
 target AS (select target_increment incr)
 ,basemix AS (
     SELECT
-        plnt          ---master data 
+        fspr
-        ,0::numeric(11,0) "ddord#"          --0 
+        ,plnt          ---master data 
-        ,0::numeric(11,0) "dditm#"          --0 
-        ,0::numeric(11,0) "fgbol#"          --0 
-        ,0::numeric(11,0) "fgent#"          --0 
-        ,0::numeric(9,0) "diinv#"          --0 
-        ,0::numeric(3,0) "dilin#"          --0 
         ,promo          --history date mix
-        ,null::text return_reas          --0 
         ,terms
-        ,''::text custpo          --0 
+        ,bill_cust_descr          --history cust mix
-        ,'I' dhincr          --0 
+        ,ship_cust_descr          --history cust mix
-        ,null::numeric diext
+        ,dsm
-        ,null::numeric ditdis
+        ,quota_rep_descr          --master data 
-        ,null::date dcodat          --calculated date mix
+        ,director
-        ,null::date ddqdat          --calculated date mix
+        ,billto_group          --master data 
-        ,null::date dcmdat          --calculated date mix
+        ,shipto_group
-        ,null::date dhidat          --calculated date mix
-        ,null::text fspr          --calculated date mix
-        ,remit_to          --master data 
-        ,bill_class          --master data 
-        ,bill_cust          --history cust mix
-        ,bill_rep          --master data 
-        ,bill_terr          --master data 
-        ,ship_class          --master data 
-        ,ship_cust          --history cust mix
-        ,ship_rep          --master data 
-        ,ship_terr          --master data 
-        ,quota_rep          --master data 
-        ,account          --master data 
-        ,shipgrp          --master data 
-        ,geo          --master data 
         ,chan          --master data 
-        ,orig_ctry          --master data 
+        ,chansub
-        ,orig_prov          --master data 
+        ,chan_retail
-        ,orig_post          --master data 
+        ,part
-        ,dest_ctry          --master data 
+        ,part_descr
-        ,dest_prov          --master data 
+        ,part_group
-        ,dest_post          --master data 
+        ,branding
-        ,part          --history part mix
+        ,majg_descr
-        ,ord_gldc          --master data 
+        ,ming_descr
-        ,majg          --master data 
+        ,majs_descr
-        ,ming          --master data 
+        ,mins_descr
-        ,majs          --master data 
+        ,segm
-        ,mins          --master data 
-        ,gldc          --master data 
-        ,glec          --master data 
-        ,harm          --master data 
-        ,clss          --master data 
-        ,brand          --master data 
-        ,assc          --master data 
         ,fs_line          --master data 
         ,r_currency          --history cust mix
         ,r_rate          --master data 
         ,c_currency          --master data 
         ,c_rate          --master data 
-        ,0::numeric(15,5) ddqtoi          --0 
+        ,sum(coalesce(units,0)) units          --history value
-        ,0::numeric(15,5) ddqtsi          --0 
+        ,sum(coalesce(value_loc,0)) value_loc          --history value
-        ,0::numeric(15,5) fgqshp          --0 
+        ,sum(coalesce(value_usd,0)) value_usd          --0 
-        ,0::numeric(15,5) diqtsh          --0 
+        ,sum(coalesce(cost_loc,0)) cost_loc          --history part mix
-        ,sum(coalesce(fb_qty,0)) fb_qty          --history value
+        ,sum(coalesce(cost_usd,0)) cost_usd
-        ,sum(coalesce(fb_cst_loc,0)) fb_cst_loc          --history part mix
-        ,sum(coalesce(fb_cst_loc_cur,0)) fb_cst_loc_cur          --master data 
-        ,sum(coalesce(fb_cst_loc_fut,0)) fb_cst_loc_fut          --master data 
-        ,sum(coalesce(fb_val_loc,0)) fb_val_loc          --history value
-        ,sum(coalesce(fb_val_loc_pl,0)) fb_val_loc_pl          --0 
         ,calc_status          --0 
         ,flag          --0 
-        ,orderdate          --history date mix
+        ,order_date          --history date mix
-        ,requestdate          --history date mix
-        ,shipdate          --history date mix
-        ,adj_orderdate          --history 
-        ,adj_requestdate          --history 
-        ,adj_shipdate          --history 
-        ,'b20' "version"          --calculated 
-        ,'adjustment' iter          --calculated 
-        ---------------ui columns-------------------------
-        ,order_season
         ,order_month
-        ,ship_season
+        ,order_season
-        ,ship_month
+        ,request_date          --history date mix
-        ,request_season
         ,request_month
-        ,part_descr
+        ,request_season
-        ,part_family
+        ,ship_date          --history date mix
-        ,part_group
+        ,ship_month
-        ,branding
+        ,ship_season
-        ,color
-        ,segm
-        ,bill_cust_descr
-        ,billto_group
-        ,ship_cust_descr
-        ,shipto_group
-        ,majg_descr
-        ,ming_descr
-        ,majs_descr
-        ,mins_descr
-        ,mod_chan
-        ,mod_chansub
-        ,quota_rep_descr
-        ,director_descr
-        ,null value_loc
-        ,null value_usd
-        ,null cost_loc
-        ,null cost_usd
-        ,null units
     FROM
-        rlarp.osm_fcpool
+        rlarp.osm_pool
     WHERE
         -----------------scenario----------------------------
         where_clause
         -----------------additional params-------------------
         AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments
-        AND adj_orderdate <= adj_shipdate
+        AND order_date <= ship_date
     GROUP BY
-        plnt          ---master data 
+                fspr
-        ,promo
+        ,plnt          ---master data 
+        ,promo          --history date mix
         ,terms
-        ,remit_to          --master data 
+        ,bill_cust_descr          --history cust mix
-        ,bill_class          --master data 
+        ,ship_cust_descr          --history cust mix
-        ,bill_cust          --history cust mix
+        ,dsm
-        ,bill_rep          --master data 
+        ,quota_rep_descr          --master data 
-        ,bill_terr          --master data 
+        ,director
-        ,ship_class          --master data 
+        ,billto_group          --master data 
-        ,ship_cust          --history cust mix
+        ,shipto_group
-        ,ship_rep          --master data 
-        ,ship_terr          --master data 
-        ,quota_rep          --master data 
-        ,account          --master data 
-        ,shipgrp          --master data 
-        ,geo          --master data 
         ,chan          --master data 
-        ,orig_ctry          --master data 
+        ,chansub
-        ,orig_prov          --master data 
+        ,chan_retail
-        ,orig_post          --master data 
+        ,part
-        ,dest_ctry          --master data 
+        ,part_descr
-        ,dest_prov          --master data 
+        ,part_group
-        ,dest_post          --master data 
+        ,branding
-        ,part          --history part mix
+        ,majg_descr
-        ,ord_gldc          --master data 
+        ,ming_descr
-        ,majg          --master data 
+        ,majs_descr
-        ,ming          --master data 
+        ,mins_descr
-        ,majs          --master data 
+        ,segm
-        ,mins          --master data 
-        ,gldc          --master data 
-        ,glec          --master data 
-        ,harm          --master data 
-        ,clss          --master data 
-        ,brand          --master data 
-        ,assc          --master data 
         ,fs_line          --master data 
         ,r_currency          --history cust mix
         ,r_rate          --master data 
@@ -159,51 +85,29 @@ SELECT
         ,c_rate          --master data 
         ,calc_status          --0 
         ,flag          --0 
-        ,orderdate          --history date mix
+        ,order_date          --history date mix
-        ,requestdate          --history date mix
-        ,shipdate          --history date mix
-        ,adj_orderdate          --history 
-        ,adj_requestdate          --history 
-        ,adj_shipdate          --history 
-        ---------------ui columns-------------------------
-        ,order_season
         ,order_month
-        ,ship_season
+        ,order_season
-        ,ship_month
+        ,request_date          --history date mix
-        ,request_season
         ,request_month
-        ,part_descr
+        ,request_season
-        ,part_family
+        ,ship_date          --history date mix
-        ,part_group
+        ,ship_month
-        ,branding
+        ,ship_season
-        ,color
-        ,segm
-        ,bill_cust_descr
-        ,billto_group
-        ,ship_cust_descr
-        ,shipto_group
-        ,majg_descr
-        ,ming_descr
-        ,majs_descr
-        ,mins_descr
-        ,mod_chan
-        ,mod_chansub
-        ,quota_rep_descr
-        ,director_descr
 )
 ,scale AS (
     SELECT
         (SELECT incr::numeric FROM target) incr
-        ,(SELECT sum(fb_val_loc * r_rate) FROM basemix) base
+        ,(SELECT sum(value_loc * r_rate) FROM basemix) base
-        ,CASE WHEN (SELECT sum(fb_val_loc * r_rate) FROM basemix) = 0 THEN
+        ,CASE WHEN (SELECT sum(value_loc * r_rate) FROM basemix) = 0 THEN
             0
         ELSE
-            (SELECT incr::numeric FROM target)/(SELECT sum(fb_val_loc * r_rate) FROM basemix) 
+            (SELECT incr::numeric FROM target)/(SELECT sum(value_loc * r_rate) FROM basemix) 
         END factor
-        ,CASE WHEN (SELECT sum(fb_val_loc * r_rate) FROM basemix) = 0 THEN
+        ,CASE WHEN (SELECT sum(value_loc * r_rate) FROM basemix) = 0 THEN
-            CASE WHEN ((SELECT incr::numeric FROM target) - (SELECT sum(fb_val_loc * r_rate) FROM basemix)) <> 0 THEN
+            CASE WHEN ((SELECT incr::numeric FROM target) - (SELECT sum(value_loc * r_rate) FROM basemix)) <> 0 THEN
                 --if the base value is -0- but the target value hasn't been achieved, derive a price to apply
-                ((SELECT incr::numeric FROM target) - (SELECT sum(fb_val_loc * r_rate) FROM basemix))/(SELECT sum(fb_qty) FROM basemix)
+                ((SELECT incr::numeric FROM target) - (SELECT sum(value_loc * r_rate) FROM basemix))/(SELECT sum(units) FROM basemix)
             ELSE
                 0
             END
@@ -211,149 +115,95 @@ SELECT
             0
         END mod_price
 )
+,log AS (
+    INSERT INTO rlarp.osm_log(doc) SELECT $$replace_iterdef$$::jsonb doc RETURNING *
+)
 ,final AS (
     SELECT
-    b.plnt          --master data 
+        fspr
-    ,b."ddord#"          --0 
+        ,plnt          ---master data 
-    ,b."dditm#"          --0 
+        ,promo          --history date mix
-    ,b."fgbol#"          --0 
+        ,terms
-    ,b."fgent#"          --0 
+        ,bill_cust_descr          --history cust mix
-    ,b."diinv#"          --0 
+        ,ship_cust_descr          --history cust mix
-    ,b."dilin#"          --0 
+        ,dsm
-    ,b.promo          --history date mix
+        ,quota_rep_descr          --master data 
-    ,b.return_reas          --0 
+        ,director
-    ,b.terms          --history cust mix
+        ,billto_group          --master data 
-    ,b.custpo          --0 
+        ,shipto_group
-    ,b.dhincr          --0 
+        ,chan          --master data 
-    ,b.diext          --0 
+        ,chansub
-    ,b.ditdis          --0 
+        ,chan_retail
-    ,b.dcodat          --calculated date mix
+        ,part
-    ,b.ddqdat          --calculated date mix
+        ,part_descr
-    ,b.dcmdat          --calculated date mix
+        ,part_group
-    ,b.dhidat          --calculated date mix
+        ,branding
-    ,b.fspr          --calculated date mix
+        ,majg_descr
-    ,b.remit_to          --master data 
+        ,ming_descr
-    ,b.bill_class          --master data 
+        ,majs_descr
-    ,b.bill_cust          --history cust mix
+        ,mins_descr
-    ,b.bill_rep          --master data 
+        ,segm
-    ,b.bill_terr          --master data 
+        ,fs_line          --master data 
-    ,b.ship_class          --master data 
+        ,r_currency          --history cust mix
-    ,b.ship_cust          --history cust mix
+        ,r_rate          --master data 
-    ,b.ship_rep          --master data 
+        ,c_currency          --master data 
-    ,b.ship_terr          --master data 
+        ,c_rate          --master data 
-    ,b.quota_rep          --master data 
+        ,0::numeric units
-    ,b.account          --master data 
+        ,(CASE WHEN s.factor = 0 THEN b.units * s.mod_price/b.r_rate ELSE b.value_loc*s.factor END)::numeric value_loc
-    ,b.shipgrp          --master data 
+        ,(CASE WHEN s.factor = 0 THEN b.units * s.mod_price ELSE b.value_usd*s.factor END)::numeric value_usd
-    ,b.geo          --master data 
+        ,0::numeric cost_loc
-    ,b.chan          --master data 
+        ,0::numeric cost_usd
-    ,b.orig_ctry          --master data 
+        ,calc_status          --0 
-    ,b.orig_prov          --master data 
+        ,flag          --0 
-    ,b.orig_post          --master data 
+        ,order_date          --history date mix
-    ,b.dest_ctry          --master data 
+        ,order_month
-    ,b.dest_prov          --master data 
+        ,order_season
-    ,b.dest_post          --master data 
+        ,request_date          --history date mix
-    ,b.part          --history part mix
+        ,request_month
-    ,b.ord_gldc          --master data 
+        ,request_season
-    ,b.majg          --master data 
+        ,ship_date          --history date mix
-    ,b.ming          --master data 
+        ,ship_month
-    ,b.majs          --master data 
+        ,ship_season
-    ,b.mins          --master data 
+        ,'replace_version' "version"
-    ,b.gldc          --master data 
+        ,'replace_source'||' price'  iter
-    ,b.glec          --master data 
+        ,log.id
-    ,b.harm          --master data 
+        ,log.doc->>'comment' "comment"
-    ,b.clss          --master data 
+        ,log.doc->>'type' module
-    ,b.brand          --master data 
-    ,b.assc          --master data 
-    ,b.fs_line          --master data 
-    ,b.r_currency          --history cust mix
-    ,b.r_rate          --master data 
-    ,b.c_currency          --master data 
-    ,b.c_rate          --master data 
-    ,b.ddqtoi          --0 
-    ,b.ddqtsi          --0 
-    ,b.fgqshp          --0 
-    ,b.diqtsh          --0 
-    ,0 fb_qty
-    ,0 fb_cst_loc
-    ,0 fb_cst_loc_cur
-    ,0 fb_cst_loc_fut
-    --,b.fb_val_loc*s.factor fb_val_loc
-    ,(CASE WHEN s.factor = 0 THEN b.fb_qty * s.mod_price/b.r_rate ELSE b.fb_val_loc*s.factor END)::numeric fb_val_loc
-    ,(CASE WHEN s.factor = 0 THEN b.fb_qty * s.mod_price/b.r_rate ELSE b.fb_val_loc_pl*s.factor END)::numeric fb_val_loc_pl
-    --,b.fb_val_loc_pl*s.factor fb_val_loc_pl
-    ,b.calc_status          --0 
-    ,b.flag          --0 
-    ,b.orderdate
-    ,b.requestdate
-    ,b.shipdate
-    ,b.adj_orderdate
-    ,b.adj_requestdate
-    ,b.adj_shipdate
-    ,'replace_version' "version"          --calculated 
-    ,'replace_source'||' price' iter         --calculated
-    -----------------------ui columns--------------------------------
-    ,'replace_iterdet' iterdet
-    ,$$replace_iterdef$$::jsonb iterdef
-    ,b.order_season
-    ,b.order_month
-    ,b.ship_season
-    ,b.ship_month
-    ,b.request_season
-    ,b.request_month
-    ,b.part_descr
-    ,b.part_family
-    ,b.part_group
-    ,b.branding
-    ,b.color
-    ,b.segm
-    ,b.bill_cust_descr
-    ,b.billto_group
-    ,b.ship_cust_descr
-    ,b.shipto_group
-    ,b.majg_descr
-    ,b.ming_descr
-    ,b.majs_descr
-    ,b.mins_descr
-    ,b.mod_chan
-    ,b.mod_chansub
-    ,b.quota_rep_descr
-    ,b.director_descr
-    ,(CASE WHEN s.factor = 0 THEN b.fb_qty * s.mod_price/b.r_rate ELSE b.fb_val_loc*s.factor END)::numeric value_loc
-    ,(CASE WHEN s.factor = 0 THEN b.fb_qty * s.mod_price ELSE b.fb_val_loc*s.factor*r_rate END)::numeric value_usd
-    ,0 cost_loc
-    ,0 cost_usd
-    ,0 units
     FROM
         basemix b
         CROSS JOIN scale s
+        CROSS JOIN log
     WHERE
         s.factor <> 0 or s.mod_price <> 0
 )
 --select sum(value_usd), count(*) from final
 , ins AS (
-    INSERT INTO rlarp.osm_fcpool SELECT * FROM final RETURNING *
+    INSERT INTO rlarp.osm_pool SELECT * FROM final RETURNING *
 )
 ,insagg AS (
    SELECT
+        ---------customer info-----------------
         bill_cust_descr
         ,billto_group
         ,ship_cust_descr
         ,shipto_group
         ,quota_rep_descr
-    ,director_descr
+        ,director
         ,segm
-    ,mod_chan
+        ,chan
-    ,mod_chansub
+        ,chansub
+        ---------product info------------------
         ,majg_descr
         ,ming_descr
         ,majs_descr
         ,mins_descr
-    ,brand
+        --,brand
-    ,part_family
+        --,part_family
         ,part_group
         ,branding
-    ,color
+        --,color
         ,part_descr
+        ---------dates-------------------------
         ,order_season
         ,order_month
         ,ship_season
@@ -363,6 +213,7 @@ SELECT
         ,promo
         ,version
         ,iter
+        --------values-------------------------
         ,sum(value_loc) value_loc
         ,sum(value_usd) value_usd
         ,sum(cost_loc) cost_loc
@@ -371,25 +222,28 @@ SELECT
     FROM
         ins
     GROUP BY
+        ---------customer info-----------------
         bill_cust_descr
         ,billto_group
         ,ship_cust_descr
         ,shipto_group
         ,quota_rep_descr
-    ,director_descr
+        ,director
         ,segm
-    ,mod_chan
+        ,chan
-    ,mod_chansub
+        ,chansub
+        ---------product info------------------
         ,majg_descr
         ,ming_descr
         ,majs_descr
         ,mins_descr
-    ,brand
+        --,brand
-    ,part_family
+        --,part_family
         ,part_group
         ,branding
-    ,color
+        --,color
         ,part_descr
+        ---------dates-------------------------
         ,order_season
         ,order_month
         ,ship_season

route_sql/scale_vd.sql

@@ -2,18 +2,17 @@ WITH
 target AS (select incr_qty qincr)
 ,testv AS (
     SELECT
-        sum(fb_qty) tot
+        sum(units) tot
-        ,sum(fb_qty) FILTER (WHERE iter = 'copy') base
+        ,sum(units) FILTER (WHERE iter = 'copy') base
-        ,sum(fb_qty) FILTER (WHERE iterdef->>'type' = 'new basket') newpart
+        ,sum(units) FILTER (WHERE module = 'new basket') newpart
     FROM
-        rlarp.osm_fcpool
+        rlarp.osm_pool p
     WHERE
         -----------------scenario----------------------------
         where_clause
         -----------------additional params-------------------
         AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments
-        AND adj_orderdate <= adj_shipdate
+        AND order_date <= ship_date
-
 )
 ,flagv AS (
     SELECT
@@ -39,114 +38,52 @@ target AS (select incr_qty qincr)
 --ever need receive a target of -0- qty but value <> 0?
 ,basemix AS (
     SELECT
-        plnt          ---master data 
+        fspr
-        ,0::numeric(11,0) "ddord#"          --0 
+        ,plnt          ---master data 
-        ,0::numeric(11,0) "dditm#"          --0 
-        ,0::numeric(11,0) "fgbol#"          --0 
-        ,0::numeric(11,0) "fgent#"          --0 
-        ,0::numeric(9,0) "diinv#"          --0 
-        ,0::numeric(3,0) "dilin#"          --0 
         ,promo          --history date mix
-        ,null::text return_reas          --0 
         ,terms
-        ,''::text custpo          --0 
+        ,bill_cust_descr          --history cust mix
-        ,'I' dhincr          --0 
+        ,ship_cust_descr          --history cust mix
-        ,null::numeric diext
+        ,dsm
-        ,null::numeric ditdis
+        ,quota_rep_descr          --master data 
-        ,null::date dcodat          --calculated date mix
+        ,director
-        ,null::date ddqdat          --calculated date mix
+        ,billto_group          --master data 
-        ,null::date dcmdat          --calculated date mix
+        ,shipto_group
-        ,null::date dhidat          --calculated date mix
-        ,null::text fspr          --calculated date mix
-        ,remit_to          --master data 
-        ,bill_class          --master data 
-        ,bill_cust          --history cust mix
-        ,bill_rep          --master data 
-        ,bill_terr          --master data 
-        ,ship_class          --master data 
-        ,ship_cust          --history cust mix
-        ,ship_rep          --master data 
-        ,ship_terr          --master data 
-        ,quota_rep          --master data 
-        ,account          --master data 
-        ,shipgrp          --master data 
-        ,geo          --master data 
         ,chan          --master data 
-        ,orig_ctry          --master data 
+        ,chansub
-        ,orig_prov          --master data 
+        ,chan_retail
-        ,orig_post          --master data 
+        ,part
-        ,dest_ctry          --master data 
+        ,part_descr
-        ,dest_prov          --master data 
+        ,part_group
-        ,dest_post          --master data 
+        ,branding
-        ,part          --history part mix
+        ,majg_descr
-        ,ord_gldc          --master data 
+        ,ming_descr
-        ,majg          --master data 
+        ,majs_descr
-        ,ming          --master data 
+        ,mins_descr
-        ,majs          --master data 
+        ,segm
-        ,mins          --master data 
-        ,gldc          --master data 
-        ,glec          --master data 
-        ,harm          --master data 
-        ,clss          --master data 
-        ,brand          --master data 
-        ,assc          --master data 
         ,fs_line          --master data 
         ,r_currency          --history cust mix
         ,r_rate          --master data 
         ,c_currency          --master data 
         ,c_rate          --master data 
-        ,0::numeric(15,5) ddqtoi          --0 
+        ,sum(coalesce(units,0)) units          --history value
-        ,0::numeric(15,5) ddqtsi          --0 
+        ,sum(coalesce(value_loc,0)) value_loc          --history value
-        ,0::numeric(15,5) fgqshp          --0 
+        ,sum(coalesce(value_usd,0)) value_usd          --0 
-        ,0::numeric(15,5) diqtsh          --0 
+        ,sum(coalesce(cost_loc,0)) cost_loc          --history part mix
-        ,sum(coalesce(fb_qty,0)) fb_qty          --history value
+        ,sum(coalesce(cost_usd,0)) cost_usd
-        ,sum(coalesce(fb_cst_loc,0)) fb_cst_loc          --history part mix
-        ,sum(coalesce(fb_cst_loc_cur,0)) fb_cst_loc_cur          --master data 
-        ,sum(coalesce(fb_cst_loc_fut,0)) fb_cst_loc_fut          --master data 
-        ,sum(coalesce(fb_val_loc,0)) fb_val_loc          --history value
-        ,sum(coalesce(fb_val_loc_pl,0)) fb_val_loc_pl          --0 
         ,calc_status          --0 
         ,flag          --0 
-        ,orderdate          --history date mix
+        ,order_date          --history date mix
-        ,requestdate          --history date mix
-        ,shipdate          --history date mix
-        ,adj_orderdate          --history 
-        ,adj_requestdate          --history 
-        ,adj_shipdate          --history 
-        ,null::text "version"          --calculated 
-        ,null::text iter          --calculated 
-        ---------------ui columns-------------------------
-        ,order_season
         ,order_month
-        ,ship_season
+        ,order_season
-        ,ship_month
+        ,request_date          --history date mix
-        ,request_season
         ,request_month
-        ,part_descr
+        ,request_season
-        ,part_family
+        ,ship_date          --history date mix
-        ,part_group
+        ,ship_month
-        ,branding
+        ,ship_season
-        ,color
-        ,segm
-        ,bill_cust_descr
-        ,billto_group
-        ,ship_cust_descr
-        ,shipto_group
-        ,majg_descr
-        ,ming_descr
-        ,majs_descr
-        ,mins_descr
-        ,mod_chan
-        ,mod_chansub
-        ,quota_rep_descr
-        ,director_descr
-        ,null value_loc
-        ,null value_usd
-        ,null cost_loc
-        ,null cost_usd
-        ,null units
     FROM
-        rlarp.osm_fcpool
+        rlarp.osm_pool
     WHERE
         -----------------scenario----------------------------
         where_clause
@@ -154,46 +91,34 @@ SELECT
         AND CASE (SELECT flag FROM flagv) 
                 WHEN 'scale all' THEN true
                 WHEN 'scale copy' THEN iter = 'copy'
-                WHEN 'scale new part' THEN iterdef->>'type' = 'new basket'
+                WHEN 'scale new part' THEN module = 'new basket'
             END
         AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments
-        AND adj_orderdate <= adj_shipdate
+        AND order_date <= ship_date
     GROUP BY
-        plnt          ---master data 
+                fspr
-        ,promo
+        ,plnt          ---master data 
+        ,promo          --history date mix
         ,terms
-        ,remit_to          --master data 
+        ,bill_cust_descr          --history cust mix
-        ,bill_class          --master data 
+        ,ship_cust_descr          --history cust mix
-        ,bill_cust          --history cust mix
+        ,dsm
-        ,bill_rep          --master data 
+        ,quota_rep_descr          --master data 
-        ,bill_terr          --master data 
+        ,director
-        ,ship_class          --master data 
+        ,billto_group          --master data 
-        ,ship_cust          --history cust mix
+        ,shipto_group
-        ,ship_rep          --master data 
-        ,ship_terr          --master data 
-        ,quota_rep          --master data 
-        ,account          --master data 
-        ,shipgrp          --master data 
-        ,geo          --master data 
         ,chan          --master data 
-        ,orig_ctry          --master data 
+        ,chansub
-        ,orig_prov          --master data 
+        ,chan_retail
-        ,orig_post          --master data 
+        ,part
-        ,dest_ctry          --master data 
+        ,part_descr
-        ,dest_prov          --master data 
+        ,part_group
-        ,dest_post          --master data 
+        ,branding
-        ,part          --history part mix
+        ,majg_descr
-        ,ord_gldc          --master data 
+        ,ming_descr
-        ,majg          --master data 
+        ,majs_descr
-        ,ming          --master data 
+        ,mins_descr
-        ,majs          --master data 
+        ,segm
-        ,mins          --master data 
-        ,gldc          --master data 
-        ,glec          --master data 
-        ,harm          --master data 
-        ,clss          --master data 
-        ,brand          --master data 
-        ,assc          --master data 
         ,fs_line          --master data 
         ,r_currency          --history cust mix
         ,r_rate          --master data 
@@ -201,185 +126,111 @@ SELECT
         ,c_rate          --master data 
         ,calc_status          --0 
         ,flag          --0 
-        ,orderdate          --history date mix
+        ,order_date          --history date mix
-        ,requestdate          --history date mix
-        ,shipdate          --history date mix
-        ,adj_orderdate          --history 
-        ,adj_requestdate          --history 
-        ,adj_shipdate          --history 
-        ---------------ui columns-------------------------
-        ,order_season
         ,order_month
-        ,ship_season
+        ,order_season
-        ,ship_month
+        ,request_date          --history date mix
-        ,request_season
         ,request_month
-        ,part_descr
+        ,request_season
-        ,part_family
+        ,ship_date          --history date mix
-        ,part_group
+        ,ship_month
-        ,branding
+        ,ship_season
-        ,color
-        ,segm
-        ,bill_cust_descr
-        ,billto_group
-        ,ship_cust_descr
-        ,shipto_group
-        ,majg_descr
-        ,ming_descr
-        ,majs_descr
-        ,mins_descr
-        ,mod_chan
-        ,mod_chansub
-        ,quota_rep_descr
-        ,director_descr
 )
 --SELECT * FROM basemix
 ,scale AS (
     SELECT
         (SELECT qincr::numeric FROM target) incr
-        ,(SELECT sum(fb_val_loc *r_rate) FROM basemix) base
+        ,(SELECT sum(value_loc *r_rate) FROM basemix) base
-        ,(SELECT qincr FROM target)/(SELECT SUM(fb_qty) FROM basemix) factor
+        ,(SELECT qincr FROM target)/(SELECT SUM(units) FROM basemix) factor
 )
 --select * from scale
+,log AS (
+    INSERT INTO rlarp.osm_log(doc) SELECT $$replace_iterdef$$::jsonb doc RETURNING *
+)
 ,final AS (
     SELECT
-    b.plnt          --master data 
+        fspr
-    ,b."ddord#"          --0 
+        ,plnt          ---master data 
-    ,b."dditm#"          --0 
+        ,promo          --history date mix
-    ,b."fgbol#"          --0 
+        ,terms
-    ,b."fgent#"          --0 
+        ,bill_cust_descr          --history cust mix
-    ,b."diinv#"          --0 
+        ,ship_cust_descr          --history cust mix
-    ,b."dilin#"          --0 
+        ,dsm
-    ,b.promo          --history date mix
+        ,quota_rep_descr          --master data 
-    ,b.return_reas          --0 
+        ,director
-    ,b.terms          --history cust mix
+        ,billto_group          --master data 
-    ,b.custpo          --0 
+        ,shipto_group
-    ,b.dhincr          --0 
+        ,chan          --master data 
-    ,b.diext          --0 
+        ,chansub
-    ,b.ditdis          --0 
+        ,chan_retail
-    ,b.dcodat          --calculated date mix
+        ,part
-    ,b.ddqdat          --calculated date mix
+        ,part_descr
-    ,b.dcmdat          --calculated date mix
+        ,part_group
-    ,b.dhidat          --calculated date mix
+        ,branding
-    ,b.fspr          --calculated date mix
+        ,majg_descr
-    ,b.remit_to          --master data 
+        ,ming_descr
-    ,b.bill_class          --master data 
+        ,majs_descr
-    ,b.bill_cust          --history cust mix
+        ,mins_descr
-    ,b.bill_rep          --master data 
+        ,segm
-    ,b.bill_terr          --master data 
+        ,fs_line          --master data 
-    ,b.ship_class          --master data 
+        ,r_currency          --history cust mix
-    ,b.ship_cust          --history cust mix
+        ,r_rate          --master data 
-    ,b.ship_rep          --master data 
+        ,c_currency          --master data 
-    ,b.ship_terr          --master data 
+        ,c_rate          --master data 
-    ,b.quota_rep          --master data 
+        ,units*s.factor
-    ,b.account          --master data 
+        ,value_loc*s.factor value_loc
-    ,b.shipgrp          --master data 
+        ,value_usd*s.factor value_usd
-    ,b.geo          --master data 
+        ,cost_loc*s.factor cost_loc
-    ,b.chan          --master data 
+        ,cost_usd*s.factor cost_usd
-    ,b.orig_ctry          --master data 
+        ,calc_status          --0 
-    ,b.orig_prov          --master data 
+        ,flag          --0 
-    ,b.orig_post          --master data 
+        ,order_date          --history date mix
-    ,b.dest_ctry          --master data 
+        ,order_month
-    ,b.dest_prov          --master data 
+        ,order_season
-    ,b.dest_post          --master data 
+        ,request_date          --history date mix
-    ,b.part          --history part mix
+        ,request_month
-    ,b.ord_gldc          --master data 
+        ,request_season
-    ,b.majg          --master data 
+        ,ship_date          --history date mix
-    ,b.ming          --master data 
+        ,ship_month
-    ,b.majs          --master data 
+        ,ship_season
-    ,b.mins          --master data 
+        ,'replace_version' "version"
-    ,b.gldc          --master data 
-    ,b.glec          --master data 
-    ,b.harm          --master data 
-    ,b.clss          --master data 
-    ,b.brand          --master data 
-    ,b.assc          --master data 
-    ,b.fs_line          --master data 
-    ,b.r_currency          --history cust mix
-    ,b.r_rate          --master data 
-    ,b.c_currency          --master data 
-    ,b.c_rate          --master data 
-    ,b.ddqtoi          --0 
-    ,b.ddqtsi          --0 
-    ,b.fgqshp          --0 
-    ,b.diqtsh          --0 
-    ,b.fb_qty*s.factor fb_qty
-    ,b.fb_cst_loc*s.factor fb_cst_loc
-    ,b.fb_cst_loc_cur*s.factor fb_cst_loc_cur
-    ,b.fb_cst_loc_fut*s.factor fb_cst_loc_fut
-    ,b.fb_val_loc*s.factor fb_val_loc
-    ,b.fb_val_loc_pl*s.factor fb_val_loc_pl
-    ,b.calc_status          --0 
-    ,b.flag          --0 
-    ,b.orderdate
-    ,b.requestdate
-    ,b.shipdate
-    ,b.adj_orderdate
-    ,b.adj_requestdate
-    ,b.adj_shipdate
-    ,'replace_version' "version"          --calculated 
         ,'replace_source'||' volume'  iter
-    -----------------------ui columns--------------------------------
+        ,log.id
-    ,'replace_iterdet' iterdet
+        ,log.doc->>'comment' "comment"
-    ,$$replace_iterdef$$::jsonb iterdef
+        ,log.doc->>'type' module
-    ,b.order_season
-    ,b.order_month
-    ,b.ship_season
-    ,b.ship_month
-    ,b.request_season
-    ,b.request_month
-    ,b.part_descr
-    ,b.part_family
-    ,b.part_group
-    ,b.branding
-    ,b.color
-    ,b.segm
-    ,b.bill_cust_descr
-    ,b.billto_group
-    ,b.ship_cust_descr
-    ,b.shipto_group
-    ,b.majg_descr
-    ,b.ming_descr
-    ,b.majs_descr
-    ,b.mins_descr
-    ,b.mod_chan
-    ,b.mod_chansub
-    ,b.quota_rep_descr
-    ,b.director_descr
-    ,(b.fb_val_loc*s.factor)::numeric value_loc
-    ,(b.fb_val_loc*s.factor*r_rate)::numeric value_usd
-    ,(b.fb_cst_loc*s.factor)::numeric cost_loc
-    ,(b.fb_cst_loc*s.factor*c_rate)::numeric cost_usd
-    ,(b.fb_qty*s.factor)::numeric units
 FROM
     basemix b
     CROSS JOIN scale s
+    CROSS JOIN log
 )
 --select sum(value_usd), count(*) from final
 , ins AS (
-    INSERT INTO rlarp.osm_fcpool SELECT * FROM final RETURNING *
+    INSERT INTO rlarp.osm_pool SELECT * FROM final RETURNING *
 )
 ,insagg AS (
     SELECT
+        ---------customer info-----------------
         bill_cust_descr
         ,billto_group
         ,ship_cust_descr
         ,shipto_group
         ,quota_rep_descr
-    ,director_descr
+        ,director
         ,segm
-    ,mod_chan
+        ,chan
-    ,mod_chansub
+        ,chansub
+        ---------product info------------------
         ,majg_descr
         ,ming_descr
         ,majs_descr
         ,mins_descr
-    ,brand
+        --,brand
-    ,part_family
+        --,part_family
         ,part_group
         ,branding
-    ,color
+        --,color
         ,part_descr
+        ---------dates-------------------------
         ,order_season
         ,order_month
         ,ship_season
@@ -389,6 +240,7 @@ SELECT
         ,promo
         ,version
         ,iter
+        --------values-------------------------
         ,sum(value_loc) value_loc
         ,sum(value_usd) value_usd
         ,sum(cost_loc) cost_loc
@@ -397,25 +249,28 @@ SELECT
     FROM
         ins
     GROUP BY
+        ---------customer info-----------------
         bill_cust_descr
         ,billto_group
         ,ship_cust_descr
         ,shipto_group
         ,quota_rep_descr
-    ,director_descr
+        ,director
         ,segm
-    ,mod_chan
+        ,chan
-    ,mod_chansub
+        ,chansub
+        ---------product info------------------
         ,majg_descr
         ,ming_descr
         ,majs_descr
         ,mins_descr
-    ,brand
+        --,brand
-    ,part_family
+        --,part_family
         ,part_group
         ,branding
-    ,color
+        --,color
         ,part_descr
+        ---------dates-------------------------
         ,order_season
         ,order_month
         ,ship_season

route_sql/scale_vupd.sql

@@ -2,17 +2,17 @@ WITH
 target AS (select target_vol vincr, target_prc pincr)
 ,testv AS (
     SELECT
-        sum(fb_qty) tot
+        sum(units) tot
-        ,sum(fb_qty) FILTER (WHERE iter = 'copy') base
+        ,sum(units) FILTER (WHERE iter = 'copy') base
-        ,sum(fb_qty) FILTER (WHERE iterdef->>'type' = 'new basket') newpart
+        ,sum(units) FILTER (WHERE module = 'new basket') newpart
     FROM
-        rlarp.osm_fcpool
+        rlarp.osm_pool
     WHERE
         -----------------scenario----------------------------
         where_clause
         -----------------additional params-------------------
         AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments
-        AND adj_orderdate <= adj_shipdate
+        AND order_date <= ship_date
 
 )
 ,flagv AS (
@@ -38,114 +38,52 @@ target AS (select target_vol vincr, target_prc pincr)
 )
 ,basemix AS (
     SELECT
-        plnt          ---master data 
+        fspr
-        ,0::numeric(11,0) "ddord#"          --0 
+        ,plnt          ---master data 
-        ,0::numeric(11,0) "dditm#"          --0 
-        ,0::numeric(11,0) "fgbol#"          --0 
-        ,0::numeric(11,0) "fgent#"          --0 
-        ,0::numeric(9,0) "diinv#"          --0 
-        ,0::numeric(3,0) "dilin#"          --0 
         ,promo          --history date mix
-        ,null::text return_reas          --0 
         ,terms
-        ,''::text custpo          --0 
+        ,bill_cust_descr          --history cust mix
-        ,'I' dhincr          --0 
+        ,ship_cust_descr          --history cust mix
-        ,null::numeric diext
+        ,dsm
-        ,null::numeric ditdis
+        ,quota_rep_descr          --master data 
-        ,null::date dcodat          --calculated date mix
+        ,director
-        ,null::date ddqdat          --calculated date mix
+        ,billto_group          --master data 
-        ,null::date dcmdat          --calculated date mix
+        ,shipto_group
-        ,null::date dhidat          --calculated date mix
-        ,null::text fspr          --calculated date mix
-        ,remit_to          --master data 
-        ,bill_class          --master data 
-        ,bill_cust          --history cust mix
-        ,bill_rep          --master data 
-        ,bill_terr          --master data 
-        ,ship_class          --master data 
-        ,ship_cust          --history cust mix
-        ,ship_rep          --master data 
-        ,ship_terr          --master data 
-        ,quota_rep          --master data 
-        ,account          --master data 
-        ,shipgrp          --master data 
-        ,geo          --master data 
         ,chan          --master data 
-        ,orig_ctry          --master data 
+        ,chansub
-        ,orig_prov          --master data 
+        ,chan_retail
-        ,orig_post          --master data 
+        ,part
-        ,dest_ctry          --master data 
+        ,part_descr
-        ,dest_prov          --master data 
+        ,part_group
-        ,dest_post          --master data 
+        ,branding
-        ,part          --history part mix
+        ,majg_descr
-        ,ord_gldc          --master data 
+        ,ming_descr
-        ,majg          --master data 
+        ,majs_descr
-        ,ming          --master data 
+        ,mins_descr
-        ,majs          --master data 
+        ,segm
-        ,mins          --master data 
-        ,gldc          --master data 
-        ,glec          --master data 
-        ,harm          --master data 
-        ,clss          --master data 
-        ,brand          --master data 
-        ,assc          --master data 
         ,fs_line          --master data 
         ,r_currency          --history cust mix
         ,r_rate          --master data 
         ,c_currency          --master data 
         ,c_rate          --master data 
-        ,0::numeric(15,5) ddqtoi          --0 
+        ,sum(coalesce(units,0)) units          --history value
-        ,0::numeric(15,5) ddqtsi          --0 
+        ,sum(coalesce(value_loc,0)) value_loc          --history value
-        ,0::numeric(15,5) fgqshp          --0 
+        ,sum(coalesce(value_usd,0)) value_usd          --0 
-        ,0::numeric(15,5) diqtsh          --0 
+        ,sum(coalesce(cost_loc,0)) cost_loc          --history part mix
-        ,sum(coalesce(fb_qty,0)) fb_qty          --history value
+        ,sum(coalesce(cost_usd,0)) cost_usd
-        ,sum(coalesce(fb_cst_loc,0)) fb_cst_loc          --history part mix
-        ,sum(coalesce(fb_cst_loc_cur,0)) fb_cst_loc_cur          --master data 
-        ,sum(coalesce(fb_cst_loc_fut,0)) fb_cst_loc_fut          --master data 
-        ,sum(coalesce(fb_val_loc,0)) fb_val_loc          --history value
-        ,sum(coalesce(fb_val_loc_pl,0)) fb_val_loc_pl          --0 
         ,calc_status          --0 
         ,flag          --0 
-        ,orderdate          --history date mix
+        ,order_date          --history date mix
-        ,requestdate          --history date mix
-        ,shipdate          --history date mix
-        ,adj_orderdate          --history 
-        ,adj_requestdate          --history 
-        ,adj_shipdate          --history 
-        ,null::text "version"          --calculated 
-        ,null::text iter          --calculated 
-        ---------------ui columns-------------------------
-        ,order_season
         ,order_month
-        ,ship_season
+        ,order_season
-        ,ship_month
+        ,request_date          --history date mix
-        ,request_season
         ,request_month
-        ,part_descr
+        ,request_season
-        ,part_family
+        ,ship_date          --history date mix
-        ,part_group
+        ,ship_month
-        ,branding
+        ,ship_season
-        ,color
-        ,segm
-        ,bill_cust_descr
-        ,billto_group
-        ,ship_cust_descr
-        ,shipto_group
-        ,majg_descr
-        ,ming_descr
-        ,majs_descr
-        ,mins_descr
-        ,mod_chan
-        ,mod_chansub
-        ,quota_rep_descr
-        ,director_descr
-        ,null value_loc
-        ,null value_usd
-        ,null cost_loc
-        ,null cost_usd
-        ,null units
     FROM
-        rlarp.osm_fcpool
+        rlarp.osm_pool
     WHERE
         -----------------scenario----------------------------
         where_clause
@@ -153,46 +91,34 @@ target AS (select target_vol vincr, target_prc pincr)
         AND CASE (SELECT flag FROM flagv) 
                 WHEN 'scale all' THEN true
                 WHEN 'scale copy' THEN iter = 'copy'
-                WHEN 'scale new part' THEN iterdef->>'type' = 'new basket'
+                WHEN 'scale new part' THEN module = 'new basket'
             END
         AND calc_status||flag <> 'CLOSEDREMAINDER' --exclude short ships when building order adjustments
-        AND adj_orderdate <= adj_shipdate
+        AND order_date <= ship_date
     GROUP BY
-        plnt          ---master data 
+                fspr
-        ,promo
+        ,plnt          ---master data 
+        ,promo          --history date mix
         ,terms
-        ,remit_to          --master data 
+        ,bill_cust_descr          --history cust mix
-        ,bill_class          --master data 
+        ,ship_cust_descr          --history cust mix
-        ,bill_cust          --history cust mix
+        ,dsm
-        ,bill_rep          --master data 
+        ,quota_rep_descr          --master data 
-        ,bill_terr          --master data 
+        ,director
-        ,ship_class          --master data 
+        ,billto_group          --master data 
-        ,ship_cust          --history cust mix
+        ,shipto_group
-        ,ship_rep          --master data 
-        ,ship_terr          --master data 
-        ,quota_rep          --master data 
-        ,account          --master data 
-        ,shipgrp          --master data 
-        ,geo          --master data 
         ,chan          --master data 
-        ,orig_ctry          --master data 
+        ,chansub
-        ,orig_prov          --master data 
+        ,chan_retail
-        ,orig_post          --master data 
+        ,part
-        ,dest_ctry          --master data 
+        ,part_descr
-        ,dest_prov          --master data 
+        ,part_group
-        ,dest_post          --master data 
+        ,branding
-        ,part          --history part mix
+        ,majg_descr
-        ,ord_gldc          --master data 
+        ,ming_descr
-        ,majg          --master data 
+        ,majs_descr
-        ,ming          --master data 
+        ,mins_descr
-        ,majs          --master data 
+        ,segm
-        ,mins          --master data 
-        ,gldc          --master data 
-        ,glec          --master data 
-        ,harm          --master data 
-        ,clss          --master data 
-        ,brand          --master data 
-        ,assc          --master data 
         ,fs_line          --master data 
         ,r_currency          --history cust mix
         ,r_rate          --master data 
@@ -200,174 +126,97 @@ target AS (select target_vol vincr, target_prc pincr)
         ,c_rate          --master data 
         ,calc_status          --0 
         ,flag          --0 
-        ,orderdate          --history date mix
+        ,order_date          --history date mix
-        ,requestdate          --history date mix
-        ,shipdate          --history date mix
-        ,adj_orderdate          --history 
-        ,adj_requestdate          --history 
-        ,adj_shipdate          --history 
-        ---------------ui columns-------------------------
-        ,order_season
         ,order_month
-        ,ship_season
+        ,order_season
-        ,ship_month
+        ,request_date          --history date mix
-        ,request_season
         ,request_month
-        ,part_descr
+        ,request_season
-        ,part_family
+        ,ship_date          --history date mix
-        ,part_group
+        ,ship_month
-        ,branding
+        ,ship_season
-        ,color
-        ,segm
-        ,bill_cust_descr
-        ,billto_group
-        ,ship_cust_descr
-        ,shipto_group
-        ,majg_descr
-        ,ming_descr
-        ,majs_descr
-        ,mins_descr
-        ,mod_chan
-        ,mod_chansub
-        ,quota_rep_descr
-        ,director_descr
 )
 ,vscale AS (
     SELECT
         (SELECT vincr::numeric FROM target) incr
-        ,(SELECT sum(fb_qty)::numeric FROM basemix) base
+        ,(SELECT sum(units)::numeric FROM basemix) base
-        ,(SELECT vincr::numeric FROM target)/(SELECT sum(fb_qty)::numeric FROM basemix) factor
+        ,(SELECT vincr::numeric FROM target)/(SELECT sum(units)::numeric FROM basemix) factor
 )
 --select * from vscale
+,log AS (
+    INSERT INTO rlarp.osm_log(doc) SELECT $$replace_iterdef$$::jsonb doc RETURNING *
+)
 ,volume AS (
     SELECT
-        b.plnt          --master data 
+        fspr
-        ,b."ddord#"          --0 
+        ,plnt          ---master data 
-        ,b."dditm#"          --0 
+        ,promo          --history date mix
-        ,b."fgbol#"          --0 
+        ,terms
-        ,b."fgent#"          --0 
+        ,bill_cust_descr          --history cust mix
-        ,b."diinv#"          --0 
+        ,ship_cust_descr          --history cust mix
-        ,b."dilin#"          --0 
+        ,dsm
-        ,b.promo          --history date mix
+        ,quota_rep_descr          --master data 
-        ,b.return_reas          --0 
+        ,director
-        ,b.terms          --history cust mix
+        ,billto_group          --master data 
-        ,b.custpo          --0 
+        ,shipto_group
-        ,b.dhincr          --0 
+        ,chan          --master data 
-        ,b.diext          --0 
+        ,chansub
-        ,b.ditdis          --0 
+        ,chan_retail
-        ,b.dcodat          --calculated date mix
+        ,part
-        ,b.ddqdat          --calculated date mix
+        ,part_descr
-        ,b.dcmdat          --calculated date mix
+        ,part_group
-        ,b.dhidat          --calculated date mix
+        ,branding
-        ,b.fspr          --calculated date mix
+        ,majg_descr
-        ,b.remit_to          --master data 
+        ,ming_descr
-        ,b.bill_class          --master data 
+        ,majs_descr
-        ,b.bill_cust          --history cust mix
+        ,mins_descr
-        ,b.bill_rep          --master data 
+        ,segm
-        ,b.bill_terr          --master data 
+        ,fs_line          --master data 
-        ,b.ship_class          --master data 
+        ,r_currency          --history cust mix
-        ,b.ship_cust          --history cust mix
+        ,r_rate          --master data 
-        ,b.ship_rep          --master data 
+        ,c_currency          --master data 
-        ,b.ship_terr          --master data 
+        ,c_rate          --master data 
-        ,b.quota_rep          --master data 
+        ,units*s.factor units
-        ,b.account          --master data 
+        ,value_loc*s.factor value_loc
-        ,b.shipgrp          --master data 
+        ,value_usd*s.factor value_usd
-        ,b.geo          --master data 
+        ,cost_loc*s.factor cost_loc
-        ,b.chan          --master data 
+        ,cost_usd*s.factor cost_usd
-        ,b.orig_ctry          --master data 
+        ,calc_status          --0 
-        ,b.orig_prov          --master data 
+        ,flag          --0 
-        ,b.orig_post          --master data 
+        ,order_date          --history date mix
-        ,b.dest_ctry          --master data 
+        ,order_month
-        ,b.dest_prov          --master data 
+        ,order_season
-        ,b.dest_post          --master data 
+        ,request_date          --history date mix
-        ,b.part          --history part mix
+        ,request_month
-        ,b.ord_gldc          --master data 
+        ,request_season
-        ,b.majg          --master data 
+        ,ship_date          --history date mix
-        ,b.ming          --master data 
+        ,ship_month
-        ,b.majs          --master data 
+        ,ship_season
-        ,b.mins          --master data 
+        ,'replace_version' "version"
-        ,b.gldc          --master data 
-        ,b.glec          --master data 
-        ,b.harm          --master data 
-        ,b.clss          --master data 
-        ,b.brand          --master data 
-        ,b.assc          --master data 
-        ,b.fs_line          --master data 
-        ,b.r_currency          --history cust mix
-        ,b.r_rate          --master data 
-        ,b.c_currency          --master data 
-        ,b.c_rate          --master data 
-        ,b.ddqtoi          --0 
-        ,b.ddqtsi          --0 
-        ,b.fgqshp          --0 
-        ,b.diqtsh          --0 
-        ,b.fb_qty*s.factor fb_qty
-        ,b.fb_cst_loc*s.factor fb_cst_loc
-        ,b.fb_cst_loc_cur*s.factor fb_cst_loc_cur
-        ,b.fb_cst_loc_fut*s.factor fb_cst_loc_fut
-        ,b.fb_val_loc*s.factor fb_val_loc
-        ,b.fb_val_loc_pl*s.factor fb_val_loc_pl
-        ,b.calc_status          --0 
-        ,b.flag          --0 
-        ,b.orderdate
-        ,b.requestdate
-        ,b.shipdate
-        ,b.adj_orderdate
-        ,b.adj_requestdate
-        ,b.adj_shipdate
-        ,'replace_version' "version"          --calculated 
         ,'replace_source'||' volume'  iter
-        -----------------------ui columns--------------------------------
+        ,log.id
-        ,'replace_iterdet' iterdet
+        ,log.doc->>'comment' "comment"
-        ,$$replace_iterdef$$::jsonb iterdef
+        ,log.doc->>'type' module
-        ,b.order_season
-        ,b.order_month
-        ,b.ship_season
-        ,b.ship_month
-        ,b.request_season
-        ,b.request_month
-        ,b.part_descr
-        ,b.part_family
-        ,b.part_group
-        ,b.branding
-        ,b.color
-        ,b.segm
-        ,b.bill_cust_descr
-        ,b.billto_group
-        ,b.ship_cust_descr
-        ,b.shipto_group
-        ,b.majg_descr
-        ,b.ming_descr
-        ,b.majs_descr
-        ,b.mins_descr
-        ,b.mod_chan
-        ,b.mod_chansub
-        ,b.quota_rep_descr
-        ,b.director_descr
-        ,(b.fb_val_loc*s.factor)::numeric value_loc
-        ,(b.fb_val_loc*s.factor*r_rate)::numeric value_usd
-        ,(b.fb_cst_loc*s.factor)::numeric cost_loc
-        ,(b.fb_cst_loc*s.factor*c_rate)::numeric cost_usd
-        ,(b.fb_qty*s.factor)::numeric units
 FROM
     basemix b
     CROSS JOIN vscale s
+    CROSS JOIN log
 )
 ,pscale AS (
     SELECT
         (SELECT pincr::numeric FROM target) incr
-        ,(SELECT sum(fb_val_loc * r_rate) FROM volume) base
+        ,(SELECT sum(value_loc * r_rate) FROM volume) base
-        ,CASE WHEN (SELECT sum(fb_val_loc * r_rate) FROM volume) = 0 THEN
+        ,CASE WHEN (SELECT sum(value_loc * r_rate) FROM volume) = 0 THEN
             --if the base value is -0- scaling will not work, need to generate price, factor goes to -0-
             0
         ELSE
             --if the target $amount is not achieved, adjust further
-            ((SELECT pincr::numeric FROM target)-(SELECT sum(fb_val_loc * r_rate) FROM volume))/(SELECT sum(fb_val_loc * r_rate) FROM volume)
+            ((SELECT pincr::numeric FROM target)-(SELECT sum(value_loc * r_rate) FROM volume))/(SELECT sum(value_loc * r_rate) FROM volume)
         END factor
-        ,CASE WHEN (SELECT sum(fb_val_loc * r_rate) FROM volume) = 0 THEN
+        ,CASE WHEN (SELECT sum(value_loc * r_rate) FROM volume) = 0 THEN
-            CASE WHEN ((SELECT pincr::numeric FROM target) - (SELECT sum(fb_val_loc * r_rate) FROM volume)) <> 0 THEN
+            CASE WHEN ((SELECT pincr::numeric FROM target) - (SELECT sum(value_loc * r_rate) FROM volume)) <> 0 THEN
                 --if the base value is -0- but the target value hasn't been achieved, derive a price to apply
-                ((SELECT pincr::numeric FROM target) - (SELECT sum(fb_val_loc * r_rate) FROM volume))/(SELECT sum(fb_qty) FROM volume)
+                ((SELECT pincr::numeric FROM target) - (SELECT sum(value_loc * r_rate) FROM volume))/(SELECT sum(units) FROM volume)
             ELSE
                 0
             END
@@ -378,147 +227,90 @@ target AS (select target_vol vincr, target_prc pincr)
 --select * from pscale
 ,pricing AS (
     SELECT
-        b.plnt          --master data 
+        fspr
-        ,b."ddord#"          --0 
+        ,plnt          ---master data 
-        ,b."dditm#"          --0 
+        ,promo          --history date mix
-        ,b."fgbol#"          --0 
+        ,terms
-        ,b."fgent#"          --0 
+        ,bill_cust_descr          --history cust mix
-        ,b."diinv#"          --0 
+        ,ship_cust_descr          --history cust mix
-        ,b."dilin#"          --0 
+        ,dsm
-        ,b.promo          --history date mix
+        ,quota_rep_descr          --master data 
-        ,b.return_reas          --0 
+        ,director
-        ,b.terms          --history cust mix
+        ,billto_group          --master data 
-        ,b.custpo          --0 
+        ,shipto_group
-        ,b.dhincr          --0 
+        ,chan          --master data 
-        ,b.diext          --0 
+        ,chansub
-        ,b.ditdis          --0 
+        ,chan_retail
-        ,b.dcodat          --calculated date mix
+        ,part
-        ,b.ddqdat          --calculated date mix
+        ,part_descr
-        ,b.dcmdat          --calculated date mix
+        ,part_group
-        ,b.dhidat          --calculated date mix
+        ,branding
-        ,b.fspr          --calculated date mix
+        ,majg_descr
-        ,b.remit_to          --master data 
+        ,ming_descr
-        ,b.bill_class          --master data 
+        ,majs_descr
-        ,b.bill_cust          --history cust mix
+        ,mins_descr
-        ,b.bill_rep          --master data 
+        ,segm
-        ,b.bill_terr          --master data 
+        ,fs_line          --master data 
-        ,b.ship_class          --master data 
+        ,r_currency          --history cust mix
-        ,b.ship_cust          --history cust mix
+        ,r_rate          --master data 
-        ,b.ship_rep          --master data 
+        ,c_currency          --master data 
-        ,b.ship_terr          --master data 
+        ,c_rate          --master data 
-        ,b.quota_rep          --master data 
+        ,0::numeric units
-        ,b.account          --master data 
+        ,(CASE WHEN s.factor = 0 THEN b.units * s.mod_price/b.r_rate ELSE b.value_loc*s.factor END)::numeric value_loc
-        ,b.shipgrp          --master data 
+        ,(CASE WHEN s.factor = 0 THEN b.units * s.mod_price ELSE b.value_usd*s.factor END)::numeric value_usd
-        ,b.geo          --master data 
+        ,0::numeric cost_loc
-        ,b.chan          --master data 
+        ,0::numeric cost_usd
-        ,b.orig_ctry          --master data 
+        ,calc_status          --0 
-        ,b.orig_prov          --master data 
+        ,flag          --0 
-        ,b.orig_post          --master data 
+        ,order_date          --history date mix
-        ,b.dest_ctry          --master data 
+        ,order_month
-        ,b.dest_prov          --master data 
+        ,order_season
-        ,b.dest_post          --master data 
+        ,request_date          --history date mix
-        ,b.part          --history part mix
+        ,request_month
-        ,b.ord_gldc          --master data 
+        ,request_season
-        ,b.majg          --master data 
+        ,ship_date          --history date mix
-        ,b.ming          --master data 
+        ,ship_month
-        ,b.majs          --master data 
+        ,ship_season
-        ,b.mins          --master data 
+        ,'replace_version' "version"
-        ,b.gldc          --master data 
-        ,b.glec          --master data 
-        ,b.harm          --master data 
-        ,b.clss          --master data 
-        ,b.brand          --master data 
-        ,b.assc          --master data 
-        ,b.fs_line          --master data 
-        ,b.r_currency          --history cust mix
-        ,b.r_rate          --master data 
-        ,b.c_currency          --master data 
-        ,b.c_rate          --master data 
-        ,b.ddqtoi          --0 
-        ,b.ddqtsi          --0 
-        ,b.fgqshp          --0 
-        ,b.diqtsh          --0 
-        ,0 fb_qty
-        ,0 fb_cst_loc
-        ,0 fb_cst_loc_cur
-        ,0 fb_cst_loc_fut
-        --,b.fb_val_loc*s.factor fb_val_loc
-        ,(CASE WHEN s.factor = 0 THEN b.fb_qty * s.mod_price/b.r_rate ELSE b.fb_val_loc*s.factor END)::numeric fb_val_loc
-        ,(CASE WHEN s.factor = 0 THEN b.fb_qty * s.mod_price/b.r_rate ELSE b.fb_val_loc_pl*s.factor END)::numeric fb_val_loc_pl
-        --,b.fb_val_loc_pl*s.factor fb_val_loc_pl
-        ,b.calc_status          --0 
-        ,b.flag          --0 
-        ,b.orderdate
-        ,b.requestdate
-        ,b.shipdate
-        ,b.adj_orderdate
-        ,b.adj_requestdate
-        ,b.adj_shipdate
-        ,'replace_version' "version"          --calculated 
         ,'replace_source'||' price'  iter
-        -----------------------ui columns--------------------------------
+        ,log.id
-        ,'replace_iterdet' iterdet
+        ,log.doc->>'comment' "comment"
-        ,$$replace_iterdef$$::jsonb iterdef
+        ,log.doc->>'type' module
-        ,b.order_season
-        ,b.order_month
-        ,b.ship_season
-        ,b.ship_month
-        ,b.request_season
-        ,b.request_month
-        ,b.part_descr
-        ,b.part_family
-        ,b.part_group
-        ,b.branding
-        ,b.color
-        ,b.segm
-        ,b.bill_cust_descr
-        ,b.billto_group
-        ,b.ship_cust_descr
-        ,b.shipto_group
-        ,b.majg_descr
-        ,b.ming_descr
-        ,b.majs_descr
-        ,b.mins_descr
-        ,b.mod_chan
-        ,b.mod_chansub
-        ,b.quota_rep_descr
-        ,b.director_descr
-        ,(CASE WHEN s.factor = 0 THEN b.fb_qty * s.mod_price/b.r_rate ELSE b.fb_val_loc*s.factor END)::numeric value_loc
-        ,(CASE WHEN s.factor = 0 THEN b.fb_qty * s.mod_price ELSE b.fb_val_loc*s.factor*b.r_rate END)::numeric value_usd
-        ,0 cost_loc
-        ,0 cost_usd
-        ,0 units
     FROM
         volume b
         CROSS JOIN pscale s
+        CROSS JOIN log
     WHERE
         s.factor <> 0 or s.mod_price <> 0
 )
---select sum(value_usd), sum(fb_qty) from pricing
+--select sum(value_usd), sum(units) from pricing
 , ins AS (
-    INSERT INTO rlarp.osm_fcpool (SELECT * FROM pricing UNION ALL SELECT * FROM volume) RETURNING *
+    INSERT INTO rlarp.osm_pool (SELECT * FROM pricing UNION ALL SELECT * FROM volume) RETURNING *
 )
 ,insagg AS (
     SELECT
+        ---------customer info-----------------
         bill_cust_descr
         ,billto_group
         ,ship_cust_descr
         ,shipto_group
         ,quota_rep_descr
-    ,director_descr
+        ,director
         ,segm
-    ,mod_chan
+        ,chan
-    ,mod_chansub
+        ,chansub
+        ---------product info------------------
         ,majg_descr
         ,ming_descr
         ,majs_descr
         ,mins_descr
-    ,brand
+        --,brand
-    ,part_family
+        --,part_family
         ,part_group
         ,branding
-    ,color
+        --,color
         ,part_descr
+        ---------dates-------------------------
         ,order_season
         ,order_month
         ,ship_season
@@ -528,6 +320,7 @@ SELECT
         ,promo
         ,version
         ,iter
+        --------values-------------------------
         ,sum(value_loc) value_loc
         ,sum(value_usd) value_usd
         ,sum(cost_loc) cost_loc
@@ -536,25 +329,28 @@ SELECT
     FROM
         ins
     GROUP BY
+        ---------customer info-----------------
         bill_cust_descr
         ,billto_group
         ,ship_cust_descr
         ,shipto_group
         ,quota_rep_descr
-    ,director_descr
+        ,director
         ,segm
-    ,mod_chan
+        ,chan
-    ,mod_chansub
+        ,chansub
+        ---------product info------------------
         ,majg_descr
         ,ming_descr
         ,majs_descr
         ,mins_descr
-    ,brand
+        --,brand
-    ,part_family
+        --,part_family
         ,part_group
         ,branding
-    ,color
+        --,color
         ,part_descr
+        ---------dates-------------------------
         ,order_season
         ,order_month
         ,ship_season

route_sql/scenario_package.sql

@@ -5,18 +5,18 @@ mseq AS (
     SELECT * FROM 
     (
         VALUES
-        ('Jun',1)
+        ('01 - Jun',1)
-        ,('Jul',2)
+        ,('02 - Jul',2)
-        ,('Aug',3)
+        ,('03 - Aug',3)
-        ,('Sep',4)
+        ,('04 - Sep',4)
-        ,('Oct',5)
+        ,('05 - Oct',5)
-        ,('Nov',6)
+        ,('06 - Nov',6)
-        ,('Dec',7)
+        ,('07 - Dec',7)
-        ,('Jan',8)
+        ,('08 - Jan',8)
-        ,('Feb',9)
+        ,('09 - Feb',9)
-        ,('Mar',10)
+        ,('10 - Mar',10)
-        ,('Apr',11)
+        ,('11 - Apr',11)
-        ,('May',12)
+        ,('12 - May',12)
 
     ) x(m,s)
 )
@@ -33,10 +33,10 @@ SELECT
     ,SUM(units) units
     ,SUM(value_usd) value_usd
 FROM
-    rlarp.osm_fcpool
+    rlarp.osm_pool
 WHERE
     where_clause
-    AND order_season IN (2019,2020)
+    AND order_season IN (2020,2021)
 GROUP BY
     order_season
     ,order_month
@@ -94,14 +94,14 @@ GROUP BY
     SELECT
         order_month
         ,seq
-        ,SUM(units) FILTER (WHERE order_season = 2019) "2019 qty"
+        ,SUM(units) FILTER (WHERE order_season = 2020) "2020 qty"
-        ,SUM(units) FILTER (WHERE order_season = 2020 AND iter IN ('copy','short ship','bad_ship')) "2020 base qty"
+        ,SUM(units) FILTER (WHERE order_season = 2021 AND iter IN ('copy','short ship','bad_ship')) "2021 base qty"
-        ,SUM(units) FILTER (WHERE order_season = 2020 AND iter NOT IN ('copy','short ship','bad_ship')) "2020 adj qty"
+        ,SUM(units) FILTER (WHERE order_season = 2021 AND iter NOT IN ('copy','short ship','bad_ship')) "2021 adj qty"
-        ,SUM(units) FILTER (WHERE order_season = 2020) "2020 tot qty"
+        ,SUM(units) FILTER (WHERE order_season = 2021) "2021 tot qty"
-        ,SUM(value_usd) FILTER (WHERE order_season = 2019) "2019 value_usd"
+        ,SUM(value_usd) FILTER (WHERE order_season = 2020) "2020 value_usd"
-        ,SUM(value_usd) FILTER (WHERE order_season = 2020 AND iter IN ('copy','short ship','bad_ship')) "2020 base value_usd"
+        ,SUM(value_usd) FILTER (WHERE order_season = 2021 AND iter IN ('copy','short ship','bad_ship')) "2021 base value_usd"
-        ,SUM(value_usd) FILTER (WHERE order_season = 2020 AND iter NOT IN ('copy','short ship','bad_ship')) "2020 adj value_usd"
+        ,SUM(value_usd) FILTER (WHERE order_season = 2021 AND iter NOT IN ('copy','short ship','bad_ship')) "2021 adj value_usd"
-        ,SUM(value_usd) FILTER (WHERE order_season = 2020) "2020 tot value_usd"
+        ,SUM(value_usd) FILTER (WHERE order_season = 2021) "2021 tot value_usd"
     FROM
         months
     GROUP BY
@@ -113,14 +113,14 @@ GROUP BY
 ,mlist AS (
     SELECT
         mseq.m order_month
-        ,"2019 qty"
+        ,"2020 qty"
-        ,"2020 base qty"
+        ,"2021 base qty"
-        ,"2020 adj qty"
+        ,"2021 adj qty"
-        ,"2020 tot qty"
+        ,"2021 tot qty"
-        ,"2019 value_usd"
+        ,"2020 value_usd"
-        ,"2020 base value_usd"
+        ,"2021 base value_usd"
-        ,"2020 adj value_usd"
+        ,"2021 adj value_usd"
-        ,"2020 tot value_usd"
+        ,"2021 tot value_usd"
     FROM
         mseq
         LEFT OUTER JOIN mpvt ON