优化

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

@@ -12,6 +12,7 @@ import com.baiyue.lastleg.mapper.LastlegOrderManualNodeHistoryMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderManualNodeMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderOperationLogMapper;
+import com.baiyue.lastleg.inventory.command.service.InventoryCommandService;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -48,6 +49,7 @@ class LastlegOrderCommandServiceTest {
     @Mock LastlegOrderManualNodeHistoryMapper manualNodeHistory;
     @Mock LastlegOrderOperationLogMapper operationLogs;
     @Mock InboundOrderDetainedOutboxService detainedOutbox;
+    @Mock InventoryCommandService inventory;
     LastlegOrderCommandService service;
 
     @BeforeEach
@@ -60,12 +62,14 @@ class LastlegOrderCommandServiceTest {
         ReflectionTestUtils.setField(service, "manualNodeHistory", manualNodeHistory);
         ReflectionTestUtils.setField(service, "operationLogs", operationLogs);
         ReflectionTestUtils.setField(service, "detainedOutbox", detainedOutbox);
+        ReflectionTestUtils.setField(service, "inventory", inventory);
         ReflectionTestUtils.setField(service, "objectMapper", JsonMapper.builder().findAndAddModules().build());
     }
 
     @Test
     void holdsOnlySelectedOrderWithVersionAndImmutableHistory() {
         LastlegOrder order = order(11L, 3);
+        order.setCurrentStatus("INBOUND_COMPLETED");
         when(orders.selectById(11L)).thenReturn(order);
         when(orders.lockById("100", 11L)).thenReturn(order);
         when(orders.updateHold(eq("100"), eq(11L), eq(true), eq(true), eq("海关查验"), eq(3),
@@ -80,9 +84,42 @@ class LastlegOrderCommandServiceTest {
         verify(orders).updateHold(eq("100"), eq(11L), eq(true), eq(true), eq("海关查验"), eq(3), any());
         verify(holdHistory).insert(any(LastlegOrderHoldHistory.class));
         verify(commands).insert(any(LastlegOrderCommandRecord.class));
+        verify(inventory).holdInboundOrderInventory("100", "900", 11L, "LL-11", "海关查验");
         verify(orders, never()).lockContainerOrders(any());
     }
 
+    @Test
+    void releasingHoldMovesOrderInventoryBackToAvailable() {
+        LastlegOrder order = order(11L, 3);
+        order.setCurrentStatus("INBOUND_COMPLETED");
+        order.setDetained(true);
+        when(orders.selectById(11L)).thenReturn(order);
+        when(orders.lockById("100", 11L)).thenReturn(order);
+        when(orders.updateHold(eq("100"), eq(11L), eq(false), eq(false), eq("质检通过"), eq(3),
+            any(LocalDateTime.class))).thenReturn(1);
+
+        service.hold("100", 11L, "release-11",
+            new LastlegOrderCommandDtos.HoldRequest(false, false, "质检通过", 3), "900", "管理员");
+
+        verify(inventory).releaseInboundOrderHold("100", "900", 11L, "LL-11", "质检通过");
+    }
+
+    @Test
+    void rejectsNewHoldBeforeInboundCompletion() {
+        LastlegOrder order = order(11L, 3);
+        when(orders.selectById(11L)).thenReturn(order);
+        when(orders.lockById("100", 11L)).thenReturn(order);
+
+        ResponseStatusException error = assertThrows(ResponseStatusException.class, () -> service.hold("100", 11L,
+            "hold-before-inbound", new LastlegOrderCommandDtos.HoldRequest(true, false, "待入库", 3),
+            "900", "管理员"));
+
+        assertEquals(409, error.getStatusCode().value());
+        assertEquals("货物完成入库后才能暂扣", error.getReason());
+        verify(orders, never()).updateHold(anyString(), anyLong(), anyBoolean(), anyBoolean(),
+            nullable(String.class), anyInt(), any(LocalDateTime.class));
+    }
+
     @Test
     void rejectsStaleHoldWithoutAnyWrite() {
         LastlegOrder order = order(11L, 4);