优化

firstleg/src/test/java/com/baiyue/firstleg/controller/InboundOrderControllerContractTest.java

@@ -51,6 +51,9 @@ class InboundOrderControllerContractTest {
             .contains("required: false")
             .contains("InboundOrderSummary:")
             .contains("required: [id, tenantId]")
+            .contains("actualNetWeightKg: {type: number, nullable: true}")
+            .contains("chargeableVolumeCbm: {type: number, nullable: true}")
+            .contains("measureCompletedAt: {type: string, format: date-time, nullable: true}")
             .contains("pricingTaxMode: {type: string, enum: [TAX_INCLUDED, TAX_EXCLUDED]")
             .contains("tenantId: {type: string, pattern: '^[1-9][0-9]*$', description:")
             .contains("[WAIT_MEASURE, WAIT_REVIEW, WAIT_FEE_SEND, WAIT_SPLIT]")

firstleg/src/test/java/com/baiyue/firstleg/controller/UnifiedInboundOpenApiContractTest.java

@@ -40,8 +40,8 @@ class UnifiedInboundOpenApiContractTest {
             "businessType", "channelCode", "pricingTaxMode", "containerMode", "destinationType",
             "holdFlag", "actualGrossWeightKg", "actualNetWeightKg", "actualVolumeCbm",
             "volumeWeightKg", "chargeableWeightKg", "chargeableVolumeCbm", "palletCount",
-            "inboundedAt", "expressCompanyCode", "expressCompanyName", "loadingStatus", "containerNo",
-            "cabinetNo", "sailingAt", "portArrivalAt", "createdAt", "updatedAt");
+            "inboundedAt", "requestedPickupAt", "expressCompanyCode", "expressCompanyName", "containerNo",
+            "cabinetNo", "sailingAt", "portArrivalAt", "createdByName", "createdAt", "updatedAt");
     }
 
     @SuppressWarnings("unchecked")

firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/repository/OceanBookingMapperContractTest.java

@@ -16,10 +16,12 @@ class OceanBookingMapperContractTest {
             com.baomidou.mybatisplus.extension.plugins.pagination.Page.class,
             com.baiyue.firstleg.oceanbooking.dto.OceanBookingDtos.Query.class)
             .getAnnotation(Select.class).value());
-        assertThat(sql).contains("customer_id=#{query.customerId}")
-            .contains("status=#{query.status}")
-            .contains("booking_no LIKE")
-            .contains("ORDER BY updated_at DESC,id DESC");
+        assertThat(sql).contains("booking.customer_id=#{query.customerId}")
+            .contains("booking.status=#{query.status}")
+            .contains("booking.booking_no LIKE")
+            .contains("party.party_type='SHIPPER'", "party.party_type='CONSIGNEE'")
+            .contains("fl_ocean_booking_container_allocation", "container.record_status='ACTIVE'", "container_count")
+            .contains("ORDER BY booking.updated_at DESC,booking.id DESC");
     }
 
     @Test

firstleg/src/test/java/com/baiyue/firstleg/outbound/dispatch/OutboundDispatchReadMapperContractTest.java

