Merge pull request #2 from The-HC-Companies/dev

part# whitespace

build/merge_actuals_pool.sql

@@ -23,7 +23,8 @@ repc AS (
     FROM
         (
             VALUES
-            ('1CU','Retail'),
+            ('1SU','Sustainable'),
+            ('1CU','Sustainable'),
             ('1GR','Greenhouse'),
             ('1NU','Nursery'),
             ('1RE','Retail'),

build/snap_itemm_pool.sql

@@ -8,7 +8,8 @@ SEG AS (
     FROM
         (
             VALUES
-            ('1CU','Retail'),
+            ('1SU','Sustainable'),
+            ('1CU','Sustainable'),
             ('1GR','Greenhouse'),
             ('1NU','Nursery'),
             ('1RE','Retail'),

over_under_ship.sql

@@ -0,0 +1,15 @@
+SELECT 
+    calc_status, 
+    flag, 
+    sum(fb_val_loc * r_rate) filter (where fb_qty < 0) overship,
+    sum(fb_val_loc * r_rate) filter (where fb_qty > 0) undership
+FROM 
+    rlarp.osm_dev 
+WHERE 
+    oseas = 2021  
+    AND version = 'ACTUALS' 
+    AND calc_status = 'CLOSED'
+    AND flag = 'REMAINDER'
+GROUP BY 
+    calc_status, 
+    flag;

route_sql/new_basket.sql

@@ -53,7 +53,8 @@ target AS (select $$replace_request$$::json def)
     FROM
         (
             VALUES
-            ('1CU','Retail'),
+            ('1SU','Sustainable'),
+            ('1CU','Sustainable'),
             ('1GR','Greenhouse'),
             ('1NU','Nursery'),
             ('1RE','Retail'),

route_sql/swap_cust.sql

@@ -37,7 +37,8 @@ target AS (SELECT $$swap_doc$$::jsonb swap)
     FROM
         (
             VALUES
-            ('1CU','Retail'),
+            ('1SU','Sustainable'),
+            ('1CU','Sustainable'),
             ('1GR','Greenhouse'),
             ('1NU','Nursery'),
             ('1RE','Retail'),

route_sql/swap_post.sql

@@ -2,7 +2,11 @@ WITH
 target AS (SELECT $$swap_doc$$::jsonb swap)
 ,pl AS (
     SELECT
-        x.*
+        -----trim white space on CMS part numbers coming from spreadsheet master data----
+        rtrim(x.original) AS original
+        ,sales
+        ,rtrim(x."replace") AS replace
+        ,rtrim(x.fit) fit
     FROM
         TARGET
         LEFT JOIN LATERAL jsonb_to_recordset(target.swap->'rows') AS x(original text, sales numeric, replace text, fit text)ON TRUE
@@ -17,7 +21,8 @@ target AS (SELECT $$swap_doc$$::jsonb swap)
     FROM
         (
             VALUES
-            ('1CU','Retail'),
+            ('1CU','Sustainable'),
+            ('1SU','Sustainable'),
             ('1GR','Greenhouse'),
             ('1NU','Nursery'),
             ('1RE','Retail'),