Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into dev

# Conflicts: # firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java
2026-08-25 14:53:27 +08:00
parent f325d57fc1 015fc09091
commit a067a9f056
2 changed files with 47 additions and 8 deletions
@@ -591,6 +591,28 @@ class LoadingPickServiceTest {
        verify(loadingListService, never()).publishCompletedEvent(anyLong());
    }

+    @Test
+    void translatesUnexpectedSettlementFailureIntoActionableStageMessage() {
+        LoadingPickTaskEntity task = task();
+        when(repository.taskForUpdate(20L)).thenReturn(task);
+        when(repository.allTaskItemsResolved(20L)).thenReturn(true);
+        var owner = new LoadingPickItemMapper.InboundOwner(101L, 50L);
+        when(repository.inboundOwners(20L)).thenReturn(List.of(owner));
+        when(repository.inboundForUpdate(101L, 50L)).thenReturn(
+            new LoadingInboundMapper.Snapshot(50L, 101L, "LOADING", 7));
+        doThrow(new IllegalStateException("unexpected database failure"))
+            .when(settlementService).settle(20L, 9L, "operator");
+
+        assertThatThrownBy(() -> service.complete(20L,
+            new CompleteLoadingRequest(0, "complete-stage-error", "checked"), 9L, "operator"))
+            .isInstanceOf(BizException.class)
+            .hasMessageContaining("拆单与库位结算")
+            .hasMessageContaining("请求编号");
+
+        verify(repository, never()).approve(anyLong(), anyLong(), anyString(), anyString());
+        verify(loadingListService, never()).finishFromPda(anyLong(), anyLong(), anyLong(), anyString());
+    }
+
    @Test
    void atomicallySubmitsCompleteBatchAndReplaysSameResult() {
        LoadingPickTaskEntity task = task();