提交

lastleg-service/src/test/java/com/baiyue/lastleg/procurement/OverseasProcurementInventoryBoundaryTest.java

@@ -23,6 +23,9 @@ class OverseasProcurementInventoryBoundaryTest {
         assertFalse(source.contains("availablePackages"));
         assertFalse(source.contains("addOutbound"));
         assertFalse(source.contains("OverseasProcurementOutbound"));
-        assertFalse(source.contains("outboundQuantity"));
+        String responses = Files.readString(Path.of(
+            "src/main/java/com/baiyue/lastleg/procurement/dto/OverseasProcurementResponses.java"),
+            StandardCharsets.UTF_8);
+        assertTrue(responses.contains("outboundQuantity"));
     }
 }

lastleg-service/src/test/java/com/baiyue/lastleg/procurement/service/OverseasProcurementServiceTest.java

@@ -64,9 +64,32 @@ class OverseasProcurementServiceTest {
 
         assertEquals(OverseasProcurementService.PENDING_REVIEW, detail.summary().status());
         assertEquals(0, detail.summary().inboundQuantity());
+        assertEquals(0, detail.summary().outboundQuantity());
         assertEquals(0, detail.summary().inventoryQuantity());
     }
 
+    @Test
+    void outboundQuantityAndDisplayStatusFollowOutboundDetails() {
+        OverseasProcurementOrder order = order(OverseasProcurementService.APPROVED, 90, 0);
+        when(orders.findNo("100", "HC1")).thenReturn(order);
+        when(histories.listOrder("100", 1L)).thenReturn(List.of());
+
+        order.setOutboundDetails("[]");
+        assertEquals("PENDING_OUTBOUND", service.detail("100", "HC1").summary().status());
+
+        order.setOutboundDetails("[{\"id\":\"1\",\"quantity\":1}]");
+        var partial = service.detail("100", "HC1").summary();
+        assertEquals(1, partial.outboundQuantity());
+        assertEquals(89, partial.inventoryQuantity());
+        assertEquals("PARTIALLY_OUTBOUND", partial.status());
+
+        order.setOutboundDetails("[{\"id\":\"1\",\"quantity\":90}]");
+        var completed = service.detail("100", "HC1").summary();
+        assertEquals(90, completed.outboundQuantity());
+        assertEquals(0, completed.inventoryQuantity());
+        assertEquals("OUTBOUNDED", completed.status());
+    }
+
     @Test
     void pendingOrderCannotReceiveInventory() {
         OverseasProcurementOrder order = order(OverseasProcurementService.PENDING_REVIEW, 0, 0);

lastleg-service/src/test/java/com/baiyue/lastleg/service/LastlegOrderServiceTest.java

@@ -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);