提交

2026-08-30 18:49:15 +08:00
parent 5ddaa4d51f
commit a4429f95b7
19 changed files with 151 additions and 31 deletions
@@ -193,6 +193,26 @@ class LastlegOrderServiceTest {
        assertEquals(25, page.getValue().getSize());
    }

+    @Test
+    void pageReturnsConfirmedPalletMergeRelatedOrderNumbers() {
+        LastlegOrder order = order(11L, "100", "INBOUND_COMPLETED", "IB-1");
+        order.setPalletMergeFlag("MERGED");
+        var resultPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<LastlegOrder>(1, 10);
+        resultPage.setRecords(List.of(order));
+        resultPage.setTotal(1);
+        when(orders.selectPage(any(), any())).thenReturn(resultPage);
+        when(orders.findPalletMergeRelations(List.of(11L))).thenReturn(List.of(
+            new LastlegOrderMapper.PalletMergeRelationRow(11L, "LMO-RELATED-2", "PMG-1"),
+            new LastlegOrderMapper.PalletMergeRelationRow(11L, "LMO-RELATED-3", "PMG-1")));
+        var query = new LastlegOrderRequests.Query(1, 10, null, null, null, null,
+            null, null, null, null, null, null, null, null, null);
+
+        var result = service.page(null, query);
+
+        assertEquals("PMG-1", result.records().get(0).palletMergeBatchId());
+        assertEquals(List.of("LMO-RELATED-2", "LMO-RELATED-3"), result.records().get(0).palletMergeOrderNos());
+    }
+
    @Test
    void holdingBeforeInboundPersistsTheOrderMarkerAndOperationRemark() {
        LastlegOrder order = order(11L, "100", "PENDING_INBOUND", null);