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

index.js

@@ -18,8 +18,8 @@ var options = {
     passprase: []
 };
 
-https.createServer(options,server).listen(process.env.nodeport, () => {
+https.createServer(options, server).listen(process.env.nodeport, () => {
-    console.log('started on '+ process.env.nodeport)
+    console.log('started on ' + process.env.nodeport)
 });
 //server.listen(3000, () => console.log('started'))
 
@@ -34,7 +34,7 @@ var Postgres = new pg.Client({
 });
 Postgres.connect();
 
-Postgres.FirstRow = function (inSQL, args, inResponse) {
+Postgres.FirstRow = function(inSQL, args, inResponse) {
     Postgres.query(inSQL, args, (err, res) => {
         if (err === null) {
             inResponse.json(res.rows[0]);
@@ -42,7 +42,7 @@ Postgres.FirstRow = function (inSQL, args, inResponse) {
         }
         console.log(err.stack);
         inResponse.json(err.stack);
-    }); 
+    });
 };
 
 server.get('/', (req, res) => res.send('node.js express is up and running'))
@@ -55,14 +55,14 @@ server.get('/pgbadger', (req, res) => res.sendFile(process.env.wd + 'logs.html')
 
 server.get('/totals', (req, res) => res.sendFile(process.env.wd + 'totals.log'))
 
-server.get('/test_sql', function(req, res){
+server.get('/test_sql', function(req, res) {
     var path = './route_meta/scenario_package.sql'
-    var callback = function(arg){
+    var callback = function(arg) {
         res.send(arg)
     };
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             callback(err);
@@ -70,21 +70,21 @@ server.get('/test_sql', function(req, res){
     });
 });
 
-server.get('/get_pool', bodyParser.json(), function (req, res) {
+server.get('/get_pool', bodyParser.json(), function(req, res) {
 
     var sql = "";
     var args = [req.body.quota_rep];
     var path = './route_sql/get_pool.sql';
-    var callback = function(arg){
+    var callback = function(arg) {
         sql = arg;
         console.log(new Date().toISOString() + "-------------------------get pool:----------------------------");
         console.log(req.body.quota_rep);
-        sql = sql.replace("rep_replace",req.body.quota_rep);
+        sql = sql.replace("rep_replace", req.body.quota_rep);
-        Postgres.FirstRow(sql,[],res)
+        Postgres.FirstRow(sql, [], res)
     };
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             console.log("fatal error pulling sql file")
@@ -94,7 +94,7 @@ server.get('/get_pool', bodyParser.json(), function (req, res) {
 
 })
 
-server.get('/scenario_package', bodyParser.json(), function (req, res) {
+server.get('/scenario_package', bodyParser.json(), function(req, res) {
 
     var sql = "";
     var w = "";
@@ -103,8 +103,8 @@ server.get('/scenario_package', bodyParser.json(), function (req, res) {
     var args = [];
     var path = './route_sql/scenario_package.sql';
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             console.log("fatal error pulling sql file")
@@ -112,9 +112,9 @@ server.get('/scenario_package', bodyParser.json(), function (req, res) {
         }
     });
 
-    var callback = function(arg){
+    var callback = function(arg) {
         sql = arg;
-        
+
         //parse request body into a where clause
         ({ c, w, d } = build_where(req, c, w, d, args));
 
@@ -126,14 +126,14 @@ server.get('/scenario_package', bodyParser.json(), function (req, res) {
         console.log(new Date().toISOString() + "-------------------------get scenario:------------------------------")
         console.log(req.body);
         //parse the where clause into the main sql statement
-        sql = sql.replace(new RegExp("where_clause",'g'),w)
+        sql = sql.replace(new RegExp("where_clause", 'g'), w)
-        //execute the sql and send the result
+            //execute the sql and send the result
-        //console.log(sql);
+            //console.log(sql);
-        Postgres.FirstRow(sql,[],res)
+        Postgres.FirstRow(sql, [], res)
     };
 })
 
-server.get('/list_changes', bodyParser.json(), function (req, res) {
+server.get('/list_changes', bodyParser.json(), function(req, res) {
 
     var sql = "";
     var w = "";
@@ -142,8 +142,8 @@ server.get('/list_changes', bodyParser.json(), function (req, res) {
     var args = [];
     var path = './route_sql/list_changes.sql';
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             console.log("fatal error pulling sql file")
@@ -151,20 +151,20 @@ server.get('/list_changes', bodyParser.json(), function (req, res) {
         }
     });
 
-    var callback = function(arg){
+    var callback = function(arg) {
         sql = arg;
-        
+
-        console.log(new Date().toISOString() +"-------------------------list changes:------------------------------")
+        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
+            //execute the sql and send the result
-        //console.log(sql);
+        console.log(sql);
-        Postgres.FirstRow(sql,[],res)
+        Postgres.FirstRow(sql, [], res)
     };
 })
 
-server.post('/addmonth_v', bodyParser.json(), function (req, res) {
+server.post('/addmonth_v', bodyParser.json(), function(req, res) {
 
     var sql = "";
     var w = "";
@@ -173,16 +173,16 @@ server.post('/addmonth_v', bodyParser.json(), function (req, res) {
     var args = [];
     var path = './route_sql/addmonth_vd.sql';
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             console.log("fatal error pulling sql file")
             callback(err);
         }
     });
-    
+
-    var callback = function(arg){
+    var callback = function(arg) {
         sql = arg;
         //buile where clause expression
         ({ c, w, d } = build_where(req, c, w, d, args));
@@ -191,22 +191,22 @@ server.post('/addmonth_v', bodyParser.json(), function (req, res) {
             res.send("no body was sent");
             return;
         }
-        console.log(new Date().toISOString() +"-----------------------------add month volume:---------------------------------");
+        console.log(new Date().toISOString() + "-----------------------------add month volume:---------------------------------");
         req.body.stamp = new Date().toISOString()
         console.log(req.body);
         //console.log(args);
-        sql = sql.replace(new RegExp("scenario = target_scenario",'g'),w);
+        sql = sql.replace(new RegExp("scenario = target_scenario", 'g'), w);
-        sql = sql.replace(new RegExp("target_increment",'g'),req.body.qty);
+        sql = sql.replace(new RegExp("target_increment", 'g'), req.body.qty);
-        sql = sql.replace(new RegExp("target_month",'g'),req.body.month);
+        sql = sql.replace(new RegExp("target_month", 'g'), req.body.month);
-        sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
+        sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
-        sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
+        sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
-        sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
+        sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
         console.log(sql)
-        Postgres.FirstRow(sql,[],res)
+        Postgres.FirstRow(sql, [], res)
     }
 })
 
-server.post('/addmonth_vp', bodyParser.json(), function (req, res) {
+server.post('/addmonth_vp', bodyParser.json(), function(req, res) {
 
     var sql = "";
     var w = "";
@@ -214,8 +214,8 @@ server.post('/addmonth_vp', bodyParser.json(), function (req, res) {
     var d = 1;
     var args = [];
     var path = './route_sql/addmonth_vupd.sql';
-    
+
-    var callback = function(arg){
+    var callback = function(arg) {
         sql = arg;
 
         ({ c, w, d } = build_where(req, c, w, d, args));
@@ -224,23 +224,23 @@ server.post('/addmonth_vp', bodyParser.json(), function (req, res) {
             res.send("no body was sent");
             return;
         }
-        console.log(new Date().toISOString() +"------------------add month volume and price:-------------------");
+        console.log(new Date().toISOString() + "------------------add month volume and price:-------------------");
         req.body.stamp = new Date().toISOString()
         console.log(req.body);
         //console.log(args);
-        sql = sql.replace(new RegExp("where_clause",'g'),w);
+        sql = sql.replace(new RegExp("where_clause", 'g'), w);
-        sql = sql.replace(new RegExp("target_volume",'g'),req.body.qty);
+        sql = sql.replace(new RegExp("target_volume", 'g'), req.body.qty);
-        sql = sql.replace(new RegExp("target_price",'g'),req.body.amount);
+        sql = sql.replace(new RegExp("target_price", 'g'), req.body.amount);
-        sql = sql.replace(new RegExp("target_month",'g'),req.body.month);
+        sql = sql.replace(new RegExp("target_month", 'g'), req.body.month);
-        sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
+        sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
-        sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
+        sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
-        sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
+        sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
         console.log(sql);
-        Postgres.FirstRow(sql,[],res)
+        Postgres.FirstRow(sql, [], res)
     }
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             console.log("fatal error pulling sql file")
@@ -249,7 +249,7 @@ server.post('/addmonth_vp', bodyParser.json(), function (req, res) {
     });
 })
 
-server.post('/scale_v', bodyParser.json(), function (req, res) {
+server.post('/scale_v', bodyParser.json(), function(req, res) {
 
     var sql = "";
     var w = "";
@@ -257,8 +257,8 @@ server.post('/scale_v', bodyParser.json(), function (req, res) {
     var d = 1;
     var args = [];
     var path = './route_sql/scale_vd.sql';
-    
+
-    var callback = function(arg){
+    var callback = function(arg) {
         sql = arg;
 
         ({ c, w, d } = build_where(req, c, w, d, args));
@@ -267,21 +267,21 @@ server.post('/scale_v', bodyParser.json(), function (req, res) {
             res.send("no body was sent");
             return;
         }
-        console.log(new Date().toISOString() +"-----------------------scale volume:------------------------------");
+        console.log(new Date().toISOString() + "-----------------------scale volume:------------------------------");
         req.body.stamp = new Date().toISOString()
         console.log(req.body);
         //console.log(args);
-        sql = sql.replace(new RegExp("where_clause",'g'),w);
+        sql = sql.replace(new RegExp("where_clause", 'g'), w);
-        sql = sql.replace(new RegExp("incr_qty",'g'),req.body.qty);
+        sql = sql.replace(new RegExp("incr_qty", 'g'), req.body.qty);
-        sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
+        sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
-        sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
+        sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
-        sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
+        sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
         console.log(sql);
-        Postgres.FirstRow(sql,[],res)
+        Postgres.FirstRow(sql, [], res)
     }
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             console.log("fatal error pulling sql file")
@@ -290,7 +290,7 @@ server.post('/scale_v', bodyParser.json(), function (req, res) {
     });
 })
 
-server.post('/scale_p', bodyParser.json(), function (req, res) {
+server.post('/scale_p', bodyParser.json(), function(req, res) {
 
     var sql = "";
     var w = "";
@@ -298,8 +298,8 @@ server.post('/scale_p', bodyParser.json(), function (req, res) {
     var d = 1;
     var args = [];
     var path = './route_sql/scale_pd.sql';
-    
+
-    var callback = function(arg){
+    var callback = function(arg) {
         sql = arg;
 
         ({ c, w, d } = build_where(req, c, w, d, args));
@@ -308,21 +308,21 @@ server.post('/scale_p', bodyParser.json(), function (req, res) {
             res.send("no body was sent");
             return;
         }
-        console.log(new Date().toISOString() +"--------------------scale price:-------------------");
+        console.log(new Date().toISOString() + "--------------------scale price:-------------------");
         req.body.stamp = new Date().toISOString()
         console.log(req.body);
         //console.log(args);
-        sql = sql.replace(new RegExp("where_clause",'g'),w);
+        sql = sql.replace(new RegExp("where_clause", 'g'), w);
-        sql = sql.replace(new RegExp("target_increment",'g'),req.body.amount);
+        sql = sql.replace(new RegExp("target_increment", 'g'), req.body.amount);
-        sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
+        sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
-        sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
+        sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
-        sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
+        sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
         console.log(sql);
-        Postgres.FirstRow(sql,[],res)
+        Postgres.FirstRow(sql, [], res)
     }
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             console.log("fatal error pulling sql file")
@@ -331,7 +331,7 @@ server.post('/scale_p', bodyParser.json(), function (req, res) {
     });
 })
 
-server.post('/scale_vp', bodyParser.json(), function (req, res) {
+server.post('/scale_vp', bodyParser.json(), function(req, res) {
 
     var sql = "";
     var w = "";
@@ -339,8 +339,8 @@ server.post('/scale_vp', bodyParser.json(), function (req, res) {
     var d = 1;
     var args = [];
     var path = './route_sql/scale_vupd.sql';
-    
+
-    var callback = function(arg){
+    var callback = function(arg) {
         sql = arg;
 
         ({ c, w, d } = build_where(req, c, w, d, args));
@@ -349,22 +349,22 @@ server.post('/scale_vp', bodyParser.json(), function (req, res) {
             res.send("no body was sent");
             return;
         }
-        console.log(new Date().toISOString() +"--------------------scale volume & price:-------------------");
+        console.log(new Date().toISOString() + "--------------------scale volume & price:-------------------");
         req.body.stamp = new Date().toISOString()
         console.log(req.body);
         //console.log(args);
-        sql = sql.replace(new RegExp("where_clause",'g'),w);
+        sql = sql.replace(new RegExp("where_clause", 'g'), w);
-        sql = sql.replace(new RegExp("target_vol",'g'),req.body.qty);
+        sql = sql.replace(new RegExp("target_vol", 'g'), req.body.qty);
-        sql = sql.replace(new RegExp("target_prc",'g'),req.body.amount);
+        sql = sql.replace(new RegExp("target_prc", 'g'), req.body.amount);
-        sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
+        sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
-        sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
+        sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
-        sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
+        sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
         console.log(sql);
-        Postgres.FirstRow(sql,[],res)
+        Postgres.FirstRow(sql, [], res)
     }
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             console.log("fatal error pulling sql file")
@@ -373,7 +373,7 @@ server.post('/scale_vp', bodyParser.json(), function (req, res) {
     });
 })
 
-server.post('/new_part', bodyParser.json(), function (req, res) {
+server.post('/new_part', bodyParser.json(), function(req, res) {
 
     var sql = "";
     var w = "";
@@ -381,8 +381,8 @@ server.post('/new_part', bodyParser.json(), function (req, res) {
     var d = 1;
     var args = [];
     var path = './route_sql/new_part.sql';
-    
+
-    var callback = function(arg){
+    var callback = function(arg) {
         sql = arg;
 
         ({ c, w, d } = build_where(req, c, w, d, args));
@@ -391,23 +391,23 @@ server.post('/new_part', bodyParser.json(), function (req, res) {
             res.send("no body was sent");
             return;
         }
-        console.log(new Date().toISOString() +"--------------------new part:-------------------");
+        console.log(new Date().toISOString() + "--------------------new part:-------------------");
         req.body.stamp = new Date().toISOString()
         console.log(req.body);
         //console.log(args);
-        sql = sql.replace(new RegExp("where_clause",'g'),w);
+        sql = sql.replace(new RegExp("where_clause", 'g'), w);
-        sql = sql.replace(new RegExp("target_vol",'g'),req.body.qty);
+        sql = sql.replace(new RegExp("target_vol", 'g'), req.body.qty);
-        sql = sql.replace(new RegExp("target_prc",'g'),req.body.amount);
+        sql = sql.replace(new RegExp("target_prc", 'g'), req.body.amount);
-        sql = sql.replace(new RegExp("replace_request",'g'),JSON.stringify(req.body));
+        sql = sql.replace(new RegExp("replace_request", 'g'), JSON.stringify(req.body));
-        sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
+        sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
-        sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
+        sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
-        sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
+        sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
         console.log(sql);
-        Postgres.FirstRow(sql,[],res)
+        Postgres.FirstRow(sql, [], res)
     }
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             console.log("fatal error pulling sql file")
@@ -416,7 +416,7 @@ server.post('/new_part', bodyParser.json(), function (req, res) {
     });
 })
 
-server.post('/new_basket', bodyParser.json(), function (req, res) {
+server.post('/new_basket', bodyParser.json(), function(req, res) {
 
     var sql = "";
     var w = "";
@@ -424,8 +424,8 @@ server.post('/new_basket', bodyParser.json(), function (req, res) {
     var d = 1;
     var args = [];
     var path = './route_sql/new_basket.sql';
-    
+
-    var callback = function(arg){
+    var callback = function(arg) {
         sql = arg;
 
         ({ c, w, d } = build_where(req, c, w, d, args));
@@ -434,23 +434,23 @@ server.post('/new_basket', bodyParser.json(), function (req, res) {
             res.send("no body was sent");
             return;
         }
-        console.log(new Date().toISOString() +"--------------------new basket:-------------------");
+        console.log(new Date().toISOString() + "--------------------new basket:-------------------");
         req.body.stamp = new Date().toISOString()
         console.log(req.body);
         //console.log(args);
-        sql = sql.replace(new RegExp("where_clause",'g'),w);
+        sql = sql.replace(new RegExp("where_clause", 'g'), w);
-        sql = sql.replace(new RegExp("target_vol",'g'),req.body.qty);
+        sql = sql.replace(new RegExp("target_vol", 'g'), req.body.qty);
-        sql = sql.replace(new RegExp("target_prc",'g'),req.body.amount);
+        sql = sql.replace(new RegExp("target_prc", 'g'), req.body.amount);
-        sql = sql.replace(new RegExp("replace_request",'g'),JSON.stringify(req.body));
+        sql = sql.replace(new RegExp("replace_request", 'g'), JSON.stringify(req.body));
-        sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version);
+        sql = sql.replace(new RegExp("replace_version", 'g'), req.body.scenario.version);
-        sql = sql.replace(new RegExp("replace_source",'g'),req.body.source);
+        sql = sql.replace(new RegExp("replace_source", 'g'), req.body.source);
-        sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body));
+        sql = sql.replace(new RegExp("replace_iterdef", 'g'), JSON.stringify(req.body));
         console.log(sql);
-        Postgres.FirstRow(sql,[],res)
+        Postgres.FirstRow(sql, [], res)
     }
 
-    fs.readFile(path, 'utf8', function(err, data){
+    fs.readFile(path, 'utf8', function(err, data) {
-        if (!err){
+        if (!err) {
             callback(data);
         } else {
             console.log("fatal error pulling sql file")
@@ -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
@@ -128,4 +128,14 @@ FROM
     LEFT OUTER JOIN rlarp.itemm i ON
         i.item = o.part
     --LIMIT 100
-) WITH DATA;
+) 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 
+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/scale_pd.sql

@@ -1,157 +1,83 @@
 WITH 
 target AS (select target_increment incr)
 ,basemix AS (
-SELECT
+    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,193 +115,143 @@ SELECT
             0
         END mod_price
 )
+,log AS (
+    INSERT INTO rlarp.osm_log(doc) SELECT $$replace_iterdef$$::jsonb doc RETURNING *
+)
 ,final AS (
-SELECT
+    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 
+    FROM
-    ,b.assc          --master data 
+        basemix b
-    ,b.fs_line          --master data 
+        CROSS JOIN scale s
-    ,b.r_currency          --history cust mix
+        CROSS JOIN log
-    ,b.r_rate          --master data 
+    WHERE
-    ,b.c_currency          --master data 
+        s.factor <> 0 or s.mod_price <> 0
-    ,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
-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
+   SELECT
-    bill_cust_descr
+        ---------customer info-----------------
-    ,billto_group
+        bill_cust_descr
-    ,ship_cust_descr
+        ,billto_group
-    ,shipto_group
+        ,ship_cust_descr
-    ,quota_rep_descr
+        ,shipto_group
-    ,director_descr
+        ,quota_rep_descr
-    ,segm
+        ,director
-    ,mod_chan
+        ,segm
-    ,mod_chansub
+        ,chan
-    ,majg_descr
+        ,chansub
-    ,ming_descr
+        ---------product info------------------
-    ,majs_descr
+        ,majg_descr
-    ,mins_descr
+        ,ming_descr
-    ,brand
+        ,majs_descr
-    ,part_family
+        ,mins_descr
-    ,part_group
+        --,brand
-    ,branding
+        --,part_family
-    ,color
+        ,part_group
-    ,part_descr
+        ,branding
-    ,order_season
+        --,color
-    ,order_month
+        ,part_descr
-    ,ship_season
+        ---------dates-------------------------
-    ,ship_month
+        ,order_season
-    ,request_season
+        ,order_month
-    ,request_month
+        ,ship_season
-    ,promo
+        ,ship_month
-    ,version
+        ,request_season
-    ,iter
+        ,request_month
-    ,sum(value_loc) value_loc
+        ,promo
-    ,sum(value_usd) value_usd
+        ,version
-    ,sum(cost_loc) cost_loc
+        ,iter
-    ,sum(cost_usd) cost_usd
+        --------values-------------------------
-    ,sum(units) units
+        ,sum(value_loc) value_loc
-FROM
+        ,sum(value_usd) value_usd
-    ins
+        ,sum(cost_loc) cost_loc
-GROUP BY
+        ,sum(cost_usd) cost_usd
-    bill_cust_descr
+        ,sum(units) units
-    ,billto_group
+    FROM
-    ,ship_cust_descr
+        ins
-    ,shipto_group
+    GROUP BY
-    ,quota_rep_descr
+        ---------customer info-----------------
-    ,director_descr
+        bill_cust_descr
-    ,segm
+        ,billto_group
-    ,mod_chan
+        ,ship_cust_descr
-    ,mod_chansub
+        ,shipto_group
-    ,majg_descr
+        ,quota_rep_descr
-    ,ming_descr
+        ,director
-    ,majs_descr
+        ,segm
-    ,mins_descr
+        ,chan
-    ,brand
+        ,chansub
-    ,part_family
+        ---------product info------------------
-    ,part_group
+        ,majg_descr
-    ,branding
+        ,ming_descr
-    ,color
+        ,majs_descr
-    ,part_descr
+        ,mins_descr
-    ,order_season
+        --,brand
-    ,order_month
+        --,part_family
-    ,ship_season
+        ,part_group
-    ,ship_month
+        ,branding
-    ,request_season
+        --,color
-    ,request_month
+        ,part_descr
-    ,promo
+        ---------dates-------------------------
-    ,version
+        ,order_season
-    ,iter
+        ,order_month
+        ,ship_season
+        ,ship_month
+        ,request_season
+        ,request_month
+        ,promo
+        ,version
+        ,iter
 )
 SELECT json_agg(row_to_json(insagg)) x from insagg

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
@@ -38,115 +37,53 @@ target AS (select incr_qty qincr)
 )
 --ever need receive a target of -0- qty but value <> 0?
 ,basemix AS (
-SELECT
+    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,229 +126,159 @@ SELECT
         ,c_rate          --master data 
         ,calc_status          --0 
         ,flag          --0 
-        ,orderdate          --history date mix
+        ,order_date          --history date mix
-        ,requestdate          --history date mix
+        ,order_month
-        ,shipdate          --history date mix
+        ,order_season
-        ,adj_orderdate          --history 
+        ,request_date          --history date mix
-        ,adj_requestdate          --history 
+        ,request_month
-        ,adj_shipdate          --history 
+        ,request_season
-        ---------------ui columns-------------------------
+        ,ship_date          --history date mix
+        ,ship_month
+        ,ship_season
+)
+--SELECT * FROM basemix
+,scale AS (
+    SELECT
+        (SELECT qincr::numeric FROM target) incr
+        ,(SELECT sum(value_loc *r_rate) FROM basemix) base
+        ,(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
+        fspr
+        ,plnt          ---master data 
+        ,promo          --history date mix
+        ,terms
+        ,bill_cust_descr          --history cust mix
+        ,ship_cust_descr          --history cust mix
+        ,dsm
+        ,quota_rep_descr          --master data 
+        ,director
+        ,billto_group          --master data 
+        ,shipto_group
+        ,chan          --master data 
+        ,chansub
+        ,chan_retail
+        ,part
+        ,part_descr
+        ,part_group
+        ,branding
+        ,majg_descr
+        ,ming_descr
+        ,majs_descr
+        ,mins_descr
+        ,segm
+        ,fs_line          --master data 
+        ,r_currency          --history cust mix
+        ,r_rate          --master data 
+        ,c_currency          --master data 
+        ,c_rate          --master data 
+        ,units*s.factor
+        ,value_loc*s.factor value_loc
+        ,value_usd*s.factor value_usd
+        ,cost_loc*s.factor cost_loc
+        ,cost_usd*s.factor cost_usd
+        ,calc_status          --0 
+        ,flag          --0 
+        ,order_date          --history date mix
+        ,order_month
+        ,order_season
+        ,request_date          --history date mix
+        ,request_month
+        ,request_season
+        ,ship_date          --history date mix
+        ,ship_month
+        ,ship_season
+        ,'replace_version' "version"
+        ,'replace_source'||' volume'  iter
+        ,log.id
+        ,log.doc->>'comment' "comment"
+        ,log.doc->>'type' module
+FROM
+    basemix b
+    CROSS JOIN scale s
+    CROSS JOIN log
+)
+--select sum(value_usd), count(*) from final
+, ins AS (
+    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
+        ,segm
+        ,chan
+        ,chansub
+        ---------product info------------------
+        ,majg_descr
+        ,ming_descr
+        ,majs_descr
+        ,mins_descr
+        --,brand
+        --,part_family
+        ,part_group
+        ,branding
+        --,color
+        ,part_descr
+        ---------dates-------------------------
         ,order_season
         ,order_month
         ,ship_season
         ,ship_month
         ,request_season
         ,request_month
-        ,part_descr
+        ,promo
-        ,part_family
+        ,version
-        ,part_group
+        ,iter
-        ,branding
+        --------values-------------------------
-        ,color
+        ,sum(value_loc) value_loc
-        ,segm
+        ,sum(value_usd) value_usd
-        ,bill_cust_descr
+        ,sum(cost_loc) cost_loc
+        ,sum(cost_usd) cost_usd
+        ,sum(units) units
+    FROM
+        ins
+    GROUP BY
+        ---------customer info-----------------
+        bill_cust_descr
         ,billto_group
         ,ship_cust_descr
         ,shipto_group
+        ,quota_rep_descr
+        ,director
+        ,segm
+        ,chan
+        ,chansub
+        ---------product info------------------
         ,majg_descr
         ,ming_descr
         ,majs_descr
         ,mins_descr
-        ,mod_chan
+        --,brand
-        ,mod_chansub
+        --,part_family
-        ,quota_rep_descr
+        ,part_group
-        ,director_descr
+        ,branding
-)
+        --,color
---SELECT * FROM basemix
+        ,part_descr
-,scale AS (
+        ---------dates-------------------------
-    SELECT
+        ,order_season
-        (SELECT qincr::numeric FROM target) incr
+        ,order_month
-        ,(SELECT sum(fb_val_loc *r_rate) FROM basemix) base
+        ,ship_season
-        ,(SELECT qincr FROM target)/(SELECT SUM(fb_qty) FROM basemix) factor
+        ,ship_month
-)
+        ,request_season
---select * from scale
+        ,request_month
-,final AS (
+        ,promo
-SELECT
+        ,version
-    b.plnt          --master data 
+        ,iter
-    ,b."ddord#"          --0 
-    ,b."dditm#"          --0 
-    ,b."fgbol#"          --0 
-    ,b."fgent#"          --0 
-    ,b."diinv#"          --0 
-    ,b."dilin#"          --0 
-    ,b.promo          --history date mix
-    ,b.return_reas          --0 
-    ,b.terms          --history cust mix
-    ,b.custpo          --0 
-    ,b.dhincr          --0 
-    ,b.diext          --0 
-    ,b.ditdis          --0 
-    ,b.dcodat          --calculated date mix
-    ,b.ddqdat          --calculated date mix
-    ,b.dcmdat          --calculated date mix
-    ,b.dhidat          --calculated date mix
-    ,b.fspr          --calculated date mix
-    ,b.remit_to          --master data 
-    ,b.bill_class          --master data 
-    ,b.bill_cust          --history cust mix
-    ,b.bill_rep          --master data 
-    ,b.bill_terr          --master data 
-    ,b.ship_class          --master data 
-    ,b.ship_cust          --history cust mix
-    ,b.ship_rep          --master data 
-    ,b.ship_terr          --master data 
-    ,b.quota_rep          --master data 
-    ,b.account          --master data 
-    ,b.shipgrp          --master data 
-    ,b.geo          --master data 
-    ,b.chan          --master data 
-    ,b.orig_ctry          --master data 
-    ,b.orig_prov          --master data 
-    ,b.orig_post          --master data 
-    ,b.dest_ctry          --master data 
-    ,b.dest_prov          --master data 
-    ,b.dest_post          --master data 
-    ,b.part          --history part mix
-    ,b.ord_gldc          --master data 
-    ,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.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--------------------------------
-    ,'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 scale s
-)
---select sum(value_usd), count(*) from final
-, ins AS (
-    INSERT INTO rlarp.osm_fcpool SELECT * FROM final RETURNING *
-)
-,insagg AS (
-SELECT
-    bill_cust_descr
-    ,billto_group
-    ,ship_cust_descr
-    ,shipto_group
-    ,quota_rep_descr
-    ,director_descr
-    ,segm
-    ,mod_chan
-    ,mod_chansub
-    ,majg_descr
-    ,ming_descr
-    ,majs_descr
-    ,mins_descr
-    ,brand
-    ,part_family
-    ,part_group
-    ,branding
-    ,color
-    ,part_descr
-    ,order_season
-    ,order_month
-    ,ship_season
-    ,ship_month
-    ,request_season
-    ,request_month
-    ,promo
-    ,version
-    ,iter
-    ,sum(value_loc) value_loc
-    ,sum(value_usd) value_usd
-    ,sum(cost_loc) cost_loc
-    ,sum(cost_usd) cost_usd
-    ,sum(units) units
-FROM
-    ins
-GROUP BY
-    bill_cust_descr
-    ,billto_group
-    ,ship_cust_descr
-    ,shipto_group
-    ,quota_rep_descr
-    ,director_descr
-    ,segm
-    ,mod_chan
-    ,mod_chansub
-    ,majg_descr
-    ,ming_descr
-    ,majs_descr
-    ,mins_descr
-    ,brand
-    ,part_family
-    ,part_group
-    ,branding
-    ,color
-    ,part_descr
-    ,order_season
-    ,order_month
-    ,ship_season
-    ,ship_month
-    ,request_season
-    ,request_month
-    ,promo
-    ,version
-    ,iter
 )
 SELECT json_agg(row_to_json(insagg)) x from insagg

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 
+        ,'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
@@ -378,191 +227,138 @@ 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 
+        ,'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
+    SELECT
-    bill_cust_descr
+        ---------customer info-----------------
-    ,billto_group
+        bill_cust_descr
-    ,ship_cust_descr
+        ,billto_group
-    ,shipto_group
+        ,ship_cust_descr
-    ,quota_rep_descr
+        ,shipto_group
-    ,director_descr
+        ,quota_rep_descr
-    ,segm
+        ,director
-    ,mod_chan
+        ,segm
-    ,mod_chansub
+        ,chan
-    ,majg_descr
+        ,chansub
-    ,ming_descr
+        ---------product info------------------
-    ,majs_descr
+        ,majg_descr
-    ,mins_descr
+        ,ming_descr
-    ,brand
+        ,majs_descr
-    ,part_family
+        ,mins_descr
-    ,part_group
+        --,brand
-    ,branding
+        --,part_family
-    ,color
+        ,part_group
-    ,part_descr
+        ,branding
-    ,order_season
+        --,color
-    ,order_month
+        ,part_descr
-    ,ship_season
+        ---------dates-------------------------
-    ,ship_month
+        ,order_season
-    ,request_season
+        ,order_month
-    ,request_month
+        ,ship_season
-    ,promo
+        ,ship_month
-    ,version
+        ,request_season
-    ,iter
+        ,request_month
-    ,sum(value_loc) value_loc
+        ,promo
-    ,sum(value_usd) value_usd
+        ,version
-    ,sum(cost_loc) cost_loc
+        ,iter
-    ,sum(cost_usd) cost_usd
+        --------values-------------------------
-    ,sum(units) units
+        ,sum(value_loc) value_loc
-FROM
+        ,sum(value_usd) value_usd
-    ins
+        ,sum(cost_loc) cost_loc
-GROUP BY
+        ,sum(cost_usd) cost_usd
-    bill_cust_descr
+        ,sum(units) units
-    ,billto_group
+    FROM
-    ,ship_cust_descr
+        ins
-    ,shipto_group
+    GROUP BY
-    ,quota_rep_descr
+        ---------customer info-----------------
-    ,director_descr
+        bill_cust_descr
-    ,segm
+        ,billto_group
-    ,mod_chan
+        ,ship_cust_descr
-    ,mod_chansub
+        ,shipto_group
-    ,majg_descr
+        ,quota_rep_descr
-    ,ming_descr
+        ,director
-    ,majs_descr
+        ,segm
-    ,mins_descr
+        ,chan
-    ,brand
+        ,chansub
-    ,part_family
+        ---------product info------------------
-    ,part_group
+        ,majg_descr
-    ,branding
+        ,ming_descr
-    ,color
+        ,majs_descr
-    ,part_descr
+        ,mins_descr
-    ,order_season
+        --,brand
-    ,order_month
+        --,part_family
-    ,ship_season
+        ,part_group
-    ,ship_month
+        ,branding
-    ,request_season
+        --,color
-    ,request_month
+        ,part_descr
-    ,promo
+        ---------dates-------------------------
-    ,version
+        ,order_season
-    ,iter
+        ,order_month
+        ,ship_season
+        ,ship_month
+        ,request_season
+        ,request_month
+        ,promo
+        ,version
+        ,iter
 )
 SELECT json_agg(row_to_json(insagg)) x from insagg

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