From ac3acfce6a53835e2bbb46bf12a0f228e31067ff Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 27 Sep 2026 21:27:57 +0800
Subject: [PATCH] fix(firstleg): project latest port schedule to merchant
 transport

---
 .../mapper/UnifiedInboundTransportMapper.java | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/UnifiedInboundTransportMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/UnifiedInboundTransportMapper.java
index b27dc0ed5..a40e966d5 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/UnifiedInboundTransportMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/UnifiedInboundTransportMapper.java
@@ -13,12 +13,26 @@ public interface UnifiedInboundTransportMapper {
     @Select("""
         <script>
         SELECT DISTINCT i.inbound_id, i.account_id, p.container_booking_id,
-               b.container_no, b.cabinet_no, b.vessel_name, b.voyage_no,
-               b.estimated_sailing_at, b.actual_sailing_at,
-               b.estimated_port_arrival_at, b.actual_port_arrival_at
+               b.container_no, b.cabinet_no,
+               COALESCE(schedule.vessel_name, b.vessel_name) AS vessel_name,
+               COALESCE(schedule.voyage_no, b.voyage_no) AS voyage_no,
+               COALESCE(schedule.etd_at, b.estimated_sailing_at) AS estimated_sailing_at,
+               b.actual_sailing_at,
+               COALESCE(schedule.eta_at, b.estimated_port_arrival_at) AS estimated_port_arrival_at,
+               b.actual_port_arrival_at
           FROM fl_loading_plan_item i
           JOIN fl_loading_plan p ON p.id = i.loading_plan_id
           JOIN fl_container_booking b ON b.id = p.container_booking_id
+          LEFT JOIN fl_port_schedule schedule
+            ON schedule.id = (
+                SELECT latest.id
+                  FROM fl_port_schedule latest
+                 WHERE latest.customer_id = i.account_id
+                   AND latest.ocean_booking_id = b.ocean_booking_id
+                   AND latest.container_booking_id = b.id
+                 ORDER BY latest.observed_at DESC, latest.updated_at DESC, latest.id DESC
+                 LIMIT 1
+            )
          WHERE i.deleted = 0
            AND p.plan_status IN ('LOADING', 'COMPLETED')
            AND i.inbound_id IN