fix container customer snapshot schema migration

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

@@ -38,7 +38,7 @@ public interface LoadingCompletedEventMapper {
         """)
     List<Row> rows(@Param("planId") long planId);
 
-    /** 读取一键代发托盘及其箱唛快照；普通订单不会使用该结果。 */
+    /** 读取头程托盘及箱唛快照；普通订单向尾程交接打印编号，一键代发同时冻结托盘库存。 */
     @Select("""
         SELECT i.account_id, i.inbound_id AS source_inbound_id,
                a.pallet_code, a.allocation_no, a.picked_package_count AS allocated_package_count,

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

@@ -89,8 +89,7 @@ public class LoadingCompletedOutboxService {
                 cartonMarks.getOrDefault(row.getLoadingPlanItemId(), List.of())))
             .toList();
         String orderType = dropship(first.getBusinessType()) ? "ONE_CLICK_DROPSHIP" : "FIRST_LEG";
-        List<FirstLegLoadingPlanCompletedV2.PalletSnapshot> pallets = dropship(first.getBusinessType())
-            ? palletSnapshots(sorted, palletRows) : List.of();
+        List<FirstLegLoadingPlanCompletedV2.PalletSnapshot> pallets = palletSnapshots(sorted, palletRows);
         if ("ONE_CLICK_DROPSHIP".equals(orderType) && pallets.isEmpty()) {
             throw new BizException(ResultCode.CONFLICT, "一键代发入仓单缺少托盘冻结快照");
         }
@@ -99,7 +98,7 @@ public class LoadingCompletedOutboxService {
             string(first.getRootOrderId()), first.getInboundCode(), string(first.getDestinationWarehouseId()),
             first.getDestinationWarehouseCode(), first.getDestinationWarehouseName(), sumInt(sorted, Row::getPackageCount),
             sumNullableInt(sorted, Row::getProductQuantity), "ONE_CLICK_DROPSHIP".equals(orderType)
-                ? pallets.size() : 0, sum(sorted, Row::getGrossWeightKg), sum(sorted, Row::getNetWeightKg),
+                ? pallets.size() : sumNullableInt(sorted, Row::getPalletCount), sum(sorted, Row::getGrossWeightKg), sum(sorted, Row::getNetWeightKg),
             sum(sorted, Row::getVolumeCbm), items, string(first.getAccountId()), orderType, pallets);
     }
 

firstleg/src/main/resources/db/phase3-smart-loading-schema.sql

@@ -132,6 +132,21 @@ BEGIN
     ALTER TABLE fl_container_booking ADD COLUMN merged_into_container_booking_id BIGINT UNSIGNED NULL
       COMMENT '真实柜被模拟柜吸收后的目标稳定柜次ID' AFTER record_status;
   END IF;
+  IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE()
+      AND table_name='fl_container_booking' AND column_name='customer_id') THEN
+    ALTER TABLE fl_container_booking ADD COLUMN customer_id BIGINT UNSIGNED NULL
+      COMMENT '已关联真实订舱指定的客户范围' AFTER ocean_booking_requirement_id;
+  END IF;
+  IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE()
+      AND table_name='fl_container_booking' AND column_name='customer_name') THEN
+    ALTER TABLE fl_container_booking ADD COLUMN customer_name VARCHAR(128) NULL
+      COMMENT '已关联真实订舱客户名称快照' AFTER customer_id;
+  END IF;
+  UPDATE fl_container_booking container_booking
+  JOIN fl_ocean_booking ocean_booking ON ocean_booking.id=container_booking.ocean_booking_id
+     SET container_booking.customer_id=COALESCE(container_booking.customer_id,ocean_booking.customer_id),
+         container_booking.customer_name=COALESCE(container_booking.customer_name,ocean_booking.customer_name)
+   WHERE container_booking.customer_id IS NULL OR container_booking.customer_name IS NULL;
   IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE()
       AND table_name='fl_container_booking' AND column_name='unloading_completed_at') THEN
     ALTER TABLE fl_container_booking ADD COLUMN unloading_completed_at DATETIME(3) NULL

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

@@ -76,6 +76,19 @@ class SmartLoadingSqlContractTest {
             .contains("version INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '乐观锁版本号'");
     }
 
+    @Test
+    @DisplayName("存量货柜迁移补齐BaseMapper所需客户快照列")
+    void shouldMigrateContainerCustomerSnapshotColumns() throws Exception {
+        for (String sql : Set.of(migration(), unifiedMigration())) {
+            assertThat(sql)
+                .contains("ADD COLUMN customer_id BIGINT UNSIGNED NULL")
+                .contains("ADD COLUMN customer_name VARCHAR(128) NULL")
+                .contains("JOIN fl_ocean_booking ocean_booking ON ocean_booking.id=container_booking.ocean_booking_id")
+                .contains("container_booking.customer_id=COALESCE(container_booking.customer_id,ocean_booking.customer_id)")
+                .contains("container_booking.customer_name=COALESCE(container_booking.customer_name,ocean_booking.customer_name)");
+        }
+    }
+
     @Test
     @DisplayName("仓库备注使用计划先行与明细单表CAS并允许已拣明细仅改备注")
     void shouldUpdateWarehouseRemarkWithoutMultiTableTriggerConflict() throws Exception {

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

@@ -55,6 +55,7 @@ class LoadingCompletedOutboxServiceTest {
         assertThat(first.payload().at("/orders/0/items/0/sourceInboundDetailId").asText()).isEqualTo("101");
         assertThat(first.payload().at("/orders/0/items/0/skuCode").asText()).isEqualTo("SKU101");
         assertThat(first.payload().at("/orders/0/items/0/cartonMarks/0").asText()).isEqualTo("BOX-POOL-1");
+        assertThat(first.payload().at("/orders/0/palletCount").asInt()).isEqualTo(2);
         assertThat(rows.get(0).getEventKey()).isEqualTo("FIRSTLEG_LOADING_COMPLETED:90:11:2");
         assertThat(first.eventVersion()).isEqualTo(2);
     }
@@ -118,6 +119,20 @@ class LoadingCompletedOutboxServiceTest {
         assertThat(event.payload().at("/orders/0/palletCount").asInt()).isEqualTo(2);
     }
 
+    @Test void publishesOrdinaryRecommendedPalletNumbersForTailLegReuse() throws Exception {
+        Row value = row(11, 100, 101);
+        when(snapshots.rows(90L)).thenReturn(List.of(value));
+        when(snapshots.palletRows(90L)).thenReturn(List.of(
+            pallet(11, 100, 1, "FL-PLT-001", 1, 101, "SKU101", 1, 10, "BOX-POOL-1")));
+
+        service.publish(90L);
+
+        ArgumentCaptor<InboundOutboxEntity> captor = ArgumentCaptor.forClass(InboundOutboxEntity.class);
+        verify(outbox).insert(captor.capture());
+        EventEnvelope event = mapper.readValue(captor.getValue().getPayloadJson(), EventEnvelope.class);
+        assertThat(event.payload().at("/orders/0/pallets/0/palletNo").asText()).isEqualTo("FL-PLT-001");
+    }
+
     private Row row(long account,long inbound,long detail) {
         Row r=new Row(); r.setLoadingPlanId(90L); r.setPlanNo("P90"); r.setContainerBookingId(91L);
         r.setAggregateVersion(8); r.setContainerNo("CONT"); r.setCabinetNo("CAB"); r.setWarehouseId(92L);