优化

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

@@ -252,6 +252,39 @@ class ContainerServiceTest {
         verify(oceanBookings).insert(any(OceanBookingContainerAllocationEntity.class));
     }
 
+    @Test
+    @DisplayName("预装已录入真实柜号时关联订舱保留原柜号")
+    void linksReleasedBookingWhilePreservingExistingRealContainerNumber() {
+        ContainerBookingEntity container = stubLinkContext();
+        container.setContainerNo("MSCU6639870");
+        when(repository.find(11L)).thenReturn(container, container);
+        when(repository.linkReleasedBooking(eq(11L), eq(21L), eq(31L), eq("MSCU6639870"),
+            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()).isEqualTo("MSCU6639870");
+        verify(repository).linkReleasedBooking(eq(11L), eq(21L), eq(31L), eq("MSCU6639870"),
+            any(OceanBookingEntity.class), eq(2), eq(9L), eq("admin"));
+        verify(oceanBookings).insert(any(OceanBookingContainerAllocationEntity.class));
+    }
+
+    @Test
+    @DisplayName("关联订舱时拒绝用不同柜号覆盖预装已录入柜号")
+    void rejectsDifferentRealContainerNumberWhenLinkingReleasedBooking() {
+        ContainerBookingEntity container = stubLinkContext();
+        container.setContainerNo("MSCU6639870");
+
+        assertThatThrownBy(() -> service.linkOceanBooking(11L, 9L, "admin",
+            new OceanBookingLinkRequest(21L, 31L, "TSTU1503306", 2)))
+            .isInstanceOf(BizException.class).hasMessageContaining("与当前柜次已录入柜号不一致");
+
+        verify(repository, never()).linkReleasedBooking(anyLong(), anyLong(), anyLong(), anyString(),
+            any(), anyInt(), anyLong(), anyString());
+        verifyNoInteractions(oceanBookings);
+    }
+
     @Test
     @DisplayName("提柜后按柜次版本原子补录真实柜号")
     void assignsRealContainerNumberAfterPickup() {
@@ -436,7 +469,7 @@ class ContainerServiceTest {
             any(), anyInt(), anyLong(), anyString());
     }
 
-    private void stubLinkContext() {
+    private ContainerBookingEntity stubLinkContext() {
         ContainerBookingEntity container = booking("WAIT_LOADING", 2);
         container.setContainerNo(null);
         container.setWarehouseId(101L); container.setChannelGroupCode("MATSON_CLX"); container.setChannelCode(null);
@@ -450,6 +483,7 @@ class ContainerServiceTest {
         when(oceanBookings.find(21L)).thenReturn(oceanBooking);
         when(oceanBookings.requirement(21L, 31L)).thenReturn(requirement);
         when(oceanBookings.activeLinkedCount(21L, 31L)).thenReturn(0L);
+        return container;
     }
 
     @Test