优化

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

@@ -102,7 +102,10 @@ class LoadingListControllerContractTest {
             .doesNotContainKey("/api/platform/v1/first-leg/loading-plans/{planId}/complete");
         assertThat(stringMap(schemas.get("LongId"))).containsEntry("type", "string");
         assertThat(properties(schemas, "PreloadPage")).containsKeys("records", "page", "size", "total", "pages");
-        assertThat(properties(schemas, "PreloadSummary")).containsKeys("planId", "customers", "skuCount");
+        assertThat(properties(schemas, "PreloadSummary"))
+            .containsKeys("planId", "containerBookingId", "customers", "skuCount");
+        assertThat(properties(schemas, "ConfirmedSummary"))
+            .containsKeys("planId", "containerBookingId", "loadingListNo");
         assertThat(properties(schemas, "LoadingItem")).containsKeys(
             "itemId", "accountId", "inboundId", "inboundDetailId", "skuCode",
             "destinationWarehouse", "productQuantity", "frozenAt");

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

@@ -0,0 +1,64 @@
+package com.baiyue.firstleg.repository;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baiyue.firstleg.dto.LoadingListDtos.ConfirmedQuery;
+import com.baiyue.firstleg.dto.LoadingListDtos.PreloadQuery;
+import com.baiyue.firstleg.mapper.LoadingListQueryMapper;
+import com.baiyue.firstleg.mapper.LoadingListQueryMapper.AggregateRow;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class LoadingListRepositoryTest {
+    @Mock
+    private LoadingListQueryMapper mapper;
+
+    private LoadingListRepository repository;
+
+    @BeforeEach
+    void setUp() {
+        repository = new LoadingListRepository();
+        ReflectionTestUtils.setField(repository, "mapper", mapper);
+    }
+
+    @Test
+    void mapsRealContainerBookingIdIntoPreloadAndConfirmedSummaries() {
+        AggregateRow row = new AggregateRow();
+        row.setPlanId(41L);
+        row.setContainerBookingId(61L);
+        row.setPlanNo("LP-41");
+        row.setPlanStatus("LOADING");
+        row.setVersion(1);
+
+        Page<AggregateRow> preloadPage = new Page<>(1, 20);
+        preloadPage.setRecords(List.of(row));
+        preloadPage.setTotal(1);
+        when(mapper.selectPreloadPage(any(), any())).thenReturn(preloadPage);
+        when(mapper.selectCustomers(List.of(41L))).thenReturn(List.of());
+
+        Page<AggregateRow> confirmedPage = new Page<>(1, 20);
+        confirmedPage.setRecords(List.of(row));
+        confirmedPage.setTotal(1);
+        when(mapper.selectConfirmedPage(any(), any())).thenReturn(confirmedPage);
+
+        var preload = repository.preloadPage(new PreloadQuery(null, null, null, null, null, 1, 20))
+            .records().get(0);
+        var confirmed = repository.confirmedPage(new ConfirmedQuery(null, null, null, null, 1, 20))
+            .records().get(0);
+
+        assertThat(preload.planId()).isEqualTo(41L);
+        assertThat(preload.containerBookingId()).isEqualTo(61L);
+        assertThat(confirmed.planId()).isEqualTo(41L);
+        assertThat(confirmed.containerBookingId()).isEqualTo(61L);
+    }
+}