优化

firstleg/src/main/java/com/baiyue/firstleg/dto/MerchantWorkbenchFilters.java

@@ -13,5 +13,8 @@ public final class MerchantWorkbenchFilters {
         @Pattern(regexp = "WAIT_MEASURE|WAIT_PALLETIZE|WAIT_SPLIT|LOADING|LOADED|DELIVERED") String mainStatus) {}
 
     public record Response(List<Long> matchingStatusOrderIds, List<Long> feeOrderIds,
-                           List<Long> customsOrderIds) {}
+                           List<Long> customsOrderIds, List<Progress> progress) {}
+
+    public record Progress(long orderId, String stage, boolean partial) {}
+    public record Fragment(long orderId, int stage) {}
 }

firstleg/src/main/java/com/baiyue/firstleg/mapper/MerchantWorkbenchFilterMapper.java

@@ -63,4 +63,29 @@ public interface MerchantWorkbenchFilterMapper {
         ORDER BY i.order_id
         """)
     List<Long> pendingCustoms(@Param("tenantId") long tenantId);
+    /** Only physically loaded fragments can expose container milestones to the customer. */
+    @Select("""
+        SELECT o.order_id, CASE WHEN owned.container_booking_id IS NULL THEN 0
+               WHEN EXISTS (SELECT 1 FROM fl_carrier_schedule_node_fact n
+                 WHERE n.container_booking_id=owned.container_booking_id
+                   AND n.standard_node='PICKUP_READY' AND n.actual_at IS NOT NULL) THEN 3
+               WHEN EXISTS (SELECT 1 FROM fl_customs_container c
+                 WHERE c.loading_plan_id=owned.loading_plan_id AND c.status='COMPLETED') THEN 2
+               ELSE 1 END AS stage
+        FROM fl_inbound_order o
+        LEFT JOIN (
+          SELECT DISTINCT i.inbound_id, i.account_id, p.id AS loading_plan_id, p.container_booking_id
+          FROM fl_loading_plan_item i
+          JOIN fl_loading_plan p ON p.id=i.loading_plan_id AND p.plan_status='COMPLETED'
+          JOIN fl_loading_pick_task t ON t.loading_plan_id=p.id AND t.task_status='COMPLETED'
+          JOIN fl_loading_pick_item picked ON picked.pick_task_id=t.id AND picked.loading_plan_item_id=i.id
+          JOIN fl_container_booking b ON b.id=p.container_booking_id AND b.record_status='ACTIVE'
+          WHERE i.account_id=#{tenantId} AND i.deleted=0
+            AND picked.item_status IN ('PICKED','PARTIAL') AND picked.picked_package_count>0
+        ) owned ON owned.inbound_id=o.id AND owned.account_id=o.tenant_id
+        WHERE o.tenant_id=#{tenantId} AND o.deleted=0 AND o.order_id IS NOT NULL
+          AND o.process_status <> 'CANCELLED'
+        ORDER BY o.order_id
+        """)
+    List<com.baiyue.firstleg.dto.MerchantWorkbenchFilters.Fragment> progressFragments(@Param("tenantId") long tenantId);
 }

firstleg/src/main/java/com/baiyue/firstleg/service/MerchantWorkbenchFilterService.java

@@ -10,10 +10,22 @@ public class MerchantWorkbenchFilterService {
     @Resource private MerchantWorkbenchFilterMapper mapper;
     @Resource private UnifiedInboundQueryService unified;
 
+    @org.springframework.transaction.annotation.Transactional(readOnly=true)
     public MerchantWorkbenchFilters.Response read(MerchantWorkbenchFilters.Request request) {
         return new MerchantWorkbenchFilters.Response(
             request.mainStatus() == null ? null : mapper.byProcessStatuses(request.tenantId(),
                 unified.internalStatuses(request.mainStatus())),
-            mapper.pendingFees(request.tenantId()), mapper.pendingCustoms(request.tenantId()));
+            mapper.pendingFees(request.tenantId()), mapper.pendingCustoms(request.tenantId()),
+            progress(mapper.progressFragments(request.tenantId())));
+    }
+
+    static java.util.List<MerchantWorkbenchFilters.Progress> progress(java.util.List<MerchantWorkbenchFilters.Fragment> facts) {
+        var grouped = facts.stream().collect(java.util.stream.Collectors.groupingBy(MerchantWorkbenchFilters.Fragment::orderId));
+        return grouped.entrySet().stream().sorted(java.util.Map.Entry.comparingByKey()).map(entry -> {
+            int max = entry.getValue().stream().mapToInt(MerchantWorkbenchFilters.Fragment::stage).max().orElse(0);
+            boolean partial = entry.getValue().stream().anyMatch(fragment -> fragment.stage() < max);
+            return new MerchantWorkbenchFilters.Progress(entry.getKey(),
+                switch(max) { case 1 -> "loaded"; case 2 -> "declared"; case 3 -> "cleared"; default -> "none"; }, partial);
+        }).filter(fact -> !"none".equals(fact.stage())).toList();
     }
 }

firstleg/src/main/resources/openapi/firstleg-v1.yaml

@@ -378,11 +378,22 @@ paths:
                   code: {type: string}
                   data:
                     type: object
-                    required: [feeOrderIds, customsOrderIds]
+                    required: [feeOrderIds, customsOrderIds, progress]
                     properties:
                       matchingStatusOrderIds: {type: array, nullable: true, items: {type: integer, format: int64}}
                       feeOrderIds: {type: array, items: {type: integer, format: int64}}
                       customsOrderIds: {type: array, items: {type: integer, format: int64}}
+                      progress:
+                        type: array
+                        description: 实际装载片段投影；报关要求COMPLETED，目的港清关要求PICKUP_READY实际时间，缺失节点不推测。
+                        items:
+                          type: object
+                          required: [orderId, stage, partial]
+                          properties:
+                            orderId: {type: integer, format: int64}
+                            stage: {type: string, enum: [loaded, declared, cleared]}
+                            partial: {type: boolean}
+
   /internal/firstleg/v1/inbounds/unified-orders/query:
     post:
       summary: 按统一订单条件分页查询履约摘要（Order 内部）

firstleg/src/test/java/com/baiyue/firstleg/controller/InternalInboundOrderReferenceControllerTest.java

@@ -49,7 +49,7 @@ class InternalInboundOrderReferenceControllerTest {
         assertThatThrownBy(() -> controller.workbenchFilters(null, request)).isInstanceOf(BizException.class);
         assertThatThrownBy(() -> controller.workbenchFilters("wrong", request)).isInstanceOf(BizException.class);
         org.mockito.Mockito.verifyNoInteractions(workbenchFilters);
-        var response = new com.baiyue.firstleg.dto.MerchantWorkbenchFilters.Response(List.of(1L), List.of(), List.of());
+        var response = new com.baiyue.firstleg.dto.MerchantWorkbenchFilters.Response(List.of(1L), List.of(), List.of(), List.of());
         when(workbenchFilters.read(request)).thenReturn(response);
         assertThat(controller.workbenchFilters("internal-token", request).data()).isEqualTo(response);
     }

firstleg/src/test/java/com/baiyue/firstleg/repository/MerchantWorkbenchFilterMapperTest.java

@@ -26,13 +26,17 @@ class MerchantWorkbenchFilterMapperTest {
         jdbc.execute("CREATE TABLE fl_customs_container(id BIGINT PRIMARY KEY,loading_plan_id BIGINT,status VARCHAR(40))");
         jdbc.execute("CREATE TABLE fl_customs_customer_document(id BIGINT PRIMARY KEY,customs_container_id BIGINT,tenant_id BIGINT,status VARCHAR(32))");
         jdbc.execute("CREATE TABLE fl_customs_customer_document_inbound(document_id BIGINT,inbound_id BIGINT,tenant_id BIGINT)");
+        jdbc.execute("ALTER TABLE fl_loading_plan_item ADD id BIGINT GENERATED BY DEFAULT AS IDENTITY");
+        jdbc.execute("CREATE TABLE fl_loading_pick_task(id BIGINT,loading_plan_id BIGINT,task_status VARCHAR(32))");
+        jdbc.execute("CREATE TABLE fl_loading_pick_item(pick_task_id BIGINT,loading_plan_item_id BIGINT,item_status VARCHAR(32),picked_package_count INT)");
+        jdbc.execute("CREATE TABLE fl_carrier_schedule_node_fact(container_booking_id BIGINT,standard_node VARCHAR(64),actual_at TIMESTAMP)");
         var config=new MybatisConfiguration();config.setMapUnderscoreToCamelCase(true);config.addMapper(MerchantWorkbenchFilterMapper.class);
         var factory=new MybatisSqlSessionFactoryBean();factory.setDataSource(ds);factory.setConfiguration(config);
         mapper=new SqlSessionTemplate(factory.getObject()).getMapper(MerchantWorkbenchFilterMapper.class);
         jdbc.update("INSERT INTO fl_inbound_order VALUES(1,11,101,0,'TAX_REFUND','LOADED'),(2,11,102,0,'TAX_REFUND','DELIVERED'),(3,22,103,0,'TAX_REFUND','LOADED'),(4,11,104,1,'TAX_REFUND','LOADED'),(5,11,105,0,'BUY_DECLARATION','LOADED')");
         jdbc.update("INSERT INTO fl_container_booking VALUES(100,'ACTIVE')");
         jdbc.update("INSERT INTO fl_loading_plan VALUES(100,100,'COMPLETED',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP)");
-        jdbc.update("INSERT INTO fl_loading_plan_item VALUES(100,1,11,0),(100,1,11,0),(100,2,11,0),(100,3,22,0),(100,4,11,0),(100,5,11,0)");
+        jdbc.update("INSERT INTO fl_loading_plan_item(loading_plan_id,inbound_id,account_id,deleted) VALUES(100,1,11,0),(100,1,11,0),(100,2,11,0),(100,3,22,0),(100,4,11,0),(100,5,11,0)");
     }
 
     @Test void latestFeeVersionAndCustomerScopeDetermineConfirmationQueue() {
@@ -71,10 +75,27 @@ class MerchantWorkbenchFilterMapperTest {
         jdbc.update("INSERT INTO fl_customs_container VALUES(200,100,'WAITING_CUSTOMER_DOCUMENTS')");
         jdbc.update("INSERT INTO fl_container_booking VALUES(101,'ACTIVE')");
         jdbc.update("INSERT INTO fl_loading_plan VALUES(101,101,'COMPLETED',TIMESTAMP '2099-01-01 00:00:00',CURRENT_TIMESTAMP)");
-        jdbc.update("INSERT INTO fl_loading_plan_item VALUES(101,1,11,0)");
+        jdbc.update("INSERT INTO fl_loading_plan_item(loading_plan_id,inbound_id,account_id,deleted) VALUES(101,1,11,0)");
         jdbc.update("INSERT INTO fl_customs_container VALUES(201,101,'COMPLETED')");
         assertThat(mapper.pendingCustoms(11)).containsExactly(102L);
         jdbc.update("UPDATE fl_container_booking SET record_status='CANCELLED' WHERE id=100");
         assertThat(mapper.pendingCustoms(11)).isEmpty();
     }
+
+    @Test void onlyActualLoadedOwnedFragmentsAndActualClearanceAdvanceProgress() {
+        assertThat(mapper.progressFragments(11)).allMatch(f->f.stage()==0);
+        jdbc.update("INSERT INTO fl_loading_pick_task VALUES(900,100,'COMPLETED')");
+        jdbc.update("INSERT INTO fl_loading_pick_item SELECT 900,id,'PICKED',2 FROM fl_loading_plan_item");
+        assertThat(mapper.progressFragments(11)).allMatch(f->f.stage()==1).noneMatch(f->f.orderId()==103||f.orderId()==104);
+        jdbc.update("INSERT INTO fl_customs_container VALUES(200,100,'DECLARING')");
+        assertThat(mapper.progressFragments(11)).allMatch(f->f.stage()==1);
+        jdbc.update("UPDATE fl_customs_container SET status='COMPLETED'");
+        assertThat(mapper.progressFragments(11)).allMatch(f->f.stage()==2);
+        jdbc.update("INSERT INTO fl_carrier_schedule_node_fact VALUES(100,'PICKUP_READY',NULL)");
+        assertThat(mapper.progressFragments(11)).allMatch(f->f.stage()==2);
+        jdbc.update("UPDATE fl_carrier_schedule_node_fact SET actual_at=CURRENT_TIMESTAMP");
+        assertThat(mapper.progressFragments(11)).allMatch(f->f.stage()==3);
+        jdbc.update("UPDATE fl_container_booking SET record_status='CANCELLED'");
+        assertThat(mapper.progressFragments(11)).allMatch(f->f.stage()==0);
+    }
 }

firstleg/src/test/java/com/baiyue/firstleg/service/MerchantWorkbenchProgressTest.java

@@ -0,0 +1,17 @@
+package com.baiyue.firstleg.service;
+
+import com.baiyue.firstleg.dto.MerchantWorkbenchFilters.Fragment;
+import org.junit.jupiter.api.Test;
+import java.util.List;
+import static org.assertj.core.api.Assertions.*;
+
+class MerchantWorkbenchProgressTest {
+    @Test void unstartedFragmentsPreventWholeOrderProgressAndLatestFactsWinWithoutInventingHistory() {
+        var facts=List.of(new Fragment(1,0),new Fragment(1,1),new Fragment(2,2),new Fragment(2,3),new Fragment(3,3),new Fragment(4,0));
+        var projected=MerchantWorkbenchFilterService.progress(facts);
+        assertThat(projected).hasSize(3);
+        assertThat(projected.get(0).stage()).isEqualTo("loaded");assertThat(projected.get(0).partial()).isTrue();
+        assertThat(projected.get(1).stage()).isEqualTo("cleared");assertThat(projected.get(1).partial()).isTrue();
+        assertThat(projected.get(2).partial()).isFalse();
+    }
+}