diff --git a/deploy/sql/头程数据库统一增量-MySQL8.sql b/deploy/sql/头程数据库统一增量-MySQL8.sql
index 7deed37fe..a2b6591b7 100644
--- a/deploy/sql/头程数据库统一增量-MySQL8.sql
+++ b/deploy/sql/头程数据库统一增量-MySQL8.sql
@@ -4869,7 +4869,7 @@ CREATE TABLE IF NOT EXISTS fl_document_sequence (
 CREATE TABLE IF NOT EXISTS fl_container_booking (
   id BIGINT UNSIGNED NOT NULL COMMENT '货柜预订ID（雪花ID）',
   booking_no VARCHAR(40) NOT NULL COMMENT '平台唯一货柜预订单号',
-  container_no VARCHAR(64) NULL COMMENT '国内唯一权威真实集装箱号；ISO 6346标准格式；仅订舱关联首次写入、预装纠错命令可修改',
+  container_no VARCHAR(64) NULL COMMENT '国内唯一权威真实集装箱号；ISO 6346标准格式；订舱关联可选写入、提柜后可原子补录、预装纠错命令可修改',
   cabinet_no VARCHAR(64) NOT NULL COMMENT '平台唯一内部柜号',
   source_type VARCHAR(24) NOT NULL DEFAULT 'SIMULATION' COMMENT '记录来源：SIMULATION内部模拟柜、OCEAN_BOOKING订舱真实柜',
   record_status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE' COMMENT '记录状态：ACTIVE可操作、MERGED已合并历史',
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dto/ContainerDtos.java b/firstleg/src/main/java/com/baiyue/firstleg/dto/ContainerDtos.java
index 600024f29..4a1cbb272 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/dto/ContainerDtos.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dto/ContainerDtos.java
@@ -85,9 +85,9 @@ public final class ContainerDtos {
         @NotNull @DecimalMin(value = "0", inclusive = false) BigDecimal capacityCbm,
         @NotNull @DecimalMin(value = "0", inclusive = false) BigDecimal maxWeightKg) {}
 
-    @Schema(name = "ContainerOceanBookingLinkRequest", description = "将现有模拟柜原地关联到已发布订舱箱型需求并补录真实柜号")
+    @Schema(name = "ContainerOceanBookingLinkRequest", description = "将现有模拟柜原地关联到已发布订舱箱型需求；真实柜号可在提柜后补录")
     public record OceanBookingLinkRequest(@NotNull @Positive Long oceanBookingId,
-        @NotNull @Positive Long requirementId, @NotBlank @Size(max = 64) String containerNo,
+        @NotNull @Positive Long requirementId, @Size(max = 64) String containerNo,
         @NotNull @PositiveOrZero Integer expectedVersion) {}
 
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/ContainerBookingMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/ContainerBookingMapper.java
index 469ade09a..138e5e138 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/ContainerBookingMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/ContainerBookingMapper.java
@@ -13,6 +13,20 @@ import org.apache.ibatis.annotations.Update;
 public interface ContainerBookingMapper extends BaseMapper<ContainerBookingEntity> {
     @Update("UPDATE fl_container_booking SET container_no=#{containerNo},ocean_booking_id=#{oceanBookingId},ocean_booking_requirement_id=#{requirementId},record_status='ACTIVE',bill_of_lading_no=#{billOfLadingNo},vessel_name=#{vesselName},voyage_no=#{voyageNo},shipping_company_id=#{shippingCompanyId},shipping_company_name=#{shippingCompanyName},departure_port_code=#{departurePortCode},departure_port_name=#{departurePortName},destination_port_code=#{destinationPortCode},destination_port_name=#{destinationPortName},channel_code=#{channelCode},channel_name=#{channelName},customer_id=#{customerId},customer_name=#{customerName},estimated_sailing_at=#{estimatedSailingAt},estimated_port_arrival_at=#{estimatedPortArrivalAt},updated_by=#{operatorId},updated_by_name=#{operatorName},updated_at=NOW(),version=version+1 WHERE id=#{id} AND version=#{version} AND source_type='SIMULATION' AND record_status='ACTIVE' AND ocean_booking_id IS NULL")
     int linkReleasedBooking(@Param("id") long id, @Param("oceanBookingId") long oceanBookingId, @Param("requirementId") long requirementId, @Param("containerNo") String containerNo, @Param("billOfLadingNo") String billOfLadingNo, @Param("vesselName") String vesselName, @Param("voyageNo") String voyageNo, @Param("shippingCompanyId") Long shippingCompanyId, @Param("shippingCompanyName") String shippingCompanyName, @Param("departurePortCode") String departurePortCode, @Param("departurePortName") String departurePortName, @Param("destinationPortCode") String destinationPortCode, @Param("destinationPortName") String destinationPortName, @Param("channelCode") String channelCode, @Param("channelName") String channelName, @Param("customerId") Long customerId, @Param("customerName") String customerName, @Param("estimatedSailingAt") java.time.LocalDateTime estimatedSailingAt, @Param("estimatedPortArrivalAt") java.time.LocalDateTime estimatedPortArrivalAt, @Param("version") int version, @Param("operatorId") long operatorId, @Param("operatorName") String operatorName);
+    @Update("""
+        UPDATE fl_container_booking SET container_no=#{containerNo},updated_by=#{operatorId},
+          updated_by_name=#{operatorName},updated_at=CURRENT_TIMESTAMP(3),version=version+1
+        WHERE id=#{id} AND version=#{version} AND source_type='SIMULATION' AND record_status='ACTIVE'
+          AND container_no IS NULL AND ocean_booking_id IS NOT NULL AND ocean_booking_requirement_id IS NOT NULL
+          AND NOT EXISTS (SELECT 1 FROM fl_loading_plan p WHERE p.container_booking_id=fl_container_booking.id
+            AND p.plan_status NOT IN ('EDITING'))
+          AND NOT EXISTS (SELECT 1 FROM fl_loading_pick_task t WHERE t.container_booking_id=fl_container_booking.id)
+          AND NOT EXISTS (SELECT 1 FROM fl_loading_cabinet_evidence e WHERE e.container_booking_id=fl_container_booking.id)
+          AND NOT EXISTS (SELECT 1 FROM fl_container_document d WHERE d.container_booking_id=fl_container_booking.id)
+        """)
+    int assignRealContainerNo(@Param("id") long id, @Param("containerNo") String containerNo,
+                              @Param("version") int version, @Param("operatorId") long operatorId,
+                              @Param("operatorName") String operatorName);
     @Select("""
         <script>
         SELECT b.*, p.id AS plan_id, p.plan_no AS plan_no,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/repository/ContainerRepository.java b/firstleg/src/main/java/com/baiyue/firstleg/repository/ContainerRepository.java
index 4afe52209..e6024bc4c 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/repository/ContainerRepository.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/repository/ContainerRepository.java
@@ -38,6 +38,10 @@ public class ContainerRepository {
                                    int version, long operatorId, String operatorName) {
         return mapper.linkReleasedBooking(id, oceanBookingId, requirementId, containerNo, booking.getBillOfLadingNo(), booking.getVesselName(), booking.getVoyageNo(), booking.getShippingCompanyId(), booking.getShippingCompanyName(), booking.getDeparturePortCode(), booking.getDeparturePortName(), booking.getDestinationPortCode(), booking.getDestinationPortName(), booking.getChannelCode(), booking.getChannelName(), booking.getCustomerId(), booking.getCustomerName(), booking.getEstimatedSailingAt(), booking.getEstimatedArrivalAt(), version, operatorId, operatorName);
     }
+    public int assignRealContainerNo(long id, String containerNo, int version,
+                                     long operatorId, String operatorName) {
+        return mapper.assignRealContainerNo(id, containerNo, version, operatorId, operatorName);
+    }
     public int updateDraft(ContainerBookingEntity value, int version, long operatorId, String operatorName) {
         return mapper.updateDraft(value, version, operatorId, operatorName);
     }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/ContainerService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/ContainerService.java
index 921917055..e24973abb 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/ContainerService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/ContainerService.java
@@ -76,8 +76,9 @@ public class ContainerService {
         if (requirement == null) throw new BizException(ResultCode.NOT_FOUND, "订舱箱型需求不存在");
         long allocated = oceanBookings.activeLinkedCount(request.oceanBookingId(), request.requirementId());
         if (allocated >= requirement.getQuantity()) throw conflict("该订舱箱型需求已达到数量上限");
-        String containerNo = Iso6346ContainerNumber.require(request.containerNo());
-        if (repository.containerNoExists(containerNo, id)) throw conflict("集装箱号已存在");
+        String requestedContainerNo = trim(request.containerNo());
+        String containerNo = requestedContainerNo == null ? null : Iso6346ContainerNumber.require(requestedContainerNo);
+        if (containerNo != null && repository.containerNoExists(containerNo, id)) throw conflict("集装箱号已存在");
         if (!java.util.Objects.equals(container.getWarehouseId(), booking.getWarehouseId())
             || !java.util.Objects.equals(container.getChannelCode(), booking.getChannelCode())
             || !java.util.Objects.equals(container.getContainerType(), requirement.getContainerType())) {
@@ -95,6 +96,32 @@ public class ContainerService {
         return required(id);
     }
 
+    @Transactional
+    public ContainerBookingEntity assignRealContainerNo(long id, String requestedContainerNo, int expectedVersion,
+                                                         long operatorId, String operatorName) {
+        ContainerBookingEntity container = required(id);
+        requireVersion(container, expectedVersion);
+        if (container.getOceanBookingId() == null || container.getOceanBookingRequirementId() == null) {
+            throw conflict("模拟柜尚未关联已发布订舱需求");
+        }
+        if (trim(container.getContainerNo()) != null) throw conflict("真实集装箱号已补录");
+        SmartLoadingStatus value = status(container);
+        if ((value != SmartLoadingStatus.WAIT_LOADING && value != SmartLoadingStatus.EDITING)
+            || repository.hasPickTask(id) || repository.hasEvidence(id) || repository.hasDocuments(id)) {
+            throw conflict("已进入PDA、证据、单证或不可逆装柜阶段，不能补录真实柜号");
+        }
+        String containerNo = Iso6346ContainerNumber.require(requestedContainerNo);
+        if (repository.containerNoExists(containerNo, id)) throw conflict("集装箱号已存在");
+        try {
+            if (repository.assignRealContainerNo(id, containerNo, expectedVersion, operatorId, operatorName) != 1) {
+                throw conflict("真实柜号已被补录或货柜版本发生变化，请刷新后重试");
+            }
+        } catch (DuplicateKeyException exception) {
+            throw conflict("集装箱号已存在");
+        }
+        return required(id);
+    }
+
     private void requireFirstLinkMutable(ContainerBookingEntity container) {
         SmartLoadingStatus value = status(container);
         if ((value != SmartLoadingStatus.WAIT_LOADING && value != SmartLoadingStatus.EDITING)
diff --git a/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql b/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql
index 432df921d..48ff9d99c 100644
--- a/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql
+++ b/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql
@@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS fl_document_sequence (
 CREATE TABLE IF NOT EXISTS fl_container_booking (
   id BIGINT UNSIGNED NOT NULL COMMENT '货柜预订ID（雪花ID）',
   booking_no VARCHAR(40) NOT NULL COMMENT '平台唯一货柜预订单号',
-  container_no VARCHAR(64) NULL COMMENT '国内唯一权威真实集装箱号；ISO 6346标准格式；仅订舱关联首次写入、预装纠错命令可修改',
+  container_no VARCHAR(64) NULL COMMENT '国内唯一权威真实集装箱号；ISO 6346标准格式；订舱关联可选写入、提柜后可原子补录、预装纠错命令可修改',
   cabinet_no VARCHAR(64) NOT NULL COMMENT '平台唯一内部柜号',
   source_type VARCHAR(24) NOT NULL DEFAULT 'SIMULATION' COMMENT '记录来源：SIMULATION内部模拟柜、OCEAN_BOOKING订舱真实柜',
   record_status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE' COMMENT '记录状态：ACTIVE可操作、MERGED已合并历史',
diff --git a/firstleg/src/main/resources/openapi/firstleg-v1.yaml b/firstleg/src/main/resources/openapi/firstleg-v1.yaml
index ffef274fd..c7e759c28 100644
--- a/firstleg/src/main/resources/openapi/firstleg-v1.yaml
+++ b/firstleg/src/main/resources/openapi/firstleg-v1.yaml
@@ -294,8 +294,8 @@ paths:
         '403': {description: 无新增按钮权限}
   /api/platform/v1/containers/{id}/ocean-booking-link:
     post:
-      summary: 将内部模拟柜关联到已发布订舱需求并补录真实柜号
-      description: 需要 platform:firstleg:container:edit；请求指定 RELEASED oceanBookingId、未满配 requirementId 和港口提柜后取得的唯一 containerNo，服务端规范化并校验ISO 6346结构、设备类别和校验位。首次关联允许 WAIT_LOADING 或已有预排货的 EDITING 模拟柜，保留原 containerBookingId/cabinetNo/loadingPlanId/items，原子写入订舱、运输和范围快照并创建 allocation；不会创建或消费另一条真实柜记录。存在跨仓、跨渠道、柜型规格不一致、超量、重复柜号、PDA、有效装柜证据、业务单证或 LOADING/COMPLETED 等事实时拒绝。
+      summary: 将内部模拟柜关联到已发布订舱需求
+      description: 需要 platform:firstleg:container:edit；请求指定 RELEASED oceanBookingId 和未满配 requirementId，containerNo 可空。首次关联允许 WAIT_LOADING 或已有预排货的 EDITING 模拟柜，保留原 containerBookingId/cabinetNo/loadingPlanId/items，原子写入订舱、运输和范围快照并创建 allocation；提柜后由拖车链调用柜次服务原子补录真实柜号。若关联请求已提供 containerNo，服务端仍规范化并校验 ISO 6346 结构、设备类别、校验位和全局唯一性。存在跨仓、跨渠道、柜型规格不一致、超量、重复柜号、PDA、有效装柜证据、业务单证或 LOADING/COMPLETED 等事实时拒绝。
       parameters: [{$ref: '#/components/parameters/ContainerBookingId'}]
       requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/ContainerOceanBookingLinkRequest'}}}}
       responses: {'200': {description: 关联后的同一模拟柜 containerBookingId/cabinetNo；列表仍只有这一条 ACTIVE 操作身份}}
@@ -1957,11 +1957,11 @@ components:
         maxWeightKg: {type: number, minimum: 0, exclusiveMinimum: true, description: 必须等于柜型固定限重}
     ContainerOceanBookingLinkRequest:
       type: object
-      required: [oceanBookingId, requirementId, containerNo, expectedVersion]
+      required: [oceanBookingId, requirementId, expectedVersion]
       properties:
         oceanBookingId: {type: integer, format: int64, minimum: 1, description: RELEASED订舱ID}
         requirementId: {type: integer, format: int64, minimum: 1, description: 未满配的订舱柜型需求ID}
-        containerNo: {type: string, maxLength: 64, description: 港口提柜后取得的全局唯一真实集装箱号；服务端移除格式空白、转大写并校验ISO 6346结构、设备类别和校验位}
+        containerNo: {type: string, nullable: true, maxLength: 64, description: 可选；港口提柜后可由拖车链另行原子补录。非空时服务端移除格式空白、转大写并校验ISO 6346结构、设备类别、校验位和全局唯一性}
         expectedVersion: {type: integer, minimum: 0}
     ContainerFeeAdjustRequest:
       type: object
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/controller/ContainerControllerContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/controller/ContainerControllerContractTest.java
index b295a3d27..c3bfbea8e 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/controller/ContainerControllerContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/controller/ContainerControllerContractTest.java
@@ -62,8 +62,9 @@ class ContainerControllerContractTest {
             .contains("首次关联允许 WAIT_LOADING 或已有预排货的 EDITING 模拟柜")
             .contains("RELEASED oceanBookingId")
             .contains("未满配 requirementId")
-            .contains("唯一 containerNo")
-            .contains("校验ISO 6346结构、设备类别和校验位")
+            .contains("containerNo 可空")
+            .contains("提柜后由拖车链调用柜次服务原子补录真实柜号")
+            .contains("校验 ISO 6346 结构、设备类别、校验位和全局唯一性")
             .doesNotContain("/api/platform/v1/containers/{id}/transport:")
             .doesNotContain("ContainerOceanBookingUnlinkRequest")
             .doesNotContain("ContainerTransportUpdateRequest")
@@ -81,7 +82,9 @@ class ContainerControllerContractTest {
         assertThat(openapi)
             .contains("/api/platform/v1/containers/{id}/clearance/document/{fileId}/download:")
             .contains("Content-Disposition 与 Cache-Control no-store")
-            .contains("required: [oceanBookingId, requirementId, containerNo, expectedVersion]")
+            .contains("required: [oceanBookingId, requirementId, expectedVersion]")
+            .contains("containerNo: {type: string, nullable: true")
+            .doesNotContain("required: [oceanBookingId, requirementId, containerNo, expectedVersion]")
             .contains("required: [id, bookingNo, cabinetNo, sourceType, recordStatus")
             .contains("sourceType: {type: string, enum: [SIMULATION, OCEAN_BOOKING]")
             .contains("recordStatus: {type: string, enum: [ACTIVE, MERGED]")
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/ContainerBookingMapperContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/ContainerBookingMapperContractTest.java
index 57024deee..4978dd74a 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/ContainerBookingMapperContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/ContainerBookingMapperContractTest.java
@@ -75,14 +75,17 @@ class ContainerBookingMapperContractTest {
     }
 
     @Test
-    @DisplayName("货柜草稿更新不得形成真实柜号或内部柜次号写入口")
-    void onlyOceanBookingLinkWritesInitialContainerNumber() throws Exception {
+    @DisplayName("真实柜号只允许订舱关联或提柜后原子补录")
+    void onlyBookingLinkOrPickupAssignmentWritesContainerNumber() throws Exception {
         String draftSql = String.join("\n", ContainerBookingMapper.class
             .getDeclaredMethod("updateDraft", ContainerBookingEntity.class, int.class,
                 long.class, String.class).getAnnotation(Update.class).value());
         String linkSql = String.join("\n", Arrays.stream(ContainerBookingMapper.class.getDeclaredMethods())
             .filter(method -> method.getName().equals("linkReleasedBooking"))
             .findFirst().orElseThrow().getAnnotation(Update.class).value());
+        String pickupSql = String.join("\n", ContainerBookingMapper.class
+            .getDeclaredMethod("assignRealContainerNo", long.class, String.class, int.class,
+                long.class, String.class).getAnnotation(Update.class).value());
         assertThat(draftSql)
             .contains("capacity_cbm")
             .contains("p.plan_status!='EDITING'")
@@ -92,6 +95,11 @@ class ContainerBookingMapperContractTest {
             .doesNotContain("&gt;");
         assertThat(linkSql).contains("container_no=#{containerNo}", "source_type='SIMULATION'",
             "ocean_booking_id IS NULL");
+        assertThat(pickupSql)
+            .contains("container_no=#{containerNo}", "container_no IS NULL", "ocean_booking_id IS NOT NULL",
+                "ocean_booking_requirement_id IS NOT NULL", "version=#{version}", "fl_loading_pick_task",
+                "fl_loading_cabinet_evidence", "fl_container_document")
+            .doesNotContain("ocean_booking_id=#{");
         assertThat(Arrays.stream(ContainerBookingMapper.class.getDeclaredMethods()).map(java.lang.reflect.Method::getName))
             .doesNotContain("updateTransport", "unlinkReleasedBooking");
     }
@@ -105,6 +113,7 @@ class ContainerBookingMapperContractTest {
         }) {
             assertThat(source)
                 .contains("国内唯一权威真实集装箱号")
+                .contains("提柜后可原子补录")
                 .contains("UNIQUE KEY uk_container_booking_container_no (container_no)")
                 .contains("CONSTRAINT chk_container_booking_iso6346")
                 .contains("container_no REGEXP '^[A-Z]{3}[UJZ][0-9]{7}$'");
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/ContainerServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/ContainerServiceTest.java
index 8d46ac8a0..221e6e480 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/ContainerServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/ContainerServiceTest.java
@@ -212,6 +212,58 @@ class ContainerServiceTest {
         verify(oceanBookings).insert(any(OceanBookingContainerAllocationEntity.class));
     }
 
+    @Test
+    @DisplayName("模拟柜允许不带真实柜号原子关联已发布订舱需求")
+    void linksReleasedBookingWithoutRealContainerNumber() {
+        stubLinkContext();
+        ContainerBookingEntity container = repository.find(11L);
+        when(repository.find(11L)).thenReturn(container, container);
+        when(repository.linkReleasedBooking(eq(11L), eq(21L), eq(31L), isNull(),
+            any(OceanBookingEntity.class), eq(2), eq(9L), eq("admin"))).thenReturn(1);
+
+        ContainerBookingEntity result = service.linkOceanBooking(11L, 9L, "admin",
+            new OceanBookingLinkRequest(21L, 31L, null, 2));
+
+        assertThat(result.getContainerNo()).isNull();
+        assertThat(result.getCabinetNo()).isEqualTo("柜-001");
+        verify(repository, never()).containerNoExists(anyString(), anyLong());
+        verify(repository).linkReleasedBooking(eq(11L), eq(21L), eq(31L), isNull(),
+            any(OceanBookingEntity.class), eq(2), eq(9L), eq("admin"));
+        verify(oceanBookings).insert(any(OceanBookingContainerAllocationEntity.class));
+    }
+
+    @Test
+    @DisplayName("提柜后按柜次版本原子补录真实柜号")
+    void assignsRealContainerNumberAfterPickup() {
+        ContainerBookingEntity linked = booking("EDITING", 3);
+        linked.setContainerNo(null); linked.setOceanBookingId(21L); linked.setOceanBookingRequirementId(31L);
+        ContainerBookingEntity assigned = booking("EDITING", 4);
+        assigned.setContainerNo("MSCU6639870"); assigned.setOceanBookingId(21L); assigned.setOceanBookingRequirementId(31L);
+        when(repository.find(11L)).thenReturn(linked, assigned);
+        when(repository.assignRealContainerNo(11L, "MSCU6639870", 3, 9L, "admin")).thenReturn(1);
+
+        ContainerBookingEntity result = service.assignRealContainerNo(
+            11L, " ms cu 663987 0 ", 3, 9L, "admin");
+
+        assertThat(result.getContainerNo()).isEqualTo("MSCU6639870");
+        verify(repository).assignRealContainerNo(11L, "MSCU6639870", 3, 9L, "admin");
+    }
+
+    @Test
+    @DisplayName("提柜补录真实柜号仍拒绝全局重复号")
+    void rejectsDuplicateRealContainerNumberAfterPickup() {
+        ContainerBookingEntity linked = booking("EDITING", 3);
+        linked.setContainerNo(null); linked.setOceanBookingId(21L); linked.setOceanBookingRequirementId(31L);
+        when(repository.find(11L)).thenReturn(linked);
+        when(repository.containerNoExists("MSCU6639870", 11L)).thenReturn(true);
+
+        assertThatThrownBy(() -> service.assignRealContainerNo(
+            11L, "MSCU6639870", 3, 9L, "admin"))
+            .isInstanceOf(BizException.class).hasMessageContaining("已存在");
+
+        verify(repository, never()).assignRealContainerNo(anyLong(), anyString(), anyInt(), anyLong(), anyString());
+    }
+
     @Test
     @DisplayName("首次关联拒绝错误ISO 6346校验位")
     void rejectsInvalidContainerNumberCheckDigit() {