@@ -7,6 +7,14 @@ import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class OutboundDispatchReadMapperContractTest {
+    @Test
+    void bindingProjectsStableCabinetAndRealContainerNumbersSeparately() throws Exception {
+        String sql = String.join("\n", OutboundDispatchReadMapper.class
+            .getMethod("bindings", Long.class, Long.class, Long.class)
+            .getAnnotation(Select.class).value());
+        assertThat(sql).contains("booking.cabinet_no cabinetNo", "booking.container_no containerNo");
+    }
+
     @Test
     void pickTaskQueryOrdersByTheSchemaStartedAtColumn() throws Exception {
         String sql = OutboundDispatchReadMapper.class.getMethod("pick", long.class)

firstleg/src/test/java/com/baiyue/firstleg/outbound/dispatch/OutboundDispatchServiceTest.java

@@ -129,7 +129,7 @@ class OutboundDispatchServiceTest {
 
     private static OutboundDispatchReadMapper.Binding binding() {
         return new OutboundDispatchReadMapper.Binding(10L, "O-10", 11L, "I-11", 7L, 8L, "客户A",
-            "LOADED", 22L, "C-22", 44L, "COMPLETED");
+            "LOADED", 22L, "CAB-22", "C-22", 44L, "COMPLETED");
     }
 
     private static OutboundDispatchGateContributor passing(String code) {

firstleg/src/test/java/com/baiyue/firstleg/repository/ContainerBookingMapperContractTest.java

@@ -24,6 +24,10 @@ class ContainerBookingMapperContractTest {
         assertThat(select)
             .contains("fl_loading_plan")
             .contains("p.id AS plan_id")
+            .contains("p.plan_no AS plan_no")
+            .contains("fl_container_exception_history")
+            .contains("destination_clearance_document_status")
+            .contains("delivery_order_document_status")
             .contains("CASE WHEN p.id IS NULL THEN 'WAIT_LOADING'")
             .contains("plan_status")
             .contains("p.plan_status != 'COMPLETED'")

firstleg/src/test/java/com/baiyue/firstleg/repository/InboundOrderRepositoryTest.java

@@ -16,6 +16,7 @@ import com.baiyue.firstleg.mapper.InboundOrderMapper;
 import com.baiyue.firstleg.mapper.InboundPalletAllocationMapper;
 import com.baiyue.firstleg.mapper.InboundStatusHistoryMapper;
 import com.baiyue.firstleg.mapper.InboundTransportSnapshotMapper;
+import com.baiyue.firstleg.mapper.InboundPickupSnapshotMapper;
 import org.junit.jupiter.api.Test;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.mockito.ArgumentCaptor;
@@ -37,6 +38,7 @@ import static org.mockito.Mockito.when;
 class InboundOrderRepositoryTest {
     @MockBean private InboundOrderMapper orders;
     @MockBean private InboundTransportSnapshotMapper transports;
+    @MockBean private InboundPickupSnapshotMapper pickupSnapshots;
     @MockBean private InboundPalletAllocationMapper pallets;
     @MockBean private InboundFileMapper files;
     @MockBean private InboundInternalNoteMapper notes;
@@ -162,8 +164,6 @@ class InboundOrderRepositoryTest {
 
         assertThat(result.records()).extracting(record -> record.tenantId())
             .containsExactly(10001L, 10002L);
-        assertThat(result.records()).extracting(record -> record.loadingStatus())
-            .containsExactly("T1", "T2");
         assertThat(result.records()).extracting(record -> record.locationCodes())
             .containsExactly("A1", "B1");
         ArgumentCaptor<Wrapper<InboundOrderEntity>> orderCaptor = ArgumentCaptor.forClass(Wrapper.class);

firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingListQueryMapperContractTest.java

@@ -54,6 +54,16 @@ class LoadingListQueryMapperContractTest {
             .doesNotContain("fl_loading_list");
     }
 
+    @Test
+    void detailItemsExposeFrozenOrderAndActiveContainerFacts() throws Exception {
+        String items = sql("selectItems", Select.class);
+        assertThat(items)
+            .contains("i.order_id", "i.order_no", "b.container_no")
+            .contains("b.record_status='ACTIVE'")
+            .contains("i.loading_plan_id = #{planId}")
+            .contains("i.deleted = 0");
+    }
+
     @Test
     void mutationsShouldUseStatusAndOptimisticVersionConditions() throws Exception {
         String touch = sql("touchEditable", Update.class);

firstleg/src/test/java/com/baiyue/firstleg/repository/TruckAppointmentMapperContractTest.java

@@ -13,7 +13,8 @@ class TruckAppointmentMapperContractTest {
     @Test void mapsToPhase3TableAndUsesOptimisticGuards() throws Exception {
         assertThat(TruckAppointmentEntity.class.getAnnotation(TableName.class).value()).isEqualTo("fl_truck_appointment");
         String page = TruckAppointmentMapper.class.getMethod("page", com.baomidou.mybatisplus.extension.plugins.pagination.Page.class, com.baiyue.firstleg.dto.TruckAppointmentDtos.Query.class).getAnnotation(Select.class).value()[0];
-        assertThat(page).contains("fl_truck_appointment", "appointment_no", "vehicle_no", "status=#{q.status}", "customer_id=#{q.customerId}", "container_booking_id=#{q.containerBookingId}");
+        assertThat(page).contains("fl_truck_appointment", "appointment_no", "vehicle_no", "status=#{q.status}", "customer_id=#{q.customerId}", "container_booking_id=#{q.containerBookingId}",
+            "fl_ocean_booking", "fl_container_booking", "record_status='ACTIVE'", "cabinet_no", "container_no", "fl_truck_appointment_attachment", "attachment_count");
         String transition = TruckAppointmentMapper.class.getMethod("transition", long.class, String.class, String.class, int.class).getAnnotation(Update.class).value()[0];
         assertThat(transition).contains("status=#{toStatus}", "status=#{fromStatus}", "version=#{version}", "revision=revision+1", "version=version+1");
         String active = TruckAppointmentMapper.class.getMethod("activeForUpdate", long.class).getAnnotation(Select.class).value()[0];

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

@@ -11,6 +11,7 @@ import com.baiyue.firstleg.entity.InboundStatusHistoryEntity;
 import com.baiyue.firstleg.entity.FulfillmentTaskEntity;
 import com.baiyue.firstleg.mapper.InboundOrderMapper;
 import com.baiyue.firstleg.mapper.InboundStatusHistoryMapper;
+import com.baiyue.firstleg.mapper.InboundPickupSnapshotMapper;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -42,6 +43,8 @@ class InboundOrderCreationServiceTest {
     @Mock
     private InboundStatusHistoryMapper histories;
     @Mock
+    private InboundPickupSnapshotMapper pickupSnapshots;
+    @Mock
     private FulfillmentTaskProvisioningService fulfillmentTasks;
     @InjectMocks
     private InboundOrderCreationService service;