优化

firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java

@@ -802,6 +802,13 @@ public class LoadingPickService {
     }
 
     private Task view(LoadingPickTaskEntity task, Long warehouseId) {
+        var booking = repository.activeBookingByTask(task.getId());
+        if (booking == null || !Objects.equals(task.getContainerBookingId(), booking.getId())) {
+            throw new BizException(ResultCode.NOT_FOUND, "PDA拣货任务不存在或柜次已非有效存续记录");
+        }
+        if (warehouseId != null && !Objects.equals(warehouseId, booking.getWarehouseId())) {
+            throw new BizException(ResultCode.NOT_FOUND, "PDA拣货任务不存在或不属于当前仓库");
+        }
         List<LoadingPickItemEntity> source = warehouseId == null
             ? repository.items(task.getId()) : repository.items(task.getId(), warehouseId);
         Map<Long, List<CartonLabelRow>> cartonsByItem = repository.cartonLabels(task.getId()).stream()
@@ -828,17 +835,14 @@ public class LoadingPickService {
             : "COMPLETION_FAILED".equals(task.getTaskStatus()) ? "COMPLETION_FAILED"
             : assigned == null ? "UNASSIGNED"
             : repository.allTaskItemsResolved(task.getId()) ? "AWAITING_REVIEW" : "IN_PROGRESS";
-        var booking = repository.activeBookingByTask(task.getId());
-        if (booking == null || !Objects.equals(task.getContainerBookingId(), booking.getId())) {
-            throw new BizException(ResultCode.NOT_FOUND, "PDA拣货任务不存在或柜次已非有效存续记录");
-        }
         var owners = repository.inboundOwners(task.getId());
         Long detailInboundId = source.isEmpty() ? null : source.get(0).getInboundId();
         var owner = detailInboundId == null ? null : owners.stream()
             .filter(value -> detailInboundId.equals(value.inboundId())).findFirst().orElse(null);
         var inbound = owner == null || owner.tenantId() == null || owner.inboundId() == null
             ? null : repository.inbound(owner.tenantId(), owner.inboundId());
-        LoadingCompletionCommandEntity command = completionCommands.latest(task.getId());
+        LoadingCompletionCommandEntity command = "LOADING".equals(task.getTaskStatus())
+            ? null : completionCommands.latest(task.getId());
         CompletionCommand completionCommand = command == null ? null : new CompletionCommand(command.getId(),
             command.getOperationId(), command.getCommandStatus(), command.getExpectedTaskVersion(), command.getRemark(),
             command.getAttemptCount(), command.getNextRetryAt(), command.getFailureStage(), command.getFailureCode(),

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

@@ -92,6 +92,7 @@ class LoadingPickServiceTest {
         ContainerBookingEntity booking = new ContainerBookingEntity();
         booking.setId(99L);
         booking.setContainerNo("CSLU1234567");
+        booking.setWarehouseId(101L);
         booking.setSourceType("SIMULATION");
         booking.setRecordStatus("ACTIVE");
         when(repository.activeBookingByTask(20L)).thenReturn(booking);
@@ -242,6 +243,7 @@ class LoadingPickServiceTest {
         task.setContainerBookingId(40L); task.setCabinetNo("CAB-001");
         var booking = new com.baiyue.firstleg.entity.ContainerBookingEntity();
         booking.setId(40L); booking.setContainerNo("MSCU-NEW");
+        booking.setWarehouseId(101L);
         booking.setSourceType("SIMULATION"); booking.setRecordStatus("ACTIVE");
         when(repository.taskByCabinet("CAB-001", 101L)).thenReturn(task);
         when(repository.taskByPlan(10L, 101L)).thenReturn(task);
@@ -424,6 +426,37 @@ class LoadingPickServiceTest {
         assertThat(result.sourceType()).isEqualTo("SIMULATION");
         assertThat(result.recordStatus()).isEqualTo("ACTIVE");
         assertThat(result.mergedIntoContainerBookingId()).isNull();
+        verify(completionCommands, never()).latest(20L);
+    }
+
+    @Test
+    void loadingTaskDetailDoesNotDependOnCompletionCommandStorage() {
+        LoadingPickTaskEntity task = task();
+        when(repository.task(20L)).thenReturn(task);
+        when(repository.items(20L, 101L)).thenReturn(List.of(item()));
+        when(repository.cartonLabels(20L)).thenReturn(List.of());
+        when(repository.inboundOwners(20L)).thenReturn(List.of());
+        doThrow(new IllegalStateException("completion command schema unavailable"))
+            .when(completionCommands).latest(20L);
+
+        var result = service.task(20L, 101L);
+
+        assertThat(result.taskStatus()).isEqualTo("LOADING");
+        assertThat(result.completionCommand()).isNull();
+        verify(completionCommands, never()).latest(20L);
+    }
+
+    @Test
+    void taskDetailRejectsWarehouseThatDoesNotOwnTheContainer() {
+        LoadingPickTaskEntity task = task();
+        when(repository.task(20L)).thenReturn(task);
+
+        assertThatThrownBy(() -> service.task(20L, 999L))
+            .isInstanceOf(BizException.class).hasMessageContaining("不属于当前仓库");
+
+        verify(repository, never()).items(20L, 999L);
+        verify(repository, never()).cartonLabels(20L);
+        verify(completionCommands, never()).latest(20L);
     }
 
     @Test