@things-factory/warehouse-base 4.3.677 → 4.3.679

package/server/service/inventory-history/inventory-history-query.ts

@@ -235,7 +235,8 @@ export class InventoryHistoryQuery {
           OR Lower(prd.description) LIKE ANY(ARRAY[${productValue}])
           OR Lower(prd.brand) LIKE ANY(ARRAY[${productValue}])
           OR Lower(prd.brand_sku) LIKE ANY(ARRAY[${productValue}])
-        )`
+        )
+        `
       }
 
       let productDescQuery = ''
@@ -247,12 +248,11 @@ export class InventoryHistoryQuery {
       if (hasTransactionOrBalanceFilter && hasTransactionOrBalanceFilter.value) {
         hasTransactionOrBalanceQuery = 'and (src.totalRow > 1 or src.totalQty <> 0)'
       }
-
       await tx.query(
         `
       create temp table temp_products AS 
       (
-        select prd.*, prd.id::varchar as product_id from products prd
+        select prd.id, prd.sku, prd.name, prd.description, prd.type, prd.aux_value_1 from products prd
         inner join bizplaces b on b.id = prd.bizplace_id 
         inner join companies c on c.domain_id = b.domain_id 
         inner join bizplaces b2 on b2.company_id = c.id
@@ -261,20 +261,20 @@ export class InventoryHistoryQuery {
       )`,
         [bizplace.id]
       )
-
       await tx.query(
         `
       create temp table temp_data_src AS
       (
         SELECT prd.sku as sku, prd.name AS product_name, prd.description AS product_description, prd.type as product_type, prd.aux_value_1 AS product_aux_value_1, trim(invh.batch_id) as batch_id, invh.product_id,
-        invh.packing_type, invh.bizplace_id, invh.domain_id,
-        invh.ref_order_id, invh.order_no, invh.order_ref_no, invh.transaction_type, invh.status, invh.created_at,
+        invh.packing_type, invh.bizplace_id,
+        invh.order_no, invh.order_ref_no, invh.transaction_type, invh.status, invh.created_at,
         TRUNC(CAST(invh.qty AS NUMERIC), 3) as qty, TRUNC(CAST(invh.opening_qty AS NUMERIC), 3) as opening_qty, 
         invh.uom, TRUNC(CAST(COALESCE(invh.uom_value, 0) AS NUMERIC), 3) as uom_value, TRUNC(CAST(COALESCE(invh.opening_uom_value, 0) AS NUMERIC), 3) as opening_uom_value
-        FROM reduced_inventory_histories invh
+        FROM inventory_histories invh
         INNER JOIN temp_products prd ON prd.id = invh.product_id::uuid
         WHERE
-        invh.domain_id = $1
+        (invh.qty <> 0 OR invh.uom_value <> 0)
+        AND invh.domain_id = $1
         AND invh.bizplace_id = $2
         AND invh.created_at <= $3::timestamp
         ${batchNoQuery}
@@ -285,105 +285,94 @@ export class InventoryHistoryQuery {
 
       await tx.query(
         `
-        create temp table temp_inv_history as (
-          SELECT src.sku, src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
-          src.bizplace_id, src.domain_id,
-          TRUNC(CAST(SUM(COALESCE(src.qty,0)) AS NUMERIC), 3) AS qty,
-          TRUNC(CAST(SUM(COALESCE(src.opening_qty,0)) AS NUMERIC), 3) AS opening_qty,
-          TRUNC(CAST(SUM(COALESCE(src.uom_value,0)) AS NUMERIC), 3) AS uom_value,
-          TRUNC(CAST(SUM(COALESCE(src.opening_uom_value,0)) AS NUMERIC), 3) AS opening_uom_value,
+        CREATE TEMP TABLE temp_inv_history AS (
+        SELECT
+          src.sku,
+          src.product_name,
+          src.product_description,
+          src.product_type,
+          src.product_aux_value_1,
+          src.batch_id,
+          src.product_id,
+          src.packing_type,
+          src.uom,
+          src.bizplace_id,
+          TRUNC(CAST(SUM(COALESCE(src.qty, 0)) AS NUMERIC), 3) AS qty,
+          TRUNC(CAST(SUM(COALESCE(src.opening_qty, 0)) AS NUMERIC), 3) AS opening_qty,
+          TRUNC(CAST(SUM(COALESCE(src.uom_value, 0)) AS NUMERIC), 3) AS uom_value,
+          TRUNC(CAST(SUM(COALESCE(src.opening_uom_value, 0)) AS NUMERIC), 3) AS opening_uom_value,
           'Opening Balance' AS order_name,
           '-' AS ref_no,
-          '-' as transaction_type,
+          '-' AS transaction_type,
           0 AS rn,
-          $1::timestamp AS created_at,
-          $1::date AS created_date  
-          FROM temp_data_src src
-          WHERE src.created_at < $1::timestamp
-          GROUP BY src.sku, src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
-          src.bizplace_id, src.domain_id
-          UNION ALL
-          SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, TRUNC(CAST(sum(qty) AS NUMERIC), 3) as qty, TRUNC(CAST(sum(opening_qty) AS NUMERIC), 3) as opening_qty, TRUNC(CAST(sum(uom_value) AS NUMERIC), 3) as uom_value, TRUNC(CAST(sum(opening_uom_value) AS NUMERIC), 3) as opening_uom_value, 
-          order_name, ref_no, '-' as transaction_type ,1 AS rn, MIN(created_at) - $2::interval as created_at, (MIN(created_at) - $2::interval)::DATE as created_date
-          FROM (
-            SELECT invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.bizplace_id, 
-            invh.domain_id,
-            invh.qty, invh.opening_qty, invh.uom_value, invh.uom, invh.opening_uom_value,
-            COALESCE(order_no, '-') AS order_name,
-            COALESCE(order_ref_no, '-') AS ref_no,
-            COALESCE(invh.transaction_type, '-') AS transaction_type,
-            invh.created_at,
-            invh.created_at::date as created_date
-            FROM temp_data_src invh
-            WHERE (invh.qty <> 0 OR invh.uom_value <> 0) AND 
-            invh.transaction_type <> 'ADJUSTMENT' AND 
-            invh.transaction_type <> 'PICKING' AND 
-            invh.transaction_type <> 'CANCEL_ORDER' AND 
-            invh.transaction_type <>'NEW'
-            AND invh.created_at >= $1::timestamp
-          ) AS inv_movement
-          GROUP BY sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, order_name, ref_no, rn
-          UNION ALL
-          SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, TRUNC(CAST(sum(qty) AS NUMERIC), 3) as qty, TRUNC(CAST(sum(opening_qty) AS NUMERIC), 3) as opening_qty, TRUNC(CAST(sum(uom_value) AS NUMERIC), 3) as uom_value, TRUNC(CAST(sum(opening_uom_value) AS NUMERIC), 3) as opening_uom_value,
-          CASE 
-          WHEN transaction_type IN ('PICKING', 'CANCEL_ORDER') THEN order_no
-          ELSE order_name
-           END AS order_name,
+          $1::timestamp AS created_at
+        FROM temp_data_src src
+        WHERE src.created_at < $1::timestamp
+        GROUP BY
+          src.sku,
+          src.product_name,
+          src.product_description,
+          src.product_type,
+          src.product_aux_value_1,
+          src.batch_id,
+          src.product_id,
+          src.packing_type,
+          src.uom,
+          src.bizplace_id
+
+        UNION ALL
+
+        -- Part 2: All Inventory Movements (combined into a single scan)
+        -- This SELECT statement replaces the three separate UNION ALLs for
+        -- transaction movements, using CASE statements to handle different
+        -- transaction types and statuses in a single pass.
+        SELECT
+          sku,
+          product_name,
+          product_description,
+          product_type,
+          product_aux_value_1,
+          batch_id,
+          product_id,
+          packing_type,
+          uom,
+          bizplace_id,
+          TRUNC(CAST(SUM(
+            -- qty and uom_value logic for all cases combined
+            CASE
+              WHEN transaction_type = 'ADJUSTMENT' AND status = 'MISSING' THEN -opening_qty
+              ELSE qty
+            END
+          ) AS NUMERIC), 3) AS qty,
+          TRUNC(CAST(SUM(opening_qty) AS NUMERIC), 3) AS opening_qty,
+          TRUNC(CAST(SUM(
+            CASE
+              WHEN transaction_type = 'ADJUSTMENT' AND status = 'MISSING' THEN -opening_uom_value
+              ELSE uom_value
+            END
+          ) AS NUMERIC), 3) AS uom_value,
+          TRUNC(CAST(SUM(opening_uom_value) AS NUMERIC), 3) AS opening_uom_value,
           CASE
-          WHEN transaction_type IN ('PICKING', 'CANCEL_ORDER') THEN ref_no
-          ELSE order_name
-            END AS ref_no, 
-            transaction_type,
-            1 AS rn, 
-          created_at - $2::interval as created_at, 
-          created_at::date as created_date
-        FROM (
-          SELECT 
-            invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, 
-            invh.packing_type, invh.uom, invh.bizplace_id, invh.domain_id,
-            invh.qty, invh.opening_qty,	invh.uom_value, invh.opening_uom_value,
-            invh.transaction_type,  
-            invh.transaction_type AS order_name,
-            order_no,
-            order_ref_no AS ref_no,
-            invh.created_at,
-            invh.created_at::date as created_date
-          FROM temp_data_src invh
-          WHERE (invh.qty <> 0 OR invh.uom_value <> 0) AND 
-            (invh.transaction_type = 'ADJUSTMENT' 
-            OR invh.transaction_type = 'PICKING'
-            OR invh.transaction_type = 'CANCEL_ORDER'
-            OR invh.transaction_type = 'NEW')
-            AND invh.created_at >= $1::timestamp
-        ) AS inv_movement 
-        GROUP BY 
-          sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, inv_movement.transaction_type,inv_movement.order_no,order_name, ref_no, rn, created_at
-          UNION ALL
-          SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, TRUNC(CAST(sum(-opening_qty) AS NUMERIC), 3) as qty, TRUNC(CAST(sum(opening_qty) AS NUMERIC), 3) as opening_qty, TRUNC(CAST(sum(-opening_uom_value) AS NUMERIC), 3) as uom_value, TRUNC(CAST(sum(opening_uom_value) AS NUMERIC), 3) as opening_uom_value,
-          order_name, ref_no, transaction_type,1 AS rn, created_at - $2::interval as created_at, created_at::date as created_date
-          FROM (
-            SELECT invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.uom, invh.bizplace_id, 
-            invh.domain_id,
-            invh.qty, invh.opening_qty,	invh.uom_value, invh.opening_uom_value,
-            invh.transaction_type as transaction_type,
-            invh.transaction_type AS order_name,
-            invh.transaction_type AS ref_no,
-            invh.created_at,
-            invh.created_at:: date as created_date
-            FROM temp_data_src invh
-            WHERE 
-            invh.transaction_type = 'ADJUSTMENT'
-            AND invh.status = 'MISSING'
-            AND invh.created_at >= $1::timestamp
-          ) AS inv_movement 
-          GROUP BY sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, order_name, ref_no, inv_movement.transaction_type,rn, created_at
-        )`,
+            WHEN transaction_type IN ('PICKING', 'CANCEL_ORDER') THEN order_no
+            WHEN transaction_type IN ('ADJUSTMENT', 'NEW') THEN transaction_type
+            ELSE COALESCE(order_no, '-')
+          END AS order_name,
+          CASE
+            WHEN transaction_type IN ('PICKING', 'CANCEL_ORDER') THEN order_ref_no
+            WHEN transaction_type IN ('ADJUSTMENT', 'NEW') THEN transaction_type
+            ELSE COALESCE(order_ref_no, '-')
+          END AS ref_no,
+          transaction_type,
+          1 AS rn,
+          MIN(created_at) - $2::interval AS created_at
+        FROM temp_data_src
+        WHERE
+          created_at >= $1::timestamp
+        GROUP BY
+          sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id,
+          packing_type, uom, bizplace_id,
+          order_name, ref_no, transaction_type
+      )`,
         [fromDate.value, tzoffset]
       )
 
@@ -393,7 +382,7 @@ export class InventoryHistoryQuery {
         result = await tx.query(
           ` 
           select sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, qty, opening_qty, round(uom_value::decimal,2) as uom_value, opening_uom_value, order_name, ref_no, transaction_type,created_at::date
+          qty, opening_qty, round(uom_value::decimal,2) as uom_value, opening_uom_value, order_name, ref_no, transaction_type,created_at::date
           from temp_inv_history invh where
           exists (
             select 1 from (
@@ -410,10 +399,10 @@ export class InventoryHistoryQuery {
         result = await tx.query(
           `
         select sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-        domain_id, sum(qty) as qty, sum(opening_qty) as opening_qty, sum(uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value, order_name, ref_no, transaction_type, created_at::date
+        sum(qty) as qty, sum(opening_qty) as opening_qty, sum(uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value, order_name, ref_no, transaction_type, created_at::date
         from(
           select sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-          domain_id, qty, opening_qty, TRUNC(CAST(uom_value AS NUMERIC), 3) as uom_value, opening_uom_value, order_name, ref_no, transaction_type,created_at::date
+          qty, opening_qty, TRUNC(CAST(uom_value AS NUMERIC), 3) as uom_value, opening_uom_value, order_name, ref_no, transaction_type,created_at
           from temp_inv_history invh where
           exists (
             select 1 from (
@@ -425,7 +414,7 @@ export class InventoryHistoryQuery {
           )
         ) foo
        GROUP BY sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
-       domain_id, order_name, ref_no, transaction_type, created_at
+       order_name, ref_no, transaction_type, created_at
        ORDER BY sku asc, product_name asc, product_description asc, packing_type asc, batch_id asc, uom asc, created_at asc,
         CASE 
             WHEN transaction_type = 'CANCEL_ORDER' THEN 2