优化

firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java

@@ -532,29 +532,33 @@ class LoadingPickServiceTest {
     }
 
     @Test
-    void conflictingTruckAppointmentsLeavePdaTaskPlanAndSettlementUntouched() {
+    void conflictingTruckAppointmentsDoNotBlockPdaCompletion() {
         LoadingPickTaskEntity task = task();
+        LoadingPickItemEntity item = item();
         when(repository.taskForUpdate(20L)).thenReturn(task);
+        when(repository.task(20L)).thenReturn(task);
+        when(repository.items(20L)).thenReturn(List.of(item));
         when(repository.allTaskItemsResolved(20L)).thenReturn(true);
+        when(repository.allPlanItemsPicked(10L)).thenReturn(true);
+        when(repository.approve(20L, 9L, "operator", "checked")).thenReturn(1);
         when(repository.review(20L)).thenReturn(null);
         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 BizException(com.baiyue.common.core.api.ResultCode.CONFLICT,
-            "同一柜次存在多条有效拖车预约，不能确认装柜完成"))
+            "同一柜次存在多条有效拖车预约，跳过自动完成"))
             .when(truckAppointmentService).completeLoadingFromPda(99L, 20L, 9L, "operator");
 
-        assertThatThrownBy(() -> service.complete(20L,
-            new CompleteLoadingRequest(0, "complete-blocked", "checked"), 9L, "operator"))
-            .isInstanceOf(BizException.class).hasMessageContaining("多条有效拖车预约");
+        service.complete(20L,
+            new CompleteLoadingRequest(0, "complete-not-blocked", "checked"), 9L, "operator");
 
-        verify(settlementService, never()).settle(anyLong(), anyLong(), anyString());
-        verify(repository, never()).approve(anyLong(), anyLong(), anyString(), any());
-        verify(loadingListService, never()).finishFromPda(anyLong(), anyLong(), anyLong(), anyString());
-        verify(loadingDeliveryService, never()).completeAfterPdaSettlement(anyLong(), anyLong(), anyLong(),
-            anyString(), anyString(), any());
-        verify(loadingListService, never()).publishCompletedEvent(anyLong());
+        verify(settlementService).settle(20L, 9L, "operator");
+        verify(repository).approve(20L, 9L, "operator", "checked");
+        verify(loadingListService).finishFromPda(10L, 20L, 9L, "operator");
+        verify(loadingDeliveryService).completeAfterPdaSettlement(101L, 50L, 9L, "operator",
+            "PDA-complete-not-blocked-50", "checked");
+        verify(loadingListService).publishCompletedEvent(10L);
     }
 
     @Test