fix(firstleg): finalize loading before customs acceptance

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

@@ -298,6 +298,12 @@ public class SmartLoadingService {
         LoadingPlanItemEntity item = repository.item(planId, itemId);
         if (item == null) throw new BizException(ResultCode.NOT_FOUND, "装柜明细不存在");
         if (!Objects.equals(item.getVersion(), request.expectedItemVersion())) throw conflict("装柜明细版本冲突");
+        LoadingPickService.MutationSnapshot pickSnapshot = loadingPickService.mutationSnapshot(planId);
+        int pickedPackageCount = pickSnapshot == null ? 0
+            : pickSnapshot.pickedByPlanItem().getOrDefault(itemId, 0);
+        if (request.packageCount() < pickedPackageCount) {
+            throw conflict("计划箱数不能低于已拣货箱数");
+        }
         ContainerBookingEntity booking = requireBooking(plan.getContainerBookingId());
         Candidate candidate = repository.candidate(booking.getWarehouseId(), item.getInboundId(), item.getInboundDetailId());
         if (candidate == null || request.packageCount() > candidate.availablePackageCount() + item.getPackageCount()) throw validation("调整箱数超过可用箱数");

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

@@ -41,6 +41,7 @@ import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.catchThrowableOfType;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -595,6 +596,23 @@ class SmartLoadingServiceTest {
         assertThat(updated.getValue().getWarehouseRemark()).isEqualTo("装柜时注意外箱");
     }
 
+    @Test
+    void pickedQuantityConflictPrecedesCandidateAvailabilityValidation() {
+        LoadingPlanEntity plan = plan("LOADING", 2);
+        LoadingPlanItemEntity line = item(8, 9, 20, 2);
+        when(repository.plan(1L)).thenReturn(plan);
+        when(repository.item(1L, 8L)).thenReturn(line);
+        when(loadingPickService.mutationSnapshot(1L)).thenReturn(
+            new LoadingPickService.MutationSnapshot(77L, "LOADING", 6, Map.of(8L, 2)));
+
+        assertThatThrownBy(() -> service.adjust(1L, 8L,
+            new AdjustRequest(1, 2, 0, "adjust-picked"), 7L, "u"))
+            .hasMessageContaining("不能低于已拣货箱数");
+
+        verify(repository, never()).candidate(anyLong(), anyLong(), anyLong());
+        verify(repository, never()).touch(anyLong(), anyInt(), anyLong(), anyString());
+    }
+
     @Test
     void preservesDownstreamCode() {
         stubAssignment();