diff --git a/models/marts/warehouse/fct_shipping__origin_warehouse_shipping_packing_lists.sql b/models/marts/warehouse/fct_shipping__origin_warehouse_shipping_packing_lists.sql
index f597e4f..f5cc8f0 100644
--- a/models/marts/warehouse/fct_shipping__origin_warehouse_shipping_packing_lists.sql
+++ b/models/marts/warehouse/fct_shipping__origin_warehouse_shipping_packing_lists.sql
@@ -33,20 +33,20 @@ origin_warehouse_shipping_packing_lists_enrich AS (
     SELECT
         origin_warehouse_shipping_packing_lists.origin_warehouse_shipping_packing_list_id,
         origin_warehouse_shipping_packing_lists.old_origin_warehouse_shipping_packing_list_id,
-        origin_warehouse_shipping_packing_lists.has_replaced_by_new_id  AS has_replaced_by_new_origin_warehouse_shipping_packing_list_id,
+        origin_warehouse_shipping_packing_lists.has_replaced_by_new_id      AS has_replaced_by_new_origin_warehouse_shipping_packing_list_id,
 
-        origin_warehouse_shipping_packing_lists.warehouse_order_number     AS warehouse_order_number,
+        origin_warehouse_shipping_packing_lists.warehouse_order_number      AS warehouse_order_number,
 
         origin_warehouse_shipping_packing_lists.warehouse_sub_company_id,
         origin_warehouse_shipping_packing_lists.reference_contract,
-        origin_warehouse_shipping_packing_lists.status  AS origin_warehouse_shipping_order_status,
-        origin_warehouse_shipping_packing_lists.created_datetime    AS origin_warehouse_shipping_order_created_datetime,
+        origin_warehouse_shipping_packing_lists.status                      AS origin_warehouse_shipping_order_status,
+        origin_warehouse_shipping_packing_lists.created_datetime            AS origin_warehouse_shipping_order_created_datetime,
 
         origin_warehouse_shipping_packing_lists.booking_id,
         bookings.sub_company_id,
         bookings.service_type,
-        bookings.status AS booking_status,
-        bookings.created_datetime    AS booking_created_datetime,
+        bookings.status                 AS booking_status,
+        bookings.created_datetime       AS booking_created_datetime,
 
         booking_delivery_and_billing_addresses.delivery_address_reference,
         booking_delivery_and_billing_addresses.delivery_address_line_one,
@@ -204,6 +204,10 @@ create_new_column AS (
             THEN 1
             ELSE 0 
         END AS is_first_time_sub_company_completed,
+
+        LEAD(origin_warehouse_shipping_order_created_datetime) OVER (
+            PARTITION BY sub_company_id ORDER BY (origin_warehouse_shipping_order_created_datetime, CAST(origin_warehouse_shipping_packing_list_id AS INT))
+        ) AS next_origin_warehouse_shipping_order_created_datetime,
         
         '{{ modules.datetime.datetime.now(modules.pytz.timezone("Asia/Kuala_Lumpur")) }}' AS _dbt_ran_datetime
     
@@ -345,6 +349,7 @@ final__fct_shipping__origin_warehouse_shipping_packing_lists AS (
         destination_warehouse_transport_first_estimate_schedule_created_datetime,
         destination_warehouse_transport_last_estimate_schedule_created_datetime,
         destination_warehouse_transport_created_datetime,
+        next_origin_warehouse_shipping_order_created_datetime,
     
         -- metadata
         _dbt_ran_datetime