fix: restore overseas list queries and identifiers

This commit is contained in:
2026-09-07 12:30:17 +08:00
parent 30e883fe0c
commit fcf1771967
19 changed files with 93 additions and 33 deletions
@@ -28,6 +28,7 @@ import java.time.LocalDateTime;
import java.math.BigDecimal;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -306,6 +307,31 @@ class LastlegOrderServiceTest {
assertEquals(List.of("INBOUND-2", "INBOUND-3"), result.records().get(0).palletMergeInboundNos());
}
@Test
void pageDoesNotExposeBusinessOrderNumbersAsInboundCodes() {
LastlegOrder relabel = order(11L, "100", "PENDING_ASSIGNMENT", null);
relabel.setOrderType("RELABEL_APPLICATION");
relabel.setInboundCode("RL-WH-20260906-701570");
LastlegOrder looseboard = order(12L, "100", "PENDING_ASSIGNMENT", null);
looseboard.setOrderType("LOCAL_LOOSEBOARD");
looseboard.setInboundCode("LB-WH-20260906-187457");
LastlegOrder firstleg = order(13L, "100", "PENDING_ASSIGNMENT", null);
firstleg.setOrderType("FIRST_LEG");
firstleg.setInboundCode("NYEXX2609060063");
var resultPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<LastlegOrder>(1, 10);
resultPage.setRecords(List.of(relabel, looseboard, firstleg));
resultPage.setTotal(3);
when(orders.selectPage(any(), any())).thenReturn(resultPage);
var query = new LastlegOrderRequests.Query(1L, 10L, null, null, null, null,
null, null, null, null, null, null, null, null, null, null);
var result = service.page(null, query);
assertNull(result.records().get(0).inboundCode());
assertNull(result.records().get(1).inboundCode());
assertEquals("NYEXX2609060063", result.records().get(2).inboundCode());
}
@Test
void holdingBeforeInboundPersistsTheOrderMarkerAndOperationRemark() {
LastlegOrder order = order(11L, "100", "PENDING_INBOUND", null);