暂扣 标记合托功能

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/InboundStockReceiptServiceTest.java

@@ -155,6 +155,21 @@ class InboundStockReceiptServiceTest {
         assertEquals(5L, requests.getAllValues().stream().mapToLong(InventoryCommandRequests.StockIn::packages).sum());
     }
 
+    @Test
+    void stocksInToHeldInventoryWhenInboundOrderIsDetained() {
+        Fixture fixture = fixture(5, 5, 5, 10);
+        fixture.order.setDetained(true);
+        when(orders.selectBatchIds(any())).thenReturn(List.of(fixture.order));
+        when(inventory.stockInHeld(eq("100"), eq("operator"), any(InventoryCommandRequests.StockIn.class)))
+            .thenReturn(new InventoryCommandResponse(8L, "STOCK_IN", 9L, 10L, 5, 0, 0, 0, false, false));
+
+        service.stockIn("100", fixture.plan, fixture.task, List.of(fixture.line),
+            List.of(fixture.allocation), List.of(fixture.pallet), LocalDateTime.now());
+
+        verify(inventory).stockInHeld(eq("100"), eq("operator"), any(InventoryCommandRequests.StockIn.class));
+        verify(inventory, never()).stockIn(any(), any(), any());
+    }
+
     @Test
     void existingTaskReceiptMakesStockInReplayANoOp() {
         Fixture fixture = fixture(10, 5, 5, 10);

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerServiceBehaviorTest.java

@@ -422,6 +422,20 @@ class ReceivingContainerServiceBehaviorTest {
         verifyNoInteractions(workflow, operations);
     }
 
+    @Test
+    void cartonResolutionReturnsInboundAndPalletMergeReminderFromTailLegOrder() {
+        stubCurrent("FBA", "CONT-A");
+        LastlegOrder marked = order("FBA");
+        marked.setPalletMergeFlag("REQUIRED");
+        when(orders.selectById(1L)).thenReturn(marked);
+
+        var resolved = service.resolveCarton("7", new ReceivingContainerRequests.CartonResolve("IN-1#2-1"));
+
+        assertThat(resolved.inboundCode()).isEqualTo("IN-1");
+        assertThat(resolved.palletMergeRequired()).isTrue();
+        assertThat(resolved.palletMergeHint()).contains("合托");
+    }
+
     @Test
     void fbaCartonResolutionRejectsCrossContainerAndInvalidPrefixesAsConflicts() {
         stubCurrent("FBA", "CONT-A");

lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/InboundPlanServiceTest.java

@@ -55,6 +55,7 @@ class InboundPlanServiceTest {
         ReflectionTestUtils.setField(service, "allocationMapper", allocationMapper);
         ReflectionTestUtils.setField(service, "orderMapper", orderMapper);
         ReflectionTestUtils.setField(service, "inventoryBalanceMapper", inventoryBalanceMapper);
+        ReflectionTestUtils.setField(service, "orderNoGenerator", new com.baiyue.lastleg.service.LastlegOrderNoGenerator());
         org.mockito.Mockito.lenient().when(lineMapper.selectList(any())).thenReturn(List.of());
         org.mockito.Mockito.lenient().when(palletMapper.selectList(any())).thenReturn(List.of());
         org.mockito.Mockito.lenient().when(allocationMapper.selectList(any())).thenReturn(List.of());