Merge remote-tracking branch 'origin/test' into dev

# Conflicts: # scripts/admin-test-env-modules/phase4-tail-order-controls.mjs
2026-09-09 19:23:57 +08:00
parent 90a0b009da e30255ff58
commit e0d8b4f76a
9 changed files with 176 additions and 15 deletions
@@ -258,6 +258,38 @@ class ContainerInboundPlanConversionCoordinatorTest {
            .map(ContainerInboundPlanConversionCoordinator.PreparedItem::fbaWarehouseCode).toList());
    }

+    @Test
+    void standardOverseasOrdersLetWarehouseGeneratePhysicalPalletCodes() {
+        ConvertContainerInboundPlanRequest request = request();
+        var overseas = new ContainerInboundPlanPreviewResponse.Order(
+            "200", "Customer 200", "12", "LM-12", "RK-OVERSEAS", "FIRST_LEG", "FIRST_LEG",
+            "31", "US-LAX-01", "Los Angeles", null, 10, BigDecimal.ONE, 2,
+            null, null, null, 0, "READY", List.of());
+        var preview = new ContainerInboundPlanPreviewResponse(BOOKING_ID, "MSCU6639870", "31", "US-LAX-01",
+            "Los Angeles", 7L, SNAPSHOT_HASH, 1, 1, 0, 2, 2, 0, 1, 0, true,
+            List.of(new ContainerInboundPlanPreviewResponse.Group("FIRST_LEG", "31", "US-LAX-01", "Los Angeles",
+                1, 1, 2, 0, 2, 0, List.of(overseas))));
+        when(plans.previewContainer(BOOKING_ID)).thenReturn(preview);
+        when(numbers.next(eq("INBOUND_PLAN"), any(String.class), any(Long.class))).thenReturn("IP-OVERSEAS");
+        when(plans.sourcePalletNos("200", 12L, "FIRST_LEG")).thenReturn(List.of());
+
+        ContainerPlanConversionCommand command = ReflectionTestUtils.invokeMethod(coordinator, "prepareCommand",
+            1L, 2L, BOOKING_ID, "FIRST-KEY", request,
+            ReflectionTestUtils.invokeMethod(coordinator, "hash",
+                List.of(BOOKING_ID, request.snapshotVersion(), request.snapshotHash())));
+        ContainerInboundPlanConversionCoordinator.Preparation preparation;
+        try {
+            preparation = objectMapper.readValue(command.getPreparationJson(),
+                ContainerInboundPlanConversionCoordinator.Preparation.class);
+        } catch (Exception exception) {
+            throw new AssertionError(exception);
+        }
+
+        assertEquals(2, preparation.items().size());
+        assertEquals(java.util.Arrays.asList(null, null), preparation.items().stream()
+            .map(ContainerInboundPlanConversionCoordinator.PreparedItem::palletCode).toList());
+    }
+
    private ContainerInboundPlanPreviewResponse.Order previewOrder(String customerId, String orderId,
                                                                    String inboundCode, String destinationCode,
                                                                    String fbaWarehouseCode) {