优化

firstleg/src/main/java/com/baiyue/firstleg/dto/ContainerDtos.java

@@ -100,9 +100,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 = "将内部模拟柜关联到真实订舱箱型分配")
-    public record OceanBookingLinkRequest(@NotNull @Positive Long oceanBookingId,
-        @NotNull @Positive Long requirementId, @NotNull @PositiveOrZero Integer expectedVersion) {}
+    @Schema(name = "ContainerOceanBookingLinkRequest", description = "将内部模拟柜原地合并为指定真实订舱柜")
+    public record OceanBookingLinkRequest(@NotNull @Positive Long realContainerBookingId,
+        @NotNull @PositiveOrZero Integer expectedVersion) {}
 
     @Schema(name = "ContainerOceanBookingUnlinkRequest", description = "解除空模拟柜的真实订舱关联")
     public record OceanBookingUnlinkRequest(@NotNull @PositiveOrZero Integer expectedVersion,

firstleg/src/main/java/com/baiyue/firstleg/entity/ContainerBookingEntity.java

@@ -20,6 +20,9 @@ public class ContainerBookingEntity {
     private String bookingNo;
     private String containerNo;
     private String cabinetNo;
+    private String sourceType;
+    private String recordStatus;
+    private Long mergedIntoContainerBookingId;
     private String channelCode;
     private String channelName;
     private Long oceanBookingId;

firstleg/src/main/java/com/baiyue/firstleg/mapper/ContainerBookingMapper.java

@@ -21,7 +21,8 @@ public interface ContainerBookingMapper extends BaseMapper<ContainerBookingEntit
                     ) THEN 'WAIT_LOADING'
                     ELSE p.plan_status END AS plan_status
           FROM fl_container_booking b LEFT JOIN fl_loading_plan p ON p.container_booking_id = b.id
-         WHERE (#{query.containerNo} IS NULL OR b.container_no = #{query.containerNo})
+         WHERE b.record_status = 'ACTIVE'
+           AND (#{query.containerNo} IS NULL OR b.container_no = #{query.containerNo})
            AND (#{query.cabinetNo} IS NULL OR b.cabinet_no = #{query.cabinetNo})
            AND (#{query.billOfLadingNo} IS NULL OR b.bill_of_lading_no = #{query.billOfLadingNo})
            AND (#{query.customerId} IS NULL OR b.customer_id = #{query.customerId} OR EXISTS (
@@ -68,13 +69,90 @@ public interface ContainerBookingMapper extends BaseMapper<ContainerBookingEntit
                     ) THEN 'WAIT_LOADING'
                     ELSE p.plan_status END AS plan_status
         FROM fl_container_booking b LEFT JOIN fl_loading_plan p ON p.container_booking_id = b.id
-        WHERE b.id = #{id}
+        WHERE b.id = #{id} AND b.record_status = 'ACTIVE'
         """)
     ContainerBookingEntity selectBooking(@Param("id") long id);
 
     @Select("SELECT * FROM fl_container_booking WHERE id=#{id} FOR UPDATE")
     ContainerBookingEntity selectBookingForUpdate(@Param("id") long id);
 
+    @Select("SELECT * FROM fl_container_booking WHERE id=#{id} AND record_status='ACTIVE' FOR UPDATE")
+    ContainerBookingEntity selectActiveBookingForUpdate(@Param("id") long id);
+
+    @Select("SELECT * FROM fl_container_booking WHERE merged_into_container_booking_id=#{targetId} AND record_status='MERGED' FOR UPDATE")
+    ContainerBookingEntity selectMergedSourceForUpdate(@Param("targetId") long targetId);
+
+    @Update("""
+        UPDATE fl_container_booking SET record_status='MERGED',
+          merged_into_container_booking_id=#{targetId}, container_no=NULL,
+          updated_by=#{operatorId}, updated_by_name=#{operatorName},
+          updated_at=CURRENT_TIMESTAMP(3), version=version+1
+        WHERE id=#{sourceId} AND source_type='OCEAN_BOOKING' AND record_status='ACTIVE'
+          AND merged_into_container_booking_id IS NULL AND container_no IS NOT NULL
+        """)
+    int consumeRealSource(@Param("sourceId") long sourceId, @Param("targetId") long targetId,
+                          @Param("operatorId") long operatorId,
+                          @Param("operatorName") String operatorName);
+
+    @Update("""
+        UPDATE fl_container_booking target
+        JOIN fl_container_booking source ON source.id=#{sourceId}
+           SET target.container_no=#{containerNo}, target.ocean_booking_id=source.ocean_booking_id,
+               target.ocean_booking_requirement_id=source.ocean_booking_requirement_id,
+               target.customer_id=source.customer_id, target.customer_name=source.customer_name,
+               target.bill_of_lading_no=source.bill_of_lading_no,
+               target.vessel_name=source.vessel_name, target.voyage_no=source.voyage_no,
+               target.shipping_company_id=source.shipping_company_id,
+               target.shipping_company_name=source.shipping_company_name,
+               target.departure_port_code=source.departure_port_code,
+               target.departure_port_name=source.departure_port_name,
+               target.destination_port_code=source.destination_port_code,
+               target.destination_port_name=source.destination_port_name,
+               target.estimated_sailing_at=source.estimated_sailing_at,
+               target.estimated_port_arrival_at=source.estimated_port_arrival_at,
+               target.updated_by=#{operatorId}, target.updated_by_name=#{operatorName},
+               target.updated_at=CURRENT_TIMESTAMP(3), target.version=target.version+1
+         WHERE target.id=#{targetId} AND target.version=#{expectedVersion}
+           AND target.source_type='SIMULATION' AND target.record_status='ACTIVE'
+           AND target.ocean_booking_id IS NULL AND source.record_status='MERGED'
+           AND source.merged_into_container_booking_id=target.id
+        """)
+    int mergeRealSource(@Param("targetId") long targetId, @Param("sourceId") long sourceId,
+                        @Param("containerNo") String containerNo,
+                        @Param("expectedVersion") int expectedVersion,
+                        @Param("operatorId") long operatorId,
+                        @Param("operatorName") String operatorName);
+
+    @Update("""
+        UPDATE fl_container_booking SET container_no=NULL, ocean_booking_id=NULL,
+          ocean_booking_requirement_id=NULL, customer_id=NULL, customer_name=NULL,
+          bill_of_lading_no=NULL, vessel_name=NULL, voyage_no=NULL,
+          shipping_company_id=NULL, shipping_company_name=NULL,
+          departure_port_code=NULL, departure_port_name=NULL,
+          destination_port_code=NULL, destination_port_name=NULL,
+          estimated_sailing_at=NULL, estimated_port_arrival_at=NULL,
+          updated_by=#{operatorId}, updated_by_name=#{operatorName},
+          updated_at=CURRENT_TIMESTAMP(3), version=version+1
+        WHERE id=#{targetId} AND version=#{expectedVersion} AND source_type='SIMULATION'
+          AND record_status='ACTIVE' AND ocean_booking_id IS NOT NULL
+        """)
+    int clearMergedLink(@Param("targetId") long targetId, @Param("expectedVersion") int expectedVersion,
+                        @Param("operatorId") long operatorId,
+                        @Param("operatorName") String operatorName);
+
+    @Update("""
+        UPDATE fl_container_booking SET record_status='ACTIVE',
+          merged_into_container_booking_id=NULL, container_no=#{containerNo},
+          updated_by=#{operatorId}, updated_by_name=#{operatorName},
+          updated_at=CURRENT_TIMESTAMP(3), version=version+1
+        WHERE id=#{sourceId} AND source_type='OCEAN_BOOKING' AND record_status='MERGED'
+          AND merged_into_container_booking_id=#{targetId} AND container_no IS NULL
+        """)
+    int restoreMergedSource(@Param("sourceId") long sourceId, @Param("targetId") long targetId,
+                            @Param("containerNo") String containerNo,
+                            @Param("operatorId") long operatorId,
+                            @Param("operatorName") String operatorName);
+
     @Update("""
         UPDATE fl_container_booking SET
           container_no=#{value.containerNo}, cabinet_no=#{value.cabinetNo},
@@ -99,10 +177,7 @@ public interface ContainerBookingMapper extends BaseMapper<ContainerBookingEntit
         """)
     int updateDraft(@Param("value") ContainerBookingEntity value, @Param("expectedVersion") int expectedVersion,
                     @Param("operatorId") long operatorId, @Param("operatorName") String operatorName);
-    @Update("UPDATE fl_container_booking SET ocean_booking_id=#{value.oceanBookingId},ocean_booking_requirement_id=#{value.oceanBookingRequirementId},customer_id=#{value.customerId},customer_name=#{value.customerName},updated_by=#{operatorId},updated_by_name=#{operatorName},updated_at=CURRENT_TIMESTAMP(3),version=version+1 WHERE id=#{value.id} AND version=#{expectedVersion} AND ocean_booking_id IS NULL")
-    int updateLink(@Param("value") ContainerBookingEntity value, @Param("expectedVersion") int expectedVersion, @Param("operatorId") long operatorId, @Param("operatorName") String operatorName);
-    @Update("UPDATE fl_container_booking SET ocean_booking_id=NULL,ocean_booking_requirement_id=NULL,customer_id=NULL,customer_name=NULL,updated_by=#{operatorId},updated_by_name=#{operatorName},updated_at=CURRENT_TIMESTAMP(3),version=version+1 WHERE id=#{id} AND version=#{expectedVersion}")
-    int clearLink(@Param("id") long id, @Param("expectedVersion") int expectedVersion, @Param("operatorId") long operatorId, @Param("operatorName") String operatorName);
+    @Select("SELECT COUNT(*) FROM fl_loading_plan WHERE container_booking_id=#{id}") int hasLoadingPlan(@Param("id") long id);
     @Select("SELECT COUNT(*) FROM fl_loading_plan_item i JOIN fl_loading_plan p ON p.id=i.loading_plan_id WHERE p.container_booking_id=#{id} AND i.deleted=0") int hasActiveLoadingItems(@Param("id") long id);
     @Select("SELECT COUNT(*) FROM fl_loading_pick_task t JOIN fl_loading_plan p ON p.id=t.loading_plan_id WHERE p.container_booking_id=#{id}") int hasPickTask(@Param("id") long id);
     @Select("SELECT COUNT(*) FROM fl_loading_evidence e JOIN fl_loading_plan_item i ON i.inbound_id=e.inbound_id AND i.account_id=e.tenant_id JOIN fl_loading_plan p ON p.id=i.loading_plan_id WHERE p.container_booking_id=#{id} AND i.deleted=0 AND e.status='ACTIVE'") int hasEvidence(@Param("id") long id);

firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickTaskMapper.java

@@ -24,7 +24,8 @@ public interface LoadingPickTaskMapper extends BaseMapper<LoadingPickTaskEntity>
           JOIN fl_loading_pick_item pick_item ON pick_item.pick_task_id = task.id
           JOIN fl_loading_plan plan ON plan.id = task.loading_plan_id
           JOIN fl_container_booking booking ON booking.id = plan.container_booking_id
-         WHERE booking.container_no = #{containerNo} AND task.task_status = 'LOADING'
+         WHERE booking.container_no = #{containerNo} AND booking.record_status = 'ACTIVE'
+           AND task.task_status = 'LOADING'
            AND booking.warehouse_id = #{warehouseId}
          LIMIT 1
         """)
@@ -33,12 +34,14 @@ public interface LoadingPickTaskMapper extends BaseMapper<LoadingPickTaskEntity>
 
     @Select("SELECT task.* FROM fl_loading_pick_task task JOIN fl_loading_plan plan ON plan.id=task.loading_plan_id "
         + "JOIN fl_container_booking booking ON booking.id=plan.container_booking_id "
-        + "WHERE task.task_status='LOADING' AND booking.cabinet_no=#{cabinetNo} AND booking.warehouse_id=#{warehouseId} LIMIT 1")
+        + "WHERE task.task_status='LOADING' AND booking.record_status='ACTIVE' "
+        + "AND booking.cabinet_no=#{cabinetNo} AND booking.warehouse_id=#{warehouseId} LIMIT 1")
     LoadingPickTaskEntity selectLoadingByCabinet(@Param("cabinetNo") String cabinetNo, @Param("warehouseId") long warehouseId);
 
     @Select("SELECT task.* FROM fl_loading_pick_task task JOIN fl_loading_plan plan ON plan.id=task.loading_plan_id "
         + "JOIN fl_container_booking booking ON booking.id=plan.container_booking_id "
-        + "WHERE task.task_status='LOADING' AND task.loading_plan_id=#{loadingPlanId} AND booking.warehouse_id=#{warehouseId} LIMIT 1")
+        + "WHERE task.task_status='LOADING' AND booking.record_status='ACTIVE' "
+        + "AND task.loading_plan_id=#{loadingPlanId} AND booking.warehouse_id=#{warehouseId} LIMIT 1")
     LoadingPickTaskEntity selectLoadingByPlan(@Param("loadingPlanId") long loadingPlanId, @Param("warehouseId") long warehouseId);
 
     @Select("""
@@ -56,7 +59,7 @@ public interface LoadingPickTaskMapper extends BaseMapper<LoadingPickTaskEntity>
           JOIN fl_container_booking booking ON booking.id = plan.container_booking_id
           JOIN fl_loading_pick_item pick_item ON pick_item.pick_task_id = task.id
           LEFT JOIN fl_loading_pick_assignment assignment ON assignment.pick_task_id = task.id
-         WHERE task.task_status = 'LOADING'
+         WHERE task.task_status = 'LOADING' AND booking.record_status = 'ACTIVE'
            AND (assignment.pick_task_id IS NULL OR assignment.assignee_id = #{operatorId})
            <if test="keyword != null and keyword != ''">
              AND (booking.container_no LIKE CONCAT('%', #{keyword}, '%')

firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/dto/OceanBookingDtos.java

@@ -1,7 +1,5 @@
 package com.baiyue.firstleg.oceanbooking.dto;
 
-import com.baiyue.firstleg.oceanbooking.entity.OceanBookingContainerAllocationEntity;
-import com.baiyue.firstleg.oceanbooking.entity.OceanBookingContainerRequirementEntity;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingEntity;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingPartyEntity;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingStatusHistoryEntity;
@@ -33,17 +31,16 @@ public final class OceanBookingDtos {
                                @Size(max = 128) String contactName,
                                @Size(max = 64) String contactPhone) {}
 
-    public record ContainerRequirementRequest(@NotBlank @Size(max = 32) String containerType,
-                                              @NotBlank @Size(max = 32) String containerKind,
-                                              @NotNull @jakarta.validation.constraints.DecimalMin(value = "0", inclusive = false) BigDecimal capacityCbm,
-                                              @NotNull @jakarta.validation.constraints.DecimalMin(value = "0", inclusive = false) BigDecimal maxWeightKg,
-                                              @NotNull @Positive Integer quantity) {}
+    public record ContainerRequest(@NotBlank @Size(max = 64) String containerNo,
+                                   @NotBlank @Size(max = 32) String containerType,
+                                   @NotBlank @Size(max = 32) String containerKind,
+                                   @NotNull @jakarta.validation.constraints.DecimalMin(value = "0", inclusive = false) BigDecimal capacityCbm,
+                                   @NotNull @jakarta.validation.constraints.DecimalMin(value = "0", inclusive = false) BigDecimal maxWeightKg) {}
 
     public record DraftData(@Positive Long customerId,
                             @Size(max = 128) String customerName,
                             @NotBlank @Size(max = 64) String channelCode,
                             @NotNull @Positive Long warehouseId,
-                            @NotBlank @Size(max = 128) String warehouseName,
                             @NotBlank @Size(max = 128) String billOfLadingNo,
                             @Positive Long shippingCompanyId,
                             @Size(max = 128) String shippingCompanyName,
@@ -62,7 +59,7 @@ public final class OceanBookingDtos {
                             @NotNull LocalDateTime estimatedArrivalAt,
                             @Size(max = 1000) String remark,
                             @Valid @NotEmpty @Size(max = 3) List<PartyRequest> parties,
-                            @Valid @NotEmpty @Size(max = 20) List<ContainerRequirementRequest> containerRequirements) {}
+                            @Valid @NotEmpty @Size(max = 20) List<ContainerRequest> containers) {}
 
     public record CreateRequest(@NotNull @Min(0) Integer expectedVersion,
                                 @Valid @NotNull DraftData data) {}
@@ -81,10 +78,15 @@ public final class OceanBookingDtos {
                                 LocalDateTime estimatedSailingAt,
                                 LocalDateTime estimatedArrivalAt,
                                 @NotBlank @Size(max = 1000) String reason) {}
+    public record RealContainer(Long containerBookingId, String cabinetNo, String containerNo,
+                                Long requirementId, Long allocationId, String containerType,
+                                String containerKind, BigDecimal capacityCbm, BigDecimal maxWeightKg,
+                                Long warehouseId, String warehouseName, String channelCode,
+                                String channelName, Long customerId, String customerName) {}
+
     public record Detail(OceanBookingEntity oceanBooking,
                          List<OceanBookingPartyEntity> parties,
-                         List<OceanBookingContainerRequirementEntity> containerRequirements,
-                         List<OceanBookingContainerAllocationEntity> containerAllocations,
+                         List<RealContainer> containers,
                          List<OceanBookingStatusHistoryEntity> histories) {}
 
     public record ChannelOption(Long priceBookVersionId, String channelCode, String channelName,

firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/mapper/OceanBookingContainerAllocationMapper.java

@@ -2,4 +2,9 @@ package com.baiyue.firstleg.oceanbooking.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingContainerAllocationEntity;
 import org.apache.ibatis.annotations.Mapper;
-@Mapper public interface OceanBookingContainerAllocationMapper extends BaseMapper<OceanBookingContainerAllocationEntity> {}
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+@Mapper public interface OceanBookingContainerAllocationMapper extends BaseMapper<OceanBookingContainerAllocationEntity> {
+    @Update("UPDATE fl_ocean_booking_container_allocation SET container_booking_id=#{targetId} WHERE container_booking_id=#{sourceId}")
+    int reassign(@Param("sourceId") long sourceId, @Param("targetId") long targetId);
+}

firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/repository/OceanBookingRepository.java

@@ -4,14 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baiyue.common.core.api.PageResult;
 import com.baiyue.firstleg.oceanbooking.dto.OceanBookingDtos.Query;
+import com.baiyue.firstleg.oceanbooking.dto.OceanBookingDtos.RealContainer;
 import com.baiyue.firstleg.oceanbooking.dto.OceanBookingDtos.ReleaseRequest;
 import com.baiyue.firstleg.oceanbooking.entity.*;
 import com.baiyue.firstleg.oceanbooking.mapper.*;
+import com.baiyue.firstleg.entity.ContainerBookingEntity;
 import com.baiyue.firstleg.repository.ContainerRepository;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Repository
 public class OceanBookingRepository {
@@ -49,6 +54,22 @@ public class OceanBookingRepository {
     public List<OceanBookingPartyEntity> parties(long id) { return parties.selectList(new LambdaQueryWrapper<OceanBookingPartyEntity>().eq(OceanBookingPartyEntity::getOceanBookingId, id).orderByAsc(OceanBookingPartyEntity::getId)); }
     public List<OceanBookingContainerRequirementEntity> requirements(long id) { return requirements.selectList(new LambdaQueryWrapper<OceanBookingContainerRequirementEntity>().eq(OceanBookingContainerRequirementEntity::getOceanBookingId, id).orderByAsc(OceanBookingContainerRequirementEntity::getSortNo)); }
     public List<OceanBookingContainerAllocationEntity> allocations(long id) { return allocations.selectList(new LambdaQueryWrapper<OceanBookingContainerAllocationEntity>().eq(OceanBookingContainerAllocationEntity::getOceanBookingId, id).orderByAsc(OceanBookingContainerAllocationEntity::getAllocatedAt)); }
+    public List<RealContainer> containers(long id) {
+        Map<Long, OceanBookingContainerRequirementEntity> requirementById = requirements(id).stream()
+            .collect(Collectors.toMap(OceanBookingContainerRequirementEntity::getId, Function.identity()));
+        return allocations(id).stream().map(allocation -> {
+            OceanBookingContainerRequirementEntity requirement = requirementById.get(allocation.getRequirementId());
+            ContainerBookingEntity container = containerBookings.find(allocation.getContainerBookingId());
+            if (requirement == null || container == null) {
+                throw new IllegalStateException("订舱真实柜聚合关系不完整");
+            }
+            return new RealContainer(container.getId(), container.getCabinetNo(), container.getContainerNo(),
+                requirement.getId(), allocation.getId(), requirement.getContainerType(),
+                requirement.getContainerKind(), requirement.getCapacityCbm(), requirement.getMaxWeightKg(),
+                container.getWarehouseId(), container.getWarehouseName(), container.getChannelCode(),
+                container.getChannelName(), container.getCustomerId(), container.getCustomerName());
+        }).toList();
+    }
     public OceanBookingContainerAllocationEntity allocationByContainer(long containerBookingId) {
         return allocations.selectOne(new LambdaQueryWrapper<OceanBookingContainerAllocationEntity>()
             .eq(OceanBookingContainerAllocationEntity::getContainerBookingId, containerBookingId));
@@ -61,7 +82,14 @@ public class OceanBookingRepository {
         return containerBookings.syncReleasedTransport(id, request.billOfLadingNo().trim(), request.vesselName().trim(),
             request.voyageNo().trim(), request.estimatedSailingAt(), operatorId, operatorName);
     }
+    public boolean containerNoExists(String containerNo) {
+        return containerBookings.containerNoExists(containerNo, null);
+    }
+    public void insertContainer(ContainerBookingEntity value) { containerBookings.insert(value); }
     public void insert(OceanBookingContainerAllocationEntity value) { allocations.insert(value); }
+    public int reassignAllocation(long sourceId, long targetId) {
+        return allocations.reassign(sourceId, targetId);
+    }
     public void deleteAllocation(long containerBookingId) { allocations.delete(new LambdaQueryWrapper<OceanBookingContainerAllocationEntity>().eq(OceanBookingContainerAllocationEntity::getContainerBookingId, containerBookingId)); }
     public void insert(OceanBookingStatusHistoryEntity value) { histories.insert(value); }
     public boolean claimOperation(Long id, long operatorId, String action, String key, String hash) { return operations.claim(com.baomidou.mybatisplus.core.toolkit.IdWorker.getId(), id, operatorId, action, key, hash) == 1; }

firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingService.java

@@ -2,8 +2,11 @@ package com.baiyue.firstleg.oceanbooking.service;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.core.api.ApiResponse;
 import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
+import com.baiyue.firstleg.client.WarehouseMasterDataClient;
+import com.baiyue.firstleg.entity.ContainerBookingEntity;
 import com.baiyue.firstleg.oceanbooking.domain.OceanBookingStatus;
 import com.baiyue.firstleg.domain.ContainerSpecificationCatalog;
 import com.baiyue.firstleg.oceanbooking.dto.OceanBookingDtos.*;
@@ -18,6 +21,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
@@ -41,6 +46,9 @@ public class OceanBookingService {
     @Resource private ObjectMapper objectMapper;
     @Resource private LoadingPickService loadingPickService;
     @Resource private WarehouseSupplierSnapshotService suppliers;
+    @Resource private WarehouseMasterDataClient warehouses;
+    @Value("${baiyue.security.internal-service-token:}") private String internalToken;
+    @Value("${baiyue.warehouse.public-tenant-id:0}") private long publicWarehouseTenantId;
 
     public PageResult<OceanBookingEntity> page(Query query) {
         String status = trim(query.status());
@@ -75,24 +83,34 @@ public class OceanBookingService {
         String hash = hash(action, null, request);
         Detail replay = claimOrReplay(null, operatorId, action, key, hash);
         if (replay != null) return replay;
-        ChannelOption channel = requireActiveChannel(request.data().warehouseId(), request.data().channelCode());
+        WarehouseMasterDataClient.Warehouse warehouse = requireDomesticTransitWarehouse(request.data().warehouseId());
+        ChannelOption channel = requireActiveChannel(warehouse.id(), request.data().channelCode());
         var bookingAgent = suppliers.booking(request.data().bookingAgentId(), request.data().bookingAgentName());
+        request.data().containers().forEach(container -> {
+            if (repository.containerNoExists(container.containerNo().trim())) {
+                throw conflict("集装箱号已存在：" + container.containerNo().trim());
+            }
+        });
         OceanBookingEntity value = new OceanBookingEntity();
         value.setId(IdWorker.getId());
         value.setBookingNo("OB" + value.getId());
         // Child-row triggers still require DRAFT while the aggregate is assembled.
         // The status transition is in the same transaction, so callers only observe CONFIRMED.
         value.setStatus(OceanBookingStatus.DRAFT.name());
-        copy(value, request.data(), channel.channelName(), bookingAgent == null ? null : bookingAgent.name());
+        copy(value, request.data(), warehouse.warehouseName(), channel.channelName(),
+            bookingAgent == null ? null : bookingAgent.name());
         value.setCreatedBy(operatorId); value.setCreatedByName(operatorName);
         value.setUpdatedBy(operatorId); value.setUpdatedByName(operatorName); value.setVersion(0);
         repository.insert(value);
         repository.replaceParties(value.getId(), parties(value.getId(), request.data().parties()));
-        repository.replaceRequirements(value.getId(), requirements(value.getId(), request.data().containerRequirements()));
+        List<OceanBookingContainerRequirementEntity> requirements = requirements(
+            value.getId(), request.data().containers());
+        repository.replaceRequirements(value.getId(), requirements);
         if (repository.transition(value.getId(), OceanBookingStatus.DRAFT.name(),
             OceanBookingStatus.CONFIRMED.name(), null, 0, operatorId, operatorName) != 1) {
             throw concurrent();
         }
+        createRealContainers(value, requirements, request.data().containers(), operatorId, operatorName);
         OceanBookingEntity confirmed = required(value.getId());
         addHistory(value.getId(), OceanBookingStatus.DRAFT.name(), OceanBookingStatus.CONFIRMED.name(), action,
             null, value, confirmed, operatorId, operatorName);
@@ -196,7 +214,7 @@ public class OceanBookingService {
         history.setOperatorId(operatorId); history.setOperatorName(operatorName); repository.insert(history);
     }
 
-    private Detail detail(OceanBookingEntity value) { return new Detail(value, repository.parties(value.getId()), repository.requirements(value.getId()), repository.allocations(value.getId()), repository.histories(value.getId())); }
+    private Detail detail(OceanBookingEntity value) { return new Detail(value, repository.parties(value.getId()), repository.containers(value.getId()), repository.histories(value.getId())); }
     private OceanBookingEntity required(long id) { OceanBookingEntity value = repository.find(id); if (value == null) throw new BizException(ResultCode.NOT_FOUND, "订舱单不存在"); return value; }
     private OceanBookingEntity requiredVersion(long id, int version) { OceanBookingEntity value = required(id); if (!Integer.valueOf(version).equals(value.getVersion())) throw concurrent(); return value; }
     private static void requireStatus(OceanBookingEntity value, OceanBookingStatus status) { if (!status.name().equals(value.getStatus())) throw conflict("订舱状态不允许当前操作"); }
@@ -219,6 +237,13 @@ public class OceanBookingService {
             if (!PARTY_TYPES.contains(type) || !types.add(type)) throw badRequest("订舱方必须各包含一条SHIPPER、CONSIGNEE和NOTIFY_PARTY");
         }
         if (!types.equals(PARTY_TYPES)) throw badRequest("订舱方必须各包含一条SHIPPER、CONSIGNEE和NOTIFY_PARTY");
+        Set<String> containerNos = new HashSet<>();
+        for (ContainerRequest container : data.containers()) {
+            String containerNo = container.containerNo().trim();
+            if (!containerNos.add(containerNo)) throw badRequest("同一订舱内集装箱号不能重复");
+            ContainerSpecificationCatalog.requireMatch(container.containerType(),
+                container.capacityCbm(), container.maxWeightKg());
+        }
     }
     private static void validateRange(LocalDateTime from, LocalDateTime to) { if (from != null && to != null && to.isBefore(from)) throw badRequest("预计到港时间不能早于预计开船时间"); }
     private static void validateRegisteredTransport(OceanBookingEntity booking, ReleaseRequest request) {
@@ -252,10 +277,11 @@ public class OceanBookingService {
         return value.trim();
     }
 
-    private static void copy(OceanBookingEntity v, DraftData d, String resolvedChannelName, String resolvedBookingAgentName) {
+    private static void copy(OceanBookingEntity v, DraftData d, String resolvedWarehouseName,
+                             String resolvedChannelName, String resolvedBookingAgentName) {
         v.setCustomerId(d.customerId()); v.setCustomerName(trim(d.customerName()));
         v.setChannelCode(d.channelCode().trim()); v.setChannelName(resolvedChannelName);
-        v.setWarehouseId(d.warehouseId()); v.setWarehouseName(d.warehouseName().trim());
+        v.setWarehouseId(d.warehouseId()); v.setWarehouseName(resolvedWarehouseName);
         v.setBillOfLadingNo(d.billOfLadingNo().trim());
         v.setShippingCompanyId(d.shippingCompanyId()); v.setShippingCompanyName(trim(d.shippingCompanyName()));
         v.setBookingAgentId(d.bookingAgentId()); v.setBookingAgentName(trim(resolvedBookingAgentName));
@@ -268,7 +294,75 @@ public class OceanBookingService {
     }
 
     private static List<OceanBookingPartyEntity> parties(long id, List<PartyRequest> requests) { return requests.stream().map(r -> { OceanBookingPartyEntity v = new OceanBookingPartyEntity(); v.setId(IdWorker.getId()); v.setOceanBookingId(id); v.setPartyType(r.partyType().trim().toUpperCase()); v.setPartyName(r.partyName().trim()); v.setAddress(trim(r.address())); v.setContactName(trim(r.contactName())); v.setContactPhone(trim(r.contactPhone())); return v; }).toList(); }
-    private static List<OceanBookingContainerRequirementEntity> requirements(long id, List<ContainerRequirementRequest> requests) { int[] sort = {0}; return requests.stream().map(r -> { var specification = ContainerSpecificationCatalog.requireMatch(r.containerType(), r.capacityCbm(), r.maxWeightKg()); OceanBookingContainerRequirementEntity v = new OceanBookingContainerRequirementEntity(); v.setId(IdWorker.getId()); v.setOceanBookingId(id); v.setContainerType(specification.containerType()); v.setContainerKind(r.containerKind().trim().toUpperCase()); v.setCapacityCbm(specification.capacityCbm()); v.setMaxWeightKg(specification.maxWeightKg()); v.setQuantity(r.quantity()); v.setSortNo(sort[0]++); return v; }).toList(); }
+    private static List<OceanBookingContainerRequirementEntity> requirements(long id, List<ContainerRequest> requests) { int[] sort = {0}; return requests.stream().map(r -> { var specification = ContainerSpecificationCatalog.requireMatch(r.containerType(), r.capacityCbm(), r.maxWeightKg()); OceanBookingContainerRequirementEntity v = new OceanBookingContainerRequirementEntity(); v.setId(IdWorker.getId()); v.setOceanBookingId(id); v.setContainerType(specification.containerType()); v.setContainerKind(r.containerKind().trim().toUpperCase()); v.setCapacityCbm(specification.capacityCbm()); v.setMaxWeightKg(specification.maxWeightKg()); v.setQuantity(1); v.setSortNo(sort[0]++); return v; }).toList(); }
+
+    private void createRealContainers(OceanBookingEntity booking,
+                                      List<OceanBookingContainerRequirementEntity> requirements,
+                                      List<ContainerRequest> requests, long operatorId,
+                                      String operatorName) {
+        for (int index = 0; index < requests.size(); index++) {
+            ContainerRequest request = requests.get(index);
+            OceanBookingContainerRequirementEntity requirement = requirements.get(index);
+            ContainerBookingEntity container = new ContainerBookingEntity();
+            container.setId(IdWorker.getId()); container.setBookingNo("CB" + container.getId());
+            container.setCabinetNo("CAB-" + container.getId());
+            container.setContainerNo(request.containerNo().trim());
+            container.setSourceType("OCEAN_BOOKING"); container.setRecordStatus("ACTIVE");
+            container.setChannelCode(booking.getChannelCode()); container.setChannelName(booking.getChannelName());
+            container.setOceanBookingId(booking.getId());
+            container.setOceanBookingRequirementId(requirement.getId());
+            container.setCustomerId(booking.getCustomerId()); container.setCustomerName(booking.getCustomerName());
+            container.setWarehouseId(booking.getWarehouseId()); container.setWarehouseName(booking.getWarehouseName());
+            container.setBillOfLadingNo(booking.getBillOfLadingNo());
+            container.setVesselName(booking.getVesselName()); container.setVoyageNo(booking.getVoyageNo());
+            container.setContainerType(requirement.getContainerType());
+            container.setShippingCompanyId(booking.getShippingCompanyId());
+            container.setShippingCompanyName(booking.getShippingCompanyName());
+            container.setDeparturePortCode(booking.getDeparturePortCode());
+            container.setDeparturePortName(booking.getDeparturePortName());
+            container.setDestinationPortCode(booking.getDestinationPortCode());
+            container.setDestinationPortName(booking.getDestinationPortName());
+            container.setCapacityCbm(requirement.getCapacityCbm());
+            container.setMaxWeightKg(requirement.getMaxWeightKg());
+            container.setEstimatedSailingAt(booking.getEstimatedSailingAt());
+            container.setEstimatedPortArrivalAt(booking.getEstimatedArrivalAt());
+            container.setCreatedBy(operatorId); container.setCreatedByName(operatorName);
+            container.setUpdatedBy(operatorId); container.setUpdatedByName(operatorName); container.setVersion(0);
+            try { repository.insertContainer(container); }
+            catch (DuplicateKeyException exception) {
+                throw conflict("集装箱号已存在：" + request.containerNo().trim());
+            }
+            OceanBookingContainerAllocationEntity allocation = new OceanBookingContainerAllocationEntity();
+            allocation.setId(IdWorker.getId()); allocation.setOceanBookingId(booking.getId());
+            allocation.setRequirementId(requirement.getId());
+            allocation.setContainerBookingId(container.getId()); allocation.setAllocatedBy(operatorId);
+            allocation.setAllocatedByName(operatorName); allocation.setAllocatedAt(LocalDateTime.now());
+            repository.insert(allocation);
+        }
+    }
+
+    private WarehouseMasterDataClient.Warehouse requireDomesticTransitWarehouse(long warehouseId) {
+        try {
+            ApiResponse<WarehouseMasterDataClient.Detail> response = warehouses.active(
+                internalToken, publicWarehouseTenantId, warehouseId);
+            if (response == null || !response.successful() || response.data() == null
+                || response.data().warehouse() == null) {
+                throw new BizException(ResultCode.NOT_FOUND, "国内中转仓不存在或已停用");
+            }
+            WarehouseMasterDataClient.Warehouse warehouse = response.data().warehouse();
+            if (!Long.valueOf(warehouseId).equals(warehouse.id())
+                || !Long.valueOf(publicWarehouseTenantId).equals(warehouse.tenantId())
+                || !"ACTIVE".equals(warehouse.status()) || !"DOMESTIC".equals(warehouse.warehouseType())
+                || !StringUtils.hasText(warehouse.warehouseName())) {
+                throw new BizException(ResultCode.VALIDATION_FAILED, "订舱只能选择启用中的国内中转仓");
+            }
+            return warehouse;
+        } catch (BizException exception) {
+            throw exception;
+        } catch (RuntimeException exception) {
+            throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "国内中转仓服务暂时不可用");
+        }
+    }
     private String hash(String action, Long id, Object request) { try { return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest((action + '|' + id + '|' + objectMapper.writeValueAsString(request)).getBytes(StandardCharsets.UTF_8))); } catch (Exception ex) { throw new IllegalStateException("无法计算订舱请求摘要", ex); } }
     private String json(Object value) { if (value == null) return null; try { return objectMapper.writeValueAsString(value); } catch (JsonProcessingException ex) { throw new IllegalStateException("无法保存订舱历史快照", ex); } }
     private static OceanBookingStatus parseStatus(String status) { try { return OceanBookingStatus.valueOf(status); } catch (RuntimeException ex) { throw badRequest("订舱状态无效"); } }

firstleg/src/main/java/com/baiyue/firstleg/repository/ContainerRepository.java

@@ -17,6 +17,10 @@ public class ContainerRepository {
     }
     public ContainerBookingEntity find(long id) { return mapper.selectBooking(id); }
     public ContainerBookingEntity findForUpdate(long id) { return mapper.selectBookingForUpdate(id); }
+    public ContainerBookingEntity findActiveForUpdate(long id) { return mapper.selectActiveBookingForUpdate(id); }
+    public ContainerBookingEntity mergedSourceForUpdate(long targetId) {
+        return mapper.selectMergedSourceForUpdate(targetId);
+    }
     public boolean containerNoExists(String no, Long excludedId) {
         if (no == null) return false;
         return mapper.selectCount(new LambdaQueryWrapper<ContainerBookingEntity>()
@@ -29,11 +33,24 @@ public class ContainerRepository {
             .ne(excludedId != null, ContainerBookingEntity::getId, excludedId)) > 0;
     }
     public void insert(ContainerBookingEntity value) { mapper.insert(value); }
+    public int consumeRealSource(long sourceId, long targetId, long operatorId, String operatorName) {
+        return mapper.consumeRealSource(sourceId, targetId, operatorId, operatorName);
+    }
+    public int mergeRealSource(long targetId, long sourceId, String containerNo, int version,
+                               long operatorId, String operatorName) {
+        return mapper.mergeRealSource(targetId, sourceId, containerNo, version, operatorId, operatorName);
+    }
+    public int clearMergedLink(long targetId, int version, long operatorId, String operatorName) {
+        return mapper.clearMergedLink(targetId, version, operatorId, operatorName);
+    }
+    public int restoreMergedSource(long sourceId, long targetId, String containerNo,
+                                   long operatorId, String operatorName) {
+        return mapper.restoreMergedSource(sourceId, targetId, containerNo, operatorId, operatorName);
+    }
     public int updateDraft(ContainerBookingEntity value, int version, long operatorId, String operatorName) {
         return mapper.updateDraft(value, version, operatorId, operatorName);
     }
-    public int updateLink(ContainerBookingEntity value, int version, long operatorId, String operatorName) { return mapper.updateLink(value, version, operatorId, operatorName); }
-    public int clearLink(long id, int version, long operatorId, String operatorName) { return mapper.clearLink(id, version, operatorId, operatorName); }
+    public boolean hasLoadingPlan(long id) { return mapper.hasLoadingPlan(id) > 0; }
     public boolean hasActiveLoadingItems(long id) { return mapper.hasActiveLoadingItems(id) > 0; }
     public boolean hasPickTask(long id) { return mapper.hasPickTask(id) > 0; }
     public boolean hasEvidence(long id) { return mapper.hasEvidence(id) > 0; }

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

@@ -75,7 +75,7 @@ public class ContainerOverviewService {
             if (!requestHash.equals(replay.requestHash())) throw conflict("Idempotency-Key已用于不同异常操作");
             return;
         }
-        ContainerBookingEntity booking = containers.findForUpdate(id);
+        ContainerBookingEntity booking = containers.findActiveForUpdate(id);
         if (booking == null) throw new BizException(ResultCode.NOT_FOUND, "货柜不存在");
         if (!request.expectedVersion().equals(booking.getVersion())) throw conflict("货柜版本已变化，请刷新后重试");
         replay = mapper.exceptionOperation(id, operatorId, operationId);

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

@@ -66,6 +66,7 @@ public class ContainerService {
             .orElseThrow(() -> conflict("所选物流渠道已失效，请重新选择"));
         ContainerBookingEntity value = new ContainerBookingEntity(); value.setId(IdWorker.getId());
         value.setBookingNo("CB" + value.getId()); value.setCabinetNo("CAB-" + value.getId());
+        value.setSourceType("SIMULATION"); value.setRecordStatus("ACTIVE");
         value.setChannelCode(channel.getChannelCode()); value.setChannelName(channel.getChannelName());
         value.setWarehouseId(warehouse.id()); value.setWarehouseName(warehouse.warehouseName());
         value.setContainerType(specification.containerType()); value.setCapacityCbm(specification.capacityCbm());
@@ -78,10 +79,27 @@ public class ContainerService {
     public ContainerBookingEntity linkOceanBooking(long id, long operatorId, String operatorName, OceanBookingLinkRequest request) {
         ContainerBookingEntity container = required(id); requireVersion(container, request.expectedVersion()); requireFirstLinkMutable(container);
         if (container.getOceanBookingId() != null) throw conflict("模拟柜已关联真实订舱柜");
-        OceanBookingEntity booking = oceanBookings.find(request.oceanBookingId());
+        ContainerBookingEntity source = repository.findForUpdate(request.realContainerBookingId());
+        if (source == null || !"OCEAN_BOOKING".equals(source.getSourceType())
+            || !"ACTIVE".equals(source.getRecordStatus()) || source.getMergedIntoContainerBookingId() != null
+            || source.getContainerNo() == null || source.getOceanBookingId() == null
+            || source.getOceanBookingRequirementId() == null) {
+            throw conflict("真实订舱柜不存在、已被消费或不可关联");
+        }
+        if (repository.hasLoadingPlan(source.getId()) || repository.hasPickTask(source.getId())
+            || repository.hasEvidence(source.getId()) || repository.hasDocuments(source.getId())) {
+            throw conflict("真实订舱柜已有装柜计划、PDA、证据或单证事实，不能被模拟柜消费");
+        }
+        OceanBookingEntity booking = oceanBookings.find(source.getOceanBookingId());
         if (booking == null || !("CONFIRMED".equals(booking.getStatus()) || "RELEASED".equals(booking.getStatus()))) throw conflict("只能关联已确认的真实订舱柜");
-        OceanBookingContainerRequirementEntity requirement = oceanBookings.requirement(booking.getId(), request.requirementId());
+        OceanBookingContainerRequirementEntity requirement = oceanBookings.requirement(
+            booking.getId(), source.getOceanBookingRequirementId());
         if (requirement == null) throw new BizException(ResultCode.NOT_FOUND, "真实订舱柜箱型分配不存在");
+        var allocation = oceanBookings.allocationByContainer(source.getId());
+        if (allocation == null || !java.util.Objects.equals(allocation.getOceanBookingId(), booking.getId())
+            || !java.util.Objects.equals(allocation.getRequirementId(), requirement.getId())) {
+            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())
@@ -89,17 +107,21 @@ public class ContainerService {
             || container.getMaxWeightKg() == null || requirement.getMaxWeightKg() == null
             || container.getCapacityCbm().compareTo(requirement.getCapacityCbm()) != 0
             || container.getMaxWeightKg().compareTo(requirement.getMaxWeightKg()) != 0) throw conflict("模拟柜与真实订舱柜仓库、渠道、箱型或容量不一致");
-        long allocated = oceanBookings.allocations(booking.getId()).stream()
-            .filter(a -> request.requirementId().equals(a.getRequirementId()) && a.getContainerBookingId() != null).count();
-        if (requirement.getQuantity() == null || requirement.getQuantity() <= 0 || allocated >= requirement.getQuantity()) {
-            throw conflict("真实订舱柜箱型分配已关联完毕");
+        if (!java.util.Objects.equals(source.getWarehouseId(), booking.getWarehouseId())
+            || !java.util.Objects.equals(source.getChannelCode(), booking.getChannelCode())
+            || !java.util.Objects.equals(source.getContainerType(), requirement.getContainerType())
+            || source.getCapacityCbm() == null || source.getMaxWeightKg() == null
+            || source.getCapacityCbm().compareTo(requirement.getCapacityCbm()) != 0
+            || source.getMaxWeightKg().compareTo(requirement.getMaxWeightKg()) != 0) {
+            throw conflict("真实订舱柜仓库、渠道或规格快照不一致");
         }
         if (booking.getCustomerId() != null && repository.hasMismatchedCustomerItems(id, booking.getCustomerId())) throw conflict("模拟柜已排货客户与真实订舱客户范围不一致");
-        container.setOceanBookingId(booking.getId()); container.setOceanBookingRequirementId(requirement.getId());
-        container.setCustomerId(booking.getCustomerId()); container.setCustomerName(booking.getCustomerName());
-        if (repository.updateLink(container, request.expectedVersion(), operatorId, operatorName) != 1) throw conflict("货柜状态或版本已变化，请刷新后重试");
-        com.baiyue.firstleg.oceanbooking.entity.OceanBookingContainerAllocationEntity allocation = new com.baiyue.firstleg.oceanbooking.entity.OceanBookingContainerAllocationEntity();
-        allocation.setId(IdWorker.getId()); allocation.setOceanBookingId(booking.getId()); allocation.setRequirementId(requirement.getId()); allocation.setContainerBookingId(id); allocation.setAllocatedBy(operatorId); allocation.setAllocatedByName(operatorName); allocation.setAllocatedAt(LocalDateTime.now()); oceanBookings.insert(allocation);
+        if (repository.consumeRealSource(source.getId(), id, operatorId, operatorName) != 1
+            || repository.mergeRealSource(id, source.getId(), source.getContainerNo(),
+                request.expectedVersion(), operatorId, operatorName) != 1
+            || oceanBookings.reassignAllocation(source.getId(), id) != 1) {
+            throw conflict("真实订舱柜已被消费或货柜版本发生变化，请刷新后重试");
+        }
         return required(id);
     }
 
@@ -107,8 +129,15 @@ public class ContainerService {
     public ContainerBookingEntity unlinkOceanBooking(long id, long operatorId, String operatorName, OceanBookingUnlinkRequest request) {
         ContainerBookingEntity container = required(id); requireVersion(container, request.expectedVersion()); requireUnlinkMutable(container);
         if (container.getOceanBookingId() == null) throw conflict("模拟柜尚未关联真实订舱柜");
-        oceanBookings.deleteAllocation(id);
-        if (repository.clearLink(id, request.expectedVersion(), operatorId, operatorName) != 1) throw conflict("货柜状态或版本已变化，请刷新后重试"); return required(id);
+        ContainerBookingEntity source = repository.mergedSourceForUpdate(id);
+        if (source == null) throw conflict("真实订舱柜合并来源不存在，不能解除关联");
+        String containerNo = container.getContainerNo();
+        if (repository.clearMergedLink(id, request.expectedVersion(), operatorId, operatorName) != 1
+            || repository.restoreMergedSource(source.getId(), id, containerNo, operatorId, operatorName) != 1
+            || oceanBookings.reassignAllocation(id, source.getId()) != 1) {
+            throw conflict("货柜状态或版本已变化，请刷新后重试");
+        }
+        return required(id);
     }
 
     private void requireFirstLinkMutable(ContainerBookingEntity container) {