优化

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

@@ -79,14 +79,20 @@ 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("模拟柜已关联真实订舱柜");
+        String existingContainerNo = trim(container.getContainerNo());
+        String requestedContainerNo = trim(request.containerNo());
+        String containerNo = requestedContainerNo == null
+            ? existingContainerNo
+            : Iso6346ContainerNumber.require(requestedContainerNo);
+        if (existingContainerNo != null && !existingContainerNo.equals(containerNo)) {
+            throw conflict("输入的真实集装箱号与当前柜次已录入柜号不一致，请先在预装运输信息中纠正");
+        }
         OceanBookingEntity booking = oceanBookings.find(request.oceanBookingId());
         if (booking == null || !"RELEASED".equals(booking.getStatus())) throw conflict("只能关联已发布订舱");
         OceanBookingContainerRequirementEntity requirement = oceanBookings.requirement(request.oceanBookingId(), request.requirementId());
         if (requirement == null) throw new BizException(ResultCode.NOT_FOUND, "订舱箱型需求不存在");
         long allocated = oceanBookings.activeLinkedCount(request.oceanBookingId(), request.requirementId());
         if (allocated >= requirement.getQuantity()) 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.getChannelGroupCode(), booking.getChannelCode())
@@ -134,7 +140,6 @@ public class ContainerService {
     private void requireFirstLinkMutable(ContainerBookingEntity container) {
         SmartLoadingStatus value = status(container);
         if ((value != SmartLoadingStatus.WAIT_LOADING && value != SmartLoadingStatus.EDITING)
-            || trim(container.getContainerNo()) != null
             || repository.hasPickTask(container.getId()) || repository.hasEvidence(container.getId())
             || repository.hasDocuments(container.getId())) throw conflict("已进入PDA、证据、单证或不可逆装柜阶段，不能关联订舱");
     }