diff --git a/offline/scale_cust.pg.sql b/offline/scale_cust.pg.sql index 2c4db7a..677596c 100644 --- a/offline/scale_cust.pg.sql +++ b/offline/scale_cust.pg.sql @@ -4,6 +4,7 @@ pgrp AS ( SELECT o.bill_dba ,o.ship_dba + ,o.dsm ,o.part ,o.odate ,o.qtyord @@ -29,6 +30,7 @@ pgrp AS ( GROUP BY o.bill_dba ,o.ship_dba + ,o.dsm ,o.part ,o.odate ,o.qtyord @@ -67,11 +69,14 @@ pgrp AS ( SELECT o.account ,o.shipgrp + ,o.dsm ,o.part ,o.oseas - ,o.odate + -- ,o.odate + ,og.sortmo omon ,o.sseas - ,o.sdate + -- ,o.sdate + ,sg.sortmo smon -- ,o.calc_status ,ROUND(sum(fb_qty * lbs),5) lbs ,ROUND(sum(fb_qty),2) qty @@ -79,26 +84,36 @@ pgrp AS ( ,ROUND(sum(fb_cst_loc_cur * c_rate),2) cost_curstd_usd FROM rlarp.osmf o + LEFT OUTER JOIN rlarp.gld og ON + o.odate BETWEEN og.sdat and og.edat + LEFT OUTER JOIN rlarp.gld sg ON + o.sdate BETWEEN sg.sdat and sg.edat WHERE iter IN ('actuals','actuals_plug','copy') GROUP BY o.account ,o.shipgrp + ,o.dsm ,o.part ,o.oseas - ,o.odate + -- ,o.odate + ,og.sortmo ,o.sseas - ,o.sdate + -- ,o.sdate + ,sg.sortmo -- ,o.calc_status ) SELECT grp.account ,grp.shipgrp + ,grp.dsm ,grp.part ,grp.oseas - ,grp.odate + ,grp.omon + -- ,grp.odate ,grp.sseas - ,grp.sdate + ,grp.smon + -- ,grp.sdate ,grp.lbs ,grp.qty ,grp.sales_usd