change status so that only true open orders show as such

route_sql/build/copy_orders.sql

@@ -255,8 +255,8 @@ gld AS (
         ,sum(o.fb_cst_loc_fut) fb_cst_loc_fut
         ,sum(o.fb_val_loc) fb_val_loc
         ,sum(o.fb_val_loc_pl) fb_val_loc_pl
-        ,o.calc_status
+        ,'CLOSED' calc_status
-        ,o.flag
+        ,'SHIPMENT' flag
         ,o.orderdate
         ,o.requestdate
         ,greatest(least(o.shipdate,gld.edat),gld.sdat) shipdate
@@ -336,8 +336,6 @@ gld AS (
         ,o.ddqtsi
         ,o.fgqshp
         ,o.diqtsh
-        ,o.calc_status
-        ,o.flag
         ,o.orderdate
         ,o.requestdate
         ,greatest(least(o.shipdate,gld.edat),gld.sdat)

route_sql/build/open_timing.sql

@@ -1,3 +1,5 @@
+BEGIN;
+
 WITH
 mseq AS (
     SELECT * FROM 
@@ -74,30 +76,21 @@ GROUP BY
 ORDER BY
     value_usd DESC
 )
-,rbld AS (
+,upd AS (
-SELECT
+UPDATE rlarp.osmfs o SET
-    o.shipgrp
+    adj_shipdate = greatest(shipdate + lag.wav_lag + 5 ,shipdate)
-    ,o.orderdate
-    ,o.requestdate
-    ,o.shipdate
-    ,o.orderm
-    ,o.rmo
-    ,o.value_usd
-    ,lag.wav_lag
-    ,o.requestdate + lag.wav_lag + 15 rship
 FROM
-    opord o
+    lag
-    LEFT OUTER JOIN lag ON
+WHERE
     lag.shipgrp = o.shipgrp
-        AND lag.orderm = o.orderm
+    AND lag.orderm = to_char(o.orderdate,'Mon')
-        AND lag.rmo = o.rmo
+    AND lag.rmo = extract(month FROM age(o.requestdate,o.orderdate))
-ORDER BY
+    AND o.calc_status in ('BACKORDER','OPEN')
-    value_usd desc
+RETURNING *
 )
-select 
+SELECT 
-    sum(value_usd) filter (where rship >= '2019-04-01')
+    sum(fb_val_loc *r_rate) filter (where adj_shipdate < '2019-04-01') 
-    ,sum(value_usd) filter (where rship < '2019-04-01')
+    ,sum(fb_val_loc *r_rate) filter (where adj_shipdate >= '2019-04-01')
-from 
+from upd;
-    rbld 
+
-where 
+COMMIT;
-    shipdate < '2019-04-01'