swap out columns on price adjust

route_sql/build/build_fcpool.sql

@@ -102,7 +102,7 @@ SELECT
     ,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
@@ -136,3 +136,6 @@ 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/scale_vd.sql

@@ -4,11 +4,9 @@ target AS (select incr_qty qincr)
     SELECT
         sum(units) tot
         ,sum(units) FILTER (WHERE iter = 'copy') base
-        ,sum(units) FILTER (WHERE l.doc->>'type' = 'new basket') newpart
+        ,sum(units) FILTER (WHERE module = 'new basket') newpart
     FROM
         rlarp.osm_pool p
-        INNER JOIN rlarp.osm_log l ON
-            l.id = p.logid
     WHERE
         -----------------scenario----------------------------
         where_clause
@@ -93,7 +91,7 @@ target AS (select incr_qty qincr)
         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 order_date <= ship_date
@@ -199,10 +197,11 @@ target AS (select incr_qty qincr)
         ,'replace_source'||' volume'  iter
         ,log.id
         ,log.doc->>'comment' "comment"
-        ,'replace_iterdet' iterdet
+        ,log.doc->>'type' module
 FROM
     basemix b
     CROSS JOIN scale s
+    CROSS JOIN log
 )
 --select sum(value_usd), count(*) from final
 , ins AS (

route_sql/scale_vupd.sql

@@ -2,11 +2,11 @@ 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
@@ -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
-        ,b.account          --master data 
+        ,value_loc*s.factor
-        ,b.shipgrp          --master data 
+        ,value_usd*s.factor
-        ,b.geo          --master data 
+        ,cost_loc*s.factor
-        ,b.chan          --master data 
+        ,cost_usd*s.factor
-        ,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'||' volume'  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 
+FROM
-        ,b.assc          --master data 
+    basemix b
-        ,b.fs_line          --master data 
+    CROSS JOIN vscale s
-        ,b.r_currency          --history cust mix
+    CROSS JOIN log
-        ,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--------------------------------
-        ,'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
-        ,(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
 )
 ,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
@@ -376,127 +225,69 @@ target AS (select target_vol vincr, target_prc pincr)
         END mod_price
 )
 --select * from pscale
+        ,(CASE WHEN s.factor = 0 THEN b.units * s.mod_price/b.r_rate ELSE b.value_loc*s.factor END)::numeric value_loc
+        ,(CASE WHEN s.factor = 0 THEN b.units * s.mod_price/b.r_rate ELSE b.value_loc_pl*s.factor END)::numeric value_loc_pl
 ,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 
+        ,'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
-        -----------------------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*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