diff --git a/auth/src/main/java/com/baiyue/auth/client/IamOnboardingClient.java b/auth/src/main/java/com/baiyue/auth/client/IamOnboardingClient.java
index bb60517ca..aae981b02 100644
--- a/auth/src/main/java/com/baiyue/auth/client/IamOnboardingClient.java
+++ b/auth/src/main/java/com/baiyue/auth/client/IamOnboardingClient.java
@@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 
@@ -16,6 +17,11 @@ public interface IamOnboardingClient {
             @RequestHeader("X-Internal-Service-Token") String internalToken,
             @RequestBody OnboardingRequest request);
 
+    @GetMapping("/merchant-registrations/{authUserId}")
+    ApiResponse<OnboardingResponse> registration(
+            @RequestHeader("X-Internal-Service-Token") String internalToken,
+            @PathVariable("authUserId") Long authUserId);
+
     @DeleteMapping("/merchant-registrations/{authUserId}/compensation")
     ApiResponse<Void> compensate(
             @RequestHeader("X-Internal-Service-Token") String internalToken,
diff --git a/auth/src/main/java/com/baiyue/auth/dto/MerchantRegisterRequest.java b/auth/src/main/java/com/baiyue/auth/dto/MerchantRegisterRequest.java
index 8203a100e..d0ca9eb4c 100644
--- a/auth/src/main/java/com/baiyue/auth/dto/MerchantRegisterRequest.java
+++ b/auth/src/main/java/com/baiyue/auth/dto/MerchantRegisterRequest.java
@@ -12,7 +12,7 @@ public record MerchantRegisterRequest(
         @NotBlank @Size(min = 8, max = 72) String password,
         @NotBlank @Size(max = 64) String displayName,
         @NotBlank @Size(max = 128) String companyName,
-        @NotBlank @Size(max = 64) String legalPerson,
+        @Size(max = 64) String legalPerson,
         @Schema(description = "首个企业管理员的登录手机号；注册时同时初始化企业联系电话，创建后两者独立维护")
         @NotBlank @Pattern(regexp = "^1[3-9]\\d{9}$") String phone,
         @Email @Size(max = 128) String contactEmail,
diff --git a/auth/src/main/java/com/baiyue/auth/service/MerchantRegistrationService.java b/auth/src/main/java/com/baiyue/auth/service/MerchantRegistrationService.java
index 1ce404873..e17c5410e 100644
--- a/auth/src/main/java/com/baiyue/auth/service/MerchantRegistrationService.java
+++ b/auth/src/main/java/com/baiyue/auth/service/MerchantRegistrationService.java
@@ -35,11 +35,20 @@ public class MerchantRegistrationService {
     @BusinessAudit(event = "MERCHANT_REGISTER", resourceType = "ACCOUNT",
         resourceId = "#request.username", description = "商户注册", captureAfter = false)
     public MerchantRegisterResponse register(MerchantRegisterRequest request) {
-        if (accountRepository.existsByUsername(request.username())) {
+        AuthAccount usernameAccount = accountRepository.findByUsername(request.username());
+        AuthAccount phoneAccount = accountRepository.findByPhone(request.phone());
+        if (usernameAccount != null && phoneAccount != null
+                && usernameAccount.getId().equals(phoneAccount.getId())
+                && "MERCHANT".equals(usernameAccount.getDefaultAppCode())
+                && "ACTIVE".equals(usernameAccount.getAccountStatus())
+                && passwordEncoder.matches(request.password(), usernameAccount.getPasswordHash())) {
+            return existingRegistration(usernameAccount);
+        }
+        if (usernameAccount != null) {
             throw new BizException(ResultCode.CONFLICT, "用户名已存在");
         }
-        if (accountRepository.existsByPhone(request.phone())) {
-            throw new BizException(ResultCode.CONFLICT, "手机号已存在");
+        if (phoneAccount != null) {
+            throw new BizException(ResultCode.CONFLICT, "该手机号已注册，请直接登录后继续完善企业资质");
         }
         long accountId = IdWorker.getId();
         String passwordHash = passwordEncoder.encode(request.password());
@@ -111,6 +120,24 @@ public class MerchantRegistrationService {
                 "LOGIN_AND_COMPLETE_QUALIFICATIONS");
     }
 
+    private MerchantRegisterResponse existingRegistration(AuthAccount account) {
+        try {
+            var response = onboardingClient.registration(internalToken, account.getId());
+            if (response == null || !response.successful() || response.data() == null) {
+                throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "注册状态暂时无法确认，请直接登录后继续完善企业资质");
+            }
+            var onboarding = response.data();
+            if (!java.util.Set.of("PROFILE_REQUIRED", "REJECTED").contains(onboarding.tenantStatus())) {
+                throw new BizException(ResultCode.CONFLICT, "该账号已注册，请直接登录");
+            }
+            return new MerchantRegisterResponse(account.getId(), onboarding.tenantId(), onboarding.membershipId(),
+                    onboarding.tenantStatus(), onboarding.dimensionInitializationStatus(),
+                    "LOGIN_AND_COMPLETE_QUALIFICATIONS");
+        } catch (FeignException exception) {
+            throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "注册状态暂时无法确认，请直接登录后继续完善企业资质");
+        }
+    }
+
     private void registerRollbackCompensation(long accountId, AtomicBoolean compensationCompleted) {
         if (!TransactionSynchronizationManager.isSynchronizationActive()) {
             return;
diff --git a/auth/src/test/java/com/baiyue/auth/service/MerchantRegistrationServiceTest.java b/auth/src/test/java/com/baiyue/auth/service/MerchantRegistrationServiceTest.java
index b09d43d33..7eb495634 100644
--- a/auth/src/test/java/com/baiyue/auth/service/MerchantRegistrationServiceTest.java
+++ b/auth/src/test/java/com/baiyue/auth/service/MerchantRegistrationServiceTest.java
@@ -23,6 +23,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.never;
 
 @SpringJUnitConfig(MerchantRegistrationService.class)
 @TestPropertySource(properties = "baiyue.security.internal-service-token=internal-token")
@@ -61,6 +62,49 @@ class MerchantRegistrationServiceTest {
         assertEquals("PENDING", result.dimensionInitializationStatus());
     }
 
+    @Test
+    void exactIncompleteRegistrationRetryReturnsTheExistingRegistration() {
+        AuthAccount account = new AuthAccount();
+        account.setId(9001L);
+        account.setUsername("registered_owner");
+        account.setPhone("13800138000");
+        account.setPasswordHash("encoded-password");
+        account.setAccountStatus("ACTIVE");
+        account.setDefaultAppCode("MERCHANT");
+        when(accounts.findByUsername("registered_owner")).thenReturn(account);
+        when(accounts.findByPhone("13800138000")).thenReturn(account);
+        when(encoder.matches("Password123", "encoded-password")).thenReturn(true);
+        when(onboarding.registration("internal-token", 9001L)).thenReturn(ApiResponse.success(
+                new IamOnboardingClient.OnboardingResponse(10001L, 30001L, "PROFILE_REQUIRED", "READY")));
+
+        var result = service.register(new MerchantRegisterRequest(
+                "registered_owner", "Password123", "注册人", "测试企业", null,
+                "13800138000", "owner@example.com", "CN", "深圳市宝安区"));
+
+        assertEquals(9001L, result.accountId());
+        assertEquals(10001L, result.tenantId());
+        assertEquals("READY", result.dimensionInitializationStatus());
+        verify(onboarding, never()).register(eq("internal-token"), any());
+        verify(accounts, never()).insert(any());
+    }
+
+    @Test
+    void phoneOwnedByAnotherUsernameDirectsTheUserBackToLogin() {
+        AuthAccount account = new AuthAccount();
+        account.setId(9001L);
+        account.setUsername("registered_owner");
+        account.setPhone("13800138000");
+        when(accounts.findByPhone("13800138000")).thenReturn(account);
+
+        var failure = assertThrows(com.baiyue.common.core.exception.BizException.class,
+                () -> service.register(new MerchantRegisterRequest(
+                        "another_owner", "Password123", "注册人", "测试企业", null,
+                        "13800138000", "owner@example.com", "CN", "深圳市宝安区")));
+
+        assertEquals("该手机号已注册，请直接登录后继续完善企业资质", failure.getMessage());
+        verify(onboarding, never()).register(eq("internal-token"), any());
+    }
+
     @Test
     void failedAuthInsertCompensatesTheIamRegistration() {
         when(encoder.encode("Password123")).thenReturn("encoded-password");
diff --git a/common-event-contract/src/main/java/com/baiyue/common/event/FirstLegLoadingPlanCompletedV2.java b/common-event-contract/src/main/java/com/baiyue/common/event/FirstLegLoadingPlanCompletedV2.java
index 905c6050d..8c64ee40f 100644
--- a/common-event-contract/src/main/java/com/baiyue/common/event/FirstLegLoadingPlanCompletedV2.java
+++ b/common-event-contract/src/main/java/com/baiyue/common/event/FirstLegLoadingPlanCompletedV2.java
@@ -141,8 +141,18 @@ public record FirstLegLoadingPlanCompletedV2(
         }
     }
 
-    /** 头程托盘冻结快照；普通入仓用于复用打印编号，一键代发还冻结 SKU/箱唛库存。 */
-    public record PalletSnapshot(String palletNo, List<SkuPackageSnapshot> skuPackages) {}
+    /** 普通 FBA 只复用 palletNo；一件代发还携带同一物理 DP 的完整清单摘要。 */
+    public record PalletSnapshot(String palletNo, List<SkuPackageSnapshot> skuPackages,
+                                 Integer manifestVersion, Integer manifestPackageCount,
+                                 Integer manifestFragmentCount, String manifestHash) {
+        public PalletSnapshot {
+            skuPackages = skuPackages == null ? List.of() : List.copyOf(skuPackages);
+        }
+
+        public PalletSnapshot(String palletNo, List<SkuPackageSnapshot> skuPackages) {
+            this(palletNo, skuPackages, null, null, null, null);
+        }
+    }
 
     /** 托盘下来源入库明细、SKU、箱数、数量及箱号冻结快照；同 SKU 多明细按 sourceInboundDetailId 精确区分。 */
     public record SkuPackageSnapshot(String sourceInboundDetailId, String skuCode, String productName,
diff --git a/deploy/docker-compose.overseas.yml b/deploy/docker-compose.overseas.yml
index 12d49a4a2..33709eb4a 100644
--- a/deploy/docker-compose.overseas.yml
+++ b/deploy/docker-compose.overseas.yml
@@ -65,6 +65,8 @@ services:
       FIRSTLEG_EVENT_BRIDGE_URL: ${CN_EVENT_BRIDGE_TARGET_URL:-http://event-bridge-cn:9312}
       DOMESTIC_WAREHOUSE_URL: ${DOMESTIC_WAREHOUSE_URL}
       FILE_SERVICE_URL: ${FILE_SERVICE_URL}
+      # Print 注册在国内 Nacos namespace；海外服务通过共享 infra-network 的 Docker DNS 直连。
+      PRINT_SERVICE_URL: ${PRINT_SERVICE_URL:-http://print:9207}
       WAREHOUSE_OVERSEAS_SERVICE_URL: ${WAREHOUSE_OVERSEAS_SERVICE_URL:-http://warehouse-overseas-service:9305}
 
   warehouse-overseas-service:
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 9f0c87d39..4b703a3c0 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -123,7 +123,6 @@ services:
       FINANCE_DB_URL: ${FINANCE_DB_URL}
       FINANCE_DB_USERNAME: ${FINANCE_DB_USERNAME}
       FINANCE_DB_PASSWORD: ${FINANCE_DB_PASSWORD}
-      FINANCE_WALLET_DEFAULT_CREDIT_LIMIT: ${FINANCE_WALLET_DEFAULT_CREDIT_LIMIT:-0.00}
       OVERSEAS_EVENT_BRIDGE_URL: ${OVERSEAS_EVENT_BRIDGE_URL:-http://event-bridge-overseas:9312}
 
   order:
diff --git a/deploy/sql/头程数据库统一增量-MySQL8.sql b/deploy/sql/头程数据库统一增量-MySQL8.sql
index 4b1e979d5..32c670b3e 100644
--- a/deploy/sql/头程数据库统一增量-MySQL8.sql
+++ b/deploy/sql/头程数据库统一增量-MySQL8.sql
@@ -329,7 +329,7 @@ USE baiyue_iam;
 
 CREATE TABLE IF NOT EXISTS iam_tenant (
   id BIGINT NOT NULL COMMENT '客户主档ID（雪花ID）；0保留为平台技术作用域',
-  tenant_code VARCHAR(64) NOT NULL COMMENT '全局唯一客户编码',
+  tenant_code VARCHAR(8) NOT NULL COMMENT '客户编号：企业客户固定五位数字，平台技术主体为PLATFORM',
   tenant_name VARCHAR(128) NOT NULL COMMENT '客户企业名称',
   tenant_type VARCHAR(20) NOT NULL DEFAULT 'MERCHANT' COMMENT '主体类型：MERCHANT企业客户',
   status VARCHAR(20) NOT NULL DEFAULT 'PROFILE_REQUIRED' COMMENT '客户状态：PROFILE_REQUIRED待完善资料、PENDING待审核、ACTIVE正常、REJECTED已驳回、DISABLED已停用',
@@ -364,6 +364,15 @@ CREATE TABLE IF NOT EXISTS iam_tenant (
   KEY idx_iam_tenant_status (status, created_at)
 ) ENGINE=InnoDB COMMENT='客户企业主档表：保存企业资料、审核结果和启停状态；ID同时作为客户数据隔离键';
 
+CREATE TABLE IF NOT EXISTS iam_number_sequence (
+  sequence_key VARCHAR(64) NOT NULL COMMENT '业务编号类型',
+  next_value BIGINT UNSIGNED NOT NULL COMMENT '下一待分配数字',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  PRIMARY KEY (sequence_key)
+) ENGINE=InnoDB COMMENT='IAM业务编号序列表';
+
+INSERT IGNORE INTO iam_number_sequence(sequence_key, next_value) VALUES ('CUSTOMER_CODE', 1);
+
 CREATE TABLE IF NOT EXISTS iam_tenant_review (
   id BIGINT NOT NULL COMMENT '审核记录ID',
   tenant_id BIGINT NOT NULL COMMENT '被审核客户ID和数据隔离键',
@@ -402,6 +411,7 @@ CREATE TABLE IF NOT EXISTS iam_tenant_qualification (
   qualification_type VARCHAR(32) NOT NULL COMMENT '客户资质类型',
   certificate_no VARCHAR(128) NULL COMMENT '证书编号',
   document_url VARCHAR(500) NULL COMMENT '资质文件存储地址',
+  original_file_name VARCHAR(255) NOT NULL COMMENT '上传时原始文件名',
   valid_from DATE NULL COMMENT '有效期开始日期',
   valid_to DATE NULL COMMENT '有效期结束日期',
   status VARCHAR(20) NOT NULL DEFAULT 'PENDING' COMMENT '资质审核状态：PENDING待审核、APPROVED已通过、REJECTED已驳回',
@@ -1424,6 +1434,7 @@ CALL phase1_iam_add_column('iam_tenant', 'approved_at', "DATETIME(3) NULL COMMEN
 CALL phase1_iam_add_column('iam_tenant', 'approved_by', "BIGINT NULL COMMENT 'Reviewer ID'");
 CALL phase1_iam_add_column('iam_tenant', 'reject_reason', "VARCHAR(500) NULL COMMENT 'Rejection reason'");
 CALL phase1_iam_add_column('iam_tenant', 'legal_representative', "VARCHAR(64) NULL COMMENT '法定代表人' AFTER legal_name");
+CALL phase1_iam_add_column('iam_tenant_qualification', 'original_file_name', "VARCHAR(255) NULL COMMENT '上传时原始文件名' AFTER document_url");
 CALL phase1_iam_add_column('iam_tenant_qualification', 'review_comment', "VARCHAR(500) NULL COMMENT 'Review comment'");
 CALL phase1_iam_add_column('iam_membership', 'created_by', "BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Creator ID'");
 CALL phase1_iam_add_column('iam_membership', 'updated_by', "BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Updater ID'");
@@ -1784,6 +1795,7 @@ CALL phase1_add_column('ord_order_cargo', 'product_height_cm', "DECIMAL(12,2) NU
 CALL phase1_add_column('ord_order_cargo', 'shipment_id', "VARCHAR(64) NULL COMMENT 'Cargo Amazon Shipment ID'");
 CALL phase1_add_column('ord_order_cargo', 'reference_id', "VARCHAR(64) NULL COMMENT 'Cargo Amazon Reference ID'");
 CALL phase1_add_column('ord_order_cargo', 'product_image_file_id', "BIGINT UNSIGNED NULL COMMENT 'Product image logical file ID'");
+CALL phase1_add_column('ord_order_cargo', 'packing_group_no', "VARCHAR(32) NULL COMMENT '混箱组合号；同组货物行共享同一批物理箱'");
 CALL phase1_add_column('ord_order_cargo', 'wooden_product', "TINYINT(1) NOT NULL DEFAULT 0 COMMENT '木制品权威判定快照；1时订单必须商检'");
 
 UPDATE ord_order_cargo cargo
@@ -2897,6 +2909,23 @@ CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
   KEY idx_carton_label_detail (tenant_id, inbound_id, inbound_detail_id),
   CONSTRAINT fk_carton_label_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)
 ) ENGINE=InnoDB COMMENT='首次打印前冻结的实际箱号与订单货物明细映射';
+CREATE TABLE IF NOT EXISTS fl_inbound_carton_label_sku (
+  id BIGINT UNSIGNED NOT NULL COMMENT '箱唛SKU快照ID',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '客户ID和数据隔离键',
+  inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
+  carton_label_id BIGINT UNSIGNED NOT NULL COMMENT '物理箱唛ID',
+  inbound_detail_id BIGINT UNSIGNED NOT NULL COMMENT '订单货物明细ID',
+  sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码快照',
+  cargo_name VARCHAR(255) NULL COMMENT '货物名称快照',
+  expected_quantity INT UNSIGNED NOT NULL COMMENT '该物理箱内应收SKU数量',
+  line_no INT UNSIGNED NOT NULL COMMENT '箱内SKU展示顺序',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_carton_label_sku_detail (carton_label_id,inbound_detail_id),
+  KEY idx_carton_label_sku_code (tenant_id,inbound_id,sku_code),
+  CONSTRAINT fk_carton_label_sku_label FOREIGN KEY (carton_label_id) REFERENCES fl_inbound_carton_label(id)
+) ENGINE=InnoDB COMMENT='物理箱唛内的多SKU冻结快照';
+
 
 -- 存量环境可能缺少稳定箱码映射兼容字段；CREATE TABLE IF NOT EXISTS 不会补列。
 DROP PROCEDURE IF EXISTS unified_carton_label_add_column;
@@ -3843,7 +3872,7 @@ CREATE TABLE IF NOT EXISTS fl_price_book_version (
   original_file_name VARCHAR(255) NOT NULL COMMENT '原始Excel文件名',
   source_file_id BIGINT UNSIGNED NULL COMMENT 'File服务原始文件ID',
   source_sha256 CHAR(64) NULL COMMENT '原始文件SHA-256',
-  status VARCHAR(24) NOT NULL DEFAULT 'PENDING_CONFIRMATION' COMMENT '价格版本状态：PENDING_CONFIRMATION待确认、ACTIVE已生效、SUPERSEDED已被替代、FAILED解析失败',
+  status VARCHAR(24) NOT NULL DEFAULT 'PENDING_CONFIRMATION' COMMENT '价格版本状态：PENDING_CONFIRMATION待确认、ACTIVE已生效、SUPERSEDED已被替代、VOIDED已作废、FAILED解析失败',
   blocking_error_count INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '阻断错误数',
   warning_count INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '警告数',
   parse_issues_json JSON NULL COMMENT '上传解析问题及待确认重新校验结果',
@@ -3854,6 +3883,9 @@ CREATE TABLE IF NOT EXISTS fl_price_book_version (
   published_by BIGINT UNSIGNED NULL COMMENT '确认并发布价格版本的操作人ID',
   published_at DATETIME(3) NULL COMMENT '确认并生效时间',
   superseded_at DATETIME(3) NULL COMMENT '被下一版本替换时间',
+  voided_by BIGINT UNSIGNED NULL COMMENT '作废操作人ID',
+  voided_at DATETIME(3) NULL COMMENT '作废时间',
+  void_reason VARCHAR(500) NULL COMMENT '作废原因',
   updated_by BIGINT UNSIGNED NOT NULL COMMENT '最后修改人ID',
   updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '最后更新时间',
   deleted TINYINT(1) NOT NULL DEFAULT 0 COMMENT '逻辑删除标记：0未删除、1已删除',
@@ -3864,6 +3896,39 @@ CREATE TABLE IF NOT EXISTS fl_price_book_version (
   KEY idx_price_book_source_hash (tenant_id, source_sha256)
 ) ENGINE=InnoDB COMMENT='平台公共船期价格整表版本';
 
+-- Warehouse 增量段已在自身结束时删除同名过程；Firstleg 价格版本的存量补列需在当前库重新定义。
+DROP PROCEDURE IF EXISTS add_column_if_missing;
+DELIMITER $$
+CREATE PROCEDURE add_column_if_missing(
+  IN p_table_name VARCHAR(64),
+  IN p_column_name VARCHAR(64),
+  IN p_column_definition TEXT
+)
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1
+      FROM information_schema.columns
+     WHERE table_schema = DATABASE()
+       AND table_name = p_table_name
+       AND column_name = p_column_name
+  ) THEN
+    SET @add_column_sql = CONCAT(
+      'ALTER TABLE `', REPLACE(p_table_name, '`', '``'),
+      '` ADD COLUMN `', REPLACE(p_column_name, '`', '``'),
+      '` ', p_column_definition
+    );
+    PREPARE add_column_statement FROM @add_column_sql;
+    EXECUTE add_column_statement;
+    DEALLOCATE PREPARE add_column_statement;
+  END IF;
+END$$
+DELIMITER ;
+
+CALL add_column_if_missing('fl_price_book_version', 'voided_by', 'BIGINT UNSIGNED NULL COMMENT ''作废操作人ID'' AFTER superseded_at');
+CALL add_column_if_missing('fl_price_book_version', 'voided_at', 'DATETIME(3) NULL COMMENT ''作废时间'' AFTER voided_by');
+CALL add_column_if_missing('fl_price_book_version', 'void_reason', 'VARCHAR(500) NULL COMMENT ''作废原因'' AFTER voided_at');
+DROP PROCEDURE IF EXISTS add_column_if_missing;
+
 CREATE TABLE IF NOT EXISTS fl_price_book_channel (
   id BIGINT UNSIGNED NOT NULL COMMENT '版本渠道快照ID',
   price_book_version_id BIGINT UNSIGNED NOT NULL COMMENT '整表价格版本ID',
@@ -5060,6 +5125,7 @@ CREATE TABLE IF NOT EXISTS fl_container_booking (
   source_type VARCHAR(24) NOT NULL DEFAULT 'SIMULATION' COMMENT '记录来源：SIMULATION内部模拟柜、OCEAN_BOOKING订舱真实柜',
   record_status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE' COMMENT '记录状态：ACTIVE可操作、MERGED已合并历史',
   merged_into_container_booking_id BIGINT UNSIGNED NULL COMMENT '真实柜被模拟柜吸收后的目标稳定柜次ID',
+  channel_group_code VARCHAR(64) NULL COMMENT '模拟柜计划渠道分组；关联真实订舱后继续保留',
   channel_code VARCHAR(64) NULL COMMENT '订舱渠道编码快照；存量回填前禁止混装',
   channel_name VARCHAR(128) NULL COMMENT '订舱渠道名称快照',
   ocean_booking_id BIGINT UNSIGNED NULL COMMENT '来源订舱ID',
@@ -5168,11 +5234,14 @@ BEGIN
     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 EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema=DATABASE()
+      AND table_name='fl_ocean_booking') THEN
+    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;
+  END IF;
   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
@@ -5484,6 +5553,7 @@ BEGIN
   DECLARE source_exists INT DEFAULT 0;
   DECLARE source_total_columns INT DEFAULT 0;
   DECLARE source_smart_columns INT DEFAULT 0;
+  DECLARE source_current_columns INT DEFAULT 0;
   DECLARE source_inbound_columns INT DEFAULT 0;
   DECLARE target_exists INT DEFAULT 0;
   DECLARE target_total_columns INT DEFAULT 0;
@@ -5528,7 +5598,45 @@ BEGIN
        OR (column_name = 'updated_at' AND data_type = 'datetime' AND datetime_precision = 3 AND is_nullable = 'NO' AND LOWER(column_default) LIKE 'current_timestamp%' AND LOWER(extra) LIKE '%on update current_timestamp%')
      );
 
-    IF source_total_columns = 11 AND source_smart_columns = 11 AND source_inbound_columns < 12
+    SELECT COUNT(*) INTO source_current_columns
+      FROM information_schema.columns
+     WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task' AND (
+       (column_name = 'id' AND LOWER(column_type) = 'bigint unsigned' AND is_nullable = 'NO')
+       OR (column_name = 'loading_plan_id' AND LOWER(column_type) = 'bigint unsigned' AND is_nullable = 'NO')
+       OR (column_name = 'container_booking_id' AND LOWER(column_type) = 'bigint unsigned' AND is_nullable = 'NO')
+       OR (column_name = 'cabinet_no' AND LOWER(column_type) = 'varchar(64)' AND is_nullable = 'NO')
+       OR (column_name = 'container_no' AND LOWER(column_type) = 'varchar(64)' AND is_nullable = 'YES')
+       OR (column_name = 'task_status' AND LOWER(column_type) = 'varchar(24)' AND is_nullable = 'NO' AND column_default = 'LOADING')
+       OR (column_name = 'started_by' AND LOWER(column_type) = 'bigint unsigned' AND is_nullable = 'NO')
+       OR (column_name = 'started_by_name' AND LOWER(column_type) = 'varchar(64)' AND is_nullable = 'YES')
+       OR (column_name = 'started_at' AND data_type = 'datetime' AND datetime_precision = 3 AND is_nullable = 'NO' AND LOWER(column_default) LIKE 'current_timestamp%')
+       OR (column_name = 'completed_by' AND LOWER(column_type) = 'bigint unsigned' AND is_nullable = 'YES')
+       OR (column_name = 'completed_by_name' AND LOWER(column_type) = 'varchar(64)' AND is_nullable = 'YES')
+       OR (column_name = 'completed_at' AND data_type = 'datetime' AND datetime_precision = 3 AND is_nullable = 'YES')
+       OR (column_name = 'version' AND LOWER(column_type) = 'int unsigned' AND is_nullable = 'NO' AND CAST(column_default AS CHAR) = '0')
+     );
+
+    IF source_total_columns = 13 AND source_current_columns = 13
+       AND (SELECT COUNT(*) FROM information_schema.statistics
+             WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task'
+               AND index_name = 'uk_loading_pick_task_plan' AND non_unique = 0
+               AND seq_in_index = 1 AND column_name = 'loading_plan_id') = 1
+       AND (SELECT COUNT(*) FROM information_schema.statistics
+             WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task'
+               AND index_name = 'uk_loading_pick_task_booking' AND non_unique = 0
+               AND seq_in_index = 1 AND column_name = 'container_booking_id') = 1
+       AND (SELECT COUNT(*) FROM information_schema.statistics
+             WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task'
+               AND index_name = 'idx_loading_pick_container'
+               AND ((seq_in_index = 1 AND column_name = 'container_no')
+                 OR (seq_in_index = 2 AND column_name = 'task_status')
+                 OR (seq_in_index = 3 AND column_name = 'started_at'))) = 3
+       AND (SELECT COUNT(*) FROM information_schema.key_column_usage
+             WHERE constraint_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task'
+               AND column_name = 'loading_plan_id' AND referenced_table_name = 'fl_loading_plan'
+               AND referenced_column_name = 'id') = 1 THEN
+      SET source_exists = 1;
+    ELSEIF source_total_columns = 11 AND source_smart_columns = 11 AND source_inbound_columns < 12
        AND (SELECT COUNT(*) FROM information_schema.statistics
              WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task'
                AND index_name = 'uk_loading_pick_task_plan' AND non_unique = 0
@@ -5842,6 +5950,29 @@ DELIMITER ;
 CALL repair_phase3_loading_pick_task_foreign_keys();
 DROP PROCEDURE repair_phase3_loading_pick_task_foreign_keys;
 
+-- Existing deployments may predate simulated-container channel grouping. The
+-- update trigger below references this column, so upgrade it before compiling
+-- the trigger rather than waiting for the later channel-container data block.
+DROP PROCEDURE IF EXISTS phase3_add_container_channel_group;
+DELIMITER $$
+CREATE PROCEDURE phase3_add_container_channel_group()
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM information_schema.columns
+     WHERE table_schema = 'baiyue_firstleg'
+       AND table_name = 'fl_container_booking'
+       AND column_name = 'channel_group_code'
+  ) THEN
+    ALTER TABLE fl_container_booking
+      ADD COLUMN channel_group_code VARCHAR(64) NULL
+      COMMENT '模拟柜计划渠道分组；关联真实订舱后继续保留'
+      AFTER merged_into_container_booking_id;
+  END IF;
+END$$
+DELIMITER ;
+CALL phase3_add_container_channel_group();
+DROP PROCEDURE phase3_add_container_channel_group;
+
 DROP TRIGGER IF EXISTS trg_container_booking_before_update;
 DELIMITER $$
 CREATE TRIGGER trg_container_booking_before_update
@@ -5854,6 +5985,7 @@ BEGIN
   IF current_plan_status IN ('LOADING', 'COMPLETED') AND (
        NOT (OLD.id <=> NEW.id) OR NOT (OLD.booking_no <=> NEW.booking_no)
     OR NOT (OLD.cabinet_no <=> NEW.cabinet_no)
+    OR NOT (OLD.channel_group_code <=> NEW.channel_group_code)
     OR NOT (OLD.channel_code <=> NEW.channel_code)
     OR NOT (OLD.channel_name <=> NEW.channel_name)
     OR NOT (OLD.ocean_booking_id <=> NEW.ocean_booking_id)
@@ -6449,14 +6581,13 @@ FROM iam_role role
  JOIN iam_permission permission
   ON permission.tenant_id = 0
  AND permission.permission_code IN (
-   'platform:firstleg:container:list', 'platform:firstleg:container:view',
+   'platform:firstleg:container:list',
    'platform:firstleg:container:create',
    'platform:firstleg:container:edit', 'platform:firstleg:smart-loading:list',
    'platform:firstleg:smart-loading:assign', 'platform:firstleg:smart-loading:delete',
-   'platform:firstleg:preload:list', 'platform:firstleg:preload:view',
+   'platform:firstleg:preload:list',
    'platform:firstleg:preload:edit', 'platform:firstleg:preload:complete',
-   'platform:firstleg:preload:confirm', 'platform:firstleg:loading-list:list',
-   'platform:firstleg:loading-list:view')
+   'platform:firstleg:preload:confirm', 'platform:firstleg:loading-list:list')
 WHERE role.tenant_id = 0
   AND role.role_code IN ('PLATFORM_ADMIN', 'ORDER_OPERATOR');
 
@@ -6581,13 +6712,13 @@ BEGIN
   IF (SELECT COUNT(DISTINCT permission_code) FROM baiyue_iam.iam_permission
        WHERE tenant_id = 0 AND app_code = 'PLATFORM' AND status = 'ACTIVE' AND deleted = 0
          AND permission_code IN (
-           'platform:firstleg:container:list', 'platform:firstleg:container:view',
+           'platform:firstleg:container:list',
            'platform:firstleg:container:create', 'platform:firstleg:container:edit',
            'platform:firstleg:smart-loading:list', 'platform:firstleg:smart-loading:assign',
            'platform:firstleg:smart-loading:delete', 'platform:firstleg:preload:list',
-           'platform:firstleg:preload:view', 'platform:firstleg:preload:edit',
+           'platform:firstleg:preload:edit',
            'platform:firstleg:preload:complete', 'platform:firstleg:preload:confirm',
-           'platform:firstleg:loading-list:list', 'platform:firstleg:loading-list:view')) <> 14 THEN
+           'platform:firstleg:loading-list:list')) <> 11 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '智能装柜迁移失败：平台权限资源未完整创建';
   END IF;
   IF (SELECT COUNT(DISTINCT CONCAT(role.role_code, ':', permission.permission_code))
@@ -6597,14 +6728,13 @@ BEGIN
        WHERE role.tenant_id = 0 AND role.role_code IN ('PLATFORM_ADMIN', 'ORDER_OPERATOR')
          AND permission.tenant_id = 0
          AND permission.permission_code IN (
-           'platform:firstleg:container:list', 'platform:firstleg:container:view',
+           'platform:firstleg:container:list',
            'platform:firstleg:container:create',
            'platform:firstleg:container:edit', 'platform:firstleg:smart-loading:list',
            'platform:firstleg:smart-loading:assign', 'platform:firstleg:smart-loading:delete',
-           'platform:firstleg:preload:list', 'platform:firstleg:preload:view',
+           'platform:firstleg:preload:list',
            'platform:firstleg:preload:edit', 'platform:firstleg:preload:complete',
-           'platform:firstleg:preload:confirm', 'platform:firstleg:loading-list:list',
-           'platform:firstleg:loading-list:view')) <> 28 THEN
+           'platform:firstleg:preload:confirm', 'platform:firstleg:loading-list:list')) <> 22 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '智能装柜迁移失败：平台角色授权未完整写入';
   END IF;
 END$$
@@ -6754,8 +6884,8 @@ INSERT INTO tmp_wh_fixed_platform_warehouse
 VALUES
 (193000000000200001,193000000000300001,'CN-YIWU-01','义乌仓','DOMESTIC','CN','UTC+8','浙江省','义乌市','322000','义乌仓通用地址待维护'),
 (193000000000200002,193000000000300002,'CN-DONGGUAN-01','东莞仓','DOMESTIC','CN','UTC+8','广东省','东莞市','523000','东莞仓通用地址待维护'),
-(193000000000200003,193000000000300003,'US-LAX-01','洛杉矶仓','OVERSEAS','US','UTC-8','CA','Los Angeles','90001','Los Angeles warehouse generic address pending maintenance'),
-(193000000000200004,193000000000300004,'US-NYC-01','纽约仓','OVERSEAS','US','UTC-5','NY','New York','10001','New York warehouse generic address pending maintenance');
+(193000000000200003,193000000000300003,'US-LAX-01','洛杉矶仓','OVERSEAS','US','UTC-8','California','Rancho Cucamonga','91730','10767 7th Street'),
+(193000000000200004,193000000000300004,'US-NYC-01','纽约仓','OVERSEAS','US','UTC-5','New Jersey','Edison','08817','Door 13-14, 75 Carter Dr');
 
 DROP PROCEDURE IF EXISTS assert_wh_fixed_platform_warehouse_seed;
 DELIMITER //
@@ -6926,7 +7056,8 @@ ON DUPLICATE KEY UPDATE
   capacity_cbm = VALUES(capacity_cbm),
   weight_kg = VALUES(weight_kg),
   color = VALUES(color),
-  remark = VALUES(remark);
+  remark = VALUES(remark),
+  deleted = 0;
 
 DROP PROCEDURE IF EXISTS assert_domestic_pallet_seed;
 DELIMITER //
@@ -6948,6 +7079,14 @@ BEGIN
   ) THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '国内作业仓木托盘、塑料托盘初始化不完整';
   END IF;
+  IF (SELECT COUNT(*)
+        FROM wh_pallet
+       WHERE tenant_id = 0
+         AND deleted = 0
+         AND ((warehouse_id = 193000000000200001 AND pallet_code IN ('TP-001','YW-TP-002'))
+           OR (warehouse_id = 193000000000200002 AND pallet_code IN ('TP-002','DG-TP-002')))) <> 4 THEN
+    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '国内作业仓固定可复用托盘编码初始化不完整';
+  END IF;
 END//
 DELIMITER ;
 CALL assert_domestic_pallet_seed();
@@ -13771,6 +13910,7 @@ CALL queue_column_comment('baiyue_firstleg', 'fl_carrier_schedule_query_operatio
 CALL queue_column_comment('baiyue_firstleg', 'fl_carrier_schedule_query_operation', 'status', '处理状态：PROCESSING处理中、SUCCESS成功');
 CALL queue_column_comment('baiyue_firstleg', 'fl_carrier_schedule_node_fact', 'id', '标准船节点事实ID');
 CALL queue_column_comment('baiyue_firstleg', 'fl_carrier_schedule_node_fact', 'query_id', '所属查询任务ID');
+CALL queue_column_comment('baiyue_firstleg', 'fl_carrier_schedule_node_fact', 'container_booking_id', '所属真实货柜ID');
 CALL queue_column_comment('baiyue_firstleg', 'fl_carrier_schedule_node_fact', 'event_key', '供应商编码与供应商事件ID组成的幂等键');
 CALL queue_column_comment('baiyue_firstleg', 'fl_carrier_schedule_node_fact', 'provider_code', '轨迹供应商编码');
 CALL queue_column_comment('baiyue_firstleg', 'fl_carrier_schedule_node_fact', 'provider_event_id', '供应商稳定事件ID');
@@ -14886,8 +15026,11 @@ CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'published
 CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'rate_count', '解析价格数');
 CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'source_file_id', 'File服务原始文件ID');
 CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'source_sha256', '原始文件SHA-256');
-CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'status', '价格版本状态：PENDING_CONFIRMATION待确认、ACTIVE已生效、SUPERSEDED已被替代、FAILED解析失败');
+CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'status', '价格版本状态：PENDING_CONFIRMATION待确认、ACTIVE已生效、SUPERSEDED已被替代、VOIDED已作废、FAILED解析失败');
 CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'superseded_at', '被下一版本替换时间');
+CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'voided_at', '作废时间');
+CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'voided_by', '作废操作人ID');
+CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'void_reason', '作废原因');
 CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'tenant_id', '平台公共价格作用域固定为0');
 CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'updated_at', '最后更新时间');
 CALL queue_column_comment('baiyue_firstleg', 'fl_price_book_version', 'updated_by', '最后修改人ID');
@@ -15111,7 +15254,7 @@ CALL queue_column_comment('baiyue_iam', 'iam_tenant', 'reject_reason', '客户
 CALL queue_column_comment('baiyue_iam', 'iam_tenant', 'sales_owner_name', '销售负责人姓名');
 CALL queue_column_comment('baiyue_iam', 'iam_tenant', 'service_package', '客户服务套餐');
 CALL queue_column_comment('baiyue_iam', 'iam_tenant', 'status', '客户状态：PROFILE_REQUIRED待完善资料、PENDING待审核、ACTIVE正常、REJECTED已驳回、DISABLED已停用');
-CALL queue_column_comment('baiyue_iam', 'iam_tenant', 'tenant_code', '全局唯一客户编码');
+CALL queue_column_comment('baiyue_iam', 'iam_tenant', 'tenant_code', '客户编号：企业客户固定五位数字，平台技术主体为PLATFORM');
 CALL queue_column_comment('baiyue_iam', 'iam_tenant', 'tenant_name', '客户企业名称');
 CALL queue_column_comment('baiyue_iam', 'iam_tenant', 'tenant_type', '主体类型：MERCHANT企业客户');
 CALL queue_column_comment('baiyue_iam', 'iam_tenant', 'unified_social_credit_code', '统一社会信用代码');
@@ -15136,6 +15279,7 @@ CALL queue_column_comment('baiyue_iam', 'iam_tenant_qualification', 'created_at'
 CALL queue_column_comment('baiyue_iam', 'iam_tenant_qualification', 'deleted', '逻辑删除标记');
 CALL queue_column_comment('baiyue_iam', 'iam_tenant_qualification', 'document_url', '资质文件存储地址');
 CALL queue_column_comment('baiyue_iam', 'iam_tenant_qualification', 'id', '资质记录ID');
+CALL queue_column_comment('baiyue_iam', 'iam_tenant_qualification', 'original_file_name', '上传时原始文件名');
 CALL queue_column_comment('baiyue_iam', 'iam_tenant_qualification', 'qualification_type', '客户资质类型');
 CALL queue_column_comment('baiyue_iam', 'iam_tenant_qualification', 'review_comment', '客户资质审核意见');
 CALL queue_column_comment('baiyue_iam', 'iam_tenant_qualification', 'status', '资质审核状态：PENDING待审核、APPROVED已通过、REJECTED已驳回');
@@ -15686,6 +15830,12 @@ BEGIN
          'baiyue_firstleg','baiyue_file','baiyue_audit','baiyue_event_bridge','baiyue_finance'))<>9 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '统一迁移失败：九个业务数据库未完整创建';
   END IF;
+  IF (SELECT COUNT(*) FROM information_schema.columns
+       WHERE table_schema='baiyue_iam' AND table_name='iam_tenant_qualification'
+         AND column_name='original_file_name') <> 1 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：IAM客户资质缺少原始文件名列';
+  END IF;
   IF (SELECT COUNT(*) FROM information_schema.columns
        WHERE table_schema='baiyue_firstleg' AND table_name='fl_inbound_fee'
          AND ((column_name='baseline_chargeable_quantity' AND is_nullable='NO'
@@ -15953,6 +16103,24 @@ BEGIN
     SIGNAL SQLSTATE '45000'
       SET MESSAGE_TEXT = '统一迁移失败：客户四箱规尺寸配置字段不完整';
   END IF;
+  IF (SELECT COUNT(*) FROM information_schema.columns
+       WHERE table_schema = 'baiyue_firstleg'
+         AND table_name = 'fl_customer_charge_rule'
+         AND column_name = 'initialization_key'
+         AND character_maximum_length = 128) <> 1 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：客户默认计费规则初始化幂等字段未创建';
+  END IF;
+  IF (SELECT COUNT(*) FROM information_schema.statistics
+       WHERE table_schema = 'baiyue_firstleg'
+         AND table_name = 'fl_customer_charge_rule'
+         AND index_name = 'idx_charge_rule_initialization'
+         AND non_unique = 1
+         AND ((seq_in_index = 1 AND column_name = 'tenant_id')
+           OR (seq_in_index = 2 AND column_name = 'initialization_key'))) <> 2 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：客户默认计费规则初始化索引未完整创建';
+  END IF;
   IF EXISTS (
     SELECT tenant.id
       FROM baiyue_iam.iam_tenant tenant
@@ -16397,6 +16565,9 @@ BEGIN
   IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='baiyue_firstleg' AND table_name='fl_container_booking' AND column_name='channel_code') THEN
     ALTER TABLE baiyue_firstleg.fl_container_booking ADD COLUMN channel_code VARCHAR(64) NULL COMMENT '订舱渠道编码快照' AFTER cabinet_no;
   END IF;
+  IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='baiyue_firstleg' AND table_name='fl_container_booking' AND column_name='channel_group_code') THEN
+    ALTER TABLE baiyue_firstleg.fl_container_booking ADD COLUMN channel_group_code VARCHAR(64) NULL COMMENT '模拟柜计划渠道分组；关联真实订舱后继续保留' AFTER merged_into_container_booking_id;
+  END IF;
   IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='baiyue_firstleg' AND table_name='fl_container_booking' AND column_name='channel_name') THEN
     ALTER TABLE baiyue_firstleg.fl_container_booking ADD COLUMN channel_name VARCHAR(128) NULL COMMENT '订舱渠道名称快照' AFTER channel_code;
   END IF;
@@ -16453,6 +16624,7 @@ BEGIN
   IF current_plan_status IN ('LOADING', 'COMPLETED') AND (
        NOT (OLD.id <=> NEW.id) OR NOT (OLD.booking_no <=> NEW.booking_no)
     OR NOT (OLD.cabinet_no <=> NEW.cabinet_no)
+    OR NOT (OLD.channel_group_code <=> NEW.channel_group_code)
     OR NOT (OLD.channel_code <=> NEW.channel_code) OR NOT (OLD.channel_name <=> NEW.channel_name)
     OR NOT (OLD.ocean_booking_id <=> NEW.ocean_booking_id)
     OR NOT (OLD.ocean_booking_requirement_id <=> NEW.ocean_booking_requirement_id)
@@ -18161,6 +18333,23 @@ CREATE TABLE IF NOT EXISTS fl_dropship_pallet_carton (
   CONSTRAINT fk_dropship_carton_pallet FOREIGN KEY (pallet_id) REFERENCES fl_dropship_pallet(id),
   CONSTRAINT fk_dropship_carton_label FOREIGN KEY (carton_label_id) REFERENCES fl_inbound_carton_label(id)
 ) ENGINE=InnoDB COMMENT='一件代发托盘内逐箱SKU和入仓单明细';
+CREATE TABLE IF NOT EXISTS fl_dropship_pallet_carton_sku (
+  id BIGINT UNSIGNED NOT NULL COMMENT '清点箱SKU明细ID',
+  carton_id BIGINT UNSIGNED NOT NULL COMMENT '清点物理箱ID',
+  inbound_detail_id BIGINT UNSIGNED NOT NULL COMMENT '入仓货物明细ID',
+  sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码快照',
+  cargo_name VARCHAR(255) NULL COMMENT '货物名称快照',
+  expected_quantity INT UNSIGNED NOT NULL COMMENT '应收数量',
+  actual_quantity INT UNSIGNED NOT NULL COMMENT '实收数量',
+  discrepancy_status VARCHAR(24) NOT NULL COMMENT 'MATCH或ACCEPTED_VARIANCE',
+  discrepancy_remark VARCHAR(500) NULL COMMENT '差异处理说明',
+  line_no INT UNSIGNED NOT NULL COMMENT '箱内SKU顺序',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_dropship_carton_sku_detail (carton_id,inbound_detail_id),
+  KEY idx_dropship_carton_sku_code (sku_code,carton_id),
+  CONSTRAINT fk_dropship_carton_sku_carton FOREIGN KEY (carton_id) REFERENCES fl_dropship_pallet_carton(id)
+) ENGINE=InnoDB COMMENT='一件代发物理箱内逐SKU清点事实';
+
 
 -- 已存在开发库直接收敛到逐箱清点与整托分柜结构；新建库由上面的最新定义一次完成。
 DROP PROCEDURE IF EXISTS converge_dropship_palletization_schema;
@@ -18404,12 +18593,13 @@ CREATE TABLE IF NOT EXISTS fin_wallet_account (
   id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键ID',
   customer_id BIGINT UNSIGNED NOT NULL COMMENT '客户ID和隔离键',
   currency_code CHAR(3) NOT NULL DEFAULT 'CNY' COMMENT '当前仅CNY',
-  actual_balance DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '账户实际余额，包含冻结资金',
+  actual_balance DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '账户实际余额，授信消费可形成负余额',
   frozen_balance DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '冻结总额，包含实际资金与授信冻结',
-  available_balance DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '总可用余额=实际余额+授信额度-已用授信-冻结总额',
+  available_balance DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '当前总可用余额；授信失效后不再计入',
   credit_limit DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '授信额度',
-  credit_used DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '已结算使用的授信',
+  credit_used DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '授信有效期内累计已使用额度；到期后并入实际余额',
   credit_frozen DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '冻结总额中占用的授信',
+  credit_expires_on DATE NULL COMMENT '授信到期日，当天仍有效；次日失效',
   version INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '余额乐观锁版本',
   created_by BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建操作人ID',
   updated_by BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '最后操作人ID',
@@ -18419,7 +18609,7 @@ CREATE TABLE IF NOT EXISTS fin_wallet_account (
   UNIQUE KEY uk_fin_wallet_account_customer (customer_id, currency_code),
   CONSTRAINT chk_fin_wallet_account_customer CHECK (customer_id > 0),
   CONSTRAINT chk_fin_wallet_account_currency CHECK (currency_code = 'CNY'),
-  CONSTRAINT chk_fin_wallet_account_balance CHECK (actual_balance >= 0 AND frozen_balance >= 0 AND available_balance >= 0 AND credit_limit >= 0 AND credit_used >= 0 AND credit_frozen >= 0 AND frozen_balance >= credit_frozen AND actual_balance >= frozen_balance-credit_frozen AND credit_limit >= credit_used+credit_frozen AND available_balance = actual_balance+credit_limit-credit_used-frozen_balance)
+  CONSTRAINT chk_fin_wallet_account_balance CHECK (frozen_balance >= 0 AND credit_limit >= 0 AND credit_used >= 0 AND credit_frozen >= 0 AND frozen_balance >= credit_frozen)
 ) ENGINE=InnoDB COMMENT='客户CNY资金账户主账';
 
 CREATE TABLE IF NOT EXISTS fin_recharge_request (
@@ -18461,6 +18651,7 @@ CREATE TABLE IF NOT EXISTS fin_wallet_ledger (
   credit_limit_after DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '变动后授信额度',
   credit_used_after DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '变动后已用授信',
   available_credit_after DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '变动后可用授信',
+  credit_expires_on_after DATE NULL COMMENT '变动后授信到期日',
   source_type VARCHAR(32) NOT NULL COMMENT 'CLIENT_RECHARGE/MANUAL_RECHARGE/MANUAL_DEDUCTION等',
   source_no VARCHAR(128) NULL COMMENT '充值申请号或外部凭证号',
   occurred_date DATE NOT NULL COMMENT '业务发生日期',
@@ -18475,8 +18666,8 @@ CREATE TABLE IF NOT EXISTS fin_wallet_ledger (
   KEY idx_fin_wallet_ledger_customer_time (customer_id, created_at, id),
   KEY idx_fin_wallet_ledger_source (customer_id, source_type, source_no),
   CONSTRAINT chk_fin_wallet_ledger_customer CHECK (customer_id > 0),
-  CONSTRAINT chk_fin_wallet_ledger_amount CHECK (amount <> 0),
-  CONSTRAINT chk_fin_wallet_ledger_balance CHECK (actual_balance_after >= 0 AND frozen_balance_after >= 0 AND available_balance_after >= 0 AND credit_limit_after >= 0 AND credit_used_after >= 0 AND available_credit_after >= 0 AND credit_limit_after >= credit_used_after+available_credit_after AND available_balance_after = actual_balance_after-frozen_balance_after+credit_limit_after-credit_used_after)
+  CONSTRAINT chk_fin_wallet_ledger_amount CHECK (amount <> 0 OR change_type='CREDIT_LIMIT'),
+  CONSTRAINT chk_fin_wallet_ledger_balance CHECK (frozen_balance_after >= 0 AND credit_limit_after >= 0 AND credit_used_after >= 0 AND available_credit_after >= 0)
 ) ENGINE=InnoDB COMMENT='客户资金账户不可变余额流水';
 
 CREATE TABLE IF NOT EXISTS fin_wallet_hold (
@@ -18506,19 +18697,42 @@ DROP PROCEDURE IF EXISTS migrate_fin_wallet_credit;
 DELIMITER $$
 CREATE PROCEDURE migrate_fin_wallet_credit()
 BEGIN
+  DECLARE v_legacy_wallet_constraint BOOLEAN DEFAULT FALSE;
+  DECLARE v_credit_expiry_missing BOOLEAN DEFAULT FALSE;
+  SET v_legacy_wallet_constraint = EXISTS (
+    SELECT 1 FROM information_schema.CHECK_CONSTRAINTS
+     WHERE CONSTRAINT_SCHEMA='baiyue_finance'
+       AND CONSTRAINT_NAME='chk_fin_wallet_account_balance'
+       AND CHECK_CLAUSE LIKE '%actual_balance%'
+  );
+  SET v_credit_expiry_missing = NOT EXISTS (
+    SELECT 1 FROM information_schema.COLUMNS
+     WHERE TABLE_SCHEMA='baiyue_finance'
+       AND TABLE_NAME='fin_wallet_account'
+       AND COLUMN_NAME='credit_expires_on'
+  );
   IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='baiyue_finance' AND TABLE_NAME='fin_wallet_account' AND COLUMN_NAME='credit_limit') THEN
     ALTER TABLE fin_wallet_account
       ADD COLUMN credit_limit DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '授信额度' AFTER available_balance,
       ADD COLUMN credit_used DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '已结算使用的授信' AFTER credit_limit,
       ADD COLUMN credit_frozen DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '冻结总额中占用的授信' AFTER credit_used;
   END IF;
+  IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='baiyue_finance' AND TABLE_NAME='fin_wallet_account' AND COLUMN_NAME='credit_expires_on') THEN
+    ALTER TABLE fin_wallet_account ADD COLUMN credit_expires_on DATE NULL COMMENT '授信到期日，当天仍有效；次日失效' AFTER credit_frozen;
+  END IF;
   IF EXISTS (SELECT 1 FROM information_schema.TABLE_CONSTRAINTS WHERE CONSTRAINT_SCHEMA='baiyue_finance' AND TABLE_NAME='fin_wallet_account' AND CONSTRAINT_NAME='chk_fin_wallet_account_balance' AND CONSTRAINT_TYPE='CHECK') THEN
     ALTER TABLE fin_wallet_account DROP CHECK chk_fin_wallet_account_balance;
   END IF;
-  UPDATE fin_wallet_account
-     SET available_balance=actual_balance+credit_limit-credit_used-frozen_balance;
+  IF v_legacy_wallet_constraint OR v_credit_expiry_missing THEN
+    UPDATE fin_wallet_account
+       SET actual_balance=actual_balance-credit_used,
+           credit_used=0,
+           credit_expires_on=NULL;
+    UPDATE fin_wallet_account
+       SET available_balance=actual_balance-credit_used-frozen_balance;
+  END IF;
   ALTER TABLE fin_wallet_account ADD CONSTRAINT chk_fin_wallet_account_balance
-    CHECK (actual_balance >= 0 AND frozen_balance >= 0 AND available_balance >= 0 AND credit_limit >= 0 AND credit_used >= 0 AND credit_frozen >= 0 AND frozen_balance >= credit_frozen AND actual_balance >= frozen_balance-credit_frozen AND credit_limit >= credit_used+credit_frozen AND available_balance = actual_balance+credit_limit-credit_used-frozen_balance);
+    CHECK (frozen_balance >= 0 AND credit_limit >= 0 AND credit_used >= 0 AND credit_frozen >= 0 AND frozen_balance >= credit_frozen);
 
   IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='baiyue_finance' AND TABLE_NAME='fin_wallet_ledger' AND COLUMN_NAME='credit_limit_after') THEN
     ALTER TABLE fin_wallet_ledger
@@ -18526,11 +18740,19 @@ BEGIN
       ADD COLUMN credit_used_after DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '变动后已用授信' AFTER credit_limit_after,
       ADD COLUMN available_credit_after DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '变动后可用授信' AFTER credit_used_after;
   END IF;
+  IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='baiyue_finance' AND TABLE_NAME='fin_wallet_ledger' AND COLUMN_NAME='credit_expires_on_after') THEN
+    ALTER TABLE fin_wallet_ledger ADD COLUMN credit_expires_on_after DATE NULL COMMENT '变动后授信到期日' AFTER available_credit_after;
+  END IF;
   IF EXISTS (SELECT 1 FROM information_schema.TABLE_CONSTRAINTS WHERE CONSTRAINT_SCHEMA='baiyue_finance' AND TABLE_NAME='fin_wallet_ledger' AND CONSTRAINT_NAME='chk_fin_wallet_ledger_balance' AND CONSTRAINT_TYPE='CHECK') THEN
     ALTER TABLE fin_wallet_ledger DROP CHECK chk_fin_wallet_ledger_balance;
   END IF;
   ALTER TABLE fin_wallet_ledger ADD CONSTRAINT chk_fin_wallet_ledger_balance
-    CHECK (actual_balance_after >= 0 AND frozen_balance_after >= 0 AND available_balance_after >= 0 AND credit_limit_after >= 0 AND credit_used_after >= 0 AND available_credit_after >= 0 AND credit_limit_after >= credit_used_after+available_credit_after AND available_balance_after = actual_balance_after-frozen_balance_after+credit_limit_after-credit_used_after);
+    CHECK (frozen_balance_after >= 0 AND credit_limit_after >= 0 AND credit_used_after >= 0 AND available_credit_after >= 0);
+  IF EXISTS (SELECT 1 FROM information_schema.TABLE_CONSTRAINTS WHERE CONSTRAINT_SCHEMA='baiyue_finance' AND TABLE_NAME='fin_wallet_ledger' AND CONSTRAINT_NAME='chk_fin_wallet_ledger_amount' AND CONSTRAINT_TYPE='CHECK') THEN
+    ALTER TABLE fin_wallet_ledger DROP CHECK chk_fin_wallet_ledger_amount;
+  END IF;
+  ALTER TABLE fin_wallet_ledger ADD CONSTRAINT chk_fin_wallet_ledger_amount
+    CHECK (amount <> 0 OR change_type='CREDIT_LIMIT');
 END$$
 DELIMITER ;
 CALL migrate_fin_wallet_credit();
@@ -19238,6 +19460,22 @@ PREPARE statement FROM @ddl; EXECUTE statement; DEALLOCATE PREPARE statement;
 ALTER TABLE fl_carrier_schedule_query
   ADD CONSTRAINT chk_carrier_schedule_query_customer CHECK (customer_id >= 0);
 
+-- 退货预报关联尾程订单业务编号（测试阶段直接收敛当前结构）
+DROP PROCEDURE IF EXISTS baiyue_lastleg.converge_return_order_tail_reference;
+DELIMITER $$
+CREATE PROCEDURE baiyue_lastleg.converge_return_order_tail_reference()
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='baiyue_lastleg' AND table_name='ll_return_order' AND column_name='lastleg_order_id') THEN
+    ALTER TABLE baiyue_lastleg.ll_return_order ADD COLUMN lastleg_order_id BIGINT NULL COMMENT '尾程订单ID' AFTER customer_reference_no;
+  END IF;
+  IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='baiyue_lastleg' AND table_name='ll_return_order' AND column_name='lastleg_order_no') THEN
+    ALTER TABLE baiyue_lastleg.ll_return_order ADD COLUMN lastleg_order_no VARCHAR(32) NULL COMMENT '尾程订单号' AFTER lastleg_order_id;
+  END IF;
+END$$
+DELIMITER ;
+CALL baiyue_lastleg.converge_return_order_tail_reference();
+DROP PROCEDURE IF EXISTS baiyue_lastleg.converge_return_order_tail_reference;
+
 CALL baiyue_firstleg.assert_unified_final_schema();
 DROP PROCEDURE IF EXISTS baiyue_firstleg.assert_unified_final_schema;
 SELECT 'PASS' AS migration_status,
diff --git a/deploy/sql/海外区域统一增量-MySQL8.sql b/deploy/sql/海外区域统一增量-MySQL8.sql
index db717957a..87fcda2fd 100644
--- a/deploy/sql/海外区域统一增量-MySQL8.sql
+++ b/deploy/sql/海外区域统一增量-MySQL8.sql
@@ -753,8 +753,9 @@ CREATE TABLE IF NOT EXISTS ll_inbound_plan_pallet (
   capacity_cbm DECIMAL(18,4) NOT NULL DEFAULT 2.0000 COMMENT '托盘容量，固定为2立方米',
   allocated_volume_cbm DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '已分配体积（立方米）',
   sequence_no INT NOT NULL COMMENT '计划内托盘序号',
+  version INT NOT NULL DEFAULT 0 COMMENT '收货累计值乐观锁版本',
   PRIMARY KEY (id),
-  UNIQUE KEY uk_ll_inbound_pallet_no (pallet_no),
+  KEY idx_ll_inbound_pallet_no (pallet_no),
   UNIQUE KEY uk_ll_inbound_pallet_sequence (plan_id, sequence_no),
   KEY idx_ll_inbound_pallet_plan (plan_id),
   KEY idx_ll_inbound_pallet_customer_plan (customer_id, plan_id)
@@ -858,6 +859,8 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
 PREPARE inbound_schema_stmt FROM @ddl; EXECUTE inbound_schema_stmt; DEALLOCATE PREPARE inbound_schema_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_pallet' AND column_name='actual_package_count'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_pallet ADD COLUMN actual_package_count INT NOT NULL DEFAULT 0 COMMENT ''实收箱数'''));
 PREPARE inbound_schema_stmt FROM @ddl; EXECUTE inbound_schema_stmt; DEALLOCATE PREPARE inbound_schema_stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_pallet' AND column_name='version'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_pallet ADD COLUMN version INT NOT NULL DEFAULT 0 COMMENT ''收货累计值乐观锁版本'''));
+PREPARE inbound_schema_stmt FROM @ddl; EXECUTE inbound_schema_stmt; DEALLOCATE PREPARE inbound_schema_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_pallet_allocation' AND column_name='planned_package_count'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_pallet_allocation ADD COLUMN planned_package_count INT NOT NULL DEFAULT 0 COMMENT ''计划分配箱数'''));
 PREPARE inbound_schema_stmt FROM @ddl; EXECUTE inbound_schema_stmt; DEALLOCATE PREPARE inbound_schema_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_pallet_allocation' AND column_name='counted_package_count'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_pallet_allocation ADD COLUMN counted_package_count INT NOT NULL DEFAULT 0 COMMENT ''清点箱数'''));
@@ -1089,7 +1092,7 @@ CREATE TABLE IF NOT EXISTS ll_receiving_container_session (
   source_container_booking_id VARCHAR(128) NOT NULL COMMENT '稳定来源柜预订ID', container_fact_hash VARCHAR(64) NOT NULL COMMENT '领取时整柜订单与计划事实摘要',
   container_no VARCHAR(64) NOT NULL COMMENT '集装箱号', overseas_warehouse_id BIGINT NOT NULL COMMENT '平台预分配并由操作员Token匹配的海外接柜仓ID', overseas_warehouse_code VARCHAR(128) NOT NULL COMMENT '海外接柜仓业务编码快照', overseas_warehouse_name VARCHAR(255) NOT NULL COMMENT '仓库服务校验后的海外接柜仓名称快照', operator_key VARCHAR(128) NOT NULL COMMENT '操作账号唯一标识',
   operator_name VARCHAR(255) NULL COMMENT '操作账号名称', active_operator_key VARCHAR(255) NULL COMMENT '未完成会话平台操作账号全局唯一锁键',
-  active_container_key VARCHAR(255) NULL COMMENT '未完成会话柜号全局唯一锁键', status VARCHAR(32) NOT NULL DEFAULT 'WAIT_SIGN' COMMENT '会话状态：WAIT_SIGN、SIGNED、RECEIVING、COMPLETED',
+  active_container_key VARCHAR(255) NULL COMMENT '未完成会话柜号全局唯一锁键', status VARCHAR(32) NOT NULL DEFAULT 'WAIT_SIGN' COMMENT '会话状态：WAIT_SIGN、SIGNED、RECEIVING、COMPLETED、COMPLETED_WITH_DIFFERENCE',
   sign_photos JSON NULL COMMENT '签收卸柜照片角色与文件ID列表', prepared_at DATETIME(3) NULL COMMENT '选择柜号时间',
   signed_at DATETIME(3) NULL COMMENT '签收时间', receiving_at DATETIME(3) NULL COMMENT '首次收货时间',
   completed_at DATETIME(3) NULL COMMENT '完成时间', created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
@@ -1112,6 +1115,16 @@ CREATE TABLE IF NOT EXISTS ll_receiving_sku_receipt (
   KEY idx_ll_receiving_sku_plan (customer_id,plan_id,line_id)
 ) ENGINE=InnoDB COMMENT='海外PDA柜号FBA SKU实收进度';
 
+CREATE TABLE IF NOT EXISTS ll_receiving_fba_pallet_count (
+  id BIGINT NOT NULL COMMENT 'FBA托盘现场累计箱数ID', session_id BIGINT NOT NULL COMMENT '柜号签收会话ID',
+  group_key VARCHAR(255) NOT NULL COMMENT '柜号与FBA仓组成的收货组键', pallet_code VARCHAR(128) NOT NULL COMMENT '现有FBA托盘码',
+  actual_packages INT NOT NULL COMMENT '该托现场累计实物箱数', created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  PRIMARY KEY(id), UNIQUE KEY uk_ll_receiving_fba_count(session_id,group_key,pallet_code),
+  KEY idx_ll_receiving_fba_group(session_id,group_key)
+) ENGINE=InnoDB COMMENT='海外PDA普通FBA托盘现场累计与超收标记';
+
+
 CREATE TABLE IF NOT EXISTS ll_receiving_container_operation (
   id BIGINT NOT NULL COMMENT '柜号收货操作ID', session_id BIGINT NOT NULL COMMENT '柜号签收会话ID',
   operator_key VARCHAR(128) NOT NULL COMMENT '操作账号唯一标识', action VARCHAR(32) NOT NULL COMMENT '操作动作', idempotency_key VARCHAR(255) NOT NULL COMMENT '客户端幂等键',
@@ -1387,6 +1400,9 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_item (
   package_count INT NOT NULL DEFAULT 0 COMMENT '箱数',
   volume_cbm DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '体积（立方米）',
   source_stage VARCHAR(32) NOT NULL COMMENT '数据来源阶段',
+  carton_marks VARCHAR(4000) NULL COMMENT '换标箱唛映射快照',
+  source_business_type VARCHAR(32) NULL COMMENT '来源业务类型',
+  source_business_no VARCHAR(128) NULL COMMENT '来源业务单号',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   PRIMARY KEY (id),
   UNIQUE KEY uk_ll_dispatch_item_source (dispatch_order_id,plan_pallet_id,warehouse_pallet_id),
@@ -1395,6 +1411,10 @@ CREATE TABLE IF NOT EXISTS ll_dispatch_item (
   KEY idx_ll_dispatch_item_pallet (customer_id,plan_pallet_id,warehouse_pallet_id)
 ) ENGINE=InnoDB COMMENT='派车货物冻结明细';
 
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_item' AND column_name='carton_marks'), 'SELECT 1', 'ALTER TABLE ll_dispatch_item ADD COLUMN carton_marks VARCHAR(4000) NULL COMMENT ''换标箱唛映射快照'' AFTER source_stage')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_item' AND column_name='source_business_type'), 'SELECT 1', 'ALTER TABLE ll_dispatch_item ADD COLUMN source_business_type VARCHAR(32) NULL COMMENT ''来源业务类型'' AFTER carton_marks')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dispatch_item' AND column_name='source_business_no'), 'SELECT 1', 'ALTER TABLE ll_dispatch_item ADD COLUMN source_business_no VARCHAR(128) NULL COMMENT ''来源业务单号'' AFTER source_business_type')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
   CREATE TABLE IF NOT EXISTS ll_dispatch_pallet_lock (
   id BIGINT NOT NULL COMMENT '主键ID',
   customer_id VARCHAR(128) NOT NULL COMMENT '客户租户ID',
@@ -1523,6 +1543,23 @@ CREATE TABLE IF NOT EXISTS ll_outbound_pda_task (
   PRIMARY KEY(id), UNIQUE KEY uk_ll_outbound_pda_task_order(customer_id,outbound_order_id), UNIQUE KEY uk_ll_outbound_pda_task_no(task_no),
   UNIQUE KEY uk_ll_outbound_pda_complete_key(customer_id,completion_idempotency_key)
 ) ENGINE=InnoDB COMMENT='一件代发出库PDA拣货任务';
+SET @ddl = (SELECT IF(EXISTS (
+  SELECT 1 FROM information_schema.columns
+   WHERE table_schema=DATABASE() AND table_name='ll_outbound_pda_task' AND column_name='completion_idempotency_key'
+), 'SELECT 1',
+  'ALTER TABLE ll_outbound_pda_task ADD COLUMN completion_idempotency_key VARCHAR(255) NULL COMMENT ''完成命令幂等键'' AFTER status'));
+PREPARE outbound_pda_completion_column_stmt FROM @ddl; EXECUTE outbound_pda_completion_column_stmt; DEALLOCATE PREPARE outbound_pda_completion_column_stmt;
+SET @index_ready = (SELECT COUNT(*)=2 AND MIN(non_unique)=0
+  AND SUM(seq_in_index=1 AND column_name='customer_id')=1
+  AND SUM(seq_in_index=2 AND column_name='completion_idempotency_key')=1
+  FROM information_schema.statistics WHERE table_schema=DATABASE()
+   AND table_name='ll_outbound_pda_task' AND index_name='uk_ll_outbound_pda_complete_key');
+SET @index_exists = (SELECT COUNT(*)>0 FROM information_schema.statistics WHERE table_schema=DATABASE()
+  AND table_name='ll_outbound_pda_task' AND index_name='uk_ll_outbound_pda_complete_key');
+SET @ddl = IF(@index_ready, 'SELECT 1', IF(@index_exists,
+  'ALTER TABLE ll_outbound_pda_task DROP INDEX uk_ll_outbound_pda_complete_key, ADD UNIQUE KEY uk_ll_outbound_pda_complete_key(customer_id,completion_idempotency_key)',
+  'ALTER TABLE ll_outbound_pda_task ADD UNIQUE KEY uk_ll_outbound_pda_complete_key(customer_id,completion_idempotency_key)'));
+PREPARE outbound_pda_completion_index_stmt FROM @ddl; EXECUTE outbound_pda_completion_index_stmt; DEALLOCATE PREPARE outbound_pda_completion_index_stmt;
 
 CREATE TABLE IF NOT EXISTS ll_outbound_pda_pick (
   id BIGINT NOT NULL COMMENT '主键ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户数据隔离键', task_id BIGINT NOT NULL COMMENT 'PDA任务ID', outbound_pallet_item_id BIGINT NOT NULL COMMENT '出库托盘明细ID',
@@ -1550,9 +1587,9 @@ CREATE TABLE IF NOT EXISTS ll_warehouse_transfer_order (
   id BIGINT NOT NULL COMMENT '主键ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户租户ID',
   transfer_no VARCHAR(64) NOT NULL COMMENT '转仓单号', inbound_order_id BIGINT NOT NULL COMMENT '入仓单ID', inbound_code VARCHAR(128) NOT NULL COMMENT '入仓单号快照',
   lastleg_order_id BIGINT NOT NULL COMMENT '尾程订单ID', lastleg_order_no VARCHAR(32) NOT NULL COMMENT '尾程订单号',
-  operating_warehouse_id VARCHAR(128) NOT NULL COMMENT '作业仓库ID', fba_warehouse_code VARCHAR(128) NOT NULL COMMENT 'FBA仓库编码',
-  delivery_address VARCHAR(1000) NOT NULL COMMENT '派送地址', package_count INT NOT NULL COMMENT '箱数', delivery_method VARCHAR(64) NOT NULL COMMENT '派送方式',
-  estimated_arrival_at DATETIME(3) NOT NULL COMMENT '预计到达时间', fba_shipment_no VARCHAR(128) NOT NULL COMMENT 'FBA货件编号',
+  operating_warehouse_id VARCHAR(128) NOT NULL COMMENT '入库中转仓ID', fba_warehouse_code VARCHAR(128) NULL COMMENT '可选FBA目的仓编码',
+  delivery_address VARCHAR(1000) NOT NULL COMMENT '提货地址或中转仓收货地址', package_count INT NOT NULL COMMENT '箱数', delivery_method VARCHAR(64) NOT NULL COMMENT '入仓方式',
+  estimated_arrival_at DATETIME(3) NOT NULL COMMENT '预计入仓时间', fba_shipment_no VARCHAR(128) NULL COMMENT '可选FBA货件编号',
   tracking_no VARCHAR(255) NULL COMMENT '物流跟踪号', fba_box_nos VARCHAR(2000) NULL COMMENT 'FBA箱号集合', remark VARCHAR(1000) NULL COMMENT '备注',
   need_relabel TINYINT NOT NULL DEFAULT 0 COMMENT '是否需要换标', relabel_application_id BIGINT NULL COMMENT '换标申请单ID', relabel_no VARCHAR(64) NULL COMMENT '换标申请单号',
   status VARCHAR(32) NOT NULL DEFAULT 'PENDING_REVIEW' COMMENT '业务状态', idempotency_key VARCHAR(255) NOT NULL COMMENT '业务幂等键',
@@ -1570,6 +1607,9 @@ CREATE TABLE IF NOT EXISTS ll_warehouse_transfer_order (
   KEY idx_ll_wh_transfer_list (customer_id,status,created_at), KEY idx_ll_wh_transfer_inbound (customer_id,inbound_code)
 ) ENGINE=InnoDB COMMENT='客户转仓单';
 
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_warehouse_transfer_order' AND column_name='fba_warehouse_code' AND is_nullable='NO'), 'ALTER TABLE ll_warehouse_transfer_order MODIFY COLUMN fba_warehouse_code VARCHAR(128) NULL COMMENT ''可选FBA目的仓编码'', MODIFY COLUMN fba_shipment_no VARCHAR(128) NULL COMMENT ''可选FBA货件编号'', MODIFY COLUMN delivery_address VARCHAR(1000) NOT NULL COMMENT ''提货地址或中转仓收货地址'', MODIFY COLUMN delivery_method VARCHAR(64) NOT NULL COMMENT ''入仓方式'', MODIFY COLUMN estimated_arrival_at DATETIME(3) NOT NULL COMMENT ''预计入仓时间''', 'SELECT 1'));
+PREPARE transfer_optional_fba_stmt FROM @ddl; EXECUTE transfer_optional_fba_stmt; DEALLOCATE PREPARE transfer_optional_fba_stmt;
+
 -- 兼容已存在的旧版转仓单表：CREATE TABLE IF NOT EXISTS 不会补充新增字段。
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_warehouse_transfer_order' AND column_name='allocation_idempotency_key'), 'SELECT 1', 'ALTER TABLE ll_warehouse_transfer_order ADD COLUMN allocation_idempotency_key VARCHAR(255) NULL COMMENT ''库存分配幂等键'' AFTER status'));
 PREPARE transfer_allocation_key_stmt FROM @ddl; EXECUTE transfer_allocation_key_stmt; DEALLOCATE PREPARE transfer_allocation_key_stmt;
@@ -1599,6 +1639,18 @@ CREATE TABLE IF NOT EXISTS ll_warehouse_transfer_item (
   KEY idx_ll_wh_transfer_item_list (customer_id,transfer_order_id), KEY idx_ll_wh_transfer_item_sku (customer_id,sku_code)
 ) ENGINE=InnoDB COMMENT='转仓货物冻结明细';
 
+CREATE TABLE IF NOT EXISTS ll_warehouse_transfer_carton (
+  id BIGINT NOT NULL COMMENT '预报箱主键', transfer_order_id BIGINT NOT NULL COMMENT '转运单ID',
+  transfer_item_id BIGINT NOT NULL COMMENT '转运申报明细ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户租户ID',
+  carton_mark VARCHAR(255) NOT NULL COMMENT '系统生成的一箱一码箱唛', carton_index INT NOT NULL COMMENT '全单箱序号',
+  total_cartons INT NOT NULL COMMENT '首次生成时全单总箱数', status VARCHAR(32) NOT NULL DEFAULT 'EXPECTED' COMMENT '箱状态：EXPECTED待实收',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  PRIMARY KEY (id), UNIQUE KEY uk_ll_wh_transfer_carton_mark (customer_id,carton_mark),
+  UNIQUE KEY uk_ll_wh_transfer_carton_index (transfer_order_id,carton_index),
+  KEY idx_ll_wh_transfer_carton_list (customer_id,transfer_order_id,status)
+) ENGINE=InnoDB COMMENT='仓储转运系统箱唛预报';
+
 CREATE TABLE IF NOT EXISTS ll_warehouse_transfer_inventory_allocation (
   id BIGINT NOT NULL COMMENT '雪花主键',
   transfer_order_id BIGINT NOT NULL COMMENT '转仓单ID',
@@ -1656,6 +1708,15 @@ CREATE TABLE IF NOT EXISTS ll_relabel_application (
   label_deadline DATETIME(3) NOT NULL COMMENT '换标截止时间',
   contact_name VARCHAR(128) NOT NULL COMMENT '联系人姓名',
   contact_phone VARCHAR(64) NOT NULL COMMENT '联系人电话',
+  delivery_method VARCHAR(32) NULL COMMENT '派送方式：TRUCK卡车、PICKUP自提、EXPRESS快递；仅涉及箱唛换标时必填',
+  print_shipping_label TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否需要打印面单',
+  shipping_label_file_id VARCHAR(128) NULL COMMENT '客户上传面单文件ID',
+  shipping_label_file_name VARCHAR(255) NULL COMMENT '客户上传面单文件名',
+  shipping_label_file_url VARCHAR(1000) NULL COMMENT '客户上传面单下载地址',
+  fulfillment_status VARCHAR(32) NOT NULL DEFAULT 'WAIT_RELABEL' COMMENT '换标后履约状态',
+  outbound_order_no VARCHAR(64) NULL COMMENT '自提或快递生成的换标出库单号',
+  customer_confirmation_key VARCHAR(255) NULL COMMENT '客户确认完成幂等键',
+  customer_confirmed_at DATETIME(3) NULL COMMENT '客户确认换标完成时间',
   remark VARCHAR(1000) NULL COMMENT '备注',
   status VARCHAR(32) NOT NULL DEFAULT 'PENDING_PROCESSING' COMMENT '业务状态',
   item_count INT NOT NULL DEFAULT 0 COMMENT '明细数量',
@@ -1681,6 +1742,19 @@ CREATE TABLE IF NOT EXISTS ll_relabel_application (
   KEY idx_ll_relabel_application_warehouse (customer_id,overseas_warehouse_id)
 ) ENGINE=InnoDB COMMENT='客户换标申请单';
 
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='total_file_id'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN total_file_id VARCHAR(128) NULL COMMENT ''总换标PDF文件ID'' AFTER remark')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='total_file_name'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN total_file_name VARCHAR(255) NULL COMMENT ''总换标PDF文件名'' AFTER total_file_id')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='total_file_url'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN total_file_url VARCHAR(1000) NULL COMMENT ''总换标PDF预览地址'' AFTER total_file_name')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='delivery_method'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN delivery_method VARCHAR(32) NULL COMMENT ''派送方式：TRUCK卡车、PICKUP自提、EXPRESS快递；仅涉及箱唛换标时必填'' AFTER contact_phone')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='print_shipping_label'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN print_shipping_label TINYINT(1) NOT NULL DEFAULT 0 COMMENT ''是否需要打印面单'' AFTER delivery_method')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='shipping_label_file_id'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN shipping_label_file_id VARCHAR(128) NULL COMMENT ''客户上传面单文件ID'' AFTER print_shipping_label')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='shipping_label_file_name'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN shipping_label_file_name VARCHAR(255) NULL COMMENT ''客户上传面单文件名'' AFTER shipping_label_file_id')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='shipping_label_file_url'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN shipping_label_file_url VARCHAR(1000) NULL COMMENT ''客户上传面单下载地址'' AFTER shipping_label_file_name')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='fulfillment_status'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN fulfillment_status VARCHAR(32) NOT NULL DEFAULT ''WAIT_RELABEL'' COMMENT ''换标后履约状态'' AFTER shipping_label_file_url')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='outbound_order_no'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN outbound_order_no VARCHAR(64) NULL COMMENT ''自提或快递生成的换标出库单号'' AFTER fulfillment_status')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='customer_confirmation_key'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN customer_confirmation_key VARCHAR(255) NULL COMMENT ''客户确认完成幂等键'' AFTER fulfillment_status')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_application' AND column_name='customer_confirmed_at'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN customer_confirmed_at DATETIME(3) NULL COMMENT ''客户确认换标完成时间'' AFTER customer_confirmation_key')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
 CREATE TABLE IF NOT EXISTS ll_relabel_item (
   id BIGINT NOT NULL COMMENT '主键ID',
   application_id BIGINT NOT NULL COMMENT '申请单ID',
@@ -1692,7 +1766,7 @@ CREATE TABLE IF NOT EXISTS ll_relabel_item (
   product_name_zh VARCHAR(255) NOT NULL COMMENT '产品中文名称',
   total_package_count INT NOT NULL COMMENT '总箱数',
   notified_package_count INT NOT NULL COMMENT '已通知箱数',
-  shipment_no VARCHAR(128) NOT NULL COMMENT '货件编号',
+  shipment_no VARCHAR(128) NULL COMMENT '货件编号（无FBA去向时为空）',
   tracking_code VARCHAR(255) NULL COMMENT '物流跟踪编码',
   new_sku_code VARCHAR(128) NOT NULL COMMENT '换标后SKU编码',
   label_requirement VARCHAR(1000) NULL COMMENT '换标要求',
@@ -1703,6 +1777,17 @@ CREATE TABLE IF NOT EXISTS ll_relabel_item (
   carton_mark VARCHAR(255) NULL COMMENT '客户自有箱唛',
   fba_carton_mark VARCHAR(255) NULL COMMENT '关联FBA箱唛',
   destination_warehouse_id VARCHAR(128) NULL COMMENT '该箱目的海外仓ID',
+  destination_fba_warehouse_code VARCHAR(128) NULL COMMENT '可选FBA目的仓编码（与海外操作仓分离）',
+  operation_type VARCHAR(32) NOT NULL DEFAULT 'CARTON_LABEL' COMMENT '换标模式：箱唛、SKU或组合换标',
+  sku_relabel_items_json JSON NULL COMMENT '同箱SKU换标子明细快照（数量按件）',
+  source_inventory_balance_id BIGINT NULL COMMENT '原库存余额ID（预入仓换标任务可为空）',
+  source_inventory_position_id BIGINT NULL COMMENT '原库存库位ID（预入仓换标任务可为空）',
+  source_inbound_order_id BIGINT NULL COMMENT '原入仓单ID（预入仓换标任务可为空）',
+  source_inbound_order_no VARCHAR(128) NULL COMMENT '原入仓单号快照',
+  source_inbound_code VARCHAR(128) NULL COMMENT '原进仓编码快照',
+  source_warehouse_id VARCHAR(128) NOT NULL COMMENT '原海外中转仓ID',
+  source_warehouse_code VARCHAR(128) NULL COMMENT '原海外中转仓编码快照',
+  source_warehouse_name VARCHAR(255) NULL COMMENT '原海外中转仓名称快照',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   PRIMARY KEY (id),
   KEY idx_ll_relabel_item_application (customer_id,application_id),
@@ -1710,6 +1795,13 @@ CREATE TABLE IF NOT EXISTS ll_relabel_item (
   KEY idx_ll_relabel_item_destination (customer_id,destination_warehouse_id,application_id)
 ) ENGINE=InnoDB COMMENT='换标货物冻结明细';
 
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='destination_fba_warehouse_code'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN destination_fba_warehouse_code VARCHAR(128) NULL COMMENT ''可选FBA目的仓编码（与海外操作仓分离）''')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='source_inventory_balance_id'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN source_inventory_balance_id BIGINT NULL COMMENT ''原库存余额ID（预入仓换标任务可为空）''')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='source_inventory_position_id'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN source_inventory_position_id BIGINT NULL COMMENT ''原库存库位ID（预入仓换标任务可为空）''')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='source_inbound_order_id'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN source_inbound_order_id BIGINT NULL COMMENT ''原入仓单ID（预入仓换标任务可为空）''')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name IN ('shipment_no','destination_fba_warehouse_code','source_inventory_balance_id','source_inventory_position_id','source_inbound_order_id') AND is_nullable='NO'), 'ALTER TABLE ll_relabel_item MODIFY COLUMN shipment_no VARCHAR(128) NULL COMMENT ''货件编号（无FBA去向时为空）'', MODIFY COLUMN destination_fba_warehouse_code VARCHAR(128) NULL COMMENT ''可选FBA目的仓编码（与海外操作仓分离）'', MODIFY COLUMN source_inventory_balance_id BIGINT NULL COMMENT ''原库存余额ID（预入仓换标任务可为空）'', MODIFY COLUMN source_inventory_position_id BIGINT NULL COMMENT ''原库存库位ID（预入仓换标任务可为空）'', MODIFY COLUMN source_inbound_order_id BIGINT NULL COMMENT ''原入仓单ID（预入仓换标任务可为空）''', 'SELECT 1'));
+PREPARE relabel_pre_inbound_stmt FROM @ddl; EXECUTE relabel_pre_inbound_stmt; DEALLOCATE PREPARE relabel_pre_inbound_stmt;
+
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='remark'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN remark VARCHAR(1000) NULL COMMENT ''货物明细备注'' AFTER label_requirement')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='carton_mark'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN carton_mark VARCHAR(255) NULL COMMENT ''客户自有箱唛'' AFTER relabel_file_url')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='fba_carton_mark'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN fba_carton_mark VARCHAR(255) NULL COMMENT ''关联FBA箱唛'' AFTER carton_mark')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
@@ -1817,11 +1909,14 @@ CREATE TABLE IF NOT EXISTS ll_dropship_order_profile (
   id BIGINT NOT NULL COMMENT '主键ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户租户ID', order_id BIGINT NOT NULL COMMENT '订单ID',
   warehouse_pallet_id BIGINT NULL COMMENT '仓库实物托盘ID', pallet_no VARCHAR(128) NULL COMMENT '托盘号',
   source_pallet_no VARCHAR(128) NOT NULL COMMENT '来源托盘号快照',
+  manifest_version INT NOT NULL COMMENT '整托清单版本', manifest_package_count INT NOT NULL COMMENT '整托总箱数',
+  manifest_fragment_count INT NOT NULL COMMENT '整托客户分片总数', manifest_hash CHAR(64) NOT NULL COMMENT '整托完整清单摘要',
   inventory_position_id BIGINT NULL COMMENT '库存仓位记录ID', status VARCHAR(32) NOT NULL DEFAULT 'PENDING_INBOUND' COMMENT '业务状态',
   idempotency_key VARCHAR(255) NOT NULL COMMENT '业务幂等键', version BIGINT NOT NULL DEFAULT 0 COMMENT '乐观锁版本',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
   PRIMARY KEY(id), UNIQUE KEY uk_ll_dropship_profile_order_pallet(customer_id,order_id,source_pallet_no),
-  UNIQUE KEY uk_ll_dropship_profile_key(customer_id,idempotency_key), KEY idx_ll_dropship_profile_order(customer_id,order_id)
+  UNIQUE KEY uk_ll_dropship_profile_key(customer_id,idempotency_key), KEY idx_ll_dropship_profile_order(customer_id,order_id),
+  KEY idx_ll_dropship_profile_manifest(source_pallet_no,manifest_hash)
 ) ENGINE=InnoDB COMMENT='一件代发托盘档案';
 
 CREATE TABLE IF NOT EXISTS ll_dropship_carton (
@@ -2355,6 +2450,112 @@ CREATE TABLE IF NOT EXISTS ll_destuff_pallet_cost_allocation (
  CONSTRAINT chk_ll_destuff_allocation CHECK(actual_volume_cbm>0 AND allocated_amount>=0)
 ) ENGINE=InnoDB COMMENT='拆柜打托成本按客户实收体积分摊';
 
+-- 客户退货预报、PDA 签收与仓储费起算批次
+CREATE TABLE IF NOT EXISTS ll_return_order (
+ -- need_relabel is added below for existing deployments
+ id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', return_no VARCHAR(128) NOT NULL COMMENT '退货订单号', overseas_warehouse_id VARCHAR(128) NOT NULL COMMENT '操作海外仓ID', warehouse_contact_name VARCHAR(128) NULL COMMENT '中转仓联系人快照', warehouse_contact_phone VARCHAR(64) NULL COMMENT '中转仓联系电话快照', customer_reference_no VARCHAR(128) NULL COMMENT '客户参考号', status VARCHAR(32) NOT NULL COMMENT 'PENDING_RECEIPT、PARTIALLY_RECEIVED或COMPLETED', expected_sku_types INT NOT NULL COMMENT '预报SKU种类数', expected_quantity BIGINT NOT NULL COMMENT '预报总数量', received_quantity BIGINT NOT NULL DEFAULT 0 COMMENT '累计实收总数量', remark VARCHAR(1000) NULL COMMENT '客户备注', idempotency_key VARCHAR(255) NOT NULL COMMENT '创建幂等键', request_hash CHAR(64) NOT NULL COMMENT '创建请求SHA-256', created_by VARCHAR(128) NULL COMMENT '创建操作人ID', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
+ PRIMARY KEY(id), UNIQUE KEY uk_ll_return_order_customer_no(customer_id,return_no), UNIQUE KEY uk_ll_return_order_customer_key(customer_id,idempotency_key), KEY idx_ll_return_order_warehouse_status(overseas_warehouse_id,status,created_at), CONSTRAINT chk_ll_return_order_quantity CHECK(expected_sku_types>0 AND expected_quantity>0 AND received_quantity>=0 AND received_quantity<=expected_quantity)
+) ENGINE=InnoDB COMMENT='客户退货订单及SKU实收汇总';
+SET @ll_return_order_need_relabel = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='need_relabel'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN need_relabel TINYINT(1) NOT NULL DEFAULT 0 COMMENT ''是否需要换标'' AFTER customer_reference_no')); PREPARE stmt FROM @ll_return_order_need_relabel; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='warehouse_contact_name'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN warehouse_contact_name VARCHAR(128) NULL COMMENT ''中转仓联系人快照'' AFTER overseas_warehouse_id')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='warehouse_contact_phone'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN warehouse_contact_phone VARCHAR(64) NULL COMMENT ''中转仓联系电话快照'' AFTER warehouse_contact_name')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='relabel_application_id'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN relabel_application_id BIGINT NULL COMMENT ''绑定换标申请单ID'' AFTER need_relabel')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='relabel_no'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN relabel_no VARCHAR(64) NULL COMMENT ''绑定换标单号'' AFTER relabel_application_id')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='relabel_status'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN relabel_status VARCHAR(32) NULL COMMENT ''换标状态'' AFTER relabel_no')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+CREATE TABLE IF NOT EXISTS ll_return_order_item (
+ id BIGINT NOT NULL COMMENT '退货预报明细ID', return_order_id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码', product_name_zh VARCHAR(255) NULL COMMENT '中文品名', expected_quantity BIGINT NOT NULL COMMENT 'SKU预报数量', received_quantity BIGINT NOT NULL DEFAULT 0 COMMENT 'SKU累计实收数量', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
+ PRIMARY KEY(id), UNIQUE KEY uk_ll_return_item_order_sku(return_order_id,sku_code), KEY idx_ll_return_item_sku(sku_code,received_quantity), CONSTRAINT chk_ll_return_item_quantity CHECK(expected_quantity>0 AND received_quantity>=0 AND received_quantity<=expected_quantity)
+) ENGINE=InnoDB COMMENT='客户退货订单的SKU预报与实收明细';
+CREATE TABLE IF NOT EXISTS ll_return_receipt (
+ id BIGINT NOT NULL COMMENT 'PDA退货签收单ID', return_order_id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', receipt_no VARCHAR(128) NOT NULL COMMENT '签收单号', receipt_batch_no VARCHAR(128) NOT NULL COMMENT '签收批次号', tracking_no VARCHAR(128) NULL COMMENT '本次签收包裹的可选快递单号', bound_by VARCHAR(16) NOT NULL COMMENT '开始签收方式，RETURN_NO退货单号或SKU候选', status VARCHAR(32) NOT NULL COMMENT '签收状态，当前SIGNED', received_quantity BIGINT NOT NULL COMMENT '本次实收数量', operator_id VARCHAR(128) NOT NULL COMMENT 'PDA操作人ID', operator_name VARCHAR(128) NULL COMMENT 'PDA操作人名称', idempotency_key VARCHAR(255) NOT NULL COMMENT 'PDA确认幂等键', request_hash CHAR(64) NOT NULL COMMENT 'PDA确认请求SHA-256', signed_at DATETIME(3) NOT NULL COMMENT '签收时间', created_at DATETIME(3) NOT NULL COMMENT '创建时间',
+ PRIMARY KEY(id), UNIQUE KEY uk_ll_return_receipt_no(receipt_no), UNIQUE KEY uk_ll_return_receipt_batch(receipt_batch_no), UNIQUE KEY uk_ll_return_receipt_operator_key(operator_id,idempotency_key), KEY idx_ll_return_receipt_order(return_order_id,signed_at), CONSTRAINT chk_ll_return_receipt_quantity CHECK(received_quantity>0), CONSTRAINT chk_ll_return_receipt_bound CHECK(bound_by IN('RETURN_NO','SKU'))
+) ENGINE=InnoDB COMMENT='PDA退货实收签收事实';
+
+-- 已创建开发库升级为“客户只预报 SKU，快递单号仅属于签收批次”的最终模型。
+SET @ll_return_item_drop_tracking_order_sku = (SELECT IF(COUNT(*) > 0, 'ALTER TABLE ll_return_order_item DROP INDEX uk_ll_return_item_order_tracking_sku', 'SELECT 1') FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_return_order_item' AND index_name='uk_ll_return_item_order_tracking_sku');
+PREPARE ll_return_item_drop_tracking_order_sku_stmt FROM @ll_return_item_drop_tracking_order_sku;
+EXECUTE ll_return_item_drop_tracking_order_sku_stmt;
+DEALLOCATE PREPARE ll_return_item_drop_tracking_order_sku_stmt;
+SET @ll_return_item_drop_tracking = (SELECT IF(COUNT(*) > 0, 'ALTER TABLE ll_return_order_item DROP INDEX idx_ll_return_item_tracking', 'SELECT 1') FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_return_order_item' AND index_name='idx_ll_return_item_tracking');
+PREPARE ll_return_item_drop_tracking_stmt FROM @ll_return_item_drop_tracking;
+EXECUTE ll_return_item_drop_tracking_stmt;
+DEALLOCATE PREPARE ll_return_item_drop_tracking_stmt;
+SET @ll_return_item_drop_order = (SELECT IF(COUNT(*) > 0, 'ALTER TABLE ll_return_order_item DROP INDEX idx_ll_return_item_order', 'SELECT 1') FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_return_order_item' AND index_name='idx_ll_return_item_order');
+PREPARE ll_return_item_drop_order_stmt FROM @ll_return_item_drop_order;
+EXECUTE ll_return_item_drop_order_stmt;
+DEALLOCATE PREPARE ll_return_item_drop_order_stmt;
+SET @ll_return_item_drop_tracking_no = (SELECT IF(COUNT(*) > 0, 'ALTER TABLE ll_return_order_item DROP COLUMN tracking_no', 'SELECT 1') FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order_item' AND column_name='tracking_no');
+PREPARE ll_return_item_drop_tracking_no_stmt FROM @ll_return_item_drop_tracking_no;
+EXECUTE ll_return_item_drop_tracking_no_stmt;
+DEALLOCATE PREPARE ll_return_item_drop_tracking_no_stmt;
+SET @ll_return_item_add_order_sku = (SELECT IF(COUNT(*) = 0, 'ALTER TABLE ll_return_order_item ADD UNIQUE KEY uk_ll_return_item_order_sku(return_order_id,sku_code)', 'SELECT 1') FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_return_order_item' AND index_name='uk_ll_return_item_order_sku');
+PREPARE ll_return_item_add_order_sku_stmt FROM @ll_return_item_add_order_sku;
+EXECUTE ll_return_item_add_order_sku_stmt;
+DEALLOCATE PREPARE ll_return_item_add_order_sku_stmt;
+SET @ll_return_item_add_sku_idx = (SELECT IF(COUNT(*) = 0, 'ALTER TABLE ll_return_order_item ADD KEY idx_ll_return_item_sku(sku_code,received_quantity)', 'SELECT 1') FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_return_order_item' AND index_name='idx_ll_return_item_sku');
+PREPARE ll_return_item_add_sku_idx_stmt FROM @ll_return_item_add_sku_idx;
+EXECUTE ll_return_item_add_sku_idx_stmt;
+DEALLOCATE PREPARE ll_return_item_add_sku_idx_stmt;
+UPDATE ll_return_receipt SET bound_by='RETURN_NO' WHERE bound_by='TRACKING';
+SET @ll_return_receipt_drop_bound_check = (SELECT IF(COUNT(*) > 0, 'ALTER TABLE ll_return_receipt DROP CHECK chk_ll_return_receipt_bound', 'SELECT 1') FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_receipt' AND constraint_name='chk_ll_return_receipt_bound');
+PREPARE ll_return_receipt_drop_bound_check_stmt FROM @ll_return_receipt_drop_bound_check;
+EXECUTE ll_return_receipt_drop_bound_check_stmt;
+DEALLOCATE PREPARE ll_return_receipt_drop_bound_check_stmt;
+SET @ll_return_receipt_alter = 'ALTER TABLE ll_return_receipt MODIFY COLUMN tracking_no VARCHAR(128) NULL COMMENT ''本次签收包裹的可选快递单号'', MODIFY COLUMN bound_by VARCHAR(16) NOT NULL COMMENT ''开始签收方式，RETURN_NO退货单号或SKU候选'', ADD CONSTRAINT chk_ll_return_receipt_bound CHECK(bound_by IN(''RETURN_NO'',''SKU''))';
+PREPARE ll_return_receipt_alter_stmt FROM @ll_return_receipt_alter;
+EXECUTE ll_return_receipt_alter_stmt;
+DEALLOCATE PREPARE ll_return_receipt_alter_stmt;
+CREATE TABLE IF NOT EXISTS ll_return_receipt_item (
+ id BIGINT NOT NULL COMMENT '签收SKU明细ID', receipt_id BIGINT NOT NULL COMMENT 'PDA退货签收单ID', return_order_item_id BIGINT NOT NULL COMMENT '退货预报明细ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码', received_quantity BIGINT NOT NULL COMMENT '本次SKU实收数量',
+ PRIMARY KEY(id), KEY idx_ll_return_receipt_item_receipt(receipt_id), KEY idx_ll_return_receipt_item_order_item(return_order_item_id), CONSTRAINT chk_ll_return_receipt_item_quantity CHECK(received_quantity>0)
+) ENGINE=InnoDB COMMENT='PDA退货签收SKU实际数量明细';
+CREATE TABLE IF NOT EXISTS ll_return_receipt_batch (
+ id BIGINT NOT NULL COMMENT '退货仓储计费批次ID', return_order_id BIGINT NOT NULL COMMENT '退货订单ID', receipt_id BIGINT NOT NULL COMMENT 'PDA退货签收单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', batch_no VARCHAR(128) NOT NULL COMMENT '签收批次号', overseas_warehouse_id VARCHAR(128) NOT NULL COMMENT '操作海外仓ID', storage_billing_status VARCHAR(32) NOT NULL COMMENT '仓储计费状态，初始PENDING_PRICING', storage_started_at DATETIME(3) NOT NULL COMMENT '仓储计费起算时间', created_at DATETIME(3) NOT NULL COMMENT '创建时间',
+ PRIMARY KEY(id), UNIQUE KEY uk_ll_return_batch_no(batch_no), UNIQUE KEY uk_ll_return_batch_receipt(receipt_id), KEY idx_ll_return_batch_billing(customer_id,overseas_warehouse_id,storage_billing_status,storage_started_at)
+) ENGINE=InnoDB COMMENT='每次退货签收生成的仓储费起算批次';
+
+-- 退货库存：签收即生成箱号，库存按客户、海外仓和SKU汇总；箱内明细保留给合箱与箱唛。
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_receipt' AND column_name='carton_mark'), 'SELECT 1', 'ALTER TABLE ll_return_receipt ADD COLUMN carton_mark VARCHAR(128) NULL COMMENT ''签收生成或绑定的退货箱号'' AFTER receipt_batch_no'));
+PREPARE return_receipt_carton_mark_stmt FROM @ddl; EXECUTE return_receipt_carton_mark_stmt; DEALLOCATE PREPARE return_receipt_carton_mark_stmt;
+CREATE TABLE IF NOT EXISTS ll_return_inventory_carton (
+ id BIGINT NOT NULL COMMENT '退货库存箱ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', overseas_warehouse_id VARCHAR(128) NOT NULL COMMENT '海外仓ID', source_receipt_id BIGINT NULL COMMENT '来源PDA签收单ID', source_batch_no VARCHAR(128) NULL COMMENT '来源签收批次号', carton_mark VARCHAR(128) NOT NULL COMMENT '退货箱号和箱唛编码', status VARCHAR(32) NOT NULL COMMENT 'AVAILABLE可用或MERGED已合箱', sku_types INT NOT NULL COMMENT '箱内SKU种类数', total_quantity BIGINT NOT NULL COMMENT '箱内总件数', length DECIMAL(12,3) NULL COMMENT '箱长CM', width DECIMAL(12,3) NULL COMMENT '箱宽CM', height DECIMAL(12,3) NULL COMMENT '箱高CM', weight DECIMAL(12,3) NULL COMMENT '箱重KG', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间', merged_at DATETIME(3) NULL COMMENT '合箱完成时间',
+ PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_carton_mark(carton_mark), UNIQUE KEY uk_ll_return_inventory_carton_receipt(source_receipt_id), KEY idx_ll_return_inventory_carton_customer(customer_id,overseas_warehouse_id,status,created_at), CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0)), CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','MERGED','OUTBOUNDED'))
+) ENGINE=InnoDB COMMENT='退货实物库存箱及箱唛';
+-- 已合箱的来源箱保留审计记录，但其箱内库存必须归零；动态 SQL 兼容 Spring 的数据库初始化器。
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_quantity'), 'ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_quantity', 'SELECT 1'));
+PREPARE return_inventory_carton_check_drop_stmt FROM @ddl; EXECUTE return_inventory_carton_check_drop_stmt; DEALLOCATE PREPARE return_inventory_carton_check_drop_stmt;
+ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0));
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_status'), 'ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_status', 'SELECT 1'));
+PREPARE return_inventory_carton_status_drop_stmt FROM @ddl; EXECUTE return_inventory_carton_status_drop_stmt; DEALLOCATE PREPARE return_inventory_carton_status_drop_stmt;
+ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','MERGED','OUTBOUNDED'));
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='source_return_no'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN source_return_no VARCHAR(2000) NULL COMMENT ''来源退货单号'' AFTER source_batch_no'));
+PREPARE return_inventory_carton_return_no_stmt FROM @ddl; EXECUTE return_inventory_carton_return_no_stmt; DEALLOCATE PREPARE return_inventory_carton_return_no_stmt;
+ALTER TABLE ll_return_inventory_carton MODIFY COLUMN source_batch_no TEXT NULL COMMENT '实际消耗来源签收批次号，多个批次逗号分隔', MODIFY COLUMN source_return_no TEXT NULL COMMENT '实际消耗来源退货单号，多个单号逗号分隔';
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='fba_carton_mark'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN fba_carton_mark VARCHAR(255) NULL COMMENT ''FBA箱唛'' AFTER carton_mark')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='destination_warehouse_code'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN destination_warehouse_code VARCHAR(128) NULL COMMENT ''目的仓编码'' AFTER fba_carton_mark')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='destination_warehouse_name'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN destination_warehouse_name VARCHAR(255) NULL COMMENT ''目的仓名称'' AFTER destination_warehouse_code')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='relabel_application_id'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN relabel_application_id BIGINT NULL COMMENT ''绑定换标申请单ID'' AFTER destination_warehouse_name')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='relabel_no'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN relabel_no VARCHAR(64) NULL COMMENT ''绑定换标单号'' AFTER relabel_application_id')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='relabel_status'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN relabel_status VARCHAR(32) NULL COMMENT ''换标状态'' AFTER relabel_no')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='relabel_completed_at'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN relabel_completed_at DATETIME(3) NULL COMMENT ''换标完成时间'' AFTER relabel_status')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+CREATE TABLE IF NOT EXISTS ll_return_inventory_carton_item (
+ id BIGINT NOT NULL COMMENT '退货库存箱SKU明细ID', carton_id BIGINT NOT NULL COMMENT '退货库存箱ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码', product_name_zh VARCHAR(255) NULL COMMENT '中文品名', quantity BIGINT NOT NULL COMMENT '该SKU箱内数量',
+ PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_carton_item(carton_id,sku_code), KEY idx_ll_return_inventory_carton_item_customer(customer_id,sku_code), CONSTRAINT chk_ll_return_inventory_carton_item_quantity CHECK(quantity>0)
+) ENGINE=InnoDB COMMENT='退货库存箱内SKU和数量';
+CREATE TABLE IF NOT EXISTS ll_return_inventory_balance (
+ id BIGINT NOT NULL COMMENT '退货库存余额ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', overseas_warehouse_id VARCHAR(128) NOT NULL COMMENT '海外仓ID', sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码', product_name_zh VARCHAR(255) NULL COMMENT '中文品名', total_quantity BIGINT NOT NULL DEFAULT 0 COMMENT '实物总库存，仅实际出库扣减', available_quantity BIGINT NOT NULL COMMENT '未合箱可用上架数量', carton_quantity BIGINT NOT NULL COMMENT '包含该SKU的可用箱数', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
+ PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_balance(customer_id,overseas_warehouse_id,sku_code), CONSTRAINT chk_ll_return_inventory_balance_quantity CHECK(total_quantity>=available_quantity AND available_quantity>=0 AND carton_quantity>=0)
+) ENGINE=InnoDB COMMENT='退货库存按客户海外仓SKU汇总余额';
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_balance' AND column_name='total_quantity'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_balance ADD COLUMN total_quantity BIGINT NULL COMMENT ''实物总库存，仅实际出库扣减'' AFTER product_name_zh'));
+PREPARE return_inventory_balance_total_stmt FROM @ddl; EXECUTE return_inventory_balance_total_stmt; DEALLOCATE PREPARE return_inventory_balance_total_stmt;
+-- 旧数据的可用量原先包含已合箱库存；升级时一次性拆分为总库存和未合箱可用库存。
+UPDATE ll_return_inventory_balance b LEFT JOIN (SELECT c.customer_id,c.overseas_warehouse_id,i.sku_code,SUM(i.quantity) merged_quantity FROM ll_return_inventory_carton c JOIN ll_return_inventory_carton_item i ON i.carton_id=c.id WHERE c.source_batch_no='MERGED' GROUP BY c.customer_id,c.overseas_warehouse_id,i.sku_code) m ON m.customer_id=b.customer_id AND m.overseas_warehouse_id=b.overseas_warehouse_id AND m.sku_code=b.sku_code SET b.total_quantity=b.available_quantity,b.available_quantity=GREATEST(0,b.available_quantity-COALESCE(m.merged_quantity,0)) WHERE b.total_quantity IS NULL;
+ALTER TABLE ll_return_inventory_balance MODIFY COLUMN total_quantity BIGINT NOT NULL DEFAULT 0 COMMENT '实物总库存，仅实际出库扣减';
+CREATE TABLE IF NOT EXISTS ll_return_inventory_operation (
+ id BIGINT NOT NULL COMMENT '退货库存PDA操作ID', operator_id VARCHAR(128) NOT NULL COMMENT 'PDA操作人ID', idempotency_key VARCHAR(255) NOT NULL COMMENT '操作幂等键', request_hash CHAR(64) NOT NULL COMMENT '请求内容SHA-256', operation_type VARCHAR(32) NOT NULL COMMENT '操作类型，当前MERGE', result_carton_id BIGINT NULL COMMENT '合箱结果退货库存箱ID', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
+ PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_operation_operator_key(operator_id,idempotency_key), KEY idx_ll_return_inventory_operation_result(result_carton_id)
+) ENGINE=InnoDB COMMENT='退货库存PDA合箱幂等操作审计';
+
 -- END INLINE EMPTY-DATABASE BASELINE: LASTLEG
 
 -- BEGIN INLINE EMPTY-DATABASE BASELINE: OVERSEAS WAREHOUSE
@@ -2469,7 +2670,7 @@ CREATE TABLE IF NOT EXISTS wh_pallet_business_binding (
   business_type VARCHAR(32) NOT NULL COMMENT '业务类型', business_id VARCHAR(128) NOT NULL COMMENT '绑定业务记录ID',
   pallet_id BIGINT NOT NULL COMMENT '托盘ID', created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   PRIMARY KEY (id), UNIQUE KEY uk_wh_pallet_binding (customer_id,warehouse_id,business_type,business_id),
-  UNIQUE KEY uk_wh_pallet_binding_pallet (pallet_id)
+  KEY idx_wh_pallet_binding_pallet (pallet_id)
 ) ENGINE=InnoDB COMMENT='托盘业务绑定关系';
 
 CREATE TABLE IF NOT EXISTS wh_pallet_operation (
@@ -2525,7 +2726,7 @@ CREATE TABLE IF NOT EXISTS wh_pallet_batch_item (
   PRIMARY KEY (id),
   UNIQUE KEY uk_wh_pallet_batch_item_business (customer_id,warehouse_id,business_key),
   UNIQUE KEY uk_wh_pallet_batch_item_sequence (batch_id,sequence_no),
-  UNIQUE KEY uk_wh_pallet_batch_item_pallet (pallet_id),
+  KEY idx_wh_pallet_batch_item_pallet (pallet_id),
   KEY idx_wh_pallet_batch_item_batch (batch_id,status)
 ) ENGINE=InnoDB COMMENT='柜级入库计划批量托盘明细与资源锁关联';
 
@@ -3093,7 +3294,7 @@ CREATE TABLE IF NOT EXISTS ll_receiving_container_session (
   source_container_booking_id VARCHAR(128) NOT NULL COMMENT '稳定来源柜预订ID', container_fact_hash VARCHAR(64) NOT NULL COMMENT '领取时整柜订单与计划事实摘要', container_no VARCHAR(64) NOT NULL COMMENT '集装箱号',
   overseas_warehouse_id BIGINT NOT NULL COMMENT '操作员Token绑定并冻结的海外实际收货共享物理仓ID', overseas_warehouse_name VARCHAR(255) NOT NULL COMMENT '仓库服务校验后的海外实际收货共享物理仓名称快照',
   operator_key VARCHAR(128) NOT NULL COMMENT '操作账号唯一标识', operator_name VARCHAR(255) NULL COMMENT '操作账号名称', active_operator_key VARCHAR(255) NULL COMMENT '未完成会话平台操作账号全局唯一锁键',
-  active_container_key VARCHAR(255) NULL COMMENT '未完成会话柜号全局唯一锁键', status VARCHAR(32) NOT NULL DEFAULT 'WAIT_SIGN' COMMENT '会话状态：WAIT_SIGN、SIGNED、RECEIVING、COMPLETED',
+  active_container_key VARCHAR(255) NULL COMMENT '未完成会话柜号全局唯一锁键', status VARCHAR(32) NOT NULL DEFAULT 'WAIT_SIGN' COMMENT '会话状态：WAIT_SIGN、SIGNED、RECEIVING、COMPLETED、COMPLETED_WITH_DIFFERENCE',
   sign_photos JSON NULL COMMENT '签收卸柜照片角色与文件ID列表', prepared_at DATETIME(3) NULL COMMENT '选择柜号时间', signed_at DATETIME(3) NULL COMMENT '签收时间',
   receiving_at DATETIME(3) NULL COMMENT '首次收货时间', completed_at DATETIME(3) NULL COMMENT '完成时间', created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本', PRIMARY KEY(id),
@@ -3142,7 +3343,7 @@ PREPARE phase4_receiving_drop_raw_photos_stmt FROM @ddl; EXECUTE phase4_receivin
 DROP PROCEDURE IF EXISTS assert_receiving_global_locks_migratable;
 UPDATE ll_receiving_container_session
 SET active_operator_key=NULL,active_container_key=NULL
-WHERE status='COMPLETED' AND (active_operator_key IS NOT NULL OR active_container_key IS NOT NULL);
+WHERE status IN ('COMPLETED','COMPLETED_WITH_DIFFERENCE') AND (active_operator_key IS NOT NULL OR active_container_key IS NOT NULL);
 DELIMITER $$
 CREATE PROCEDURE assert_receiving_global_locks_migratable()
 BEGIN
@@ -3192,6 +3393,16 @@ CREATE TABLE IF NOT EXISTS ll_receiving_sku_receipt (
   KEY idx_ll_receiving_sku_plan (customer_id,plan_id,line_id)
 ) ENGINE=InnoDB COMMENT='海外PDA柜号FBA SKU实收进度';
 
+CREATE TABLE IF NOT EXISTS ll_receiving_fba_pallet_count (
+  id BIGINT NOT NULL COMMENT 'FBA托盘现场累计箱数ID', session_id BIGINT NOT NULL COMMENT '柜号签收会话ID',
+  group_key VARCHAR(255) NOT NULL COMMENT '柜号与FBA仓组成的收货组键', pallet_code VARCHAR(128) NOT NULL COMMENT '现有FBA托盘码',
+  actual_packages INT NOT NULL COMMENT '该托现场累计实物箱数', created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  PRIMARY KEY(id), UNIQUE KEY uk_ll_receiving_fba_count(session_id,group_key,pallet_code),
+  KEY idx_ll_receiving_fba_group(session_id,group_key)
+) ENGINE=InnoDB COMMENT='海外PDA普通FBA托盘现场累计与超收标记';
+
+
 CREATE TABLE IF NOT EXISTS ll_receiving_container_operation (
   id BIGINT NOT NULL COMMENT '柜号收货操作ID', session_id BIGINT NOT NULL COMMENT '柜号签收会话ID',
   operator_key VARCHAR(128) NOT NULL COMMENT '操作账号唯一标识', action VARCHAR(32) NOT NULL COMMENT '操作动作', idempotency_key VARCHAR(255) NOT NULL COMMENT '客户端幂等键',
@@ -3646,6 +3857,21 @@ PREPARE phase5_structure_ddl FROM @ddl; EXECUTE phase5_structure_ddl; DEALLOCATE
 
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dropship_order_profile' AND column_name='source_pallet_no'), 'SELECT 1', 'ALTER TABLE ll_dropship_order_profile ADD COLUMN source_pallet_no VARCHAR(128) NULL COMMENT ''来源托盘号快照'' AFTER pallet_no'));
 PREPARE phase5_structure_ddl FROM @ddl; EXECUTE phase5_structure_ddl; DEALLOCATE PREPARE phase5_structure_ddl;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dropship_order_profile' AND column_name='manifest_version'), 'SELECT 1', 'ALTER TABLE ll_dropship_order_profile ADD COLUMN manifest_version INT NOT NULL DEFAULT 1 COMMENT ''整托清单版本'' AFTER source_pallet_no'));
+PREPARE phase5_structure_ddl FROM @ddl; EXECUTE phase5_structure_ddl; DEALLOCATE PREPARE phase5_structure_ddl;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dropship_order_profile' AND column_name='manifest_package_count'), 'SELECT 1', 'ALTER TABLE ll_dropship_order_profile ADD COLUMN manifest_package_count INT NOT NULL DEFAULT 1 COMMENT ''整托总箱数'' AFTER manifest_version'));
+PREPARE phase5_structure_ddl FROM @ddl; EXECUTE phase5_structure_ddl; DEALLOCATE PREPARE phase5_structure_ddl;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dropship_order_profile' AND column_name='manifest_fragment_count'), 'SELECT 1', 'ALTER TABLE ll_dropship_order_profile ADD COLUMN manifest_fragment_count INT NOT NULL DEFAULT 1 COMMENT ''整托客户分片总数'' AFTER manifest_package_count'));
+PREPARE phase5_structure_ddl FROM @ddl; EXECUTE phase5_structure_ddl; DEALLOCATE PREPARE phase5_structure_ddl;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_dropship_order_profile' AND column_name='manifest_hash'), 'SELECT 1', 'ALTER TABLE ll_dropship_order_profile ADD COLUMN manifest_hash CHAR(64) NOT NULL DEFAULT ''0000000000000000000000000000000000000000000000000000000000000000'' COMMENT ''整托完整清单摘要'' AFTER manifest_fragment_count'));
+PREPARE phase5_structure_ddl FROM @ddl; EXECUTE phase5_structure_ddl; DEALLOCATE PREPARE phase5_structure_ddl;
+ALTER TABLE ll_dropship_order_profile
+  MODIFY COLUMN manifest_version INT NOT NULL COMMENT '整托清单版本',
+  MODIFY COLUMN manifest_package_count INT NOT NULL COMMENT '整托总箱数',
+  MODIFY COLUMN manifest_fragment_count INT NOT NULL COMMENT '整托客户分片总数',
+  MODIFY COLUMN manifest_hash CHAR(64) NOT NULL COMMENT '整托完整清单摘要';
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_dropship_order_profile' AND index_name='idx_ll_dropship_profile_manifest'), 'SELECT 1', 'ALTER TABLE ll_dropship_order_profile ADD KEY idx_ll_dropship_profile_manifest(source_pallet_no,manifest_hash)'));
+PREPARE phase5_structure_ddl FROM @ddl; EXECUTE phase5_structure_ddl; DEALLOCATE PREPARE phase5_structure_ddl;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_dropship_order_profile' AND index_name='uk_ll_dropship_profile_order'), 'ALTER TABLE ll_dropship_order_profile DROP INDEX uk_ll_dropship_profile_order', 'SELECT 1'));
 PREPARE phase5_structure_ddl FROM @ddl; EXECUTE phase5_structure_ddl; DEALLOCATE PREPARE phase5_structure_ddl;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema=DATABASE() AND table_name='ll_dropship_order_profile' AND index_name='uk_ll_dropship_profile_order_pallet'), 'SELECT 1', 'ALTER TABLE ll_dropship_order_profile ADD UNIQUE KEY uk_ll_dropship_profile_order_pallet(customer_id,order_id,source_pallet_no)'));
@@ -3700,9 +3926,9 @@ BEGIN
          'll_dispatch_order','ll_dispatch_item','ll_dispatch_pallet_lock','ll_dispatch_draft','ll_dispatch_draft_container',
          'll_dispatch_pda_task','ll_dispatch_pda_pick','ll_dispatch_pda_operation','ll_dispatch_pda_pick_order',
          'll_outbound_order','ll_outbound_pallet_item','ll_outbound_pda_task','ll_outbound_pda_pick',
-         'll_delivery_order','ll_delivery_fee','ll_delivery_operation',
+         'll_delivery_order','ll_delivery_operation',
          'll_dropship_order_profile','ll_dropship_carton','ll_dropship_sku_inventory','ll_dropship_carton_ledger',
-         'll_exception_order','ll_exception_return_item','ll_exception_order_command','ll_customer_visit')) <> 24 THEN
+         'll_exception_order','ll_exception_return_item','ll_exception_order_command','ll_customer_visit')) <> 23 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='五期排车、出库、派送、一件代发、异常或回访表未完整部署';
   END IF;
   IF EXISTS (SELECT dispatch_no FROM ll_dispatch_order GROUP BY dispatch_no HAVING COUNT(*)>1) THEN
@@ -3816,9 +4042,9 @@ BEGIN
          'll_dispatch_order','ll_dispatch_item','ll_dispatch_pallet_lock','ll_dispatch_draft','ll_dispatch_draft_container',
          'll_dispatch_pda_task','ll_dispatch_pda_pick','ll_dispatch_pda_operation','ll_dispatch_pda_pick_order',
          'll_outbound_order','ll_outbound_pallet_item','ll_outbound_pda_task','ll_outbound_pda_pick',
-         'll_delivery_order','ll_delivery_fee','ll_delivery_operation',
+         'll_delivery_order','ll_delivery_operation',
          'll_dropship_order_profile','ll_dropship_carton','ll_dropship_sku_inventory','ll_dropship_carton_ledger',
-         'll_exception_order','ll_exception_return_item','ll_exception_order_command','ll_customer_visit')) <> 24 THEN
+         'll_exception_order','ll_exception_return_item','ll_exception_order_command','ll_customer_visit')) <> 23 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='五期完整业务表集合未部署';
   END IF;
   IF (SELECT COUNT(*) FROM information_schema.columns WHERE table_schema='baiyue_lastleg'
@@ -3834,6 +4060,16 @@ BEGIN
        AND column_type='varchar(128)' AND is_nullable='NO' AND column_comment='来源托盘号快照') <> 1 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='一件代发来源托盘号字段未收敛';
   END IF;
+  IF (SELECT COUNT(*) FROM information_schema.columns WHERE table_schema='baiyue_lastleg'
+       AND table_name='ll_dropship_order_profile'
+       AND column_name IN ('manifest_version','manifest_package_count','manifest_fragment_count','manifest_hash')
+       AND is_nullable='NO') <> 4 THEN
+    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='一件代发托盘清单字段未完整收敛';
+  END IF;
+  IF (SELECT COUNT(*) FROM information_schema.statistics WHERE table_schema='baiyue_lastleg'
+       AND table_name='ll_dropship_order_profile' AND index_name='idx_ll_dropship_profile_manifest') <> 2 THEN
+    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='一件代发托盘清单索引未部署';
+  END IF;
   IF (SELECT COUNT(*) FROM information_schema.columns WHERE table_schema='baiyue_lastleg'
        AND table_name='ll_outbound_pda_task' AND column_name='completion_idempotency_key'
        AND column_type='varchar(255)' AND is_nullable='YES') <> 1 THEN
@@ -3968,7 +4204,7 @@ BEGIN
       AND aggregate_version=0 AND last_event_id='baseline-platform-admin-authorization-v0'
       AND (JSON_LENGTH(roles_json) <> 1
         OR NOT JSON_CONTAINS(roles_json, JSON_QUOTE('PLATFORM_ADMIN'))
-        OR JSON_LENGTH(authorities_json) <> 109
+        OR JSON_LENGTH(authorities_json) <> 105
         OR NOT JSON_CONTAINS(authorities_json, JSON_QUOTE('platform:overseas-warehouse:last-mile-order:list'))
         OR NOT JSON_CONTAINS(authorities_json, JSON_QUOTE('platform:overseas-warehouse:inbound-order:list'))
         OR NOT JSON_CONTAINS(authorities_json, JSON_QUOTE('platform:overseas-warehouse:dispatch:list'))
@@ -4405,8 +4641,12 @@ BEGIN
   IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='baiyue_lastleg' AND table_name='ll_relabel_application' AND column_name='total_file_url' AND column_type='varchar(1000)') THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='缺少字段 ll_relabel_application.total_file_url';
   END IF;
-  IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='baiyue_lastleg' AND table_name='ll_inbound_plan_pallet' AND column_name='pallet_no' AND column_type='varchar(128)' AND is_nullable='NO') THEN
-    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='入仓计划托盘码长度未就绪';
+  IF (SELECT COUNT(*) FROM information_schema.columns WHERE table_schema='baiyue_lastleg'
+      AND table_name='ll_inbound_plan_pallet' AND column_name IN ('pallet_no','version')) <> 2
+     OR NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='baiyue_lastleg'
+      AND table_name='ll_inbound_plan_pallet' AND column_name='pallet_no'
+      AND column_type='varchar(128)' AND is_nullable='NO') THEN
+    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='入仓计划托盘码或乐观锁版本字段未就绪';
   END IF;
   IF NOT EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema='baiyue_lastleg' AND table_name='ll_delivery_document_revision' AND index_name='uk_delivery_document_command') THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='缺少索引 uk_delivery_document_command';
@@ -4536,7 +4776,12 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
 PREPARE ll_delivery_order_bol_no_stmt FROM @ddl; EXECUTE ll_delivery_order_bol_no_stmt; DEALLOCATE PREPARE ll_delivery_order_bol_no_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='lastleg_order_id'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN lastleg_order_id BIGINT NULL COMMENT ''关联尾程主订单ID'' AFTER customer_reference_no'));
 PREPARE ll_return_order_lastleg_id_stmt FROM @ddl; EXECUTE ll_return_order_lastleg_id_stmt; DEALLOCATE PREPARE ll_return_order_lastleg_id_stmt;
-UPDATE ll_return_order r JOIN ll_order o ON o.source_order_id = CAST(r.id AS CHAR) AND o.source_order_no = r.return_no AND o.order_type = 'RETURN_RELABEL' SET r.lastleg_order_id = o.id WHERE r.lastleg_order_id IS NULL;
+UPDATE ll_return_order r JOIN ll_order o
+  ON o.source_order_id COLLATE utf8mb4_unicode_ci = CAST(r.id AS CHAR) COLLATE utf8mb4_unicode_ci
+ AND o.source_order_no COLLATE utf8mb4_unicode_ci = r.return_no COLLATE utf8mb4_unicode_ci
+ AND o.order_type = 'RETURN_RELABEL'
+SET r.lastleg_order_id = o.id
+WHERE r.lastleg_order_id IS NULL;
 
 -- 柜级入库计划跨客户批量托盘预留、确认与失败补偿。
 USE baiyue_lastlag_warehouse;
@@ -4562,7 +4807,7 @@ CREATE TABLE IF NOT EXISTS wh_pallet_batch_item (
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
   PRIMARY KEY (id), UNIQUE KEY uk_wh_pallet_batch_item_business (customer_id,warehouse_id,business_key),
-  UNIQUE KEY uk_wh_pallet_batch_item_sequence (batch_id,sequence_no), UNIQUE KEY uk_wh_pallet_batch_item_pallet (pallet_id),
+  UNIQUE KEY uk_wh_pallet_batch_item_sequence (batch_id,sequence_no), KEY idx_wh_pallet_batch_item_pallet (pallet_id),
   KEY idx_wh_pallet_batch_item_batch (batch_id,status)
 ) ENGINE=InnoDB COMMENT='柜级入库计划批量托盘明细与资源锁关联';
 
diff --git a/file/src/main/java/com/baiyue/file/client/IamQualificationClient.java b/file/src/main/java/com/baiyue/file/client/IamQualificationClient.java
index a0c63a603..181269c14 100644
--- a/file/src/main/java/com/baiyue/file/client/IamQualificationClient.java
+++ b/file/src/main/java/com/baiyue/file/client/IamQualificationClient.java
@@ -31,6 +31,7 @@ public interface IamQualificationClient {
 
     record QualificationRequest(Long tenantId, String qualificationType,
                                 String certificateNo, String documentUrl,
+                                String originalFileName,
                                 java.time.LocalDate validTo, boolean replace) { }
     record QualificationResponse(Long qualificationId, Long reviewId, String tenantStatus,
                                  String replacedDocumentUrl) { }
@@ -38,12 +39,15 @@ public interface IamQualificationClient {
                                          String replacedDocumentUrl) { }
     record PlatformQualificationRequest(Long tenantId, String qualificationType,
                                         String certificateNo, String documentUrl,
+                                        String originalFileName,
                                         java.time.LocalDate validTo, boolean replace) { }
     record RequiredPackageRequest(Long tenantId, String unifiedSocialCreditCode,
                                   String businessLicenseDocumentUrl,
+                                  String businessLicenseOriginalFileName,
                                   java.time.LocalDate businessLicenseValidTo,
                                   boolean replaceBusinessLicense,
                                   String legalPersonIdDocumentUrl,
+                                  String legalPersonIdOriginalFileName,
                                   java.time.LocalDate legalPersonIdValidTo,
                                   boolean replaceLegalPersonId) { }
     record RequiredPackageResponse(Long businessLicenseQualificationId,
diff --git a/file/src/main/java/com/baiyue/file/controller/PlatformQualificationFileController.java b/file/src/main/java/com/baiyue/file/controller/PlatformQualificationFileController.java
index 44ed58565..e4694bede 100644
--- a/file/src/main/java/com/baiyue/file/controller/PlatformQualificationFileController.java
+++ b/file/src/main/java/com/baiyue/file/controller/PlatformQualificationFileController.java
@@ -53,7 +53,8 @@ public class PlatformQualificationFileController {
         try {
             var response = iamClient.submitPlatform(internalToken,
                     new IamQualificationClient.PlatformQualificationRequest(
-                            tenantId, qualificationType, certificateNo, stored.documentUrl(), validTo, replace));
+                            tenantId, qualificationType, certificateNo, stored.documentUrl(),
+                            file.getOriginalFilename(), validTo, replace));
             if (response == null) {
                 throw new IllegalStateException("IAM qualification response is empty");
             }
diff --git a/file/src/main/java/com/baiyue/file/controller/QualificationFileController.java b/file/src/main/java/com/baiyue/file/controller/QualificationFileController.java
index d47487852..fd8cf524b 100644
--- a/file/src/main/java/com/baiyue/file/controller/QualificationFileController.java
+++ b/file/src/main/java/com/baiyue/file/controller/QualificationFileController.java
@@ -45,7 +45,7 @@ public class QualificationFileController {
         try {
             var response = iamClient.submit(internalToken,
                     new IamQualificationClient.QualificationRequest(tenantId, qualificationType,
-                            certificateNo, stored.documentUrl(), validTo, replace));
+                            certificateNo, stored.documentUrl(), file.getOriginalFilename(), validTo, replace));
             if (response == null) {
                 throw new IllegalStateException("IAM qualification response is empty");
             }
diff --git a/file/src/main/java/com/baiyue/file/mapper/FileExportOutboxMapper.java b/file/src/main/java/com/baiyue/file/mapper/FileExportOutboxMapper.java
index eaffd1079..a8104f66e 100644
--- a/file/src/main/java/com/baiyue/file/mapper/FileExportOutboxMapper.java
+++ b/file/src/main/java/com/baiyue/file/mapper/FileExportOutboxMapper.java
@@ -44,12 +44,13 @@ public interface FileExportOutboxMapper extends BaseMapper<FileExportOutbox> {
     int releaseExpiredClaims();
 
     @Update("""
-        UPDATE file_export_outbox o JOIN file_export_task t
-        ON t.id=o.task_id AND t.dispatch_version=o.dispatch_version
-        SET o.status='PENDING',o.next_retry_at=CURRENT_TIMESTAMP(3),o.lease_owner=NULL,o.lease_until=NULL
-        WHERE o.status='SENT' AND o.sent_at<=DATE_SUB(CURRENT_TIMESTAMP(3), INTERVAL #{staleSeconds} SECOND)
-        AND t.status='PENDING' AND t.next_retry_at<=DATE_SUB(CURRENT_TIMESTAMP(3), INTERVAL #{graceSeconds} SECOND)
-        LIMIT 20
+        UPDATE file_export_outbox
+        SET status='PENDING',next_retry_at=CURRENT_TIMESTAMP(3),lease_owner=NULL,lease_until=NULL
+        WHERE id IN (SELECT id FROM (SELECT o.id FROM file_export_outbox o JOIN file_export_task t
+          ON t.id=o.task_id AND t.dispatch_version=o.dispatch_version
+          WHERE o.status='SENT' AND o.sent_at<=DATE_SUB(CURRENT_TIMESTAMP(3), INTERVAL #{staleSeconds} SECOND)
+          AND t.status='PENDING' AND t.next_retry_at<=DATE_SUB(CURRENT_TIMESTAMP(3), INTERVAL #{graceSeconds} SECOND)
+          ORDER BY o.sent_at,o.id LIMIT 20) stale)
         """)
     int redispatchSent(@Param("staleSeconds") int staleSeconds, @Param("graceSeconds") int graceSeconds);
 
diff --git a/file/src/main/java/com/baiyue/file/service/LocalQualificationStorage.java b/file/src/main/java/com/baiyue/file/service/LocalQualificationStorage.java
index 6d872dc02..8885e0be6 100644
--- a/file/src/main/java/com/baiyue/file/service/LocalQualificationStorage.java
+++ b/file/src/main/java/com/baiyue/file/service/LocalQualificationStorage.java
@@ -25,7 +25,8 @@ import java.util.UUID;
 public class LocalQualificationStorage {
     private static final Logger LOGGER = LoggerFactory.getLogger(LocalQualificationStorage.class);
     private static final long MAX_SIZE = 5L * 1024 * 1024;
-    private static final Set<String> TYPES = Set.of("image/jpeg", "image/png", "application/pdf");
+    private static final Set<String> TYPES = Set.of(
+            "image/jpeg", "image/png", "image/bmp", "image/x-ms-bmp", "application/pdf");
     @Value("${baiyue.file.storage-root}") private String configuredRoot;
     private Path root;
     private Path qualificationRoot;
@@ -53,11 +54,16 @@ public class LocalQualificationStorage {
         if (file == null || file.isEmpty()) throw new BizException("One qualification file is required / 请选择资质文件");
         if (file.getSize() > MAX_SIZE) throw new BizException("Qualification file must not exceed 5 MB / 资质文件不能超过 5MB");
         String contentType = file.getContentType() == null ? "" : file.getContentType().toLowerCase(Locale.ROOT);
-        if (!TYPES.contains(contentType)) throw new BizException("Only PDF, JPG and PNG files are supported / 仅支持 PDF、JPG、PNG 文件");
+        if (!TYPES.contains(contentType)) throw new BizException("Only PDF, JPG, PNG and BMP files are supported / 仅支持 PDF、JPG、PNG、BMP 文件");
         if (!matchesSignature(file, contentType)) {
             throw new BizException("The uploaded file content does not match its type / 文件内容与格式不匹配");
         }
-        String extension = "image/png".equals(contentType) ? ".png" : ("application/pdf".equals(contentType) ? ".pdf" : ".jpg");
+        String extension = switch (contentType) {
+            case "image/png" -> ".png";
+            case "image/bmp", "image/x-ms-bmp" -> ".bmp";
+            case "application/pdf" -> ".pdf";
+            default -> ".jpg";
+        };
         String fileName = UUID.randomUUID() + extension;
         Path directory = tenantDirectory(tenantId);
         Path target = directory.resolve(fileName).normalize();
@@ -92,6 +98,9 @@ public class LocalQualificationStorage {
                 return read >= 5 && header[0] == 0x25 && header[1] == 0x50 && header[2] == 0x44
                     && header[3] == 0x46 && header[4] == 0x2d;
             }
+            if ("image/bmp".equals(contentType) || "image/x-ms-bmp".equals(contentType)) {
+                return read >= 2 && header[0] == 0x42 && header[1] == 0x4d;
+            }
             return read >= 8 && (header[0] & 0xff) == 0x89 && header[1] == 0x50
                     && header[2] == 0x4e && header[3] == 0x47 && header[4] == 0x0d
                     && header[5] == 0x0a && header[6] == 0x1a && header[7] == 0x0a;
@@ -101,7 +110,7 @@ public class LocalQualificationStorage {
     }
 
     public Resource load(long tenantId, String fileName) {
-        if (fileName == null || !fileName.matches("[0-9a-fA-F-]{36}\\.(jpg|png|pdf)")) {
+        if (fileName == null || !fileName.matches("[0-9a-fA-F-]{36}\\.(jpg|png|bmp|pdf)")) {
             throw fileNotFound();
         }
         Path directory = tenantDirectory(tenantId);
@@ -124,7 +133,7 @@ public class LocalQualificationStorage {
         String prefix = "/api/merchant/v1/files/qualifications/";
         if (!documentUrl.startsWith(prefix)) return;
         String fileName = documentUrl.substring(prefix.length());
-        if (!fileName.matches("[0-9a-fA-F-]{36}\\.(jpg|png|pdf)")) return;
+        if (!fileName.matches("[0-9a-fA-F-]{36}\\.(jpg|png|bmp|pdf)")) return;
         Path directory = tenantDirectory(tenantId);
         Path target = directory.resolve(fileName).normalize();
         if (!target.startsWith(directory)) return;
diff --git a/file/src/main/java/com/baiyue/file/service/QualificationPackageService.java b/file/src/main/java/com/baiyue/file/service/QualificationPackageService.java
index 63d2c00aa..5519973f0 100644
--- a/file/src/main/java/com/baiyue/file/service/QualificationPackageService.java
+++ b/file/src/main/java/com/baiyue/file/service/QualificationPackageService.java
@@ -45,8 +45,10 @@ public class QualificationPackageService {
         String legalPersonIdDocumentUrl = storedLegalPersonId == null ? null : storedLegalPersonId.documentUrl();
 
         var request = new IamQualificationClient.RequiredPackageRequest(
-                tenantId, normalizedCreditCode, storedBusinessLicense.documentUrl(), businessLicenseValidTo,
-                replaceBusinessLicense, legalPersonIdDocumentUrl, legalPersonIdValidTo, replaceLegalPersonId);
+                tenantId, normalizedCreditCode, storedBusinessLicense.documentUrl(), businessLicense.getOriginalFilename(),
+                businessLicenseValidTo, replaceBusinessLicense, legalPersonIdDocumentUrl,
+                legalPersonId == null ? null : legalPersonId.getOriginalFilename(),
+                legalPersonIdValidTo, replaceLegalPersonId);
         try {
             var response = platform
                     ? iamClient.submitPlatformRequiredPackage(internalToken, request)
diff --git a/file/src/main/resources/openapi/qualification-required-package-v1.yaml b/file/src/main/resources/openapi/qualification-required-package-v1.yaml
index 1316db9eb..99e4d0112 100644
--- a/file/src/main/resources/openapi/qualification-required-package-v1.yaml
+++ b/file/src/main/resources/openapi/qualification-required-package-v1.yaml
@@ -29,7 +29,7 @@ paths:
                   type: string
                   format: binary
                   maxLength: 5242880
-                  description: PDF/JPG/PNG，最大5MB，声明媒体类型必须与文件签名一致
+                  description: PDF/JPG/PNG/BMP，最大5MB，声明媒体类型必须与文件签名一致
       responses:
         '200':
           description: 成功或业务失败，失败时按 code 判断并保留 requestId/traceId
@@ -139,12 +139,12 @@ components:
               businessLicense:
                 type: string
                 format: binary
-                description: 营业执照，必填；PDF/JPG/PNG，最大5MB
+                description: 营业执照，必填；PDF/JPG/PNG/BMP，最大5MB
               legalPersonId:
                 type: string
                 format: binary
                 nullable: true
-                description: 法人身份证，选填；PDF/JPG/PNG，最大5MB
+                description: 法人身份证，选填；PDF/JPG/PNG/BMP，最大5MB
   responses:
     Error:
       description: 认证或授权失败，响应包含请求关联元数据
diff --git a/file/src/test/java/com/baiyue/file/config/QualificationAndOrderFileOpenApiContractTest.java b/file/src/test/java/com/baiyue/file/config/QualificationAndOrderFileOpenApiContractTest.java
index 948b3eef3..0717cd6ce 100644
--- a/file/src/test/java/com/baiyue/file/config/QualificationAndOrderFileOpenApiContractTest.java
+++ b/file/src/test/java/com/baiyue/file/config/QualificationAndOrderFileOpenApiContractTest.java
@@ -16,7 +16,7 @@ class QualificationAndOrderFileOpenApiContractTest {
         assertThat(yaml)
             .contains("/api/merchant/v1/files/qualifications:")
             .contains("enum: [LEGAL_PERSON_ID, FREIGHT_FORWARDER_CERTIFICATE, BANK_ACCOUNT_LICENSE]")
-            .contains("merchant:qualification:upload", "maxLength: 5242880")
+            .contains("merchant:qualification:upload", "maxLength: 5242880", "PDF/JPG/PNG/BMP")
             .contains("name: replace", "requestId:", "traceId:")
             .doesNotContain("enum: [BUSINESS_LICENSE, LEGAL_PERSON_ID, FREIGHT_FORWARDER_CERTIFICATE, BANK_ACCOUNT_LICENSE]");
     }
diff --git a/file/src/test/java/com/baiyue/file/mapper/ExportMapperContractTest.java b/file/src/test/java/com/baiyue/file/mapper/ExportMapperContractTest.java
index 3583f87d3..63c167e07 100644
--- a/file/src/test/java/com/baiyue/file/mapper/ExportMapperContractTest.java
+++ b/file/src/test/java/com/baiyue/file/mapper/ExportMapperContractTest.java
@@ -22,6 +22,9 @@ class ExportMapperContractTest {
         String sql=update(FileExportOutboxMapper.class,"redispatchSent");
         assertTrue(sql.contains("o.status='SENT'"));
         assertTrue(sql.contains("t.dispatch_version=o.dispatch_version"));
+        assertTrue(sql.contains("WHERE id IN (SELECT id FROM (SELECT o.id"));
+        assertTrue(sql.contains("ORDER BY o.sent_at,o.id LIMIT 20"));
+        assertFalse(sql.contains("SET o.status"));
         assertFalse(sql.contains("dispatch_version=dispatch_version+1"));
         assertFalse(sql.contains("QUARANTINED"));
     }
diff --git a/file/src/test/java/com/baiyue/file/service/LocalQualificationStorageTest.java b/file/src/test/java/com/baiyue/file/service/LocalQualificationStorageTest.java
index 9fd947bf1..e08d03c5c 100644
--- a/file/src/test/java/com/baiyue/file/service/LocalQualificationStorageTest.java
+++ b/file/src/test/java/com/baiyue/file/service/LocalQualificationStorageTest.java
@@ -43,7 +43,7 @@ class LocalQualificationStorageTest {
         Path qualificationRoot = storageRoot.resolve("qualifications");
         assertTrue(Files.isDirectory(qualificationRoot));
         try (var files = Files.list(qualificationRoot)) {
-            assertEquals(0, files.count());
+            assertFalse(files.anyMatch(path -> path.getFileName().toString().startsWith(".file-service-probe-")));
         }
     }
 
@@ -78,6 +78,47 @@ class LocalQualificationStorageTest {
             storage.load(10001L, stored.fileName()).getFile().toPath().toAbsolutePath());
     }
 
+    @Test
+    void storesBmpQualificationWithEitherStandardMimeTypeAndKeepsTenantOwnership() throws Exception {
+        storage.initialize();
+        byte[] bmp = {0x42, 0x4d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+        for (String contentType : new String[] {"image/bmp", "image/x-ms-bmp"}) {
+            var upload = new MockMultipartFile("file", "license.bmp", contentType, bmp);
+            var stored = storage.store(10001L, upload);
+
+            assertTrue(stored.fileName().endsWith(".bmp"));
+            assertEquals(stored.path().toAbsolutePath(),
+                    storage.load(10001L, stored.fileName()).getFile().toPath().toAbsolutePath());
+            BizException crossTenant = assertThrows(BizException.class,
+                    () -> storage.load(10002L, stored.fileName()));
+            assertEquals(ResultCode.NOT_FOUND, crossTenant.getResultCode());
+        }
+    }
+
+    @Test
+    void rejectsBmpMimeTypeWhenTheFileSignatureIsNotBmp() {
+        storage.initialize();
+        var upload = new MockMultipartFile("file", "license.bmp", "image/bmp", "not-bmp".getBytes());
+
+        BizException exception = assertThrows(BizException.class,
+                () -> storage.store(10001L, upload));
+
+        assertTrue(exception.getMessage().contains("文件内容与格式不匹配"));
+    }
+
+    @Test
+    void deletesBmpQualificationByItsValidatedDocumentUrl() {
+        storage.initialize();
+        byte[] bmp = {0x42, 0x4d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00};
+        var stored = storage.store(10001L,
+                new MockMultipartFile("file", "license.bmp", "image/bmp", bmp));
+
+        storage.deleteByDocumentUrl(10001L, stored.documentUrl());
+
+        assertFalse(Files.exists(stored.path()));
+    }
+
     @Test
     void rejectsQualificationFilesLargerThanTheClientFiveMegabyteLimit() {
         storage.initialize();
diff --git a/file/src/test/java/com/baiyue/file/service/QualificationPackageServiceTest.java b/file/src/test/java/com/baiyue/file/service/QualificationPackageServiceTest.java
index 2157f6b76..43d1b1944 100644
--- a/file/src/test/java/com/baiyue/file/service/QualificationPackageServiceTest.java
+++ b/file/src/test/java/com/baiyue/file/service/QualificationPackageServiceTest.java
@@ -57,6 +57,8 @@ class QualificationPackageServiceTest {
         var captor = ArgumentCaptor.forClass(IamQualificationClient.RequiredPackageRequest.class);
         ordered.verify(fixture.iamClient).submitRequiredPackage(eq("internal-token"), captor.capture());
         assertEquals("91310101ABCDE12345", captor.getValue().unifiedSocialCreditCode());
+        assertEquals("license.pdf", captor.getValue().businessLicenseOriginalFileName());
+        assertEquals("legal-person.png", captor.getValue().legalPersonIdOriginalFileName());
         assertEquals(BUSINESS_URL, result.businessLicenseDocumentUrl());
         assertEquals(LEGAL_PERSON_URL, result.legalPersonIdDocumentUrl());
     }
@@ -74,6 +76,7 @@ class QualificationPackageServiceTest {
         var captor = ArgumentCaptor.forClass(IamQualificationClient.RequiredPackageRequest.class);
         verify(fixture.iamClient).submitRequiredPackage(eq("internal-token"), captor.capture());
         assertNull(captor.getValue().legalPersonIdDocumentUrl());
+        assertNull(captor.getValue().legalPersonIdOriginalFileName());
         assertNull(captor.getValue().legalPersonIdValidTo());
         assertNull(result.legalPersonIdQualificationId());
         assertNull(result.legalPersonIdDocumentUrl());
diff --git a/finance/AGENTS.md b/finance/AGENTS.md
index a408b9497..87820bedc 100644
--- a/finance/AGENTS.md
+++ b/finance/AGENTS.md
@@ -42,6 +42,7 @@
 - 出账后的业务来源和账单不得原地覆盖或物理删除；调整、作废、收款分配和修订必须保留可追溯记录。金额使用定点小数，当前业务币种固定为 CNY，长整型 ID 跨前端按字符串传输。
 - 对账单出账后将客户确认状态置为 `PENDING_CONFIRMATION`；已出账账单调整后必须清除原确认快照并重新待确认，作废或重开时为 `NOT_REQUIRED`。客户只能确认本企业且状态为 `ISSUED`、`PARTIALLY_PAID` 或 `PAID` 的待确认账单，必须校验登录成员、乐观锁版本和幂等键，并记录确认人姓名快照与确认时间。
 - 对账单、应收结算单和应付结算单编号统一按北京时间生成 `REC/AR/AP-yyMMdd-####`，各前缀每日独立递增且单日最多 9999；不得回退为数据库 ID 拼接、随机数或跨时区日期。
+- 客户授信必须带晚于当天的到期日且不限制最远日期；到期日当天仍有效。有效期内消费先用实际资金，不足部分累计为已用授信；次日失效时已用授信自动并入实际余额并允许为负，充值先归还已用授信或负余额。Order 在客户提交新订单时必须拒绝负数实际余额，已存在的资金冻结仍按原业务单结算或释放。
 - 应收款统计只按正式应收结算单的生成月份汇总 CNY 应收、已收和未收，支持可选客户筛选和分页；导出必须通过 Finance Provider + File `FINANCE_RECEIVABLE_STATISTICS` 异步任务，不在 Controller 或 Admin 直接生成文件。
 - 费用入池只接受满足上游发布与结算条件的不可变来源版本；来源 ID、版本、客户归属、方向或金额变化时同时核对事件消费、主动快照查询、唯一约束和账单明细消费者。
 - 海外业务费用事件只接受非 `FIRSTLEG` 来源、`APPROVED` 审核快照和 `PUBLISHED` 活跃版本或明确 `VOIDED` 动作；按 `eventId + payloadHash` 防重放冲突，并以 `sourceSystem + sourceType + sourceFeeId + sourceVersion` 单调落库。事件携带完整客户、业务、方向、供应商、付款与来源哈希事实，Finance 不跨区同步回查 Lastleg。
diff --git a/finance/src/main/java/com/baiyue/finance/dto/FinancePhase1Dtos.java b/finance/src/main/java/com/baiyue/finance/dto/FinancePhase1Dtos.java
index 476a75f6a..51aaf07f3 100644
--- a/finance/src/main/java/com/baiyue/finance/dto/FinancePhase1Dtos.java
+++ b/finance/src/main/java/com/baiyue/finance/dto/FinancePhase1Dtos.java
@@ -33,6 +33,7 @@ public final class FinancePhase1Dtos {
                                  BigDecimal actualBalance, BigDecimal frozenBalance,
                                  BigDecimal availableBalance, BigDecimal creditLimit,
                                  BigDecimal creditUsed, BigDecimal availableCredit,
+                                 LocalDate creditExpiresOn, boolean creditActive,
                                  int accountVersion,
                                  long pendingRechargeCount,
                                  String status, LocalDateTime lastChangedAt) {}
diff --git a/finance/src/main/java/com/baiyue/finance/dto/FinanceWalletDtos.java b/finance/src/main/java/com/baiyue/finance/dto/FinanceWalletDtos.java
index 5a8d4fd92..9f48b1313 100644
--- a/finance/src/main/java/com/baiyue/finance/dto/FinanceWalletDtos.java
+++ b/finance/src/main/java/com/baiyue/finance/dto/FinanceWalletDtos.java
@@ -12,6 +12,7 @@ public final class FinanceWalletDtos {
                                 BigDecimal frozenBalance, BigDecimal availableBalance,
                                 BigDecimal creditLimit, BigDecimal creditUsed,
                                 BigDecimal creditFrozen, BigDecimal availableCredit,
+                                LocalDate creditExpiresOn, boolean creditActive,
                                 int version, LocalDateTime updatedAt) { }
 
     public record WalletPage<T>(List<T> records, long total, int page, int size, int pages) {
@@ -26,6 +27,7 @@ public final class FinanceWalletDtos {
                                     BigDecimal frozenBalanceAfter, BigDecimal availableBalanceAfter,
                                     BigDecimal creditLimitAfter, BigDecimal creditUsedAfter,
                                     BigDecimal availableCreditAfter,
+                                    LocalDate creditExpiresOnAfter,
                                     String sourceType, String sourceNo, LocalDate occurredDate,
                                     String paymentMethod, String referenceNo, String operatorName,
                                     String remark, LocalDateTime createdAt) { }
@@ -45,7 +47,7 @@ public final class FinanceWalletDtos {
                                            String paymentMethod, String referenceNo, String remark,
                                            int expectedAccountVersion) { }
 
-    public record CreditLimitRequest(BigDecimal creditLimit, String remark,
+    public record CreditLimitRequest(BigDecimal creditLimit, LocalDate creditExpiresOn, String remark,
                                      int expectedAccountVersion) { }
 
     public record WalletFreezeRequest(BigDecimal amount, String businessType,
diff --git a/finance/src/main/java/com/baiyue/finance/service/FinanceCustomerAccountService.java b/finance/src/main/java/com/baiyue/finance/service/FinanceCustomerAccountService.java
index 6d9ecdc3f..c27ab8532 100644
--- a/finance/src/main/java/com/baiyue/finance/service/FinanceCustomerAccountService.java
+++ b/finance/src/main/java/com/baiyue/finance/service/FinanceCustomerAccountService.java
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,18 +22,12 @@ public class FinanceCustomerAccountService {
     private final JdbcTemplate jdbc;
     private final IamCustomerClient iamCustomerClient;
     private final String internalToken;
-    private final BigDecimal defaultCreditLimit;
 
     public FinanceCustomerAccountService(JdbcTemplate jdbc, IamCustomerClient iamCustomerClient,
-                                         @Value("${baiyue.security.internal-service-token:}") String internalToken,
-                                         @Value("${baiyue.finance.wallet.default-credit-limit:0.00}") BigDecimal defaultCreditLimit) {
+                                         @Value("${baiyue.security.internal-service-token:}") String internalToken) {
         this.jdbc = jdbc;
         this.iamCustomerClient = iamCustomerClient;
         this.internalToken = internalToken;
-        if (defaultCreditLimit == null || defaultCreditLimit.signum() < 0 || defaultCreditLimit.scale() > 2) {
-            throw new IllegalArgumentException("默认授信额度不能为负数且最多保留两位小数");
-        }
-        this.defaultCreditLimit = defaultCreditLimit.setScale(2);
     }
 
     public PageEnvelope<AccountSummary> list(int page, int pageSize, String keyword, String status, Long customerId) {
@@ -60,6 +55,7 @@ public class FinanceCustomerAccountService {
                     value.outstandingPayable(),
                     value.actualBalance(), value.frozenBalance(), value.availableBalance(),
                     value.creditLimit(), value.creditUsed(), value.availableCredit(),
+                    value.creditExpiresOn(), value.creditActive(),
                     value.accountVersion(), value.pendingRechargeCount(),
                     customer.status(), value.lastChangedAt());
         }).toList();
@@ -70,7 +66,7 @@ public class FinanceCustomerAccountService {
         if (customerIds.isEmpty()) return Map.of();
         String placeholders = String.join(",", customerIds.stream().map(id -> "?").toList());
         Map<Long, MutableMetrics> result = new HashMap<>();
-        customerIds.forEach(id -> result.put(id, new MutableMetrics(defaultCreditLimit)));
+        customerIds.forEach(id -> result.put(id, new MutableMetrics()));
         jdbc.queryForList("SELECT tenant_id customer_id,SUM(outstanding_amount) amount FROM fin_settlement WHERE tenant_id IN (" + placeholders + ") AND direction='RECEIVABLE' AND status<>'VOIDED' GROUP BY tenant_id", customerIds.toArray())
                 .forEach(row -> metric(result, row, "outstandingReceivable", "amount"));
         jdbc.queryForList("SELECT customer_id,SUM(amount) amount FROM fin_fee_source f WHERE customer_id IN (" + placeholders + ") AND direction='RECEIVABLE' AND review_status='APPROVED' AND currency_code='CNY' AND amount>0 AND status='AVAILABLE' AND NOT EXISTS (SELECT 1 FROM fin_bill_line bl JOIN fin_bill b ON b.id=bl.bill_id AND b.tenant_id=bl.tenant_id WHERE bl.tenant_id=f.customer_id AND bl.source_id=f.id AND bl.source_version=f.source_fee_version AND b.status<>'VOIDED') GROUP BY customer_id", customerIds.toArray())
@@ -83,7 +79,7 @@ public class FinanceCustomerAccountService {
                 .forEach(row -> metric(result, row, "paidCost", "amount"));
         jdbc.queryForList("SELECT customer_id,SUM(amount) amount FROM (SELECT tenant_id customer_id,outstanding_amount amount FROM fin_settlement WHERE tenant_id IN (" + placeholders + ") AND direction='PAYABLE' AND status<>'VOIDED' UNION ALL SELECT f.customer_id,f.amount FROM fin_fee_source f WHERE f.customer_id IN (" + placeholders + ") AND f.direction='PAYABLE' AND f.settlement_mode='ON_ACCOUNT' AND f.review_status='APPROVED' AND f.currency_code='CNY' AND f.amount>0 AND f.status NOT IN ('VOIDED','SUPERSEDED') AND NOT EXISTS (SELECT 1 FROM fin_settlement_line sl JOIN fin_settlement s ON s.id=sl.settlement_id AND s.tenant_id=sl.tenant_id WHERE sl.tenant_id=f.customer_id AND sl.fee_source_id=f.id AND s.direction='PAYABLE' AND s.status<>'VOIDED')) payable_obligations GROUP BY customer_id", concat(customerIds, 2))
                 .forEach(row -> metric(result, row, "outstandingPayable", "amount"));
-        jdbc.queryForList("SELECT customer_id,actual_balance,frozen_balance,available_balance,credit_limit,credit_used,credit_frozen,version FROM fin_wallet_account WHERE customer_id IN (" + placeholders + ")", customerIds.toArray())
+        jdbc.queryForList("SELECT customer_id,actual_balance,frozen_balance,available_balance,credit_limit,credit_used,credit_frozen,credit_expires_on,version FROM fin_wallet_account WHERE customer_id IN (" + placeholders + ")", customerIds.toArray())
                 .forEach(row -> walletMetric(result, row));
         jdbc.queryForList("SELECT customer_id,COUNT(*) pending_count FROM fin_recharge_request WHERE customer_id IN (" + placeholders + ") AND status='PENDING' GROUP BY customer_id", customerIds.toArray())
                 .forEach(row -> pendingMetric(result, row));
@@ -100,10 +96,22 @@ public class FinanceCustomerAccountService {
         MutableMetrics target = result.get(number.longValue());
         target.actualBalance = decimal(row.get("actual_balance"));
         target.frozenBalance = decimal(row.get("frozen_balance"));
-        target.availableBalance = decimal(row.get("available_balance"));
         target.creditLimit = decimal(row.get("credit_limit"));
+        BigDecimal creditFrozen = decimal(row.get("credit_frozen"));
+        target.creditExpiresOn = row.get("credit_expires_on") instanceof java.sql.Date value ? value.toLocalDate()
+            : row.get("credit_expires_on") instanceof LocalDate value ? value : null;
+        target.creditActive = target.creditLimit.signum() > 0 && target.creditExpiresOn != null
+            && !target.creditExpiresOn.isBefore(LocalDate.now());
         target.creditUsed = decimal(row.get("credit_used"));
-        target.availableCredit = target.creditLimit.subtract(target.creditUsed).subtract(decimal(row.get("credit_frozen")));
+        if (!target.creditActive && target.creditUsed.signum() > 0) {
+            target.actualBalance = target.actualBalance.subtract(target.creditUsed);
+            target.creditUsed = BigDecimal.ZERO;
+        }
+        target.availableCredit = target.creditActive
+            ? target.creditLimit.subtract(target.creditUsed).subtract(creditFrozen) : BigDecimal.ZERO;
+        target.availableBalance = target.creditActive
+            ? target.actualBalance.subtract(target.frozenBalance.subtract(creditFrozen)).add(target.availableCredit)
+            : target.actualBalance.subtract(target.frozenBalance);
         target.accountVersion = row.get("version") instanceof Number value ? value.intValue() : 0;
     }
 
@@ -158,13 +166,15 @@ public class FinanceCustomerAccountService {
         private BigDecimal creditLimit;
         private BigDecimal creditUsed = BigDecimal.ZERO;
         private BigDecimal availableCredit;
+        private LocalDate creditExpiresOn;
+        private boolean creditActive;
         private int accountVersion;
         private long pendingRechargeCount;
         private LocalDateTime lastChangedAt;
-        private MutableMetrics(BigDecimal defaultCreditLimit) {
-            this.creditLimit = defaultCreditLimit;
-            this.availableCredit = defaultCreditLimit;
-            this.availableBalance = defaultCreditLimit;
+        private MutableMetrics() {
+            this.creditLimit = BigDecimal.ZERO.setScale(2);
+            this.availableCredit = BigDecimal.ZERO.setScale(2);
+            this.availableBalance = BigDecimal.ZERO.setScale(2);
         }
         void set(String field, BigDecimal value) {
             switch (field) {
@@ -179,6 +189,7 @@ public class FinanceCustomerAccountService {
         }
         Metrics freeze() { return new Metrics(outstandingReceivable, pendingBilling, receivedInPeriod, totalCost, paidCost, outstandingPayable,
                 actualBalance, frozenBalance, availableBalance, creditLimit, creditUsed, availableCredit,
+                creditExpiresOn, creditActive,
                 accountVersion, pendingRechargeCount, lastChangedAt); }
     }
 
@@ -186,7 +197,8 @@ public class FinanceCustomerAccountService {
                            BigDecimal receivedInPeriod, BigDecimal totalCost, BigDecimal paidCost,
                            BigDecimal outstandingPayable, BigDecimal actualBalance, BigDecimal frozenBalance,
                            BigDecimal availableBalance, BigDecimal creditLimit, BigDecimal creditUsed,
-                           BigDecimal availableCredit, int accountVersion, long pendingRechargeCount,
+                           BigDecimal availableCredit, LocalDate creditExpiresOn, boolean creditActive,
+                           int accountVersion, long pendingRechargeCount,
                            LocalDateTime lastChangedAt) {
     }
 }
diff --git a/finance/src/main/java/com/baiyue/finance/service/FinancePhase1OperationService.java b/finance/src/main/java/com/baiyue/finance/service/FinancePhase1OperationService.java
index 41f128c0f..1a64ca3a3 100644
--- a/finance/src/main/java/com/baiyue/finance/service/FinancePhase1OperationService.java
+++ b/finance/src/main/java/com/baiyue/finance/service/FinancePhase1OperationService.java
@@ -78,22 +78,46 @@ public class FinancePhase1OperationService {
             "COALESCE((SELECT available_balance FROM fin_wallet_account w WHERE w.customer_id=c.customer_id),0) available_balance," +
             "COALESCE((SELECT credit_limit FROM fin_wallet_account w WHERE w.customer_id=c.customer_id),0) credit_limit," +
             "COALESCE((SELECT credit_used FROM fin_wallet_account w WHERE w.customer_id=c.customer_id),0) credit_used," +
+            "COALESCE((SELECT credit_frozen FROM fin_wallet_account w WHERE w.customer_id=c.customer_id),0) credit_frozen," +
             "COALESCE((SELECT credit_limit-credit_used-credit_frozen FROM fin_wallet_account w WHERE w.customer_id=c.customer_id),0) available_credit," +
+            "(SELECT credit_expires_on FROM fin_wallet_account w WHERE w.customer_id=c.customer_id) credit_expires_on," +
             "COALESCE((SELECT version FROM fin_wallet_account w WHERE w.customer_id=c.customer_id),0) account_version," +
             "(SELECT COUNT(*) FROM fin_recharge_request rr WHERE rr.customer_id=c.customer_id AND rr.status='PENDING') pending_recharge_count," +
             "GREATEST(COALESCE((SELECT MAX(updated_at) FROM fin_bill b WHERE b.tenant_id=c.customer_id),'1970-01-01'),COALESCE((SELECT MAX(updated_at) FROM fin_receipt r WHERE r.tenant_id=c.customer_id),'1970-01-01'),COALESCE((SELECT MAX(updated_at) FROM fin_cost x WHERE x.tenant_id=c.customer_id),'1970-01-01'),COALESCE((SELECT MAX(updated_at) FROM fin_fee_source f WHERE f.customer_id=c.customer_id),'1970-01-01'),COALESCE((SELECT MAX(updated_at) FROM fin_settlement x WHERE x.tenant_id=c.customer_id),'1970-01-01')) last_changed_at" + base + " ORDER BY last_changed_at DESC,c.customer_id DESC LIMIT ? OFFSET ?";
         Object[] args = java.util.Arrays.copyOf(filterArgs, filterArgs.length + 2);
         args[args.length - 2] = pageSize; args[args.length - 1] = (page - 1) * pageSize;
-        List<AccountSummary> rows = jdbc.query(select, (rs, row) -> new AccountSummary(rs.getLong("customer_id"), String.valueOf(rs.getLong("customer_id")), rs.getString("customer_name"), null, null,
-            money(rs, "outstanding_receivable"), money(rs, "pending_billing"), money(rs, "received_period"),
-            money(rs, "total_cost"), money(rs, "paid_cost"), money(rs, "outstanding_payable"),
-            money(rs, "actual_balance"), money(rs, "frozen_balance"), money(rs, "available_balance"),
-            money(rs, "credit_limit"), money(rs, "credit_used"), money(rs, "available_credit"),
-            rs.getInt("account_version"), rs.getLong("pending_recharge_count"),
-            rs.getString("account_status"), time(rs, "last_changed_at")), args);
+        List<AccountSummary> rows = jdbc.query(select, (rs, row) -> accountSummaryRow(rs), args);
         return PageEnvelope.success(rows, page, pageSize, total == null ? 0 : total);
     }
 
+    private static AccountSummary accountSummaryRow(ResultSet rs) throws SQLException {
+        BigDecimal actualBalance = money(rs, "actual_balance");
+        BigDecimal frozenBalance = money(rs, "frozen_balance");
+        BigDecimal creditLimit = money(rs, "credit_limit");
+        BigDecimal creditFrozen = money(rs, "credit_frozen");
+        LocalDate creditExpiresOn = rs.getDate("credit_expires_on") == null
+            ? null : rs.getDate("credit_expires_on").toLocalDate();
+        boolean creditActive = creditLimit.signum() > 0 && creditExpiresOn != null
+            && !creditExpiresOn.isBefore(LocalDate.now());
+        BigDecimal creditUsed = money(rs, "credit_used");
+        if (!creditActive && creditUsed.signum() > 0) {
+            actualBalance = actualBalance.subtract(creditUsed);
+            creditUsed = BigDecimal.ZERO;
+        }
+        BigDecimal availableCredit = creditActive
+            ? creditLimit.subtract(creditUsed).subtract(creditFrozen) : BigDecimal.ZERO;
+        BigDecimal availableBalance = creditActive
+            ? actualBalance.subtract(frozenBalance.subtract(creditFrozen)).add(availableCredit)
+            : actualBalance.subtract(frozenBalance);
+        return new AccountSummary(rs.getLong("customer_id"), String.valueOf(rs.getLong("customer_id")),
+            rs.getString("customer_name"), null, null, money(rs, "outstanding_receivable"),
+            money(rs, "pending_billing"), money(rs, "received_period"), money(rs, "total_cost"),
+            money(rs, "paid_cost"), money(rs, "outstanding_payable"), actualBalance, frozenBalance,
+            availableBalance, creditLimit, creditUsed, availableCredit, creditExpiresOn, creditActive,
+            rs.getInt("account_version"), rs.getLong("pending_recharge_count"), rs.getString("account_status"),
+            time(rs, "last_changed_at"));
+    }
+
     public PageEnvelope<LedgerEntry> listDerivedCustomerAccountLedger(long customerId, int page, int pageSize,
                                                                        String businessType, LocalDate startDate, LocalDate endDate) {
         customer(customerId); page = page(page); pageSize = pageSize(pageSize);
diff --git a/finance/src/main/java/com/baiyue/finance/service/FinanceWalletService.java b/finance/src/main/java/com/baiyue/finance/service/FinanceWalletService.java
index 29faab5a1..0d1f81a09 100644
--- a/finance/src/main/java/com/baiyue/finance/service/FinanceWalletService.java
+++ b/finance/src/main/java/com/baiyue/finance/service/FinanceWalletService.java
@@ -53,7 +53,6 @@ public class FinanceWalletService {
     private final String internalToken;
     private final String wechatQrCodeUrl;
     private final String alipayQrCodeUrl;
-    private final BigDecimal defaultCreditLimit;
 
     public FinanceWalletService(JdbcTemplate jdbc, ObjectMapper objectMapper,
                                 FinanceFileClient fileClient,
@@ -61,7 +60,6 @@ public class FinanceWalletService {
                                 @Value("${baiyue.security.internal-service-token:}") String internalToken,
                                 @Value("${baiyue.finance.recharge.wechat-qr-code-url:}") String wechatQrCodeUrl,
                                 @Value("${baiyue.finance.recharge.alipay-qr-code-url:}") String alipayQrCodeUrl,
-                                @Value("${baiyue.finance.wallet.default-credit-limit:0.00}") BigDecimal defaultCreditLimit,
                                 @Value("${spring.profiles.active:}") String activeProfiles,
                                 @Value("${DEPLOY_ENV:}") String deployEnvironment) {
         this.jdbc = jdbc;
@@ -69,7 +67,6 @@ public class FinanceWalletService {
         this.fileClient = fileClient;
         this.numberGenerator = numberGenerator;
         this.internalToken = internalToken;
-        this.defaultCreditLimit = nonNegativeMoney(defaultCreditLimit, "默认授信额度");
         boolean development = "development".equalsIgnoreCase(deployEnvironment.trim())
             || List.of(activeProfiles.split(",")).stream().map(String::trim).anyMatch("dev"::equalsIgnoreCase);
         this.wechatQrCodeUrl = rechargeQrCode(wechatQrCodeUrl, development);
@@ -84,7 +81,7 @@ public class FinanceWalletService {
     public WalletAccount account(long customerId) {
         requirePositive(customerId, "客户");
         List<WalletAccount> rows = jdbc.query(
-            "SELECT currency_code,actual_balance,frozen_balance,available_balance,credit_limit,credit_used,credit_frozen,version,updated_at FROM fin_wallet_account WHERE customer_id=?",
+            "SELECT currency_code,actual_balance,frozen_balance,available_balance,credit_limit,credit_used,credit_frozen,credit_expires_on,version,updated_at FROM fin_wallet_account WHERE customer_id=?",
             (rs, n) -> accountRow(rs), customerId);
         return rows.isEmpty() ? zeroAccount() : rows.get(0);
     }
@@ -202,7 +199,7 @@ public class FinanceWalletService {
         if (replay != null) return requiredLedger(replay, customerId);
         WalletAccount before = accountForUpdate(customerId);
         if (before.version() != request.expectedAccountVersion()) throw error("FIN-WALLET-409", "账户余额版本已变化，请刷新后重试");
-        if ("DEDUCTION".equals(type) && before.availableBalance().compareTo(amount) < 0) {
+        if ("DEDUCTION".equals(type) && before.creditActive() && before.availableBalance().compareTo(amount) < 0) {
             throw error("FIN-WALLET-INSUFFICIENT", "扣款金额不能超过当前可用余额");
         }
         BigDecimal signed = "RECHARGE".equals(type) ? amount : amount.negate();
@@ -225,19 +222,26 @@ public class FinanceWalletService {
         requirePositive(customerId, "客户"); requirePositive(operatorId, "操作人");
         if (request == null || request.expectedAccountVersion() < 0) throw bad("授信额度请求无效");
         BigDecimal limit = nonNegativeMoney(request.creditLimit(), "授信额度");
+        LocalDate expiresOn = request.creditExpiresOn();
+        if (expiresOn == null || !expiresOn.isAfter(LocalDate.now())) {
+            throw bad("授信到期日必须晚于今天");
+        }
         Long replay = reserve(customerId, operatorId, "WALLET_CREDIT_LIMIT", idempotencyKey, hash(request));
         if (replay != null) return requiredLedger(replay, customerId);
         WalletAccount before = accountForUpdate(customerId);
         if (before.version() != request.expectedAccountVersion()) {
             throw error("FIN-WALLET-409", "账户余额版本已变化，请刷新后重试");
         }
-        if (limit.compareTo(before.creditUsed().add(before.creditFrozen())) < 0) {
+        BigDecimal existingDebt = before.actualBalance().signum() < 0
+            ? before.actualBalance().negate() : before.creditUsed();
+        if (limit.compareTo(existingDebt.add(before.creditFrozen())) < 0) {
             throw error("FIN-WALLET-CREDIT-IN-USE", "授信额度不能低于已用与已冻结授信合计");
         }
         BigDecimal delta = limit.subtract(before.creditLimit());
-        if (delta.signum() == 0) throw bad("授信额度未发生变化");
-        WalletAccount after = accountState(before.actualBalance(), before.frozenBalance(), limit,
-            before.creditUsed(), before.creditFrozen(), before.version());
+        if (delta.signum() == 0 && expiresOn.equals(before.creditExpiresOn())) throw bad("授信额度和有效期均未发生变化");
+        BigDecimal carriedDebt = existingDebt;
+        WalletAccount after = accountState(before.actualBalance().max(BigDecimal.ZERO), before.frozenBalance(), limit,
+            carriedDebt, before.creditFrozen(), expiresOn, before.version());
         updateAccount(customerId, after, before.version(), operatorId);
         WalletLedgerEntry entry = insertLedger(customerId, "CREDIT_LIMIT", delta, after,
             "CREDIT_LIMIT_ADJUSTMENT", null, LocalDate.now(), null, null,
@@ -273,11 +277,12 @@ public class FinanceWalletService {
             throw error("FIN-WALLET-INSUFFICIENT", "可用余额和授信额度不足");
         }
         BigDecimal actualAvailable = before.actualBalance()
-            .subtract(before.frozenBalance().subtract(before.creditFrozen()));
+            .subtract(before.frozenBalance().subtract(before.creditFrozen())).max(BigDecimal.ZERO);
         BigDecimal actualFrozen = amount.min(actualAvailable);
         BigDecimal creditFrozen = amount.subtract(actualFrozen);
         WalletAccount after = accountState(before.actualBalance(), before.frozenBalance().add(amount),
-            before.creditLimit(), before.creditUsed(), before.creditFrozen().add(creditFrozen), before.version());
+            before.creditLimit(), before.creditUsed(), before.creditFrozen().add(creditFrozen),
+            before.creditExpiresOn(), before.version());
         updateAccount(customerId, after, before.version(), 0);
         long holdId = insertHold(customerId, businessType, businessNo, amount, actualFrozen, creditFrozen,
             clean(request.remark(), 500));
@@ -315,12 +320,18 @@ public class FinanceWalletService {
         WalletHold hold = findHold(customerId, businessType, businessNo, true);
         if (hold == null) throw error("FIN-WALLET-HOLD-404", "资金冻结记录不存在");
         if (!"FROZEN".equals(hold.status())) throw error("FIN-WALLET-HOLD-409", "资金冻结记录已处理");
-        BigDecimal actual = settle ? before.actualBalance().subtract(hold.actualFrozenAmount()) : before.actualBalance();
-        BigDecimal creditUsed = settle ? before.creditUsed().add(hold.creditFrozenAmount()) : before.creditUsed();
+        BigDecimal actual = before.actualBalance();
+        BigDecimal creditUsed = before.creditUsed();
+        if (settle && before.creditActive()) {
+            actual = actual.subtract(hold.actualFrozenAmount());
+            creditUsed = creditUsed.add(hold.creditFrozenAmount());
+        } else if (settle) {
+            actual = actual.subtract(hold.amount());
+        }
         BigDecimal frozen = before.frozenBalance().subtract(hold.amount());
         BigDecimal creditFrozen = before.creditFrozen().subtract(hold.creditFrozenAmount());
         WalletAccount after = accountState(actual, frozen, before.creditLimit(), creditUsed,
-            creditFrozen, before.version());
+            creditFrozen, before.creditExpiresOn(), before.version());
         updateAccount(customerId, after, before.version(), 0);
         String action = settle ? "SETTLED" : "RELEASED";
         WalletLedgerEntry ledger = insertLedger(customerId, settle ? "CONSUMPTION" : "UNFREEZE",
@@ -346,17 +357,17 @@ public class FinanceWalletService {
     }
 
     private WalletAccount accountForUpdate(long customerId) {
-        jdbc.update("INSERT IGNORE INTO fin_wallet_account(customer_id,currency_code,actual_balance,frozen_balance,available_balance,credit_limit,credit_used,credit_frozen,version,created_by,updated_by) VALUES(?,'CNY',0,0,?,?,0,0,0,0,0)",
-            customerId, defaultCreditLimit, defaultCreditLimit);
+        jdbc.update("INSERT IGNORE INTO fin_wallet_account(customer_id,currency_code,actual_balance,frozen_balance,available_balance,credit_limit,credit_used,credit_frozen,credit_expires_on,version,created_by,updated_by) VALUES(?,'CNY',0,0,0,0,0,0,NULL,0,0,0)",
+            customerId);
         return jdbc.queryForObject(
-            "SELECT currency_code,actual_balance,frozen_balance,available_balance,credit_limit,credit_used,credit_frozen,version,updated_at FROM fin_wallet_account WHERE customer_id=? FOR UPDATE",
+            "SELECT currency_code,actual_balance,frozen_balance,available_balance,credit_limit,credit_used,credit_frozen,credit_expires_on,version,updated_at FROM fin_wallet_account WHERE customer_id=? FOR UPDATE",
             (rs, n) -> accountRow(rs), customerId);
     }
 
     private void updateAccount(long customerId, WalletAccount account, int expectedVersion, long operatorId) {
-        int updated = jdbc.update("UPDATE fin_wallet_account SET actual_balance=?,frozen_balance=?,available_balance=?,credit_limit=?,credit_used=?,credit_frozen=?,version=version+1,updated_by=? WHERE customer_id=? AND version=?",
+        int updated = jdbc.update("UPDATE fin_wallet_account SET actual_balance=?,frozen_balance=?,available_balance=?,credit_limit=?,credit_used=?,credit_frozen=?,credit_expires_on=?,version=version+1,updated_by=? WHERE customer_id=? AND version=?",
             account.actualBalance(), account.frozenBalance(), account.availableBalance(), account.creditLimit(),
-            account.creditUsed(), account.creditFrozen(), operatorId, customerId, expectedVersion);
+            account.creditUsed(), account.creditFrozen(), account.creditExpiresOn(), operatorId, customerId, expectedVersion);
         if (updated != 1) throw error("FIN-WALLET-409", "账户余额版本已变化，请刷新后重试");
     }
 
@@ -369,17 +380,17 @@ public class FinanceWalletService {
         KeyHolder holder = new GeneratedKeyHolder();
         jdbc.update(connection -> {
             PreparedStatement statement = connection.prepareStatement(
-                "INSERT INTO fin_wallet_ledger(customer_id,business_no,change_type,amount,actual_balance_after,frozen_balance_after,available_balance_after,credit_limit_after,credit_used_after,available_credit_after,source_type,source_no,occurred_date,payment_method,reference_no,operator_id,operator_name,remark) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+                "INSERT INTO fin_wallet_ledger(customer_id,business_no,change_type,amount,actual_balance_after,frozen_balance_after,available_balance_after,credit_limit_after,credit_used_after,available_credit_after,credit_expires_on_after,source_type,source_no,occurred_date,payment_method,reference_no,operator_id,operator_name,remark) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
                 Statement.RETURN_GENERATED_KEYS);
             statement.setLong(1, customerId); statement.setString(2, businessNo); statement.setString(3, changeType);
             statement.setBigDecimal(4, amount); statement.setBigDecimal(5, account.actualBalance());
             statement.setBigDecimal(6, account.frozenBalance()); statement.setBigDecimal(7, account.availableBalance());
             statement.setBigDecimal(8, account.creditLimit()); statement.setBigDecimal(9, account.creditUsed());
-            statement.setBigDecimal(10, account.availableCredit()); statement.setString(11, sourceType);
-            statement.setString(12, sourceNo); statement.setObject(13, occurredDate);
-            statement.setString(14, paymentMethod); statement.setString(15, referenceNo);
-            statement.setLong(16, operatorId); statement.setString(17, clean(operatorName, 128));
-            statement.setString(18, clean(remark, 500)); return statement;
+            statement.setBigDecimal(10, account.availableCredit()); statement.setObject(11, account.creditExpiresOn());
+            statement.setString(12, sourceType); statement.setString(13, sourceNo); statement.setObject(14, occurredDate);
+            statement.setString(15, paymentMethod); statement.setString(16, referenceNo);
+            statement.setLong(17, operatorId); statement.setString(18, clean(operatorName, 128));
+            statement.setString(19, clean(remark, 500)); return statement;
         }, holder);
         return requiredLedger(generatedId(holder), customerId);
     }
@@ -392,48 +403,70 @@ public class FinanceWalletService {
     }
 
     WalletAccount rechargeAccount(WalletAccount before, BigDecimal amount) {
-        BigDecimal creditRepayment = amount.min(before.creditUsed());
-        return accountState(before.actualBalance().add(amount.subtract(creditRepayment)), before.frozenBalance(),
-            before.creditLimit(), before.creditUsed().subtract(creditRepayment), before.creditFrozen(), before.version());
+        BigDecimal repaidCredit = before.creditActive() ? amount.min(before.creditUsed()) : BigDecimal.ZERO;
+        return accountState(before.actualBalance().add(amount.subtract(repaidCredit)), before.frozenBalance(),
+            before.creditLimit(), before.creditUsed().subtract(repaidCredit), before.creditFrozen(),
+            before.creditExpiresOn(), before.version());
     }
 
     WalletAccount deductAccount(WalletAccount before, BigDecimal amount) {
-        BigDecimal actualAvailable = before.actualBalance()
-            .subtract(before.frozenBalance().subtract(before.creditFrozen()));
+        if (!before.creditActive()) {
+            return accountState(before.actualBalance().subtract(amount), before.frozenBalance(),
+                before.creditLimit(), BigDecimal.ZERO, before.creditFrozen(), before.creditExpiresOn(), before.version());
+        }
+        BigDecimal actualFrozen = before.frozenBalance().subtract(before.creditFrozen());
+        BigDecimal actualAvailable = before.actualBalance().subtract(actualFrozen).max(BigDecimal.ZERO);
         BigDecimal actualDeduction = amount.min(actualAvailable);
-        BigDecimal creditDeduction = amount.subtract(actualDeduction);
         return accountState(before.actualBalance().subtract(actualDeduction), before.frozenBalance(),
-            before.creditLimit(), before.creditUsed().add(creditDeduction), before.creditFrozen(), before.version());
+            before.creditLimit(), before.creditUsed().add(amount.subtract(actualDeduction)),
+            before.creditFrozen(), before.creditExpiresOn(), before.version());
     }
 
     WalletAccount accountState(BigDecimal actual, BigDecimal frozen, BigDecimal creditLimit,
-                                       BigDecimal creditUsed, BigDecimal creditFrozen, int version) {
-        BigDecimal availableCredit = creditLimit.subtract(creditUsed).subtract(creditFrozen);
+                               BigDecimal creditFrozen, LocalDate creditExpiresOn, int version) {
+        return accountState(actual, frozen, creditLimit, BigDecimal.ZERO, creditFrozen, creditExpiresOn, version);
+    }
+
+    WalletAccount accountState(BigDecimal actual, BigDecimal frozen, BigDecimal creditLimit,
+                               BigDecimal creditUsed, BigDecimal creditFrozen,
+                               LocalDate creditExpiresOn, int version) {
+        boolean creditActive = creditLimit.signum() > 0 && creditExpiresOn != null
+            && !creditExpiresOn.isBefore(LocalDate.now());
+        if (!creditActive && creditUsed.signum() > 0) {
+            actual = actual.subtract(creditUsed);
+            creditUsed = BigDecimal.ZERO.setScale(2);
+        }
+        BigDecimal availableCredit = creditActive
+            ? creditLimit.subtract(creditUsed).subtract(creditFrozen) : BigDecimal.ZERO.setScale(2);
         BigDecimal actualFrozen = frozen.subtract(creditFrozen);
-        BigDecimal available = actual.subtract(actualFrozen).add(availableCredit);
-        if (actual.signum() < 0 || frozen.signum() < 0 || creditLimit.signum() < 0 || creditUsed.signum() < 0
-            || creditFrozen.signum() < 0 || actualFrozen.signum() < 0 || actual.compareTo(actualFrozen) < 0
-            || availableCredit.signum() < 0 || available.signum() < 0) {
+        BigDecimal available = creditActive
+            ? actual.subtract(actualFrozen).add(availableCredit)
+            : actual.subtract(frozen);
+        if (frozen.signum() < 0 || creditLimit.signum() < 0 || creditFrozen.signum() < 0
+            || creditUsed.signum() < 0 || actualFrozen.signum() < 0
+            || (creditActive && (actual.signum() < 0 || availableCredit.signum() < 0))) {
             throw error("FIN-WALLET-409", "账户余额状态无效");
         }
         return new WalletAccount("CNY", actual, frozen, available, creditLimit, creditUsed,
-            creditFrozen, availableCredit, version, null);
+            creditFrozen, availableCredit, creditExpiresOn, creditActive, version, null);
     }
 
     private WalletAccount accountRow(java.sql.ResultSet rs) throws java.sql.SQLException {
         BigDecimal creditLimit = rs.getBigDecimal("credit_limit");
-        BigDecimal creditUsed = rs.getBigDecimal("credit_used");
         BigDecimal creditFrozen = rs.getBigDecimal("credit_frozen");
-        return new WalletAccount(rs.getString("currency_code"), rs.getBigDecimal("actual_balance"),
-            rs.getBigDecimal("frozen_balance"), rs.getBigDecimal("available_balance"), creditLimit, creditUsed,
-            creditFrozen, creditLimit.subtract(creditUsed).subtract(creditFrozen), rs.getInt("version"),
+        LocalDate expiresOn = rs.getDate("credit_expires_on") == null ? null : rs.getDate("credit_expires_on").toLocalDate();
+        WalletAccount calculated = accountState(rs.getBigDecimal("actual_balance"), rs.getBigDecimal("frozen_balance"),
+            creditLimit, rs.getBigDecimal("credit_used"), creditFrozen, expiresOn, rs.getInt("version"));
+        return new WalletAccount(calculated.currencyCode(), calculated.actualBalance(), calculated.frozenBalance(),
+            calculated.availableBalance(), calculated.creditLimit(), calculated.creditUsed(), calculated.creditFrozen(),
+            calculated.availableCredit(), calculated.creditExpiresOn(), calculated.creditActive(), calculated.version(),
             timestamp(rs.getTimestamp("updated_at")));
     }
 
     private WalletAccount zeroAccount() {
         BigDecimal zero = BigDecimal.ZERO.setScale(2);
-        return new WalletAccount("CNY", zero, zero, defaultCreditLimit, defaultCreditLimit, zero,
-            zero, defaultCreditLimit, 0, null);
+        return new WalletAccount("CNY", zero, zero, zero, zero, zero,
+            zero, zero, null, false, 0, null);
     }
 
     private long insertHold(long customerId, String businessType, String businessNo, BigDecimal amount,
@@ -546,6 +579,7 @@ public class FinanceWalletService {
             rs.getBigDecimal("amount"), rs.getBigDecimal("actual_balance_after"), rs.getBigDecimal("frozen_balance_after"),
             rs.getBigDecimal("available_balance_after"), rs.getBigDecimal("credit_limit_after"),
             rs.getBigDecimal("credit_used_after"), rs.getBigDecimal("available_credit_after"),
+            rs.getObject("credit_expires_on_after", LocalDate.class),
             rs.getString("source_type"), rs.getString("source_no"),
             rs.getObject("occurred_date", LocalDate.class), rs.getString("payment_method"), rs.getString("reference_no"),
             rs.getString("operator_name"), rs.getString("remark"), timestamp(rs.getTimestamp("created_at")));
diff --git a/finance/src/main/resources/db/finance.sql b/finance/src/main/resources/db/finance.sql
index 4ec095e21..d704277da 100644
--- a/finance/src/main/resources/db/finance.sql
+++ b/finance/src/main/resources/db/finance.sql
@@ -443,12 +443,13 @@ CREATE TABLE IF NOT EXISTS fin_wallet_account (
   id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键ID',
   customer_id BIGINT UNSIGNED NOT NULL COMMENT '客户ID和隔离键',
   currency_code CHAR(3) NOT NULL DEFAULT 'CNY' COMMENT '当前仅CNY',
-  actual_balance DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '账户实际余额，包含冻结资金',
+  actual_balance DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '账户实际余额，授信消费可形成负余额',
   frozen_balance DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '冻结总额，包含实际资金与授信冻结',
-  available_balance DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '总可用余额=实际余额+授信额度-已用授信-冻结总额',
+  available_balance DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '当前总可用余额；授信失效后不再计入',
   credit_limit DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '授信额度',
-  credit_used DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '已结算使用的授信',
+  credit_used DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '授信有效期内累计已使用额度；到期后并入实际余额',
   credit_frozen DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '冻结总额中占用的授信',
+  credit_expires_on DATE NULL COMMENT '授信到期日，当天仍有效；次日失效',
   version INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '余额乐观锁版本',
   created_by BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建操作人ID',
   updated_by BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '最后操作人ID',
@@ -458,7 +459,7 @@ CREATE TABLE IF NOT EXISTS fin_wallet_account (
   UNIQUE KEY uk_fin_wallet_account_customer (customer_id, currency_code),
   CONSTRAINT chk_fin_wallet_account_customer CHECK (customer_id > 0),
   CONSTRAINT chk_fin_wallet_account_currency CHECK (currency_code = 'CNY'),
-  CONSTRAINT chk_fin_wallet_account_balance CHECK (actual_balance >= 0 AND frozen_balance >= 0 AND available_balance >= 0 AND credit_limit >= 0 AND credit_used >= 0 AND credit_frozen >= 0 AND frozen_balance >= credit_frozen AND actual_balance >= frozen_balance-credit_frozen AND credit_limit >= credit_used+credit_frozen AND available_balance = actual_balance+credit_limit-credit_used-frozen_balance)
+  CONSTRAINT chk_fin_wallet_account_balance CHECK (frozen_balance >= 0 AND credit_limit >= 0 AND credit_used >= 0 AND credit_frozen >= 0 AND frozen_balance >= credit_frozen)
 ) ENGINE=InnoDB COMMENT='客户CNY资金账户主账';
 
 CREATE TABLE IF NOT EXISTS fin_recharge_request (
@@ -500,6 +501,7 @@ CREATE TABLE IF NOT EXISTS fin_wallet_ledger (
   credit_limit_after DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '变动后授信额度',
   credit_used_after DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '变动后已用授信',
   available_credit_after DECIMAL(20,2) NOT NULL DEFAULT 0 COMMENT '变动后可用授信',
+  credit_expires_on_after DATE NULL COMMENT '变动后授信到期日',
   source_type VARCHAR(32) NOT NULL COMMENT 'CLIENT_RECHARGE/MANUAL_RECHARGE/MANUAL_DEDUCTION等',
   source_no VARCHAR(128) NULL COMMENT '充值申请号或外部凭证号',
   occurred_date DATE NOT NULL COMMENT '业务发生日期',
@@ -514,8 +516,8 @@ CREATE TABLE IF NOT EXISTS fin_wallet_ledger (
   KEY idx_fin_wallet_ledger_customer_time (customer_id, created_at, id),
   KEY idx_fin_wallet_ledger_source (customer_id, source_type, source_no),
   CONSTRAINT chk_fin_wallet_ledger_customer CHECK (customer_id > 0),
-  CONSTRAINT chk_fin_wallet_ledger_amount CHECK (amount <> 0),
-  CONSTRAINT chk_fin_wallet_ledger_balance CHECK (actual_balance_after >= 0 AND frozen_balance_after >= 0 AND available_balance_after >= 0 AND credit_limit_after >= 0 AND credit_used_after >= 0 AND available_credit_after >= 0 AND credit_limit_after >= credit_used_after+available_credit_after AND available_balance_after = actual_balance_after-frozen_balance_after+credit_limit_after-credit_used_after)
+  CONSTRAINT chk_fin_wallet_ledger_amount CHECK (amount <> 0 OR change_type='CREDIT_LIMIT'),
+  CONSTRAINT chk_fin_wallet_ledger_balance CHECK (frozen_balance_after >= 0 AND credit_limit_after >= 0 AND credit_used_after >= 0 AND available_credit_after >= 0)
 ) ENGINE=InnoDB COMMENT='客户资金账户不可变余额流水';
 
 CREATE TABLE IF NOT EXISTS fin_wallet_hold (
diff --git a/finance/src/test/java/com/baiyue/finance/FinanceCustomerAccountServiceTest.java b/finance/src/test/java/com/baiyue/finance/FinanceCustomerAccountServiceTest.java
index 00981425f..89dbc7f59 100644
--- a/finance/src/test/java/com/baiyue/finance/FinanceCustomerAccountServiceTest.java
+++ b/finance/src/test/java/com/baiyue/finance/FinanceCustomerAccountServiceTest.java
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.when;
 
 class FinanceCustomerAccountServiceTest {
     @Test
-    void listsMasterCustomersWithConfiguredInitialCreditAndForwardsSearchFields() {
+    void listsMasterCustomersWithoutImplicitPermanentCreditAndForwardsSearchFields() {
         JdbcTemplate jdbc = mock(JdbcTemplate.class);
         IamCustomerClient iam = mock(IamCustomerClient.class);
         when(jdbc.queryForList(anyString(), any(Object[].class))).thenReturn(List.of());
@@ -32,7 +32,7 @@ class FinanceCustomerAccountServiceTest {
                         new IamCustomerClient.Customer(900000000000000001L, "TEN-001", "Alice Trading", "ACTIVE", "Alice", "13800138000")),
                         1, 20, 1, 1)));
 
-        var result = new FinanceCustomerAccountService(jdbc, iam, "internal-token", new BigDecimal("8000.00"))
+        var result = new FinanceCustomerAccountService(jdbc, iam, "internal-token")
                 .list(1, 20, " Alice ", "active", 900000000000000001L);
 
         AccountSummary row = result.data().get(0);
@@ -41,9 +41,11 @@ class FinanceCustomerAccountServiceTest {
         assertThat(row.contactPhone()).isEqualTo("13800138000");
         assertThat(row.outstandingReceivable()).isZero();
         assertThat(row.pendingBilling()).isZero();
-        assertThat(row.creditLimit()).isEqualByComparingTo("8000.00");
-        assertThat(row.availableCredit()).isEqualByComparingTo("8000.00");
-        assertThat(row.availableBalance()).isEqualByComparingTo("8000.00");
+        assertThat(row.creditLimit()).isZero();
+        assertThat(row.availableCredit()).isZero();
+        assertThat(row.availableBalance()).isZero();
+        assertThat(row.creditExpiresOn()).isNull();
+        assertThat(row.creditActive()).isFalse();
         verify(iam).page("internal-token", 1, 20, "Alice", "ACTIVE", 900000000000000001L);
     }
 
@@ -56,7 +58,7 @@ class FinanceCustomerAccountServiceTest {
             new PageResult<>(List.of(new IamCustomerClient.Customer(9L, "C-9", "客户9", "ACTIVE", null, null)),
                 1, 20, 1, 1)));
 
-        new FinanceCustomerAccountService(jdbc, iam, "internal-token", BigDecimal.ZERO).list(1, 20, null, null, 9L);
+        new FinanceCustomerAccountService(jdbc, iam, "internal-token").list(1, 20, null, null, 9L);
 
         var sql = org.mockito.ArgumentCaptor.forClass(String.class);
         verify(jdbc, atLeastOnce()).queryForList(sql.capture(), any(Object[].class));
@@ -72,7 +74,7 @@ class FinanceCustomerAccountServiceTest {
 
     @Test
     void rejectsUnsupportedFinanceAccountStatus() {
-        var service = new FinanceCustomerAccountService(mock(JdbcTemplate.class), mock(IamCustomerClient.class), "token", BigDecimal.ZERO);
+        var service = new FinanceCustomerAccountService(mock(JdbcTemplate.class), mock(IamCustomerClient.class), "token");
         assertThatThrownBy(() -> service.list(1, 20, null, "PENDING", null))
                 .isInstanceOf(FinanceEventException.class)
                 .extracting(error -> ((FinanceEventException) error).code())
diff --git a/finance/src/test/java/com/baiyue/finance/FinancePhase1OperationBehaviorTest.java b/finance/src/test/java/com/baiyue/finance/FinancePhase1OperationBehaviorTest.java
index b794badf7..7b826cd3b 100644
--- a/finance/src/test/java/com/baiyue/finance/FinancePhase1OperationBehaviorTest.java
+++ b/finance/src/test/java/com/baiyue/finance/FinancePhase1OperationBehaviorTest.java
@@ -375,7 +375,7 @@ class FinancePhase1OperationBehaviorTest {
                     new BigDecimal("20.00"), new BigDecimal("30.00"), BigDecimal.ZERO,
                     BigDecimal.ZERO, BigDecimal.ZERO,
                     BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO,
-                    BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, 0, 0,
+                    BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, null, false, 0, 0,
                     "ACTIVE", LocalDateTime.of(2026, 8, 11, 10, 0)));
             }
             if (sql.startsWith("SELECT id,bill_no") || sql.startsWith("SELECT id,receipt_no")
diff --git a/finance/src/test/java/com/baiyue/finance/FinanceSqlCommentContractTest.java b/finance/src/test/java/com/baiyue/finance/FinanceSqlCommentContractTest.java
index d1182edb7..964d12bdd 100644
--- a/finance/src/test/java/com/baiyue/finance/FinanceSqlCommentContractTest.java
+++ b/finance/src/test/java/com/baiyue/finance/FinanceSqlCommentContractTest.java
@@ -44,7 +44,7 @@ class FinanceSqlCommentContractTest {
             }
         }
         assertThat(tableCount).isEqualTo(23);
-        assertThat(columnCount).isEqualTo(351);
+        assertThat(columnCount).isEqualTo(353);
         assertThat(missing).as("缺少中文业务注释的Finance字段").isEmpty();
     }
 
diff --git a/finance/src/test/java/com/baiyue/finance/FinanceWalletContractTest.java b/finance/src/test/java/com/baiyue/finance/FinanceWalletContractTest.java
index e2d340709..2b2ecd69c 100644
--- a/finance/src/test/java/com/baiyue/finance/FinanceWalletContractTest.java
+++ b/finance/src/test/java/com/baiyue/finance/FinanceWalletContractTest.java
@@ -9,17 +9,34 @@ import java.nio.file.Path;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class FinanceWalletContractTest {
+    @Test
+    void unifiedMigrationDropsTheLegacyBalanceConstraintBeforeRewritingBalances() throws Exception {
+        Path migration = Path.of("deploy/sql/头程数据库统一增量-MySQL8.sql");
+        if (!Files.exists(migration)) migration = Path.of("..").resolve(migration);
+        String sql = Files.readString(migration, StandardCharsets.UTF_8);
+        int procedure = sql.indexOf("CREATE PROCEDURE migrate_fin_wallet_credit()");
+        int dropConstraint = sql.indexOf("ALTER TABLE fin_wallet_account DROP CHECK chk_fin_wallet_account_balance", procedure);
+        int rewriteBalance = sql.indexOf("SET actual_balance=actual_balance-credit_used", procedure);
+
+        assertThat(procedure).isGreaterThanOrEqualTo(0);
+        assertThat(sql.substring(procedure, rewriteBalance))
+            .contains("CHECK_CLAUSE LIKE '%actual_balance%'", "v_legacy_wallet_constraint OR v_credit_expiry_missing");
+        assertThat(dropConstraint).isBetween(procedure, rewriteBalance - 1);
+    }
+
     @Test
     void schemaKeepsBalancesConsistentAndRechargeReviewTraceable() throws Exception {
         String sql = Files.readString(Path.of("src/main/resources/db/finance.sql"), StandardCharsets.UTF_8);
         assertThat(sql)
             .contains("CREATE TABLE IF NOT EXISTS fin_wallet_account")
-            .contains("available_balance = actual_balance+credit_limit-credit_used-frozen_balance")
-            .contains("credit_limit >= credit_used+credit_frozen")
+            .contains("credit_expires_on DATE NULL")
+            .contains("actual_balance DECIMAL(20,2) NOT NULL DEFAULT 0")
+            .contains("frozen_balance >= 0 AND credit_limit >= 0 AND credit_used >= 0")
             .contains("CREATE TABLE IF NOT EXISTS fin_recharge_request")
             .contains("status IN ('PENDING','APPROVED','REJECTED')")
             .contains("CREATE TABLE IF NOT EXISTS fin_wallet_ledger")
-            .contains("amount <> 0")
+            .contains("amount <> 0 OR change_type='CREDIT_LIMIT'")
+            .contains("credit_expires_on_after DATE NULL")
             .contains("uk_fin_wallet_ledger_no")
             .contains("idx_fin_recharge_customer_status")
             .contains("CREATE TABLE IF NOT EXISTS fin_wallet_hold")
diff --git a/finance/src/test/java/com/baiyue/finance/FinanceWalletBehaviorTest.java b/finance/src/test/java/com/baiyue/finance/service/FinanceWalletBehaviorTest.java
similarity index 59%
rename from finance/src/test/java/com/baiyue/finance/FinanceWalletBehaviorTest.java
rename to finance/src/test/java/com/baiyue/finance/service/FinanceWalletBehaviorTest.java
index 456f67ed5..4a37ce725 100644
--- a/finance/src/test/java/com/baiyue/finance/FinanceWalletBehaviorTest.java
+++ b/finance/src/test/java/com/baiyue/finance/service/FinanceWalletBehaviorTest.java
@@ -1,7 +1,6 @@
 package com.baiyue.finance.service;
 
 import com.baiyue.finance.client.FinanceFileClient;
-import com.baiyue.finance.dto.FinanceWalletDtos.AccountAdjustmentRequest;
 import com.baiyue.finance.dto.FinanceWalletDtos.WalletAccount;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
@@ -9,8 +8,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -48,7 +45,7 @@ class FinanceWalletBehaviorTest {
     void developmentProfileUsesTheNonPayableSampleQrCode() {
         var channels = new FinanceWalletService(mock(JdbcTemplate.class), new ObjectMapper().findAndRegisterModules(),
             mock(FinanceFileClient.class), mock(FinanceDocumentNumberGenerator.class), "token", "", "",
-            BigDecimal.ZERO, "cn", "development").channels();
+            "cn", "development").channels();
 
         assertThat(channels).allSatisfy(channel -> {
             assertThat(channel.enabled()).isTrue();
@@ -57,44 +54,29 @@ class FinanceWalletBehaviorTest {
     }
 
     @Test
-    void manualDeductionCannotExceedAvailableBalance() throws Exception {
-        JdbcTemplate jdbc = mock(JdbcTemplate.class);
-        when(jdbc.queryForList(startsWith("SELECT request_hash"), any(Object[].class))).thenReturn(List.of());
-        when(jdbc.update(startsWith("INSERT INTO fin_idempotency_record"), any(Object[].class))).thenReturn(1);
-        when(jdbc.update(startsWith("INSERT IGNORE INTO fin_wallet_account"), any(Object[].class))).thenReturn(1);
-        when(jdbc.queryForObject(startsWith("SELECT currency_code"), any(RowMapper.class), eq(9L))).thenAnswer(invocation -> {
-            @SuppressWarnings("unchecked") RowMapper<Object> mapper = invocation.getArgument(1);
-            ResultSet rs = mock(ResultSet.class);
-            when(rs.getString("currency_code")).thenReturn("CNY");
-            when(rs.getBigDecimal("actual_balance")).thenReturn(new BigDecimal("10.00"));
-            when(rs.getBigDecimal("frozen_balance")).thenReturn(BigDecimal.ZERO);
-            when(rs.getBigDecimal("available_balance")).thenReturn(new BigDecimal("10.00"));
-            when(rs.getBigDecimal("credit_limit")).thenReturn(BigDecimal.ZERO);
-            when(rs.getBigDecimal("credit_used")).thenReturn(BigDecimal.ZERO);
-            when(rs.getBigDecimal("credit_frozen")).thenReturn(BigDecimal.ZERO);
-            when(rs.getInt("version")).thenReturn(2);
-            when(rs.getTimestamp("updated_at")).thenReturn(Timestamp.valueOf("2026-09-05 08:00:00"));
-            return mapper.mapRow(rs, 0);
-        });
+    void deductionMayMakeActualBalanceNegative() {
+        FinanceWalletService service = service(mock(JdbcTemplate.class), "x", "y");
+        WalletAccount initial = service.accountState(new BigDecimal("10.00"), BigDecimal.ZERO,
+            BigDecimal.ZERO, BigDecimal.ZERO, null, 2);
 
-        assertThatThrownBy(() -> service(jdbc, "x", "y").adjust(9L, 7L, "财务员", "deduct-1",
-            new AccountAdjustmentRequest("DEDUCTION", new BigDecimal("10.01"), LocalDate.now(),
-                "BANK_TRANSFER", "REF-1", "人工扣款", 2)))
-            .isInstanceOf(FinanceEventException.class)
-            .extracting(error -> ((FinanceEventException) error).code()).isEqualTo("FIN-WALLET-INSUFFICIENT");
-        verify(jdbc, never()).update(startsWith("UPDATE fin_wallet_account SET actual_balance="), any(Object[].class));
+        WalletAccount deducted = service.deductAccount(initial, new BigDecimal("10.01"));
+
+        assertThat(deducted.actualBalance()).isEqualByComparingTo("-0.01");
+        assertThat(deducted.availableBalance()).isEqualByComparingTo("-0.01");
+        assertThat(deducted.creditActive()).isFalse();
     }
 
     @Test
-    void configuredCreditLimitIsUsedForAFirstAccountRead() {
+    void aMissingAccountNeverReceivesPermanentDefaultCredit() {
         JdbcTemplate jdbc = mock(JdbcTemplate.class);
         when(jdbc.query(startsWith("SELECT currency_code"), any(RowMapper.class), eq(9L))).thenReturn(List.of());
 
-        var account = service(jdbc, "x", "y", new BigDecimal("8000.00")).account(9L);
+        var account = service(jdbc, "x", "y").account(9L);
 
-        assertThat(account.creditLimit()).isEqualByComparingTo("8000.00");
-        assertThat(account.availableCredit()).isEqualByComparingTo("8000.00");
-        assertThat(account.availableBalance()).isEqualByComparingTo("8000.00");
+        assertThat(account.creditLimit()).isZero();
+        assertThat(account.availableCredit()).isZero();
+        assertThat(account.availableBalance()).isZero();
+        assertThat(account.creditExpiresOn()).isNull();
         verify(jdbc, never()).update(anyString(), any(Object[].class));
     }
 
@@ -102,7 +84,7 @@ class FinanceWalletBehaviorTest {
     void deductionUsesCashBeforeCreditAndRechargeRepaysCreditFirst() {
         FinanceWalletService service = service(mock(JdbcTemplate.class), "x", "y");
         WalletAccount initial = service.accountState(new BigDecimal("100.00"), BigDecimal.ZERO,
-            new BigDecimal("50.00"), BigDecimal.ZERO, BigDecimal.ZERO, 3);
+            new BigDecimal("50.00"), BigDecimal.ZERO, LocalDate.now().plusDays(7), 3);
 
         WalletAccount deducted = service.deductAccount(initial, new BigDecimal("120.00"));
         assertThat(deducted.actualBalance()).isEqualByComparingTo("0.00");
@@ -120,7 +102,7 @@ class FinanceWalletBehaviorTest {
     void deductionNeverConsumesCashReservedByAnActiveHold() {
         FinanceWalletService service = service(mock(JdbcTemplate.class), "x", "y");
         WalletAccount initial = service.accountState(new BigDecimal("100.00"), new BigDecimal("50.00"),
-            new BigDecimal("80.00"), BigDecimal.ZERO, new BigDecimal("20.00"), 4);
+            new BigDecimal("80.00"), new BigDecimal("20.00"), LocalDate.now().plusDays(7), 4);
 
         WalletAccount deducted = service.deductAccount(initial, new BigDecimal("80.00"));
 
@@ -135,37 +117,40 @@ class FinanceWalletBehaviorTest {
     @Test
     void rechargeRepaysUsedCreditWithoutReleasingFrozenCredit() {
         FinanceWalletService service = service(mock(JdbcTemplate.class), "x", "y");
-        WalletAccount initial = service.accountState(new BigDecimal("30.00"), new BigDecimal("25.00"),
-            new BigDecimal("100.00"), new BigDecimal("40.00"), new BigDecimal("20.00"), 5);
+        WalletAccount initial = service.accountState(new BigDecimal("5.00"), new BigDecimal("25.00"),
+            new BigDecimal("100.00"), new BigDecimal("40.00"), new BigDecimal("20.00"),
+            LocalDate.now().plusDays(7), 5);
 
         WalletAccount recharged = service.rechargeAccount(initial, new BigDecimal("50.00"));
 
-        assertThat(recharged.actualBalance()).isEqualByComparingTo("40.00");
+        assertThat(recharged.actualBalance()).isEqualByComparingTo("15.00");
         assertThat(recharged.creditUsed()).isEqualByComparingTo("0.00");
         assertThat(recharged.creditFrozen()).isEqualByComparingTo("20.00");
         assertThat(recharged.frozenBalance()).isEqualByComparingTo("25.00");
         assertThat(recharged.availableCredit()).isEqualByComparingTo("80.00");
-        assertThat(recharged.availableBalance()).isEqualByComparingTo("115.00");
+        assertThat(recharged.availableBalance()).isEqualByComparingTo("90.00");
     }
 
     @Test
     void accountStateRejectsCreditUsedAndFrozenAboveTheLimit() {
         FinanceWalletService service = service(mock(JdbcTemplate.class), "x", "y");
 
-        assertThatThrownBy(() -> service.accountState(new BigDecimal("10.00"), new BigDecimal("25.00"),
-            new BigDecimal("50.00"), new BigDecimal("31.00"), new BigDecimal("20.00"), 1))
+        assertThatThrownBy(() -> service.accountState(BigDecimal.ZERO, new BigDecimal("20.00"),
+            new BigDecimal("50.00"), new BigDecimal("31.00"), new BigDecimal("20.00"),
+            LocalDate.now().plusDays(7), 1))
             .isInstanceOf(FinanceEventException.class)
             .extracting(error -> ((FinanceEventException) error).code()).isEqualTo("FIN-WALLET-409");
     }
 
     @Test
-    void accountStateRejectsFrozenCashAboveActualCash() {
+    void accountStateAllowsBalanceToBecomeNegativeWhileFundsRemainFrozen() {
         FinanceWalletService service = service(mock(JdbcTemplate.class), "x", "y");
 
-        assertThatThrownBy(() -> service.accountState(new BigDecimal("9.99"), new BigDecimal("10.00"),
-            new BigDecimal("20.00"), BigDecimal.ZERO, BigDecimal.ZERO, 1))
-            .isInstanceOf(FinanceEventException.class)
-            .extracting(error -> ((FinanceEventException) error).code()).isEqualTo("FIN-WALLET-409");
+        WalletAccount account = service.accountState(new BigDecimal("9.99"), new BigDecimal("10.00"),
+            new BigDecimal("20.00"), BigDecimal.ZERO, LocalDate.now().plusDays(7), 1);
+
+        assertThat(account.availableBalance()).isEqualByComparingTo("19.99");
+        assertThat(account.creditActive()).isTrue();
     }
 
     @Test
@@ -173,32 +158,27 @@ class FinanceWalletBehaviorTest {
         FinanceWalletService service = service(mock(JdbcTemplate.class), "x", "y");
 
         assertThatThrownBy(() -> service.accountState(new BigDecimal("100.00"), new BigDecimal("10.00"),
-            new BigDecimal("50.00"), BigDecimal.ZERO, new BigDecimal("10.01"), 1))
+            new BigDecimal("50.00"), new BigDecimal("10.01"), LocalDate.now().plusDays(7), 1))
             .isInstanceOf(FinanceEventException.class)
             .extracting(error -> ((FinanceEventException) error).code()).isEqualTo("FIN-WALLET-409");
     }
 
     @Test
-    void invalidDefaultCreditConfigurationFailsClosed() {
-        assertThatThrownBy(() -> service(mock(JdbcTemplate.class), "x", "y", new BigDecimal("-0.01")))
-            .isInstanceOf(FinanceEventException.class)
-            .extracting(error -> ((FinanceEventException) error).code()).isEqualTo("FIN-REQ-400");
-        assertThatThrownBy(() -> service(mock(JdbcTemplate.class), "x", "y", new BigDecimal("1.001")))
-            .isInstanceOf(FinanceEventException.class)
-            .extracting(error -> ((FinanceEventException) error).code()).isEqualTo("FIN-REQ-400");
-        assertThatThrownBy(() -> service(mock(JdbcTemplate.class), "x", "y", new BigDecimal("1000000000000.00")))
-            .isInstanceOf(FinanceEventException.class)
-            .extracting(error -> ((FinanceEventException) error).code()).isEqualTo("FIN-REQ-400");
+    void expiredCreditNoLongerContributesToAvailableBalance() {
+        FinanceWalletService service = service(mock(JdbcTemplate.class), "x", "y");
+
+        WalletAccount account = service.accountState(BigDecimal.ZERO, BigDecimal.ZERO,
+            new BigDecimal("50.00"), new BigDecimal("20.00"), BigDecimal.ZERO,
+            LocalDate.now().minusDays(1), 1);
+
+        assertThat(account.creditActive()).isFalse();
+        assertThat(account.availableCredit()).isZero();
+        assertThat(account.availableBalance()).isEqualByComparingTo("-20.00");
     }
 
     private static FinanceWalletService service(JdbcTemplate jdbc, String wechat, String alipay) {
-        return service(jdbc, wechat, alipay, BigDecimal.ZERO);
-    }
-
-    private static FinanceWalletService service(JdbcTemplate jdbc, String wechat, String alipay,
-                                                BigDecimal defaultCreditLimit) {
         return new FinanceWalletService(jdbc, new ObjectMapper().findAndRegisterModules(),
             mock(FinanceFileClient.class), mock(FinanceDocumentNumberGenerator.class), "token", wechat, alipay,
-            defaultCreditLimit, "test", "test");
+            "test", "test");
     }
 }
diff --git a/firstleg/AGENTS.md b/firstleg/AGENTS.md
index 3e6de5460..86599c08d 100644
--- a/firstleg/AGENTS.md
+++ b/firstleg/AGENTS.md
@@ -19,8 +19,8 @@
 | 入库单扣货、履约门禁与凭证 | `service/InboundHoldService.java`、`InboundHoldGuard.java`、`InboundHoldEvidenceService.java`、`client/InboundHoldFileClient.java`；凭证固定按客户、入库单和 `INBOUND_HOLD_EVIDENCE` 精确归属，只有进入不可变扣货历史的文件可下载 |
 | Order 申报同步与渠道变更履约门禁 | `controller/InternalInboundOrderController.java` 的 `/order-channel-changes/validate`、`/order-declaration-updated`，`service/OrderDeclarationSyncService.java`、`mapper/OrderDeclarationSyncMapper.java`、`dto/OrderDeclarationSync.java`；契约 `src/main/resources/openapi/firstleg-v1.yaml`，只接受内部服务令牌 |
 | 平台测量/OCR 与箱规计费快照 | `controller/PlatformInboundMeasurementController.java`、`service/InboundMeasurementService.java`、`service/CartonMeasurementService.java`、`service/CustomerDimensionWeightingService.java`；手工单箱测量保存实际尺寸、可选外箱修正、`chargeRuleId` 与 `coefficientMode`，计算结果以服务端返回值为准 |
-| 箱唛箱码生成、打印与测量绑定 | 审核建单生成钩子 `controller/InternalInboundOrderController.java`；生成/解析 `service/InboundCartonLabelService.java`、`repository/InboundCartonLabelRepository.java`；平台与客户打印 `controller/PlatformInboundOrderController.java`、`MerchantInboundCartonLabelController.java`、`service/InboundCartonLabelPrintService.java`。`fl_inbound_carton_label.sku_code` 是箱唛的 SKU 冻结快照，生成时经 `client/OrderCargoClient.java` 获取；既有记录按 `inbound_detail_id` 回填。`ONE_CLICK_DROPSHIP` 缺 SKU 时禁止生成箱唛，打印面显示 SKU；`box_code` 与二维码内容仍只携带稳定箱码。基线/升级 SQL 为 `src/main/resources/db/phase2-inbound-carton-label.sql`、`phase2-carton-label-versioning-migration.sql`、`../deploy/sql/头程数据库统一增量-MySQL8.sql` |
-| 一件代发测量后 PDA 合托 | `controller/PlatformDropshipPalletizationController.java`、`service/DropshipPalletizationService.java`、`mapper/DropshipPalletizationMapper.java`；测量通过进入 `WAIT_PALLETIZE` 并下发独立任务，不创建国内库存，封托生成 `DP` 托盘号，全部箱数完成后进入 `WAIT_SPLIT`。契约 `src/main/resources/openapi/dropship-palletization-v1.yaml` |
+| 箱唛箱码生成、打印与测量绑定 | 审核建单生成钩子 `controller/InternalInboundOrderController.java`；生成/解析 `service/InboundCartonLabelService.java`、`repository/InboundCartonLabelRepository.java`；平台与客户打印 `controller/PlatformInboundOrderController.java`、`MerchantInboundCartonLabelController.java`、`service/InboundCartonLabelPrintService.java`。一件代发箱唛以 `fl_inbound_carton_label` 表示物理箱，`fl_inbound_carton_label_sku` 冻结箱内一条或多条 SKU；生成时经 `client/OrderCargoClient.java` 获取。缺 SKU 时禁止生成，打印面显示箱内 SKU；`box_code` 与二维码内容仍只携带稳定箱码。基线/升级 SQL 为 `src/main/resources/db/phase2-inbound-carton-label.sql`、`phase2-carton-label-versioning-migration.sql`、`../deploy/sql/头程数据库统一增量-MySQL8.sql` |
+| 一件代发测量后 PDA 清点组托 | `controller/PlatformDropshipPalletizationController.java`、`service/DropshipPalletizationService.java`、`mapper/DropshipPalletizationMapper.java`；测量审核通过进入 `WAIT_PALLETIZE`，按预计托数预生成 `DP` 托盘码并下发独立任务，不创建国内库存；托盘信息单固定为每托一页 A4，包含托盘 Code 128 一维码、入仓码、总箱数与 SKU/商品名称/箱数/实点数量，不展示作业状态。PDA 逐箱清点，支持先扫箱或先扫托、归托和逐托封托，预计托数与已生成托盘数不一致时禁止作业，全部箱和全部预生成托盘完成后进入 `WAIT_SPLIT`。契约 `src/main/resources/openapi/dropship-palletization-v1.yaml` |
 | 墨家设备测量上传 | `controller/OpenApiInboundMeasurementController.java`、`dto/MojiaMeasurementDtos.java`、`service/MojiaMeasurementOpenApiService.java`、`security/MeasurementRequestAuthenticator.java`；接口契约见 `src/main/resources/openapi/firstleg-v1.yaml` 与 `../../docs/墨家设备测量上传接口说明-V3.md` |
 | 称重确认与整票库位块 | `service/MeasurementLocationOccupationService.java` 的 `ensureForConfirmedWeight/ensureForSubmission`、`InboundMeasurementService.java`、`MeasurementSubmissionService.java`、`client/WarehousePalletLocationClient.java`；Warehouse 块服务见 `../warehouse/src/main/java/com/baiyue/warehouse/service/LocationBlockService.java`，接口与上架引导见 `src/main/resources/openapi/firstleg-v1.yaml` |
 | 审核与初始计价 | `controller/PlatformInboundMeasurementReviewController.java`、`service/MeasurementReviewService.java`、`service/InitialInboundPricingService.java`、`dto/MeasurementApprovalResponse.java` |
@@ -29,7 +29,7 @@
 | 客户专属价格簿、柜级阶梯运费与调价边界 | `controller/PlatformPriceBookController.java`、`service/PlatformPriceBookService.java`、`pricing/ActivePriceBookEstimator.java`、`service/FbaPricingService.java`、`pricing/ContainerTierAmountAllocator.java`；公共价格簿固定 `customerId=0`，客户专属版本按客户独立发布与替换，计价优先专属 ACTIVE、缺失才回退公共 ACTIVE。`REGION_WEIGHT_TIER` 对同柜同客户有效成员聚合实际计费量命中一个阶梯，再按成员计费量守恒分摊；装柜成员变化调用 `recalculateUnlockedContainerCustomerFees`，已确认/已发送或客户已确认的版本不得改写。人工调整以系统基准量为中心限制上下 10%（含边界），保存版本、原因和二次确认；一件代发 `WAIT_PALLETIZE` 可在预装确认前试算，`markInboundCalculated` 只更新费用并保留该托盘化状态 |
 | 入库费用明细 | `controller/PlatformInboundFeeDetailController.java`、`service/InboundFeeDetailService.java`、`dto/InboundFeeDetailDtos.java`；`PRIVATE_LAST_MILE_DELIVERY` 是独立私人仓尾程派送费，只允许 `destinationType=PRIVATE`，按稳定费用代码校验而不按中文名判断；Admin 消费端见 `../../apps/admin-web/src/modules/unified-orders/api/inboundFeeDetails.ts` |
 | 入库/柜次直接已付快照与凭证校验 | `service/FeePaymentSnapshotValidator.java`、`client/FeePaymentVoucherFileClient.java`；写入入口分别为 `InboundFeeDetailService.java`、`ContainerFeeDetailService.java`，File 业务类型固定 `FINANCE_VOUCHER` |
-| 客户运营统计/在途柜量 | `customerstatistics/controller/PlatformCustomerTransitStatisticsController.java`、`customerstatistics/service/CustomerTransitStatisticsService.java`；契约见 `src/main/resources/openapi/customer-statistics-v1.yaml` |
+| 首页实时指标、客户运营统计/在途柜量 | 首页物理在途柜 TEU 与待清关票数从 `dashboard/PlatformDashboardMetricsController.java` 进入，契约见 `src/main/resources/openapi/dashboard-metrics-v1.yaml`；客户维度统计为 `customerstatistics/adapter/in/web/PlatformCustomerTransitStatisticsController.java`、`customerstatistics/application/CustomerTransitStatisticsService.java`，契约见 `src/main/resources/openapi/customer-statistics-v1.yaml` |
 | 费用项目与价格簿 | `controller/PlatformFeeItemController.java`、`PlatformPriceBookController.java`、`MerchantPriceBookController.java` |
 | 客户入库结果与头程费用确认 | `controller/MerchantInboundBillingController.java`、`service/MerchantInboundBillingService.java`、`FbaPricingService.java`；查询与确认接口为 `/api/merchant/v1/first-leg/orders/{orderId}/inbound-billing`、`/confirm`，契约 `src/main/resources/openapi/firstleg-v1.yaml` |
 | 价格簿查询内部切片 | `pricebookquery/application/port/in/PriceBookQueryUseCase.java`、`application/PriceBookQueryService.java`、`application/port/out/PriceBookQueryReader.java`、`adapter/out/persistence/PriceBookQueryMapper.java`；查询行模型位于 `application/model/PriceBookQueryRows.java` |
@@ -65,7 +65,7 @@
 - 价格簿查询消费者依赖 `PriceBookQueryUseCase` 或稳定查询端口，不得反向依赖持久化 Mapper；移动旧查询类时同步更新生产调用、测试、Mock 与 import，避免同一职责在根 `repository/mapper` 和 `pricebookquery/` 双写。
 - 第三方回传必须签名、时间窗、防重放、请求哈希，并绑定订单货物和 File 证据；不得信任外部客户字段。
 - 稳定箱码映射以入库快照和 Order 货物明细为事实；订单审核创建入库单时必须幂等生成，打印接口只复用或补齐同一映射，用户是否下载箱唛不得决定箱码有效性。手工测量、墨家设备和 PDA 扫码统一通过 `InboundCartonLabelService` 校验客户、入库单、货物明细、总箱数/下标和有效批次，不得在测量时临时伪造箱码或接受跨客户、跨入库箱码。
-- 一件代发以 `fl_inbound_carton_label.sku_code` 作为不可变 SKU 快照；PDA 仍只扫描稳定 `box_code`，不得将 SKU 塞入二维码或以 SKU 替代箱码。实际打托后的查询必须能按“现场托盘 -> 客户 -> SKU -> 箱数”聚合；历史箱唛仅能在同客户、同入库单范围内按 `inbound_detail_id` 回填，禁止按货名、箱规或箱号猜测 SKU。修改本链路时同步检查 `OrderCargoClient`、Order 内部货物接口及 PDA 打托实现。
+- 一件代发以 `fl_inbound_carton_label_sku` 作为物理箱内不可变 SKU 快照；一个稳定 `box_code` 可以对应多条 SKU，PDA 扫箱后必须一次清点全部 SKU，不得将 SKU 塞入二维码或以 SKU 替代箱码。实际打托后的查询必须能按“现场托盘 -> 客户 -> SKU -> 箱数”聚合；同一国内作业仓的多票允许共用一个开放托盘，单票全部归托不自动封托，只有参与该票装箱的开放托盘阻止该票完成，预生成但未使用的空托盘不得阻塞；禁止按货名、箱规或箱号猜测 SKU。修改本链路时同步检查 `OrderCargoClient`、Order 内部货物接口及 PDA 打托实现。
 - 测量审核通过后直接进入 `WAIT_SPLIT`，费用仅作为独立初算和人工维护结果，不得阻塞或回退订单主流程；计费量、单价和附加费调整必须版本化并由服务端重算金额。状态或 DTO 变更时逐个检查 Order/Warehouse/File/Integration 消费者。
 - 客户箱规配置必须恰好保持四档且默认算法在四行一致；`ADD` 以实测尺寸为基准对三个维度分别增加命中箱规的尺寸值，`MULTIPLY` 使用当前客户唯一默认计费规则，并由服务端按规则中的规格档位选择系数。测量行必须保存实际尺寸、选用规则和算法快照，页面不得自行重算后覆盖服务端结果；计价使用用户确认的重量/体积选择值并纳入幂等请求哈希。
 - 报关、订舱和拖车引用的供应商必须通过 `WarehouseSupplierSnapshotService` 按 ID 向 Warehouse 校验：报关使用 `CUSTOMS`，订舱使用 `BOOKING`（不区分国内/国外 scope），拖车使用 `TRUCKING`；供应商必须为 `ACTIVE`。请求中的名称只能作为一致性提示，持久化名称必须来自 Warehouse 快照，禁止用自由文本绕过 ID、类别或启用状态校验。修改任一供应商引用 DTO、OpenAPI 或内部客户端时，必须同步检查三条业务链、Warehouse `supplier-v1.yaml`、数据库快照字段和对应契约测试。
@@ -85,9 +85,10 @@
 
 ## 国内货柜履约装柜与 PDA 资源结算
 
-- 智能装柜全局工作台由服务端把业务渠道分组映射为实际渠道，并分别分页查询候选与 `WAIT_LOADING/EDITING/LOADING` 柜次；候选支持按创建日期和预计到货日期闭区间筛选，状态筛选使用最多四项的 `orderStatuses`，未传表示 `PENDING_REVIEW/WAIT_MEASURE/WAIT_SPLIT/LOADING` 全部未完成状态。状态只用于搜索和展示，能否加入以响应 `canAssign` 为准，由有效柜次占用、剩余箱数、容量、组锁和版本等事实决定；人工加入允许订单国内仓及渠道与柜次不同，智能推荐允许跨国内仓但仍只选择柜次渠道。容积和重量均允许达到柜型额定值的 150%，超过即拒绝。待审核事实必须经 `PendingReviewOrderClient` 重新核验 Order 权威 `SUBMITTED` 订单，待审核或待测量可先占位，但确认预装和启动 PDA 前仍必须进入 `WAIT_SPLIT`。计划明细通过 `totalPackageCount/remainingPackageCount` 返回可调总量和余量：测量前取 Order 原始申报箱数，进入 `WAIT_SPLIT/LOADING` 后取最新已审核测量箱数；只读补充失败时保守回退当前已分配数，调整写入仍重新查询并校验权威数量。同柜不可拆组只有全部成员命中状态集合时才返回，且必须成员完整、满箱并作为单个分页与分配单元，不能跨页或拆分。一次性移除未拣明细时，普通未拣项直接移除；同柜组仅全组未拣时整组移除，任一成员已拣则整组保留，单事务只递增一次计划版本。推荐顺序按入库时间先进先出。装柜计划状态为 `EDITING -> LOADING -> COMPLETED`，PDA 全部明细处理完成后自动完成。
+- 新增模拟柜只保存智能装柜的 9 类计划渠道 channel_group_code；未关联已放舱订舱时 channel_code/channel_name 为空，关联后才冻结订舱的实际渠道。智能装柜全局工作台和订舱关联候选均按计划渠道组匹配；服务端把业务渠道分组映射为实际渠道，并分别分页查询候选与 `WAIT_LOADING/EDITING/LOADING` 柜次；候选支持按创建日期和预计到货日期闭区间筛选，状态筛选使用最多四项的 `orderStatuses`，未传表示 `PENDING_REVIEW/WAIT_MEASURE/WAIT_SPLIT/LOADING` 全部未完成状态。状态只用于搜索和展示，能否加入以响应 `canAssign` 为准，由有效柜次占用、剩余箱数、容量、组锁和版本等事实决定；人工加入允许订单国内仓及渠道与柜次不同，智能推荐允许跨国内仓但仍只选择柜次渠道。容积和重量均允许达到柜型额定值的 150%，超过即拒绝。待审核事实必须经 `PendingReviewOrderClient` 重新核验 Order 权威 `SUBMITTED` 订单，待审核或待测量可先占位，但确认预装和启动 PDA 前仍必须进入 `WAIT_SPLIT`。计划明细通过 `totalPackageCount/remainingPackageCount` 返回可调总量和余量：测量前取 Order 原始申报箱数，进入 `WAIT_SPLIT/LOADING` 后取最新已审核测量箱数；只读补充失败时保守回退当前已分配数，调整写入仍重新查询并校验权威数量。同柜不可拆组只有全部成员命中状态集合时才返回，且必须成员完整、满箱并作为单个分页与分配单元，不能跨页或拆分。一次性移除未拣明细时，普通未拣项直接移除；同柜组仅全组未拣时整组移除，任一成员已拣则整组保留，单事务只递增一次计划版本。推荐顺序按入库时间先进先出。装柜计划状态为 `EDITING -> LOADING -> COMPLETED`，PDA 全部明细处理完成后自动完成。
+- 预装进入 `CONFIRMING/CONFIRMED` 只固化确认快照，不得锁死尚未完成柜次的智能装柜分配；装柜计划仍处于 `EDITING/LOADING` 时可继续新增，未产生实物拣货的明细可调整或移除，已拣明细保持锁定。
 - 客户入库费用只在登录客户范围、测量审核通过、`feeStatus=SENT` 且存在已发布明细时可见；确认必须具备 `merchant:order:edit`，携带当前 `expectedFeeVersion` 与幂等键。成功后记录确认成员和时间；客户未确认或该票尚未装柜完成时，平台仍可修改箱规规则、生成新费用版本并重新发送，新版本必须清空旧版客户确认快照。仅当“客户已确认且该票已装柜完成”同时成立时最终冻结；装柜完成不得代替客户自动确认。旧版本、未发送或重复异参确认均返回冲突，不做兼容覆盖。
-- PDA 拣货以 `fl_inbound_carton_label.box_code` 对应的稳定箱唛箱码为扫描身份；审核建单、重复打印、手工测量和墨家测量复用同一映射，版本字段只用于并发控制，不进入扫码文本。一个有效且未重复的箱码扫描表示拣出一箱，不得以 SKU、商品件数或页面展示字段替代箱码。装柜允许跨国内仓，仓库与渠道限制统一由上游装柜编排负责；PDA 只按已生成任务读取各入仓单自身的 `CONFIRMED` 库位资源，不得再用柜次仓库过滤任务明细、库存快照或拣货写入。任务下发与提交契约见 `src/main/resources/openapi/phase3-pda-convergence-v1.yaml`。
+- PDA 普通散箱拣货以 `fl_inbound_carton_label.box_code` 对应的稳定箱唛箱码为扫描身份；审核建单、重复打印、手工测量和墨家测量复用同一映射，版本字段只用于并发控制，不进入扫码文本。一个有效且未重复的箱码扫描表示拣出一箱，不得以 SKU、商品件数、入库单号或页面展示字段替代箱码。一件代发已封托的 `SEALED_PALLET` 是不可拆整托单元，PDA 可扫描计划快照中的 `palletNo`、用该托任一成员 `boxCode` 反查所属整托，也可在明细卡片手工确认整托；三种入口最终都必须携带权威 `palletNo` 以 `PICK_PALLET` 一次性提交，不能按成员箱逐箱累计、部分拣货或跳拣。PDA 首页从 Warehouse 主档选择启用国内仓，一件代发与装柜待办列表必须按所选 `warehouseId` 服务端过滤；装柜任务内部仍允许跨国内仓，仓库与渠道限制统一由上游装柜编排负责，PDA 只按已生成任务读取各入仓单自身的 `CONFIRMED` 库位资源，不得再用柜次仓库过滤任务明细、库存快照或拣货写入。任务下发与提交契约见 `src/main/resources/openapi/phase3-pda-convergence-v1.yaml`。
 - PDA 部分拣货生成二级子入库单时，数量必须守恒：`已拣数量 + 子单数量 = 拣货前主单可用数量`。子单只允许一层，不能继续拆分。
 - 首张称重图片确认时按 `max(已确认称重图片数, ceil(有效体积 / 默认托盘容量))` 尽力预留并确认整票库位块；有效体积先取入库单已落地的正数实测体积，否则对最新测量批次的正数 `totalVolumeCbm/originalVolumeCbm` 取较大值，再无有效值才查询 Order 最新客户申报体积，全部无效则拒绝。后续确认绑定最小空槽，所需槽数增长时通过 Warehouse `/blocks/expand` 原子追加，既有 `blockId/slotNo/reservationId/locationId/sharedOverflow` 不得变化。库位指引失败只记录警告，不阻断称重确认；测量提交后以最新已确认图片调用 `ensureForSubmission` 再次补齐和校验，失败同样不回滚已提交的测量主流程。Firstleg 必须显式保存 `weightResultId -> blockId/slotNo/reservationId/locationId/locationCode`，按 `confirmedAt + weightResultId` 稳定顺序绑定，禁止按列表下标推断；普通连续位不足的新增槽由 Warehouse 放入共享 A0，不阻断确认。
 - 删除称重图片只解除图片和托盘快照绑定，将槽位恢复为 `RESERVED_EMPTY`；槽位和整票块继续归当前入仓码。解绑失败时不得调用文件删除，文件删除失败时本地解绑和重量结果删除必须回滚。
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java b/firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java
index ee11c2d60..45387e73e 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java
@@ -65,18 +65,18 @@ public interface OrderCargoClient {
     record CargoLabelBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
                              String skuNo, Integer packageCount, Integer unitsPerCarton,
                              BigDecimal lengthCm, BigDecimal widthCm, BigDecimal heightCm,
-                             String shipmentId) {
+                             String shipmentId, String packingGroupNo) {
         public CargoLabelBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
                                  Integer packageCount, BigDecimal lengthCm, BigDecimal widthCm,
                                  BigDecimal heightCm) {
             this(cargoId, orderId, itemNo, cargoName, null,
-                packageCount, null, lengthCm, widthCm, heightCm, null);
+                packageCount, null, lengthCm, widthCm, heightCm, null, null);
         }
         public CargoLabelBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
                                  String skuNo, Integer packageCount, BigDecimal lengthCm,
                                  BigDecimal widthCm, BigDecimal heightCm, String shipmentId) {
             this(cargoId, orderId, itemNo, cargoName, skuNo,
-                packageCount, null, lengthCm, widthCm, heightCm, shipmentId);
+                packageCount, null, lengthCm, widthCm, heightCm, shipmentId, null);
         }
     }
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/client/PrintPdfClient.java b/firstleg/src/main/java/com/baiyue/firstleg/client/PrintPdfClient.java
index 923ba2e5c..ed265fbca 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/client/PrintPdfClient.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/client/PrintPdfClient.java
@@ -26,6 +26,12 @@ public interface PrintPdfClient {
         @RequestHeader(value = "X-Request-Id", required = false) String requestId,
         @RequestBody FreightA4PdfRequest request);
 
+    @PostMapping(value = "/dropship-pallet-a4-documents", consumes = "application/json")
+    ResponseEntity<byte[]> generateDropshipPalletA4Documents(
+        @RequestHeader("X-Internal-Service-Token") String token,
+        @RequestHeader(value = "X-Request-Id", required = false) String requestId,
+        @RequestBody DropshipPalletA4PdfRequest request);
+
     record InboundMarkPdfRequest(String templateCode, PageSpec pageSpec,
                                  String downloadFileName, List<Label> labels) {
     }
@@ -44,4 +50,15 @@ public interface PrintPdfClient {
 
     record CargoRow(String marksAndNos, String quantity, String packaging,
                     String descriptionOfGoods, String grossWeight, String measurement) {}
+
+    record DropshipPalletA4PdfRequest(String templateCode, PageSpec pageSpec,
+                                      String downloadFileName, List<DropshipPalletDocument> documents) {}
+
+    record DropshipPalletDocument(String palletNo, String inboundCodes, int cartonCount,
+                                  int skuCount, BigDecimal weightKg, BigDecimal volumeCbm,
+                                  String barcodeContent, List<DropshipPalletSkuRow> skuRows) {}
+
+    record DropshipPalletSkuRow(String inboundCode, String skuCode, String cargoName,
+                                int cartonCount, int skuQuantity) {}
+
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/client/WarehouseMasterDataClient.java b/firstleg/src/main/java/com/baiyue/firstleg/client/WarehouseMasterDataClient.java
index 3985ff209..28ae9d820 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/client/WarehouseMasterDataClient.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/client/WarehouseMasterDataClient.java
@@ -6,6 +6,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
 
+import java.util.List;
+
 /** 获取平台仓库主数据，供虚拟柜校验国内中转仓使用。 */
 @FeignClient(name = "warehouse-service", contextId = "firstlegWarehouseMasterDataClient",
     url = "${baiyue.clients.warehouse.url:}", path = "/internal/warehouses")
@@ -15,10 +17,17 @@ public interface WarehouseMasterDataClient {
                                @PathVariable long tenantId,
                                @PathVariable long warehouseId);
 
+    @GetMapping("/domestic")
+    ApiResponse<List<WarehouseOption>> domestic(
+        @RequestHeader("X-Internal-Service-Token") String token);
+
     record Detail(Warehouse warehouse) {
     }
 
     record Warehouse(Long id, Long tenantId, String warehouseCode, String internalCode, String warehouseName,
                      String warehouseType, String status) {
     }
+
+    record WarehouseOption(Long id, String warehouseCode, String warehouseName) {
+    }
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformDropshipPalletizationController.java b/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformDropshipPalletizationController.java
index bbb40a3a7..59b3c9e17 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformDropshipPalletizationController.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformDropshipPalletizationController.java
@@ -39,9 +39,10 @@ public class PlatformDropshipPalletizationController {
     @PreAuthorize("hasAuthority('platform:firstleg:pda:view')")
     public ApiResponse<List<DropshipPalletizationDtos.PendingTask>> pending(
         @AuthenticationPrincipal AuthenticatedUser user,
+        @RequestParam @Positive long warehouseId,
         @RequestParam(required = false) @Size(max = 64) String keyword) {
         FirstlegScopeGuard.platform(user);
-        return ApiResponse.success(service.pending(user.userId(), keyword));
+        return ApiResponse.success(service.pending(user.userId(), warehouseId, keyword));
     }
 
     @GetMapping("/tasks/{taskId}")
@@ -92,15 +93,6 @@ public class PlatformDropshipPalletizationController {
         return ApiResponse.success(service.bindPending(taskId, request, user.userId(), user.username()));
     }
 
-    @PostMapping("/tasks/{taskId}/pallets/create-and-bind")
-    @PreAuthorize("hasAuthority('platform:firstleg:pda:work')")
-    public ApiResponse<Task> createAndBind(@AuthenticationPrincipal AuthenticatedUser user,
-                                           @PathVariable @Positive long taskId,
-                                           @Valid @RequestBody DropshipPalletizationDtos.CreateAndBindRequest request) {
-        FirstlegScopeGuard.platform(user);
-        return ApiResponse.success(service.createAndBind(taskId, request, user.userId(), user.username()));
-    }
-
     @PostMapping("/tasks/{taskId}/cartons/{cartonId}/move")
     @PreAuthorize("hasAuthority('platform:firstleg:pda:work')")
     public ApiResponse<Task> moveCarton(@AuthenticationPrincipal AuthenticatedUser user,
@@ -121,6 +113,34 @@ public class PlatformDropshipPalletizationController {
         return ApiResponse.success(service.seal(taskId, palletId, request, user.userId(), user.username()));
     }
 
+    @GetMapping("/tasks/{taskId}/pallets/{palletId}/print")
+    @PreAuthorize("hasAuthority('platform:firstleg:pda:view')")
+    public ResponseEntity<byte[]> printTaskPallet(@AuthenticationPrincipal AuthenticatedUser user,
+                                                  @PathVariable @Positive long taskId,
+                                                  @PathVariable @Positive long palletId,
+                                                  @RequestParam @Positive long warehouseId,
+                                                  @RequestHeader(value = "X-Request-Id", required = false) String requestId) {
+        FirstlegScopeGuard.platform(user);
+        Task task = service.task(taskId, warehouseId, user.userId());
+        Pallet pallet = task.pallets().stream()
+            .filter(item -> item.palletId() == palletId).findFirst()
+            .orElseThrow(() -> new com.baiyue.common.core.exception.BizException(
+                com.baiyue.common.core.api.ResultCode.NOT_FOUND, "托盘不存在"));
+        return printService.generateDropshipPallet(pallet, task.inboundCode(), requestId);
+    }
+
+    @GetMapping("/tasks/{taskId}/pallets/print")
+    @PreAuthorize("hasAuthority('platform:firstleg:pda:view')")
+    public ResponseEntity<byte[]> printTaskPallets(@AuthenticationPrincipal AuthenticatedUser user,
+                                                   @PathVariable @Positive long taskId,
+                                                   @RequestParam @Positive long warehouseId,
+                                                   @RequestHeader(value = "X-Request-Id", required = false) String requestId) {
+        FirstlegScopeGuard.platform(user);
+        Task task = service.task(taskId, warehouseId, user.userId());
+        return printService.generateDropshipPallets(
+            service.generatedPallets(taskId, warehouseId, user.userId()), task.inboundCode(), requestId);
+    }
+
     @GetMapping("/inbound-orders/{inboundId}/pallets")
     @PreAuthorize("hasAuthority('firstleg:inbound:list')")
     public ApiResponse<List<Pallet>> inboundPallets(@AuthenticationPrincipal AuthenticatedUser user,
@@ -142,6 +162,6 @@ public class PlatformDropshipPalletizationController {
             .filter(item -> item.palletId() == palletId).findFirst()
             .orElseThrow(() -> new com.baiyue.common.core.exception.BizException(
                 com.baiyue.common.core.api.ResultCode.NOT_FOUND, "托盘不存在"));
-        return printService.generateDropshipPallet(pallet, requestId);
+        return printService.generateDropshipPallet(pallet, service.inboundCode(accountId, inboundId), requestId);
     }
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformLoadingPdaController.java b/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformLoadingPdaController.java
index 81cedd891..0344746e7 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformLoadingPdaController.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformLoadingPdaController.java
@@ -20,6 +20,8 @@ import java.util.List;
 import com.baiyue.firstleg.dto.LoadingPickDtos.Task;
 import com.baiyue.firstleg.service.FirstlegScopeGuard;
 import com.baiyue.firstleg.service.LoadingPickService;
+import com.baiyue.firstleg.service.PdaWarehouseCatalogService;
+import com.baiyue.firstleg.client.WarehouseMasterDataClient.WarehouseOption;
 import com.baiyue.firstleg.loading.service.CabinetLoadingEvidenceService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.MediaType;
@@ -51,6 +53,8 @@ public class PlatformLoadingPdaController {
     @Resource
     private LoadingPickService service;
     @Resource
+    private PdaWarehouseCatalogService warehouseCatalog;
+    @Resource
     private CabinetLoadingEvidenceService evidenceService;
 
     @GetMapping("/tasks")
@@ -66,10 +70,18 @@ public class PlatformLoadingPdaController {
     @GetMapping("/tasks/pending")
     @PreAuthorize("hasAuthority('platform:firstleg:pda:view')")
     public ApiResponse<List<PendingTask>> pendingTasks(@AuthenticationPrincipal AuthenticatedUser user,
+                                                       @RequestParam @Positive long warehouseId,
                                                        @RequestParam(required = false)
                                                        @Size(max = 64) String keyword) {
         FirstlegScopeGuard.platform(user);
-        return ApiResponse.success(service.pendingTasks(user.userId(), keyword));
+        return ApiResponse.success(service.pendingTasks(user.userId(), warehouseId, keyword));
+    }
+
+    @GetMapping("/warehouses")
+    @PreAuthorize("hasAuthority('platform:firstleg:pda:view')")
+    public ApiResponse<List<WarehouseOption>> warehouses(@AuthenticationPrincipal AuthenticatedUser user) {
+        FirstlegScopeGuard.platform(user);
+        return ApiResponse.success(warehouseCatalog.activeDomesticWarehouses());
     }
 
     @GetMapping("/tasks/{taskId}")
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformPriceBookController.java b/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformPriceBookController.java
index af13b112d..78af65ba8 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformPriceBookController.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformPriceBookController.java
@@ -75,6 +75,17 @@ public class PlatformPriceBookController {
         return ApiResponse.success(service.publish(versionId, user.userId(), request));
     }
 
+    @PostMapping("/{versionId}/void")
+    @PreAuthorize("hasAuthority('firstleg:fba-pricing:rate:edit')")
+    @BusinessAudit(event = "FBA_PRICE_BOOK_VOID", resourceType = "PRICE_BOOK_VERSION", resourceId = "#versionId", description = "作废待确认船期价格表")
+    public ApiResponse<PriceBookDtos.PriceBookVersionDetail> voidPending(
+        @AuthenticationPrincipal com.baiyue.common.security.AuthenticatedUser user,
+        @PathVariable long versionId,
+        @Valid @RequestBody PriceBookDtos.PriceBookVoidRequest request) {
+        FirstlegScopeGuard.platform(user);
+        return ApiResponse.success(service.voidPending(versionId, user.userId(), request));
+    }
+
     @GetMapping("/{versionId}/source")
     @PreAuthorize("hasAuthority('firstleg:fba-pricing:rate:view')")
     public ResponseEntity<byte[]> source(
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dashboard/DashboardMetricsDtos.java b/firstleg/src/main/java/com/baiyue/firstleg/dashboard/DashboardMetricsDtos.java
new file mode 100644
index 000000000..00e619e54
--- /dev/null
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dashboard/DashboardMetricsDtos.java
@@ -0,0 +1,16 @@
+package com.baiyue.firstleg.dashboard;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+public final class DashboardMetricsDtos {
+    private DashboardMetricsDtos() {}
+
+    public record OperationalMetrics(
+        long inTransitContainerCount,
+        BigDecimal inTransitTeu,
+        long unknownContainerTypeCount,
+        long pendingCustomsOrderCount,
+        LocalDateTime asOf
+    ) {}
+}
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dashboard/DashboardMetricsMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/dashboard/DashboardMetricsMapper.java
new file mode 100644
index 000000000..b803f27fc
--- /dev/null
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dashboard/DashboardMetricsMapper.java
@@ -0,0 +1,52 @@
+package com.baiyue.firstleg.dashboard;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Mapper
+public interface DashboardMetricsMapper {
+    @Select("""
+        SELECT transit.container_count inTransitContainerCount,
+               transit.total_teu inTransitTeu,
+               transit.unknown_container_type_count unknownContainerTypeCount,
+               customs.pending_customs_order_count pendingCustomsOrderCount,
+               CURRENT_TIMESTAMP(3) asOf
+          FROM (
+            SELECT COUNT(*) container_count,
+                   COALESCE(SUM(container.teu), 0) total_teu,
+                   COALESCE(SUM(CASE WHEN container.teu IS NULL THEN 1 ELSE 0 END), 0) unknown_container_type_count
+              FROM (
+                SELECT DISTINCT booking.id,
+                       CASE
+                         WHEN UPPER(TRIM(booking.container_type)) LIKE '20%' THEN 1.0
+                         WHEN UPPER(TRIM(booking.container_type)) LIKE '40%' THEN 2.0
+                         WHEN UPPER(TRIM(booking.container_type)) LIKE '45%' THEN 2.25
+                         ELSE NULL
+                       END teu
+                  FROM fl_container_booking booking
+                  JOIN fl_ocean_booking ocean ON ocean.id = booking.ocean_booking_id
+                 WHERE booking.actual_sailing_at IS NOT NULL
+                   AND booking.actual_warehouse_arrival_at IS NULL
+                   AND booking.record_status = 'ACTIVE'
+                   AND ocean.status <> 'CANCELLED'
+              ) container
+          ) transit
+          CROSS JOIN (
+            SELECT COUNT(DISTINCT inbound.order_id) pending_customs_order_count
+              FROM fl_customs_container customs_container
+              JOIN fl_loading_plan_item item
+                ON item.loading_plan_id = customs_container.loading_plan_id AND item.deleted = 0
+              JOIN fl_inbound_order inbound
+                ON inbound.id = item.inbound_id AND inbound.tenant_id = item.account_id AND inbound.deleted = 0
+             WHERE customs_container.status <> 'COMPLETED'
+          ) customs
+        """)
+    MetricsProjection read();
+
+    record MetricsProjection(Long inTransitContainerCount, BigDecimal inTransitTeu,
+                             Long unknownContainerTypeCount, Long pendingCustomsOrderCount,
+                             LocalDateTime asOf) {}
+}
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dashboard/DashboardMetricsService.java b/firstleg/src/main/java/com/baiyue/firstleg/dashboard/DashboardMetricsService.java
new file mode 100644
index 000000000..6f3671b3c
--- /dev/null
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dashboard/DashboardMetricsService.java
@@ -0,0 +1,24 @@
+package com.baiyue.firstleg.dashboard;
+
+import com.baiyue.firstleg.dashboard.DashboardMetricsDtos.OperationalMetrics;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+
+@Service
+public class DashboardMetricsService {
+    @Resource private DashboardMetricsMapper mapper;
+
+    public OperationalMetrics read() {
+        var row = mapper.read();
+        if (row == null) return new OperationalMetrics(0, BigDecimal.ZERO, 0, 0, null);
+        return new OperationalMetrics(value(row.inTransitContainerCount()),
+            row.inTransitTeu() == null ? BigDecimal.ZERO : row.inTransitTeu(),
+            value(row.unknownContainerTypeCount()), value(row.pendingCustomsOrderCount()), row.asOf());
+    }
+
+    private static long value(Long value) {
+        return value == null ? 0 : value;
+    }
+}
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dashboard/PlatformDashboardMetricsController.java b/firstleg/src/main/java/com/baiyue/firstleg/dashboard/PlatformDashboardMetricsController.java
new file mode 100644
index 000000000..350b1ab22
--- /dev/null
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dashboard/PlatformDashboardMetricsController.java
@@ -0,0 +1,25 @@
+package com.baiyue.firstleg.dashboard;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.firstleg.dashboard.DashboardMetricsDtos.OperationalMetrics;
+import com.baiyue.firstleg.service.FirstlegScopeGuard;
+import jakarta.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/platform/v1/first-leg/dashboard")
+public class PlatformDashboardMetricsController {
+    @Resource private DashboardMetricsService service;
+
+    @GetMapping("/operational-metrics")
+    @PreAuthorize("hasAuthority('platform:firstleg:container:list') and hasAuthority('platform:firstleg:customs:list')")
+    public ApiResponse<OperationalMetrics> metrics(@AuthenticationPrincipal AuthenticatedUser user) {
+        FirstlegScopeGuard.platform(user);
+        return ApiResponse.success(service.read());
+    }
+}
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/domain/PriceBookChannelCatalog.java b/firstleg/src/main/java/com/baiyue/firstleg/domain/PriceBookChannelCatalog.java
index 0766bf4f9..2504fbd92 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/domain/PriceBookChannelCatalog.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/domain/PriceBookChannelCatalog.java
@@ -1,12 +1,16 @@
 package com.baiyue.firstleg.domain;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 /** 首版固定渠道目录；上传名称只能映射到这些稳定编码。 */
 public final class PriceBookChannelCatalog {
     private PriceBookChannelCatalog() {}
 
+    private static final Set<String> SEA_RAIL_CHANNEL_CODES = Set.of(
+        "EXX_RAIL_NY", "NYEXX", "OA_CHICAGO_RAIL", "CPHT");
+
     public static final List<ChannelDefinition> CHANNELS = List.of(
         fba("MATSON_CLX_TRUCK", "美森正班海卡", "美森正班海卡", "ZBYHK", "ZBYHWK"),
         fba("MATSON_MAX_TRUCK", "美森加班海卡", "美森加班海卡", "BYHK", "BYHWK"),
@@ -37,6 +41,11 @@ public final class PriceBookChannelCatalog {
             inboundCodePrefix, overseasInboundCodePrefix);
     }
 
+    public static boolean isSeaRail(String channelCode) {
+        return channelCode != null
+            && SEA_RAIL_CHANNEL_CODES.contains(channelCode.trim().toUpperCase(Locale.ROOT));
+    }
+
     public record ChannelDefinition(
         String channelCode,
         String displayName,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/domain/PriceBookStatus.java b/firstleg/src/main/java/com/baiyue/firstleg/domain/PriceBookStatus.java
index 717eefca6..c3bb8a276 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/domain/PriceBookStatus.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/domain/PriceBookStatus.java
@@ -5,5 +5,6 @@ public enum PriceBookStatus {
     PENDING_CONFIRMATION,
     ACTIVE,
     SUPERSEDED,
+    VOIDED,
     FAILED
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/domain/SmartLoadingChannelGroupCatalog.java b/firstleg/src/main/java/com/baiyue/firstleg/domain/SmartLoadingChannelGroupCatalog.java
new file mode 100644
index 000000000..0e07eefbe
--- /dev/null
+++ b/firstleg/src/main/java/com/baiyue/firstleg/domain/SmartLoadingChannelGroupCatalog.java
@@ -0,0 +1,64 @@
+package com.baiyue.firstleg.domain;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+/** Stable planning groups used by simulated containers and smart-loading filters. */
+public final class SmartLoadingChannelGroupCatalog {
+    private SmartLoadingChannelGroupCatalog() {}
+
+    public static final List<Definition> GROUPS = List.of(
+        group("MATSON_CLX", "美森正班", "MATSON_CLX_TRUCK", "MATSON_CLX_PARCEL", "ZBYHK", "ZBYHWK", "ZBYHP"),
+        group("MATSON_MAX", "美森加班", "MATSON_MAX_TRUCK", "MATSON_MAX_PARCEL", "BYHK", "BYHWK", "BYHP"),
+        group("EXX", "EXX", "EXX_TRUCK", "EXX_RAIL_NY", "EXXHK", "EXXHWK", "NYEXX"),
+        group("HEDE", "合德", "HEDE_TRUCK", "HEDE_PARCEL", "HDHK", "HDHWK", "HDHP"),
+        group("OA_LA", "洛杉矶普船", "OA_LA_TRUCK", "OA_LA_FULL_TRUCK", "OA_PARCEL", "PCHK", "PCHWK", "PCKK", "PCHP"),
+        group("OA_CHICAGO", "芝加哥普船", "OA_CHICAGO_RAIL", "CPHT"),
+        group("OA_HOUSTON", "休斯顿普船", "OA_HOUSTON_TRUCK", "HPHK"),
+        group("OA_SAVANNAH", "萨凡纳普船", "OA_SAVANNAH_TRUCK", "SPHK"),
+        group("OA_NEW_YORK_TRUCK", "纽约普船海卡", "OA_NEW_YORK_TRUCK", "NPHK", "NPHWK")
+    );
+
+    private static final Map<String, Definition> BY_CODE = indexByCode();
+    private static final Map<String, Definition> BY_CHANNEL = indexByChannel();
+
+    public static Definition require(String value) {
+        Definition result = BY_CODE.get(normalize(value));
+        if (result == null) throw new IllegalArgumentException("不支持的渠道分组: " + value);
+        return result;
+    }
+
+    public static Definition resolveChannel(String channelCode) {
+        return BY_CHANNEL.get(normalize(channelCode));
+    }
+
+    public static boolean contains(String groupCode, String channelCode) {
+        Definition group = BY_CODE.get(normalize(groupCode));
+        return group != null && group.channelCodes().contains(normalize(channelCode));
+    }
+
+    private static Definition group(String code, String name, String... channelCodes) {
+        return new Definition(code, name, Set.of(channelCodes));
+    }
+
+    private static String normalize(String value) {
+        return value == null ? "" : value.trim().toUpperCase(Locale.ROOT);
+    }
+
+    private static Map<String, Definition> indexByCode() {
+        Map<String, Definition> result = new LinkedHashMap<>();
+        GROUPS.forEach(group -> result.put(group.code(), group));
+        return Map.copyOf(result);
+    }
+
+    private static Map<String, Definition> indexByChannel() {
+        Map<String, Definition> result = new LinkedHashMap<>();
+        GROUPS.forEach(group -> group.channelCodes().forEach(channel -> result.put(channel, group)));
+        return Map.copyOf(result);
+    }
+
+    public record Definition(String code, String name, Set<String> channelCodes) {}
+}
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dto/ContainerDtos.java b/firstleg/src/main/java/com/baiyue/firstleg/dto/ContainerDtos.java
index b20580354..b9ee1f536 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/dto/ContainerDtos.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dto/ContainerDtos.java
@@ -83,7 +83,7 @@ public final class ContainerDtos {
     ) {}
 
     @Schema(name = "ContainerSimulationCreateRequest", description = "新增内部模拟柜；内部柜号由服务端生成")
-    public record SimulationCreateRequest(@NotBlank @Size(max = 64) String channelCode,
+    public record SimulationCreateRequest(@NotBlank @Size(max = 64) String channelGroupCode,
         @NotNull @Positive Long warehouseId, @NotBlank @Size(max = 32) String containerType,
         @NotNull @DecimalMin(value = "0", inclusive = false) BigDecimal capacityCbm,
         @NotNull @DecimalMin(value = "0", inclusive = false) BigDecimal maxWeightKg) {}
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dto/DropshipPalletizationDtos.java b/firstleg/src/main/java/com/baiyue/firstleg/dto/DropshipPalletizationDtos.java
index 78cc53664..f520f6b49 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/dto/DropshipPalletizationDtos.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dto/DropshipPalletizationDtos.java
@@ -4,7 +4,10 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
 import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.Valid;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -15,19 +18,20 @@ public final class DropshipPalletizationDtos {
 
     public record ClaimRequest(@Positive long warehouseId) {}
 
-    public record CreateAndBindRequest(@Positive long warehouseId,
-                                       @NotBlank @Size(max = 128) String operationId) {}
-
     public enum DiscrepancyAction { MATCH, ACCEPT_VARIANCE }
 
     public record CountCartonRequest(@Positive long warehouseId,
                                      @NotBlank @Size(max = 80) String boxCode,
-                                     @Positive int actualSkuQuantity,
-                                     @NotNull DiscrepancyAction discrepancyAction,
-                                     @Size(max = 500) String discrepancyRemark,
+                                     @NotEmpty @Valid List<CountSkuLine> skuLines,
                                      @Pattern(regexp = "DP-[0-9]{6}-[0-9]{4}") String palletNo,
                                      @NotBlank @Size(max = 128) String operationId) {}
 
+    public record CountSkuLine(@Positive long inboundDetailId,
+                               @NotBlank @Size(max = 128) String skuCode,
+                               @PositiveOrZero int actualQuantity,
+                               @NotNull DiscrepancyAction discrepancyAction,
+                               @Size(max = 500) String discrepancyRemark) {}
+
     public record BindPendingRequest(@Positive long warehouseId,
                                      @NotBlank @Pattern(regexp = "DP-[0-9]{6}-[0-9]{4}") String palletNo,
                                      @NotBlank @Size(max = 128) String operationId) {}
@@ -49,7 +53,9 @@ public final class DropshipPalletizationDtos {
     public record Task(Long taskId, Long inboundId, String inboundCode, Long tenantId,
                        String customerName, Long warehouseId, String warehouseName,
                        Integer totalCartons, Integer countedCartons, Integer boundCartons,
-                       Integer unboundCartons, Integer discrepancyCartons, String taskStatus,
+                       Integer unboundCartons, Integer discrepancyCartons,
+                       Integer expectedPalletCount, Integer generatedPalletCount,
+                       Boolean palletSetupReady, String palletSetupMessage, String taskStatus,
                        Long assigneeId, String assigneeName, Integer version,
                        List<Pallet> pallets, List<Carton> unbound) {}
 
@@ -64,12 +70,14 @@ public final class DropshipPalletizationDtos {
                           List<String> cartonMarks) {}
 
     public record Carton(Long cartonId, String boxCode, Long inboundId, String inboundCode,
-                         Long inboundDetailId, String skuCode, String cargoName,
-                         Integer expectedSkuQuantity, Integer actualSkuQuantity,
-                         String discrepancyStatus, String discrepancyRemark,
+                         List<CartonSkuLine> skuLines,
                          String countStatus, Long palletId, String palletNo,
                          Boolean canCount, String blockReason) {}
 
+    public record CartonSkuLine(Long inboundDetailId, String skuCode, String cargoName,
+                                Integer expectedQuantity, Integer actualQuantity,
+                                String discrepancyStatus, String discrepancyRemark) {}
+
     public record CountResult(Carton carton, Integer countedCartons, Integer boundCartons,
                               Integer unboundCartons, Integer remainingCartons, Pallet pallet) {}
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dto/InboundMeasurementRequests.java b/firstleg/src/main/java/com/baiyue/firstleg/dto/InboundMeasurementRequests.java
index afefd5038..5488d7cdc 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/dto/InboundMeasurementRequests.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dto/InboundMeasurementRequests.java
@@ -28,8 +28,14 @@ public final class InboundMeasurementRequests {
         Long measurementId,
         @NotNull @PositiveOrZero Integer version,
         @Size(max = 255) String actualGoodsName,
+        @Positive @Max(1000) Integer expectedPalletCount,
         @NotEmpty @Size(max = 500) List<@Valid ItemRequest> items
     ) {
+        public SaveDraftRequest(Long measurementId, Integer version, String actualGoodsName,
+                                List<ItemRequest> items) {
+            this(measurementId, version, actualGoodsName, null, items);
+        }
+
         @JsonAnySetter
         public void rejectUnknownField(String fieldName, Object ignored) {
             throw new IllegalArgumentException("测量草稿不接受字段: " + fieldName);
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dto/InboundMeasurementResponses.java b/firstleg/src/main/java/com/baiyue/firstleg/dto/InboundMeasurementResponses.java
index c58ec1b5f..deda6cb94 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/dto/InboundMeasurementResponses.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dto/InboundMeasurementResponses.java
@@ -19,6 +19,8 @@ public final class InboundMeasurementResponses {
         String companyName,
         String channelCode,
         String channelName,
+        String fulfillmentType,
+        Integer expectedPalletCount,
         String processStatus,
         String measureReviewStatus,
         @Schema(description = "测量完成后的推荐托盘类型，仅为建议，不代表已分配托盘",
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dto/LoadingPickDtos.java b/firstleg/src/main/java/com/baiyue/firstleg/dto/LoadingPickDtos.java
index 0827228d8..c3b7df976 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/dto/LoadingPickDtos.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dto/LoadingPickDtos.java
@@ -47,7 +47,7 @@ public final class LoadingPickDtos {
     ) {
     }
 
-    /** PDA 在线草稿只在员工提交时发送一次，服务端原子处理整批明细。 */
+    /** PDA 已即时提交的明细不重复包含；收尾时服务端原子处理剩余全部待拣明细。 */
     public record BatchRequest(
         @NotNull @Min(1) Long warehouseId,
         @NotNull @Min(1) Long loadingPlanId,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dto/PriceBookDtos.java b/firstleg/src/main/java/com/baiyue/firstleg/dto/PriceBookDtos.java
index f0e0f4317..b4c4943da 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/dto/PriceBookDtos.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dto/PriceBookDtos.java
@@ -38,7 +38,16 @@ public final class PriceBookDtos {
         LocalDateTime createdAt,
         Long publishedBy,
         LocalDateTime publishedAt,
-        LocalDateTime supersededAt
+        LocalDateTime supersededAt,
+        Long voidedBy,
+        LocalDateTime voidedAt,
+        String voidReason
+    ) {}
+
+    public record PriceBookVoidRequest(
+        @NotBlank(message = "作废原因不能为空")
+        @Size(max = 500, message = "作废原因不能超过500个字符")
+        String reason
     ) {}
 
     public record PriceBookVersionDetail(
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/dto/SmartLoadingDtos.java b/firstleg/src/main/java/com/baiyue/firstleg/dto/SmartLoadingDtos.java
index acca35f80..939eff487 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/dto/SmartLoadingDtos.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/dto/SmartLoadingDtos.java
@@ -49,7 +49,7 @@ public final class SmartLoadingDtos { private SmartLoadingDtos(){}
   }
  }
  public record WorkbenchContainer(Long bookingId, String bookingNo, String cabinetNo, String containerNo,
-  Long warehouseId, String warehouseName, String channelCode, String channelName, String containerType,
+  Long warehouseId, String warehouseName, String channelGroupCode, String channelCode, String channelName, String containerType,
   BigDecimal capacityCbm, BigDecimal maxWeightKg,
   Long planId, String planNo, String planStatus, Integer version) {}
  public record Candidate(Long accountId, Long inboundId, Long inboundDetailId, Long orderId, String orderNo, String inboundCode,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/entity/ContainerBookingEntity.java b/firstleg/src/main/java/com/baiyue/firstleg/entity/ContainerBookingEntity.java
index 6f6244d5c..1901cacff 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/entity/ContainerBookingEntity.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/entity/ContainerBookingEntity.java
@@ -24,6 +24,7 @@ public class ContainerBookingEntity {
     private String sourceType;
     private String recordStatus;
     private Long mergedIntoContainerBookingId;
+    private String channelGroupCode;
     private String channelCode;
     private String channelName;
     private Long oceanBookingId;
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/entity/PriceBookVersionEntity.java b/firstleg/src/main/java/com/baiyue/firstleg/entity/PriceBookVersionEntity.java
index d4fa1f579..69bddf846 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/entity/PriceBookVersionEntity.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/entity/PriceBookVersionEntity.java
@@ -28,4 +28,7 @@ public class PriceBookVersionEntity extends BaseEntity {
     private Long publishedBy;
     private LocalDateTime publishedAt;
     private LocalDateTime supersededAt;
+    private Long voidedBy;
+    private LocalDateTime voidedAt;
+    private String voidReason;
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/loading/bridge/service/LoadingModelBridgeService.java b/firstleg/src/main/java/com/baiyue/firstleg/loading/bridge/service/LoadingModelBridgeService.java
index 9c41f4913..f0989d6d7 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/loading/bridge/service/LoadingModelBridgeService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/loading/bridge/service/LoadingModelBridgeService.java
@@ -134,8 +134,7 @@ public class LoadingModelBridgeService {
         var preload = repository.preload(tenantId, inboundId);
         if (preload == null) throw new BizException(ResultCode.NOT_FOUND, "入库单预装计划不存在");
         boolean running = "LOADING".equals(plan.status());
-        if (!Set.of("PENDING", "CONFIRMED").contains(preload.status())
-            && !(running && "CONFIRMING".equals(preload.status()))) {
+        if (!Set.of("PENDING", "CONFIRMING", "CONFIRMED").contains(preload.status())) {
             throw conflict("新增入库单预装状态不允许进入当前柜次");
         }
         PreloadLoadingPlanLinkEntity link = new PreloadLoadingPlanLinkEntity();
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/DropshipPalletizationMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/DropshipPalletizationMapper.java
index 77dc5e25f..f639861df 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/DropshipPalletizationMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/DropshipPalletizationMapper.java
@@ -13,11 +13,6 @@ import java.util.List;
 /** 一件代发逐箱清点、待绑托与封托事实。 */
 @Mapper
 public interface DropshipPalletizationMapper {
- @Select("SELECT id FROM fl_dropship_pallet_task WHERE id=#{taskId} AND warehouse_id=#{warehouseId} FOR UPDATE")
- Long lockTask(@Param("taskId") long taskId,@Param("warehouseId") long warehouseId);
-
- @Select("SELECT * FROM fl_dropship_pallet WHERE open_operation_id=#{operationId}")
- PalletRow palletByOpenOperation(@Param("operationId") String operationId);
  @Insert("""
   INSERT IGNORE INTO fl_dropship_pallet_task
   (id,tenant_id,inbound_id,warehouse_id,task_status,total_cartons,counted_cartons,allocated_cartons,discrepancy_cartons,version,created_at,updated_at)
@@ -30,13 +25,16 @@ public interface DropshipPalletizationMapper {
   o.warehouse_name,t.total_cartons,t.counted_cartons,t.allocated_cartons bound_cartons,
   t.counted_cartons-t.allocated_cartons unbound_cartons,t.discrepancy_cartons,t.task_status,t.created_at
   FROM fl_dropship_pallet_task t JOIN fl_inbound_order o ON o.id=t.inbound_id AND o.tenant_id=t.tenant_id
-  WHERE t.task_status IN ('PENDING','CLAIMED') AND (t.assignee_id IS NULL OR t.assignee_id=#{operatorId})
+  WHERE t.task_status IN ('PENDING','CLAIMED') AND t.warehouse_id=#{warehouseId}
+  AND (t.assignee_id IS NULL OR t.assignee_id=#{operatorId})
   AND (#{keyword} IS NULL OR o.inbound_code LIKE CONCAT('%',#{keyword},'%') OR o.customer_name LIKE CONCAT('%',#{keyword},'%'))
   ORDER BY t.created_at,t.id""")
- List<PendingTask> pending(@Param("operatorId") long operatorId,@Param("keyword") String keyword);
+ List<PendingTask> pending(@Param("operatorId") long operatorId,@Param("warehouseId") long warehouseId,
+                           @Param("keyword") String keyword);
 
  @Select("""
-  SELECT t.*,o.inbound_code,o.customer_name,o.warehouse_name,o.process_status,o.fulfillment_type
+  SELECT t.*,o.inbound_code,o.customer_name,o.warehouse_name,o.process_status,o.fulfillment_type,
+  o.pallet_count expected_pallet_count
   FROM fl_dropship_pallet_task t JOIN fl_inbound_order o ON o.id=t.inbound_id AND o.tenant_id=t.tenant_id
   WHERE t.id=#{taskId} AND t.warehouse_id=#{warehouseId}""")
  TaskRow task(@Param("taskId") long taskId,@Param("warehouseId") long warehouseId);
@@ -58,12 +56,31 @@ public interface DropshipPalletizationMapper {
   @Param("inboundId") long inboundId,@Param("warehouseId") long warehouseId,@Param("palletNo") String palletNo,
   @Param("operationId") String operationId,@Param("operatorId") long operatorId,@Param("operatorName") String operatorName);
 
- @Select("SELECT * FROM fl_dropship_pallet WHERE pallet_no=#{palletNo}") PalletRow palletByNo(@Param("palletNo") String palletNo);
+ @Select("SELECT * FROM fl_dropship_pallet WHERE pallet_no=#{palletNo} FOR UPDATE") PalletRow palletByNo(@Param("palletNo") String palletNo);
+ @Select("SELECT COUNT(*) FROM fl_dropship_pallet WHERE task_id=#{taskId}") int palletCount(@Param("taskId") long taskId);
  @Select("SELECT * FROM fl_dropship_pallet WHERE seal_operation_id=#{operationId}") PalletRow palletBySealOperation(@Param("operationId") String operationId);
- @Select("SELECT * FROM fl_dropship_pallet WHERE id=#{palletId} AND task_id=#{taskId} AND warehouse_id=#{warehouseId}")
+ @Select("""
+  SELECT p.* FROM fl_dropship_pallet p
+  WHERE p.id=#{palletId} AND p.warehouse_id=#{warehouseId}
+    AND (p.task_id=#{taskId} OR EXISTS(SELECT 1 FROM fl_dropship_pallet_carton c WHERE c.pallet_id=p.id AND c.task_id=#{taskId}))
+  """)
  PalletRow pallet(@Param("taskId") long taskId,@Param("palletId") long palletId,@Param("warehouseId") long warehouseId);
- @Select("SELECT * FROM fl_dropship_pallet WHERE task_id=#{taskId} ORDER BY id") List<PalletRow> pallets(@Param("taskId") long taskId);
- @Select("SELECT p.* FROM fl_dropship_pallet p JOIN fl_dropship_pallet_task t ON t.id=p.task_id WHERE t.tenant_id=#{tenantId} AND t.inbound_id=#{inboundId} ORDER BY p.id")
+ @Select("""
+  SELECT p.* FROM fl_dropship_pallet p
+  WHERE EXISTS(SELECT 1 FROM fl_dropship_pallet_carton c WHERE c.pallet_id=p.id AND c.task_id=#{taskId})
+  ORDER BY p.id
+  """) List<PalletRow> pallets(@Param("taskId") long taskId);
+ @Select("SELECT * FROM fl_dropship_pallet WHERE task_id=#{taskId} ORDER BY id")
+ List<PalletRow> generatedPallets(@Param("taskId") long taskId);
+ @Select("""
+  SELECT p.* FROM fl_dropship_pallet p
+  WHERE ((p.tenant_id=#{tenantId} AND p.inbound_id=#{inboundId})
+         AND EXISTS(SELECT 1 FROM fl_inbound_order own
+                     WHERE own.id=#{inboundId} AND own.tenant_id=#{tenantId} AND own.process_status='WAIT_PALLETIZE'))
+     OR EXISTS(SELECT 1 FROM fl_dropship_pallet_carton c
+                WHERE c.pallet_id=p.id AND c.tenant_id=#{tenantId} AND c.inbound_id=#{inboundId})
+  ORDER BY p.id
+  """)
  List<PalletRow> palletsByInbound(@Param("tenantId") long tenantId,@Param("inboundId") long inboundId);
  @Select("SELECT inbound_code FROM fl_inbound_order WHERE tenant_id=#{tenantId} AND id=#{inboundId} AND deleted=0")
  String inboundCode(@Param("tenantId") long tenantId,@Param("inboundId") long inboundId);
@@ -73,6 +90,12 @@ public interface DropshipPalletizationMapper {
   FROM fl_inbound_carton_label l JOIN fl_dropship_pallet_task t ON t.inbound_id=l.inbound_id AND t.tenant_id=l.tenant_id
   WHERE t.id=#{taskId} AND l.box_code=#{boxCode} AND l.batch_status='ACTIVE'""")
  LabelRow label(@Param("taskId") long taskId,@Param("boxCode") String boxCode);
+ @Select("""
+  SELECT s.inbound_detail_id,s.sku_code,s.cargo_name,s.expected_quantity,s.line_no
+  FROM fl_inbound_carton_label_sku s JOIN fl_inbound_carton_label l ON l.id=s.carton_label_id
+  JOIN fl_dropship_pallet_task t ON t.inbound_id=l.inbound_id AND t.tenant_id=l.tenant_id
+  WHERE t.id=#{taskId} AND l.id=#{labelId} ORDER BY s.line_no
+  """) List<LabelSkuRow> labelSkus(@Param("taskId") long taskId,@Param("labelId") long labelId);
  @Select("SELECT c.*,p.pallet_no FROM fl_dropship_pallet_carton c LEFT JOIN fl_dropship_pallet p ON p.id=c.pallet_id WHERE c.count_operation_id=#{operationId}") CartonRow cartonByCountOperation(@Param("operationId") String operationId);
  @Select("SELECT c.*,p.pallet_no FROM fl_dropship_pallet_carton c LEFT JOIN fl_dropship_pallet p ON p.id=c.pallet_id WHERE c.task_id=#{taskId} AND c.id=#{cartonId}") CartonRow carton(@Param("taskId") long taskId,@Param("cartonId") long cartonId);
  @Select("SELECT c.*,p.pallet_no FROM fl_dropship_pallet_carton c LEFT JOIN fl_dropship_pallet p ON p.id=c.pallet_id WHERE c.task_id=#{taskId} AND c.carton_label_id=#{labelId}")
@@ -94,6 +117,24 @@ public interface DropshipPalletizationMapper {
   @Param("discrepancyStatus") String discrepancyStatus,@Param("discrepancyRemark") String discrepancyRemark,
   @Param("operationId") String operationId,@Param("operatorId") long operatorId,@Param("operatorName") String operatorName);
 
+ @Insert("""
+  INSERT INTO fl_dropship_pallet_carton_sku
+  (id,carton_id,inbound_detail_id,sku_code,cargo_name,expected_quantity,actual_quantity,
+   discrepancy_status,discrepancy_remark,line_no)
+  VALUES(#{id},#{cartonId},#{detailId},#{skuCode},#{cargoName},#{expectedQuantity},#{actualQuantity},
+   #{discrepancyStatus},#{discrepancyRemark},#{lineNo})
+  """)
+ int insertCartonSku(@Param("id") long id,@Param("cartonId") long cartonId,@Param("detailId") long detailId,
+  @Param("skuCode") String skuCode,@Param("cargoName") String cargoName,
+  @Param("expectedQuantity") int expectedQuantity,@Param("actualQuantity") int actualQuantity,
+  @Param("discrepancyStatus") String discrepancyStatus,@Param("discrepancyRemark") String discrepancyRemark,
+  @Param("lineNo") int lineNo);
+
+ @Select("""
+  SELECT inbound_detail_id,sku_code,cargo_name,expected_quantity,actual_quantity,discrepancy_status,discrepancy_remark,line_no
+  FROM fl_dropship_pallet_carton_sku WHERE carton_id=#{cartonId} ORDER BY line_no
+  """) List<CartonSkuRow> cartonSkus(@Param("cartonId") long cartonId);
+
  @Update("""
   UPDATE fl_dropship_pallet_task SET counted_cartons=counted_cartons+1,allocated_cartons=allocated_cartons+#{boundCount},
   discrepancy_cartons=discrepancy_cartons+#{discrepancyCount},version=version+1,updated_at=CURRENT_TIMESTAMP(3)
@@ -123,65 +164,83 @@ public interface DropshipPalletizationMapper {
  @Update("""
   UPDATE fl_dropship_pallet SET pallet_status='SEALED',seal_operation_id=#{operationId},completed_by=#{operatorId},
   completed_by_name=#{operatorName},completed_at=CURRENT_TIMESTAMP(3),version=version+1,updated_at=CURRENT_TIMESTAMP(3)
-  WHERE id=#{palletId} AND task_id=#{taskId} AND pallet_status='OPEN' AND version=#{expectedVersion}
+  WHERE id=#{palletId} AND warehouse_id=#{warehouseId} AND pallet_status='OPEN' AND version=#{expectedVersion}
   AND EXISTS(SELECT 1 FROM fl_dropship_pallet_carton c WHERE c.pallet_id=#{palletId})
-  AND NOT EXISTS(SELECT 1 FROM fl_dropship_pallet_carton c WHERE c.task_id=#{taskId} AND c.pallet_id IS NULL)""")
+  AND EXISTS(SELECT 1 FROM fl_dropship_pallet_carton c WHERE c.pallet_id=#{palletId} AND c.task_id=#{taskId})""")
  int seal(@Param("taskId") long taskId,@Param("palletId") long palletId,@Param("expectedVersion") int expectedVersion,
-  @Param("operationId") String operationId,@Param("operatorId") long operatorId,@Param("operatorName") String operatorName);
- @Select("SELECT COUNT(*) FROM fl_dropship_pallet WHERE task_id=#{taskId} AND pallet_status='OPEN'") int openPalletCount(@Param("taskId") long taskId);
+  @Param("warehouseId") long warehouseId,@Param("operationId") String operationId,@Param("operatorId") long operatorId,@Param("operatorName") String operatorName);
+ @Select("""
+  SELECT COUNT(DISTINCT p.id) FROM fl_dropship_pallet_carton c
+  JOIN fl_dropship_pallet p ON p.id=c.pallet_id
+  WHERE c.task_id=#{taskId} AND p.pallet_status='OPEN'
+  """) int openPalletCount(@Param("taskId") long taskId);
+ @Select("SELECT DISTINCT task_id FROM fl_dropship_pallet_carton WHERE pallet_id=#{palletId} ORDER BY task_id")
+ List<Long> taskIdsByPallet(@Param("palletId") long palletId);
  @Update("""
   UPDATE fl_dropship_pallet_task SET task_status='COMPLETED',completed_at=CURRENT_TIMESTAMP(3),version=version+1,updated_at=CURRENT_TIMESTAMP(3)
   WHERE id=#{taskId} AND task_status='CLAIMED' AND counted_cartons=total_cartons AND allocated_cartons=total_cartons
-  AND NOT EXISTS(SELECT 1 FROM fl_dropship_pallet p WHERE p.task_id=#{taskId} AND p.pallet_status='OPEN')""") int completeTask(@Param("taskId") long taskId);
+  AND NOT EXISTS(SELECT 1 FROM fl_dropship_pallet_carton c JOIN fl_dropship_pallet p ON p.id=c.pallet_id
+                 WHERE c.task_id=#{taskId} AND p.pallet_status='OPEN')""") int completeTask(@Param("taskId") long taskId);
  @Update("""
-  UPDATE fl_inbound_order o SET o.process_status='WAIT_SPLIT',o.pallet_count=(SELECT COUNT(*) FROM fl_dropship_pallet p
-  WHERE p.inbound_id=o.id AND p.pallet_status='SEALED'),o.updated_by=#{operatorId},o.version=o.version+1
+  UPDATE fl_inbound_order o SET o.process_status='WAIT_SPLIT',o.pallet_count=(SELECT COUNT(DISTINCT p.id)
+  FROM fl_dropship_pallet_carton c JOIN fl_dropship_pallet p ON p.id=c.pallet_id
+  WHERE c.tenant_id=o.tenant_id AND c.inbound_id=o.id AND p.pallet_status='SEALED'),o.updated_by=#{operatorId},o.version=o.version+1
   WHERE o.id=#{inboundId} AND o.tenant_id=#{tenantId} AND o.process_status='WAIT_PALLETIZE'
   AND EXISTS(SELECT 1 FROM fl_dropship_pallet_task t WHERE t.id=#{taskId} AND t.task_status='COMPLETED')""")
  int completeInbound(@Param("taskId") long taskId,@Param("tenantId") long tenantId,@Param("inboundId") long inboundId,@Param("operatorId") long operatorId);
 
- @Select("SELECT c.*,p.pallet_no FROM fl_dropship_pallet_carton c LEFT JOIN fl_dropship_pallet p ON p.id=c.pallet_id WHERE c.pallet_id=#{palletId} ORDER BY c.sku_code,c.inbound_detail_id,c.id") List<CartonRow> cartons(@Param("palletId") long palletId);
+ @Select("""
+  SELECT c.*,p.pallet_no,o.inbound_code FROM fl_dropship_pallet_carton c
+  LEFT JOIN fl_dropship_pallet p ON p.id=c.pallet_id
+  JOIN fl_inbound_order o ON o.id=c.inbound_id AND o.tenant_id=c.tenant_id
+  WHERE c.pallet_id=#{palletId} ORDER BY o.inbound_code,c.sku_code,c.inbound_detail_id,c.id
+  """) List<CartonRow> cartons(@Param("palletId") long palletId);
  @Select("SELECT c.*,p.pallet_no FROM fl_dropship_pallet_carton c LEFT JOIN fl_dropship_pallet p ON p.id=c.pallet_id WHERE c.task_id=#{taskId} AND c.pallet_id IS NULL ORDER BY c.counted_at,c.id") List<CartonRow> unboundCartons(@Param("taskId") long taskId);
  @Select("""
-  SELECT COALESCE(o.actual_gross_weight_kg*COUNT(c.id)/NULLIF(o.total_package_count,0),0) weight_kg,
-  COALESCE(o.actual_volume_cbm*COUNT(c.id)/NULLIF(o.total_package_count,0),0) volume_cbm
-  FROM fl_dropship_pallet p JOIN fl_inbound_order o ON o.id=p.inbound_id AND o.tenant_id=p.tenant_id
-  LEFT JOIN fl_dropship_pallet_carton c ON c.pallet_id=p.id WHERE p.id=#{palletId}
-  GROUP BY p.id,o.actual_gross_weight_kg,o.actual_volume_cbm,o.total_package_count""")
+  SELECT COALESCE(SUM(o.actual_gross_weight_kg/NULLIF(o.total_package_count,0)),0) weight_kg,
+  COALESCE(SUM(o.actual_volume_cbm/NULLIF(o.total_package_count,0)),0) volume_cbm
+  FROM fl_dropship_pallet_carton c
+  JOIN fl_inbound_order o ON o.id=c.inbound_id AND o.tenant_id=c.tenant_id
+  WHERE c.pallet_id=#{palletId}""")
  PalletMetrics metrics(@Param("palletId") long palletId);
  @Select("""
-  SELECT p.id pallet_id,p.pallet_no,'SEALED_PALLET' unit_type,TRUE indivisible,COUNT(c.id) carton_count,
-         COUNT(DISTINCT c.sku_code) sku_count,
-         COALESCE(o.actual_gross_weight_kg*COUNT(c.id)/NULLIF(o.total_package_count,0),0) weight_kg,
-         COALESCE(o.actual_volume_cbm*COUNT(c.id)/NULLIF(o.total_package_count,0),0) volume_cbm
-    FROM fl_dropship_pallet p JOIN fl_inbound_order o ON o.id=p.inbound_id AND o.tenant_id=p.tenant_id
-    JOIN fl_dropship_pallet_carton c ON c.pallet_id=p.id
-   WHERE p.inbound_id=#{inboundId} AND p.pallet_status='SEALED'
+  SELECT p.id pallet_id,p.pallet_no,'SEALED_PALLET' unit_type,TRUE indivisible,COUNT(DISTINCT c.id) carton_count,
+         (SELECT COUNT(DISTINCT sku.sku_code) FROM fl_dropship_pallet_carton pc
+           JOIN fl_dropship_pallet_carton_sku sku ON sku.carton_id=pc.id WHERE pc.pallet_id=p.id) sku_count,
+         COALESCE(SUM(o.actual_gross_weight_kg/NULLIF(o.total_package_count,0)),0) weight_kg,
+         COALESCE(SUM(o.actual_volume_cbm/NULLIF(o.total_package_count,0)),0) volume_cbm
+    FROM fl_dropship_pallet p JOIN fl_dropship_pallet_carton c ON c.pallet_id=p.id
+    JOIN fl_inbound_order o ON o.id=c.inbound_id AND o.tenant_id=c.tenant_id
+   WHERE EXISTS(SELECT 1 FROM fl_dropship_pallet_carton own WHERE own.pallet_id=p.id AND own.inbound_id=#{inboundId})
+     AND p.pallet_status='SEALED'
      AND NOT EXISTS(SELECT 1 FROM fl_loading_plan_item i WHERE i.pallet_id=p.id AND i.deleted=0)
-   GROUP BY p.id,p.pallet_no,o.actual_gross_weight_kg,o.actual_volume_cbm,o.total_package_count ORDER BY p.id
+   GROUP BY p.id,p.pallet_no ORDER BY p.id
   """) List<PalletCandidate> palletCandidates(@Param("inboundId") long inboundId);
 
  @Select("""
-  SELECT p.id pallet_id,p.pallet_no,p.pallet_status,p.tenant_id account_id,p.inbound_id,o.order_id,o.order_no,
+  SELECT p.id pallet_id,p.pallet_no,p.pallet_status,c.tenant_id account_id,c.inbound_id,o.order_id,o.order_no,
          o.inbound_code,o.warehouse_id,o.channel_code,o.channel_name,o.destination_warehouse_id,
          o.destination_code destination_warehouse_code,o.destination_name destination_warehouse_name,o.customer_name,
-         c.inbound_detail_id,c.sku_code,MAX(c.cargo_name) cargo_name,COUNT(c.id) carton_count,
-         SUM(c.actual_sku_quantity) actual_sku_quantity,
+         s.inbound_detail_id,s.sku_code,MAX(s.cargo_name) cargo_name,COUNT(DISTINCT c.id) carton_count,
+         SUM(s.actual_quantity) actual_sku_quantity,
          COALESCE(o.actual_gross_weight_kg/NULLIF(o.total_package_count,0),0) unit_gross_weight_kg,
          COALESCE(o.actual_net_weight_kg/NULLIF(o.total_package_count,0),0) unit_net_weight_kg,
          COALESCE(o.actual_volume_cbm/NULLIF(o.total_package_count,0),0) unit_volume_cbm
-    FROM fl_dropship_pallet p JOIN fl_inbound_order o ON o.id=p.inbound_id AND o.tenant_id=p.tenant_id
-    JOIN fl_dropship_pallet_carton c ON c.pallet_id=p.id WHERE p.id=#{palletId}
-   GROUP BY p.id,p.pallet_no,p.pallet_status,p.tenant_id,p.inbound_id,o.order_id,o.order_no,o.inbound_code,
+    FROM fl_dropship_pallet p JOIN fl_dropship_pallet_carton c ON c.pallet_id=p.id
+    JOIN fl_dropship_pallet_carton_sku s ON s.carton_id=c.id
+    JOIN fl_inbound_order o ON o.id=c.inbound_id AND o.tenant_id=c.tenant_id WHERE p.id=#{palletId}
+   GROUP BY p.id,p.pallet_no,p.pallet_status,c.tenant_id,c.inbound_id,o.order_id,o.order_no,o.inbound_code,
          o.warehouse_id,o.channel_code,o.channel_name,o.destination_warehouse_id,o.destination_code,o.destination_name,
-         o.customer_name,c.inbound_detail_id,c.sku_code,o.actual_gross_weight_kg,o.actual_net_weight_kg,o.actual_volume_cbm,o.total_package_count
-   ORDER BY c.inbound_detail_id
+         o.customer_name,s.inbound_detail_id,s.sku_code,o.actual_gross_weight_kg,o.actual_net_weight_kg,o.actual_volume_cbm,o.total_package_count
+   ORDER BY s.inbound_detail_id
   """) List<PalletLine> sealedPalletLines(@Param("palletId") long palletId);
 
- @Getter @Setter class TaskRow { private Long id,tenantId,inboundId,warehouseId,assigneeId; private String inboundCode,customerName,warehouseName,taskStatus,assigneeName,processStatus,fulfillmentType; private Integer totalCartons,countedCartons,allocatedCartons,discrepancyCartons,version; }
+ @Getter @Setter class TaskRow { private Long id,tenantId,inboundId,warehouseId,assigneeId; private String inboundCode,customerName,warehouseName,taskStatus,assigneeName,processStatus,fulfillmentType; private Integer totalCartons,countedCartons,allocatedCartons,discrepancyCartons,expectedPalletCount,version; }
  @Getter @Setter class PalletRow { private Long id,taskId,tenantId,inboundId,warehouseId; private String palletNo,palletStatus,sealOperationId; private Integer version; private LocalDateTime completedAt; }
  @Getter @Setter class LabelRow { private Long cartonLabelId,inboundDetailId; private String skuCode,cargoName,inboundCode,boxCode; private Integer unitsPerCarton; }
- @Getter @Setter class CartonRow { private Long id,taskId,palletId,inboundId,inboundDetailId; private String palletNo,skuCode,cargoName,boxCode,discrepancyStatus,discrepancyRemark; private Integer expectedSkuQuantity,actualSkuQuantity; }
+ @Getter @Setter class LabelSkuRow { private Long inboundDetailId; private String skuCode,cargoName; private Integer expectedQuantity,lineNo; }
+ @Getter @Setter class CartonRow { private Long id,taskId,palletId,inboundId,inboundDetailId; private String palletNo,inboundCode,skuCode,cargoName,boxCode,discrepancyStatus,discrepancyRemark; private Integer expectedSkuQuantity,actualSkuQuantity; }
+ @Getter @Setter class CartonSkuRow { private Long inboundDetailId; private String skuCode,cargoName,discrepancyStatus,discrepancyRemark; private Integer expectedQuantity,actualQuantity,lineNo; }
  record PalletMetrics(BigDecimal weightKg,BigDecimal volumeCbm) {}
  @Getter @Setter class PalletLine { private Long palletId,tenantId,accountId,inboundId,orderId,warehouseId,destinationWarehouseId,inboundDetailId; private String palletNo,palletStatus,orderNo,inboundCode,channelCode,channelName,destinationWarehouseCode,destinationWarehouseName,customerName,skuCode,cargoName; private Integer cartonCount,actualSkuQuantity; private BigDecimal unitGrossWeightKg,unitNetWeightKg,unitVolumeCbm; }
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/InboundCartonLabelSkuMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/InboundCartonLabelSkuMapper.java
new file mode 100644
index 000000000..7a427760e
--- /dev/null
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/InboundCartonLabelSkuMapper.java
@@ -0,0 +1,48 @@
+package com.baiyue.firstleg.mapper;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/** A physical carton label may freeze more than one SKU line. */
+@Mapper
+public interface InboundCartonLabelSkuMapper {
+    @Insert("""
+        INSERT INTO fl_inbound_carton_label_sku
+        (id,tenant_id,inbound_id,carton_label_id,inbound_detail_id,sku_code,cargo_name,expected_quantity,line_no,created_at)
+        VALUES(#{id},#{tenantId},#{inboundId},#{labelId},#{detailId},#{skuCode},#{cargoName},#{expectedQuantity},#{lineNo},CURRENT_TIMESTAMP(3))
+        """)
+    int insert(@Param("id") long id, @Param("tenantId") long tenantId,
+               @Param("inboundId") long inboundId, @Param("labelId") long labelId,
+               @Param("detailId") long detailId, @Param("skuCode") String skuCode,
+               @Param("cargoName") String cargoName, @Param("expectedQuantity") int expectedQuantity,
+               @Param("lineNo") int lineNo);
+
+    @Select("""
+        SELECT inbound_detail_id,sku_code,cargo_name,expected_quantity,line_no
+        FROM fl_inbound_carton_label_sku WHERE carton_label_id=#{labelId} ORDER BY line_no
+        """)
+    List<SkuRow> findByLabel(@Param("labelId") long labelId);
+
+    @Select("""
+        SELECT carton_label_id,inbound_detail_id,sku_code,cargo_name,expected_quantity,line_no
+        FROM fl_inbound_carton_label_sku WHERE tenant_id=#{tenantId} AND inbound_id=#{inboundId}
+        ORDER BY carton_label_id,line_no
+        """)
+    List<SkuRow> findByInbound(@Param("tenantId") long tenantId, @Param("inboundId") long inboundId);
+
+    @Getter @Setter
+    class SkuRow {
+        private Long inboundDetailId;
+        private Long cartonLabelId;
+        private String skuCode;
+        private String cargoName;
+        private Integer expectedQuantity;
+        private Integer lineNo;
+    }
+}
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingCompletedEventMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingCompletedEventMapper.java
index 9d4493422..947107039 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingCompletedEventMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingCompletedEventMapper.java
@@ -85,7 +85,8 @@ public interface LoadingCompletedEventMapper {
                pallet.pallet_no AS pallet_code,NULL AS allocation_no,
                COUNT(*) OVER (PARTITION BY pallet.id,carton.tenant_id,carton.inbound_id) AS allocated_package_count,
                carton.inbound_detail_id AS source_inbound_detail_id,carton.sku_code,
-               item.product_name_zh,item.package_count,item.product_quantity,carton.box_code
+               item.product_name_zh,item.package_count,item.product_quantity,carton.box_code,
+               carton.actual_sku_quantity
           FROM fl_dropship_pallet pallet
           JOIN fl_dropship_pallet_carton carton ON carton.pallet_id=pallet.id
           JOIN fl_loading_plan_item item ON item.loading_plan_id=#{planId}
@@ -98,15 +99,17 @@ public interface LoadingCompletedEventMapper {
 
     @Select("""
         SELECT COUNT(DISTINCT p.id) FROM fl_dropship_pallet p
-        JOIN fl_loading_plan_item i ON i.loading_plan_id=#{planId} AND i.account_id=p.tenant_id
-          AND i.inbound_id=p.inbound_id AND i.deleted=0 WHERE p.pallet_status='SEALED'
+        JOIN fl_dropship_pallet_carton c ON c.pallet_id=p.id
+        JOIN fl_loading_plan_item i ON i.loading_plan_id=#{planId} AND i.account_id=c.tenant_id
+          AND i.inbound_id=c.inbound_id AND i.deleted=0 WHERE p.pallet_status='SEALED'
         """)
     int workPalletCount(@Param("planId") long planId);
 
     @Select("""
         SELECT COUNT(DISTINCT p.id) FROM fl_dropship_pallet p
-        JOIN fl_loading_plan_item i ON i.loading_plan_id=#{planId} AND i.account_id=p.tenant_id
-          AND i.inbound_id=p.inbound_id AND i.deleted=0 WHERE p.pallet_status='OPEN'
+        JOIN fl_dropship_pallet_carton c ON c.pallet_id=p.id
+        JOIN fl_loading_plan_item i ON i.loading_plan_id=#{planId} AND i.account_id=c.tenant_id
+          AND i.inbound_id=c.inbound_id AND i.deleted=0 WHERE p.pallet_status='OPEN'
         """)
     int openWorkPalletCount(@Param("planId") long planId);
 
@@ -138,6 +141,6 @@ public interface LoadingCompletedEventMapper {
         private Boolean actualBinding;
         private Integer allocationNo; private Integer allocatedPackageCount;
         private Long sourceInboundDetailId; private String skuCode; private String productNameZh;
-        private Integer packageCount; private Integer productQuantity; private String boxCode;
+        private Integer packageCount; private Integer productQuantity; private Integer actualSkuQuantity; private String boxCode;
     }
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingListQueryMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingListQueryMapper.java
index 23ff26071..d1fd0820c 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingListQueryMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingListQueryMapper.java
@@ -23,6 +23,11 @@ public interface LoadingListQueryMapper {
         p.id AS plan_id, p.plan_no, p.container_booking_id, p.plan_status, p.remark,
         p.created_by, p.created_by_name, p.created_at, p.version,
         b.container_no, b.cabinet_no, b.warehouse_id, b.warehouse_name,
+        b.channel_code,
+        (SELECT MIN(outbound.confirmed_at) FROM fl_outbound_dispatch outbound
+          WHERE outbound.container_booking_id = p.container_booking_id AND outbound.confirmed_at IS NOT NULL
+            AND outbound.reversed_at IS NULL AND outbound.status = 'WAITING_FOR_LOADING') AS outbound_confirmed_at,
+        b.actual_empty_reported_at,
         b.vessel_name, b.voyage_no, b.container_type,
         (SELECT COUNT(*) FROM fl_preload_loading_plan_link preload_link
           WHERE preload_link.loading_plan_id = p.id) AS preload_link_count,
@@ -51,6 +56,7 @@ public interface LoadingListQueryMapper {
         p.id, p.plan_no, p.container_booking_id, p.plan_status, p.remark,
         p.created_by, p.created_by_name, p.created_at, p.version,
         b.container_no, b.cabinet_no, b.warehouse_id, b.warehouse_name,
+        b.channel_code, b.actual_empty_reported_at,
         b.vessel_name, b.voyage_no, b.container_type
         """;
 
@@ -394,6 +400,9 @@ public interface LoadingListQueryMapper {
         private String cabinetNo;
         private Long warehouseId;
         private String warehouseName;
+        private String channelCode;
+        private LocalDateTime outboundConfirmedAt;
+        private LocalDateTime actualEmptyReportedAt;
         private String vesselName;
         private String voyageNo;
         private String containerType;
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java
index ef54c006a..b74c441d5 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java
@@ -199,7 +199,7 @@ public interface LoadingPickItemMapper extends BaseMapper<LoadingPickItemEntity>
                         WHERE plan_item.id = fl_loading_pick_item.loading_plan_item_id
                           AND plan_item.deleted = 0)
            AND item_status IN ('PENDING', 'PICKING')
-           AND picked_package_count < #{finalCount}
+           AND picked_package_count <= #{finalCount}
            AND #{finalCount} < planned_package_count
         """)
     int partial(@Param("id") long id, @Param("finalCount") int finalCount,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickTaskMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickTaskMapper.java
index 614173ae9..7ab029bc1 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickTaskMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickTaskMapper.java
@@ -49,6 +49,7 @@ public interface LoadingPickTaskMapper extends BaseMapper<LoadingPickTaskEntity>
           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 booking.record_status = 'ACTIVE'
+           AND booking.warehouse_id = #{warehouseId}
            AND task.task_status = 'LOADING'
          LIMIT 1
         """)
@@ -58,12 +59,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.record_status='ACTIVE' "
+        + "AND booking.warehouse_id=#{warehouseId} "
         + "AND booking.cabinet_no=#{cabinetNo} 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 booking.record_status='ACTIVE' "
+        + "AND booking.warehouse_id=#{warehouseId} "
         + "AND task.loading_plan_id=#{loadingPlanId} LIMIT 1")
     LoadingPickTaskEntity selectLoadingByPlan(@Param("loadingPlanId") long loadingPlanId, @Param("warehouseId") long warehouseId);
 
@@ -97,6 +100,7 @@ public interface LoadingPickTaskMapper extends BaseMapper<LoadingPickTaskEntity>
           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 IN ('LOADING','COMPLETING','COMPLETION_FAILED') AND booking.record_status = 'ACTIVE'
+           AND booking.warehouse_id = #{warehouseId}
            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}, '%')
@@ -112,6 +116,7 @@ public interface LoadingPickTaskMapper extends BaseMapper<LoadingPickTaskEntity>
         </script>
         """)
     List<PendingTaskRow> selectPendingForOperator(@Param("operatorId") long operatorId,
+                                                   @Param("warehouseId") long warehouseId,
                                                    @Param("keyword") String keyword);
 
     class PendingTaskRow {
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/SmartLoadingCandidateMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/SmartLoadingCandidateMapper.java
index e85a6daa8..1bea8b781 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/SmartLoadingCandidateMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/SmartLoadingCandidateMapper.java
@@ -321,7 +321,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ba
  @Select("""
   <script>
   SELECT b.id bookingId,b.booking_no bookingNo,b.cabinet_no cabinetNo,b.container_no containerNo,
-         b.warehouse_id warehouseId,b.warehouse_name warehouseName,b.channel_code channelCode,
+         b.warehouse_id warehouseId,b.warehouse_name warehouseName,b.channel_group_code channelGroupCode,b.channel_code channelCode,
          b.channel_name channelName,b.container_type containerType,b.capacity_cbm capacityCbm,
          b.max_weight_kg maxWeightKg,p.id planId,p.plan_no planNo,
          CASE WHEN p.id IS NULL OR NOT EXISTS (SELECT 1 FROM fl_loading_plan_item state_item
@@ -331,8 +331,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ba
     LEFT JOIN fl_loading_plan p ON p.container_booking_id=b.id
    WHERE b.record_status='ACTIVE'
      AND (p.id IS NULL OR p.plan_status IN ('EDITING','LOADING'))
-     AND b.channel_code IN
-     <foreach collection="actualChannels" item="channel" open="(" separator="," close=")">#{channel}</foreach>
+     AND b.channel_group_code IN
+     <foreach collection="channelGroups" item="channelGroup" open="(" separator="," close=")">#{channelGroup}</foreach>
      <if test="query.warehouseId != null">AND b.warehouse_id=#{query.warehouseId}</if>
      <if test="query.customerId != null or query.inboundCode != null or query.createdStart != null or query.createdEnd != null">
        AND EXISTS (
@@ -351,7 +351,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ba
   """)
  Page<WorkbenchContainer> workbenchContainers(Page<WorkbenchContainer> page,
      @Param("query") WorkbenchContainerQuery query,
-     @Param("actualChannels") Set<String> actualChannels);
+     @Param("channelGroups") Set<String> channelGroups);
 
  @Select("""
   SELECT o.tenant_id accountId,o.id inboundId,i.inbound_detail_id inboundDetailId,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/dto/OceanBookingDtos.java b/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/dto/OceanBookingDtos.java
index fc1ab0bc4..ab58dda00 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/dto/OceanBookingDtos.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/dto/OceanBookingDtos.java
@@ -29,7 +29,7 @@ public final class OceanBookingDtos {
     }
 
     public record LinkCandidateQuery(@NotNull @Positive Long warehouseId,
-                                     @NotBlank @Size(max = 64) String channelCode,
+                                     @NotBlank @Size(max = 64) String channelGroupCode,
                                      @NotBlank @Size(max = 32) String containerType,
                                      @Min(1) Long page,
                                      @Min(1) @Max(200) Long size) {
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/mapper/OceanBookingMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/mapper/OceanBookingMapper.java
index d34c94d7e..bd29c36c3 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/mapper/OceanBookingMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/mapper/OceanBookingMapper.java
@@ -54,6 +54,7 @@ public interface OceanBookingMapper extends BaseMapper<OceanBookingEntity> {
     Page<OceanBookingEntity> selectPage(Page<OceanBookingEntity> page, @Param("query") Query query);
 
     @Select("""
+        <script>
         SELECT booking.id ocean_booking_id,booking.booking_no,requirement.id requirement_id,
           requirement.container_type,requirement.capacity_cbm,requirement.max_weight_kg,
           requirement.quantity required_quantity,
@@ -75,13 +76,16 @@ public interface OceanBookingMapper extends BaseMapper<OceanBookingEntity> {
           AND allocated.requirement_id=requirement.id
         WHERE booking.status='RELEASED'
           AND booking.warehouse_id=#{query.warehouseId}
-          AND booking.channel_code=#{query.channelCode}
+          AND booking.channel_code IN
+  <foreach collection="channelCodes" item="channelCode" open="(" separator="," close=")">#{channelCode}</foreach>
           AND requirement.container_type=#{query.containerType}
           AND requirement.quantity>COALESCE(allocated.allocated_quantity,0)
         ORDER BY booking.updated_at DESC,booking.id DESC,requirement.sort_no ASC,requirement.id ASC
+        </script>
         """)
     Page<LinkCandidate> selectLinkCandidates(Page<LinkCandidate> page,
-                                              @Param("query") LinkCandidateQuery query);
+                                              @Param("query") LinkCandidateQuery query,
+                                              @Param("channelCodes") java.util.Set<String> channelCodes);
 
     @Update("""
         UPDATE fl_ocean_booking SET status=#{toStatus},
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/repository/OceanBookingRepository.java b/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/repository/OceanBookingRepository.java
index e6c8f1013..b5f5bb663 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/repository/OceanBookingRepository.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/repository/OceanBookingRepository.java
@@ -33,8 +33,8 @@ public class OceanBookingRepository {
     public PageResult<OceanBookingEntity> page(Query query) {
         return PageResult.from(bookings.selectPage(new Page<>(query.page(), query.size()), query));
     }
-    public PageResult<LinkCandidate> linkCandidates(LinkCandidateQuery query) {
-        return PageResult.from(bookings.selectLinkCandidates(new Page<>(query.page(), query.size()), query));
+    public PageResult<LinkCandidate> linkCandidates(LinkCandidateQuery query, java.util.Set<String> channelCodes) {
+        return PageResult.from(bookings.selectLinkCandidates(new Page<>(query.page(), query.size()), query, channelCodes));
     }
     public OceanBookingEntity find(long id) { return bookings.selectById(id); }
     public OceanBookingEntity findForUpdate(long id) { return bookings.selectForUpdate(id); }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingPrintService.java b/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingPrintService.java
index 1b98b7535..ca7a1b1dd 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingPrintService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingPrintService.java
@@ -15,7 +15,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -47,7 +46,7 @@ public class OceanBookingPrintService {
         String fileName = booking.getBookingNo() + "-" + suffix + ".pdf";
         PrintPdfClient.FreightA4PdfRequest request = new PrintPdfClient.FreightA4PdfRequest(
             template, A4, fileName, List.of(new PrintPdfClient.FreightDocument(
-                fields(template, detail), List.of(cargo(detail.containerRequirements())))));
+                fields(template, detail), List.of(emptyCargo()))));
         try {
             ResponseEntity<byte[]> response = print.generateFreightA4Documents(internalToken, requestId, request);
             MediaType contentType = response.getHeaders().getContentType();
@@ -78,12 +77,12 @@ public class OceanBookingPrintService {
         fields.put("placeOfDelivery", text(booking.getPlaceOfDelivery()));
         fields.put("serviceTerm", text(booking.getServiceTerm()));
         fields.put("freightTerm", text(booking.getFreightTerm()));
-        fields.put("totalPackagesInWords", Integer.toString(totalContainers(detail.containerRequirements())));
+        fields.put("totalPackagesInWords", "");
         if (SHIPPING_INSTRUCTION.equals(template)) {
             fields.put("toCompany", text(booking.getBookingAgentName()));
             fields.put("jobNumber", text(booking.getBookingNo()));
             fields.put("etdDate", date(booking.getEstimatedSailingAt()));
-            fields.put("cargoQuantity", Integer.toString(totalContainers(detail.containerRequirements())));
+            fields.put("cargoQuantity", "");
             fields.put("carrier", text(booking.getShippingCompanyName()));
             fields.put("bookingAgent", text(booking.getBookingAgentName()));
             fields.put("remark", text(booking.getRemark()));
@@ -99,18 +98,8 @@ public class OceanBookingPrintService {
         return fields;
     }
 
-    private static PrintPdfClient.CargoRow cargo(List<OceanBookingContainerRequirementEntity> requirements) {
-        BigDecimal gross = requirements.stream().map(value -> value.getMaxWeightKg()
-            .multiply(BigDecimal.valueOf(value.getQuantity()))).reduce(BigDecimal.ZERO, BigDecimal::add);
-        BigDecimal volume = requirements.stream().map(value -> value.getCapacityCbm()
-            .multiply(BigDecimal.valueOf(value.getQuantity()))).reduce(BigDecimal.ZERO, BigDecimal::add);
-        return new PrintPdfClient.CargoRow("N/M", Integer.toString(totalContainers(requirements)),
-            "CONTAINERS", requirementSummary(requirements), decimal(gross, 3) + " KGS",
-            decimal(volume, 4) + " CBM");
-    }
-
-    private static int totalContainers(List<OceanBookingContainerRequirementEntity> values) {
-        return values.stream().mapToInt(OceanBookingContainerRequirementEntity::getQuantity).sum();
+    private static PrintPdfClient.CargoRow emptyCargo() {
+        return new PrintPdfClient.CargoRow("—", "—", "—", "—", "—", "—");
     }
 
     private static String requirementSummary(List<OceanBookingContainerRequirementEntity> values) {
@@ -128,9 +117,6 @@ public class OceanBookingPrintService {
     private static String date(java.time.LocalDateTime value) {
         return value == null ? "" : value.format(DateTimeFormatter.ISO_LOCAL_DATE);
     }
-    private static String decimal(BigDecimal value, int scale) {
-        return value.setScale(scale, RoundingMode.HALF_UP).toPlainString();
-    }
     private static String first(String first, String fallback) { return !text(first).isEmpty() ? first.trim() : text(fallback); }
     private static String join(String first, String second) { return List.of(text(first), text(second)).stream().filter(value -> !value.isEmpty()).collect(Collectors.joining(" / ")); }
     private static String text(String value) { return value == null ? "" : value.trim(); }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingService.java b/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingService.java
index a08d56de7..14163fa4d 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingService.java
@@ -10,6 +10,7 @@ import com.baiyue.firstleg.client.WarehousePartnerClient;
 import com.baiyue.firstleg.client.WarehouseSupplierClient;
 import com.baiyue.firstleg.oceanbooking.domain.OceanBookingStatus;
 import com.baiyue.firstleg.domain.ContainerSpecificationCatalog;
+import com.baiyue.firstleg.domain.SmartLoadingChannelGroupCatalog;
 import com.baiyue.firstleg.oceanbooking.dto.OceanBookingDtos.*;
 import com.baiyue.firstleg.oceanbooking.entity.*;
 import com.baiyue.firstleg.oceanbooking.repository.OceanBookingRepository;
@@ -71,8 +72,11 @@ public class OceanBookingService {
     }
 
     public PageResult<LinkCandidate> linkCandidates(LinkCandidateQuery query) {
+        SmartLoadingChannelGroupCatalog.Definition group;
+        try { group = SmartLoadingChannelGroupCatalog.require(query.channelGroupCode()); }
+        catch (IllegalArgumentException exception) { throw badRequest(exception.getMessage()); }
         return repository.linkCandidates(new LinkCandidateQuery(query.warehouseId(),
-            query.channelCode().trim(), query.containerType().trim(), query.page(), query.size()));
+            group.code(), query.containerType().trim(), query.page(), query.size()), group.channelCodes());
     }
 
     public List<ChannelOption> channels(long originWarehouseId) {
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/portschedule/mapper/CarrierScheduleQueryMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/portschedule/mapper/CarrierScheduleQueryMapper.java
index 40bee31dc..630b2bdfe 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/portschedule/mapper/CarrierScheduleQueryMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/portschedule/mapper/CarrierScheduleQueryMapper.java
@@ -47,6 +47,13 @@ public interface CarrierScheduleQueryMapper extends BaseMapper<CarrierScheduleQu
                                                     @Param("oceanBookingId") long oceanBookingId,
                                                     @Param("containerBookingId") long containerBookingId);
 
+    @Select("""
+        SELECT * FROM fl_carrier_schedule_query
+         WHERE container_booking_id=#{containerBookingId}
+         ORDER BY id DESC LIMIT 1
+        """)
+    CarrierScheduleQueryEntity findByContainerBookingId(@Param("containerBookingId") long containerBookingId);
+
     @Select("""
         <script>
         SELECT b.id AS containerBookingId,q.id AS queryId,q.version AS queryVersion,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/portschedule/repository/CarrierScheduleQueryRepository.java b/firstleg/src/main/java/com/baiyue/firstleg/portschedule/repository/CarrierScheduleQueryRepository.java
index 1fdd30cd0..407dbdcee 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/portschedule/repository/CarrierScheduleQueryRepository.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/portschedule/repository/CarrierScheduleQueryRepository.java
@@ -41,6 +41,9 @@ public class CarrierScheduleQueryRepository {
     public CarrierScheduleQueryEntity findByBusinessScope(long customerId, long oceanBookingId, long containerBookingId) {
         return queries.findByBusinessScope(customerId, oceanBookingId, containerBookingId);
     }
+    public CarrierScheduleQueryEntity findByContainerBookingId(long containerBookingId) {
+        return queries.findByContainerBookingId(containerBookingId);
+    }
     public List<ContainerActualFacts> containerActualFacts(List<Long> containerBookingIds) {
         return queries.selectContainerActualFacts(containerBookingIds);
     }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/portschedule/service/CarrierScheduleQueryService.java b/firstleg/src/main/java/com/baiyue/firstleg/portschedule/service/CarrierScheduleQueryService.java
index 5741edc80..fe432ba49 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/portschedule/service/CarrierScheduleQueryService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/portschedule/service/CarrierScheduleQueryService.java
@@ -222,6 +222,7 @@ public class CarrierScheduleQueryService {
         }
         CarrierScheduleQueryEntity value = requiredLockedVersion(id, request.expectedVersion());
         CarrierScheduleNode node = CarrierScheduleNode.require(request.standardNode());
+        requireManualActualAdvance(value, node, request.actualAt());
         CarrierScheduleQueryEntity before = copy(value);
         String providerEventId = sha256("MANUAL|" + id + '|' + key);
         CarrierScheduleNodeFactEntity fact = addNode(value, "MANUAL", providerEventId, node.name(), node,
@@ -261,13 +262,27 @@ public class CarrierScheduleQueryService {
         ContainerBookingEntity container = portSchedules.containerBooking(containerBookingId);
         if (container == null) throw new BizException(ResultCode.NOT_FOUND, "货柜不存在");
         CarrierScheduleNode node = CarrierScheduleNode.require(request.standardNode());
+        CarrierScheduleQueryEntity found = repository.findByContainerBookingId(containerBookingId);
+        CarrierScheduleQueryEntity query = found == null ? null : requiredLocked(found.getId());
         String providerEventId = sha256("CONTAINER_MANUAL|" + containerBookingId + '|' + key);
         String payloadHash = hash("CONTAINER_MANUAL_NODE", containerBookingId, request);
-        CarrierScheduleNodeFactEntity fact = addNode(null, containerBookingId, "MANUAL", providerEventId,
+        CarrierScheduleNodeFactEntity fact = addNode(query == null ? null : query.getId(), containerBookingId,
+            "MANUAL", providerEventId,
             node.name(), node, request.observedAt(), request.estimatedAt(), request.actualAt(),
             request.locationCode(), request.locationName(), "MANUAL:" + operatorId, payloadHash);
-        if (fact != null) nodeOutbox.publishContainerNode(container.getOceanBookingId(), containerBookingId,
-            fact, normalizedContainerNo(container));
+        if (fact != null && query != null) {
+            CarrierScheduleQueryEntity before = copy(query);
+            requireManualActualAdvance(query, node, request.actualAt());
+            boolean advanced = advanceActualNode(query, node, request.actualAt(), request.observedAt(),
+                operatorId, operatorName);
+            CarrierScheduleQueryEntity after = advanced ? required(query.getId()) : query;
+            addHistory(query.getId(), "MANUAL_NODE", before.getVersion(), after.getVersion(), request.reason(),
+                before, after, operatorId, operatorName);
+            nodeOutbox.publish(after, fact, normalizedContainerNo(container));
+        } else if (fact != null) {
+            nodeOutbox.publishContainerNode(container.getOceanBookingId(), containerBookingId,
+                fact, normalizedContainerNo(container));
+        }
         return containerNodeDetail(containerBookingId, repository.nodesByContainer(containerBookingId));
     }
 
@@ -306,6 +321,16 @@ public class CarrierScheduleQueryService {
         return false;
     }
 
+    private void requireManualActualAdvance(CarrierScheduleQueryEntity value, CarrierScheduleNode node,
+                                            LocalDateTime actualAt) {
+        if (actualAt == null) return;
+        CarrierScheduleNode current = value.getLatestStandardNode() == null ? null
+            : CarrierScheduleNode.require(value.getLatestStandardNode());
+        if ("STOPPED".equals(value.getStatus()) || current != null && node.sequence() <= current.sequence()) {
+            throw conflict("实际船节点必须按业务顺序向后推进");
+        }
+    }
+
     public boolean hasOutboundDepartureFact(long customerId, long oceanBookingId, long containerBookingId) {
         CarrierScheduleQueryEntity query = repository.findByBusinessScope(customerId, oceanBookingId,
             containerBookingId);
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/repository/LoadingPickRepository.java b/firstleg/src/main/java/com/baiyue/firstleg/repository/LoadingPickRepository.java
index f3b1a1390..51260d8c9 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/repository/LoadingPickRepository.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/repository/LoadingPickRepository.java
@@ -90,8 +90,8 @@ public class LoadingPickRepository {
         return tasks.selectLoadingByPlan(loadingPlanId, warehouseId);
     }
 
-    public List<PendingTaskRow> pendingTasks(long operatorId, String keyword) {
-        return tasks.selectPendingForOperator(operatorId, keyword);
+    public List<PendingTaskRow> pendingTasks(long operatorId, long warehouseId, String keyword) {
+        return tasks.selectPendingForOperator(operatorId, warehouseId, keyword);
     }
 
     public ContainerBookingEntity activeBookingByTask(long taskId) {
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/repository/PriceBookRepository.java b/firstleg/src/main/java/com/baiyue/firstleg/repository/PriceBookRepository.java
index 7c03889ce..cc744793b 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/repository/PriceBookRepository.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/repository/PriceBookRepository.java
@@ -156,4 +156,15 @@ public class PriceBookRepository {
             .set(CarrierFbaRateEntity::getUpdatedBy, operatorId)
             .set(CarrierFbaRateEntity::getUpdatedAt, at));
     }
+
+    public void voidPending(PriceBookVersionEntity value, LocalDateTime at, long operatorId, String reason) {
+        value.setStatus("VOIDED"); value.setVoidedAt(at); value.setVoidedBy(operatorId); value.setVoidReason(reason);
+        value.setUpdatedBy(operatorId); value.setUpdatedAt(at); updateVersion(value);
+        rates.update(null, new LambdaUpdateWrapper<CarrierFbaRateEntity>()
+            .eq(CarrierFbaRateEntity::getPriceBookVersionId, value.getId())
+            .eq(CarrierFbaRateEntity::getStatus, "PENDING_CONFIRMATION")
+            .set(CarrierFbaRateEntity::getStatus, "VOIDED")
+            .set(CarrierFbaRateEntity::getUpdatedBy, operatorId)
+            .set(CarrierFbaRateEntity::getUpdatedAt, at));
+    }
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/repository/SmartLoadingRepository.java b/firstleg/src/main/java/com/baiyue/firstleg/repository/SmartLoadingRepository.java
index 5ebe83126..26b223597 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/repository/SmartLoadingRepository.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/repository/SmartLoadingRepository.java
@@ -49,9 +49,9 @@ public class SmartLoadingRepository {
         return units.isEmpty() ? List.of() : candidates.globalCandidatesByUnits(units);
     }
     public PageResult<WorkbenchContainer> workbenchContainers(WorkbenchContainerQuery query,
-                                                               Set<String> actualChannels) {
+                                                               Set<String> channelGroups) {
         return PageResult.from(candidates.workbenchContainers(
-            new Page<>(query.page(), query.size()), query, actualChannels));
+            new Page<>(query.page(), query.size()), query, channelGroups));
     }
     public List<ChannelContainerCountRow> channelContainerCounts(long warehouseId) {
         return candidates.channelContainerCounts(warehouseId);
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/ContainerService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/ContainerService.java
index 4fbae5f56..c2565a9ff 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/ContainerService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/ContainerService.java
@@ -7,6 +7,7 @@ import com.baiyue.common.core.exception.BizException;
 import com.baiyue.firstleg.client.WarehouseMasterDataClient;
 import com.baiyue.firstleg.domain.SmartLoadingStatus;
 import com.baiyue.firstleg.domain.ContainerSpecificationCatalog;
+import com.baiyue.firstleg.domain.SmartLoadingChannelGroupCatalog;
 import com.baiyue.firstleg.dto.ContainerDtos.FullUpdateRequest;
 import com.baiyue.firstleg.dto.ContainerDtos.SaveRequest;
 import com.baiyue.firstleg.dto.ContainerDtos.SimulationCreateRequest;
@@ -55,13 +56,16 @@ public class ContainerService {
         WarehouseMasterDataClient.Warehouse warehouse = requireDomesticTransitWarehouse(request.warehouseId());
         Long versionId = priceBooks.activeVersionId();
         if (versionId == null) throw conflict("当前没有 ACTIVE 价格版本");
-        ChannelRow channel = priceBooks.channels(versionId, warehouse.id()).stream()
-            .filter(row -> request.channelCode().trim().equals(row.getChannelCode())).findFirst()
-            .orElseThrow(() -> conflict("所选物流渠道已失效，请重新选择"));
+        SmartLoadingChannelGroupCatalog.Definition channelGroup;
+        try { channelGroup = SmartLoadingChannelGroupCatalog.require(request.channelGroupCode()); }
+        catch (IllegalArgumentException exception) { throw conflict(exception.getMessage()); }
+        boolean activeGroup = priceBooks.channels(versionId, warehouse.id()).stream()
+            .map(ChannelRow::getChannelCode).anyMatch(channelGroup.channelCodes()::contains);
+        if (!activeGroup) throw conflict("所选物流渠道分组在当前仓库已失效，请重新选择");
         ContainerBookingEntity value = new ContainerBookingEntity(); value.setId(IdWorker.getId());
         value.setBookingNo(documentNumbers.next("CB")); value.setCabinetNo(documentNumbers.next("CAB"));
         value.setSourceType("SIMULATION"); value.setRecordStatus("ACTIVE");
-        value.setChannelCode(channel.getChannelCode()); value.setChannelName(channel.getChannelName());
+        value.setChannelGroupCode(channelGroup.code()); value.setChannelCode(null); value.setChannelName(null);
         value.setWarehouseId(warehouse.id()); value.setWarehouseName(warehouse.warehouseName());
         value.setContainerType(specification.containerType()); value.setCapacityCbm(specification.capacityCbm());
         value.setMaxWeightKg(specification.maxWeightKg()); value.setCreatedBy(operatorId); value.setCreatedByName(operatorName);
@@ -85,9 +89,9 @@ public class ContainerService {
         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.getChannelCode(), booking.getChannelCode())
+            || !SmartLoadingChannelGroupCatalog.contains(container.getChannelGroupCode(), booking.getChannelCode())
             || !java.util.Objects.equals(container.getContainerType(), requirement.getContainerType())) {
-            throw conflict("模拟柜与真实订舱柜仓库、渠道或柜型不一致");
+            throw conflict("模拟柜与真实订舱柜仓库、渠道分组或柜型不一致");
         }
         try {
             if (repository.linkReleasedBooking(id, request.oceanBookingId(), request.requirementId(), containerNo,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/DropshipPalletizationService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/DropshipPalletizationService.java
index 513ab7594..e28433341 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/DropshipPalletizationService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/DropshipPalletizationService.java
@@ -9,7 +9,6 @@ import com.baiyue.firstleg.entity.InboundOrderEntity;
 import com.baiyue.firstleg.mapper.DropshipPalletizationMapper;
 import com.baiyue.firstleg.mapper.DropshipPalletizationMapper.*;
 import jakarta.annotation.Resource;
-import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -24,38 +23,24 @@ public class DropshipPalletizationService {
  @Resource private FirstlegDocumentNumberGenerator documentNumbers;
 
  @Transactional
- public Task createAndBind(long taskId,CreateAndBindRequest request,long operatorId,String operatorName){
-  if(mapper.lockTask(taskId,request.warehouseId())==null) throw new BizException(ResultCode.NOT_FOUND,"未找到当前仓库的一件代发清点组托任务");
-  TaskRow task=requireTask(taskId,request.warehouseId());
-  if(!Objects.equals(task.getAssigneeId(),operatorId)) throw conflict("任务不属于当前操作员");
-  String operation=operation(request.operationId());
-  PalletRow replay=mapper.palletByOpenOperation(operation);
-  if(replay!=null){
-   if(!Objects.equals(replay.getTaskId(),taskId)||!Objects.equals(replay.getWarehouseId(),request.warehouseId())
-      ||!Objects.equals(replay.getTenantId(),task.getTenantId())) throw conflict("创建托盘幂等号已用于不同任务");
-   return view(task);
-  }
-  if(!"CLAIMED".equals(task.getTaskStatus())||!"WAIT_PALLETIZE".equals(task.getProcessStatus())) throw conflict("当前任务不允许创建托盘");
-  int expected=mapper.unboundCount(taskId);
-  if(expected==0) throw conflict("当前没有待绑托箱，请先清点箱码");
-  long palletId=IdWorker.getId();
-  String palletNo=documentNumbers.next("DP");
-  mapper.insertPallet(palletId,taskId,task.getTenantId(),task.getInboundId(),task.getWarehouseId(),palletNo,operation,operatorId,operatorName);
-  int bound=mapper.bindPending(taskId,palletId,operation,operatorId,operatorName);
-  if(bound!=expected||mapper.adjustBound(taskId,operatorId,bound)!=1) throw conflict("待绑托箱已变化，请刷新后重试");
-  return view(requireTask(taskId,request.warehouseId()));
- }
-
- public void createTask(InboundOrderEntity inbound) {
+ public void createTask(InboundOrderEntity inbound,long operatorId,String operatorName) {
   if (!"ONE_CLICK_DROPSHIP".equals(inbound.getFulfillmentType())) return;
   if (inbound.getTotalPackageCount()==null || inbound.getTotalPackageCount()<1) throw invalid("一件代发测量完成箱数无效，不能下发清点组托任务");
-  mapper.insertTask(IdWorker.getId(),inbound.getTenantId(),inbound.getId(),inbound.getWarehouseId(),inbound.getTotalPackageCount());
+  if (inbound.getPalletCount()==null || inbound.getPalletCount()<1) throw invalid("一件代发预计托数无效，不能生成托盘码");
+  if (inbound.getPalletCount()>inbound.getTotalPackageCount()) throw invalid("一件代发预计托数不能超过总箱数");
+  long taskId=IdWorker.getId();
+  if(mapper.insertTask(taskId,inbound.getTenantId(),inbound.getId(),inbound.getWarehouseId(),inbound.getTotalPackageCount())!=1) return;
+  for(int sequence=1;sequence<=inbound.getPalletCount();sequence++){
+   mapper.insertPallet(IdWorker.getId(),taskId,inbound.getTenantId(),inbound.getId(),inbound.getWarehouseId(),
+    documentNumbers.next("DP"),"dropship-precreate-"+taskId+"-"+sequence,operatorId,operatorName);
+  }
  }
 
- public List<PendingTask> pending(long operatorId,String keyword){ return mapper.pending(operatorId,normalize(keyword)); }
+ public List<PendingTask> pending(long operatorId,long warehouseId,String keyword){ return mapper.pending(operatorId,warehouseId,normalize(keyword)); }
 
  @Transactional
  public Task claim(long taskId,long warehouseId,long operatorId,String operatorName){
+  requirePalletSetup(requireTask(taskId,warehouseId));
   if(mapper.claim(taskId,warehouseId,operatorId,operatorName)!=1) throw conflict("任务已被其他人员领取或状态已变化");
   return task(taskId,warehouseId,operatorId);
  }
@@ -76,8 +61,11 @@ public class DropshipPalletizationService {
   if(!"CLAIMED".equals(task.getTaskStatus())) block="请先领取任务";
   else if(!Objects.equals(task.getAssigneeId(),operatorId)) block="任务不属于当前操作员";
   else if(!"WAIT_PALLETIZE".equals(task.getProcessStatus())) block="入仓单已不在待清点组托状态";
-  return new Carton(null,label.getBoxCode(),task.getInboundId(),label.getInboundCode(),label.getInboundDetailId(),
-   label.getSkuCode(),label.getCargoName(),label.getUnitsPerCarton(),null,null,null,"UNCOUNTED",null,null,
+  else if(!palletSetupReady(task)) block=palletSetupMessage(task);
+  List<CartonSkuLine> skuLines=labelSkuLines(taskId,label).stream().map(line ->
+   new CartonSkuLine(line.getInboundDetailId(),line.getSkuCode(),line.getCargoName(),line.getExpectedQuantity(),
+    null,null,null)).toList();
+  return new Carton(null,label.getBoxCode(),task.getInboundId(),label.getInboundCode(),skuLines,"UNCOUNTED",null,null,
    block==null,block);
  }
 
@@ -88,23 +76,22 @@ public class DropshipPalletizationService {
   CartonRow replay=mapper.cartonByCountOperation(operation);
   if(replay!=null){
    if(!Objects.equals(replay.getTaskId(),taskId) || !Objects.equals(replay.getBoxCode(),request.boxCode().trim())
-      || !Objects.equals(replay.getActualSkuQuantity(),request.actualSkuQuantity())) throw conflict("清点幂等号已用于不同操作");
+      || !sameCountLines(mapper.cartonSkus(replay.getId()),request.skuLines())) throw conflict("清点幂等号已用于不同操作");
    return countResult(task,replay);
   }
   LabelRow label=requireLabel(taskId,request.boxCode());
   if(mapper.countedByLabel(taskId,label.getCartonLabelId())!=null) throw conflict("箱码已清点，不能重复清点");
-  int expected=requireExpectedQuantity(label);
-  boolean mismatch=expected!=request.actualSkuQuantity();
-  String remark=normalize(request.discrepancyRemark());
-  if(!mismatch && request.discrepancyAction()!=DiscrepancyAction.MATCH) throw invalid("实收数量一致时差异动作必须为 MATCH");
-  if(mismatch && request.discrepancyAction()!=DiscrepancyAction.ACCEPT_VARIANCE) throw conflict("实收数量存在差异，请确认差异处理结果");
-  if(mismatch && !StringUtils.hasText(remark)) throw invalid("接受数量差异时必须填写处理说明");
-  PalletRow pallet=StringUtils.hasText(request.palletNo())
-   ? getOrCreatePallet(task,request.palletNo().trim(),operation,operatorId,operatorName):null;
+  List<CountedLine> lines=validateCountLines(labelSkuLines(taskId,label),request.skuLines());
+  boolean mismatch=lines.stream().anyMatch(CountedLine::mismatch);
+  PalletRow pallet=StringUtils.hasText(request.palletNo())?requireAssignablePallet(task,request.palletNo().trim()):null;
   long cartonId=IdWorker.getId();
+  CountedLine primary=lines.get(0);
   mapper.insertCarton(cartonId,taskId,pallet==null?null:pallet.getId(),task.getTenantId(),task.getInboundId(),
-   label.getInboundDetailId(),label.getCartonLabelId(),label.getSkuCode(),label.getCargoName(),label.getBoxCode(),
-   expected,request.actualSkuQuantity(),mismatch?"ACCEPTED_VARIANCE":"MATCH",remark,operation,operatorId,operatorName);
+   primary.detailId(),label.getCartonLabelId(),primary.skuCode(),primary.cargoName(),label.getBoxCode(),
+   primary.expected(),primary.actual(),mismatch?"ACCEPTED_VARIANCE":"MATCH",null,operation,operatorId,operatorName);
+  int lineNo=0;
+  for(CountedLine line:lines) mapper.insertCartonSku(IdWorker.getId(),cartonId,line.detailId(),line.skuCode(),line.cargoName(),
+   line.expected(),line.actual(),line.mismatch()?"ACCEPTED_VARIANCE":"MATCH",line.remark(),++lineNo);
   if(mapper.addCounted(taskId,operatorId,pallet==null?0:1,mismatch?1:0)!=1) throw conflict("任务清点数量已变化，请刷新后重试");
   TaskRow refreshed=requireTask(taskId,request.warehouseId());
   return countResult(refreshed,mapper.carton(taskId,cartonId));
@@ -115,7 +102,7 @@ public class DropshipPalletizationService {
   TaskRow task=requireWorkingTask(taskId,request.warehouseId(),operatorId);
   String operation=operation(request.operationId());
   if(mapper.bindOperationCount(taskId,operation)>0) return view(requireTask(taskId,request.warehouseId()));
-  PalletRow pallet=getOrCreatePallet(task,request.palletNo().trim(),operation,operatorId,operatorName);
+  PalletRow pallet=requireAssignablePallet(task,request.palletNo().trim());
   int expected=mapper.unboundCount(taskId);
   if(expected==0) throw conflict("当前没有待绑托箱");
   int bound=mapper.bindPending(taskId,pallet.getId(),operation,operatorId,operatorName);
@@ -130,7 +117,7 @@ public class DropshipPalletizationService {
   if(carton==null) throw new BizException(ResultCode.NOT_FOUND,"清点箱不存在");
   if(carton.getPalletId()!=null) requireOpenPallet(taskId,carton.getPalletId(),request.warehouseId());
   PalletRow target=StringUtils.hasText(request.targetPalletNo())
-   ? getOrCreatePallet(task,request.targetPalletNo().trim(),operation(request.operationId()),operatorId,operatorName):null;
+   ? requireAssignablePallet(task,request.targetPalletNo().trim()):null;
   if(Objects.equals(carton.getPalletId(),target==null?null:target.getId())) return view(task);
   if(mapper.moveCarton(taskId,cartonId,target==null?null:target.getId(),operation(request.operationId()),operatorId,operatorName)!=1)
    throw conflict("清点箱已被其他操作修改，请刷新后重试");
@@ -143,16 +130,17 @@ public class DropshipPalletizationService {
  public Task seal(long taskId,long palletId,SealPalletRequest request,long operatorId,String operatorName){
   TaskRow task=requireWorkingTask(taskId,request.warehouseId(),operatorId);
   PalletRow replay=mapper.palletBySealOperation(operation(request.operationId()));
-  if(replay!=null){ if(!Objects.equals(replay.getTaskId(),taskId)||!Objects.equals(replay.getId(),palletId)) throw conflict("封托幂等号已用于其他托盘"); return view(requireTask(taskId,request.warehouseId())); }
+  if(replay!=null){ if(!Objects.equals(replay.getId(),palletId)||!Objects.equals(replay.getWarehouseId(),request.warehouseId())) throw conflict("封托幂等号已用于其他托盘"); return view(requireTask(taskId,request.warehouseId())); }
   requireOpenPallet(taskId,palletId,request.warehouseId());
-  if(mapper.unboundCount(taskId)>0) throw conflict("仍有已清点待绑托箱，不能封托");
-  if(mapper.seal(taskId,palletId,request.expectedVersion(),operation(request.operationId()),operatorId,operatorName)!=1)
+  if(mapper.seal(taskId,palletId,request.expectedVersion(),request.warehouseId(),operation(request.operationId()),operatorId,operatorName)!=1)
    throw conflict("空托盘、托盘状态或版本已变化，请刷新后重试");
-  TaskRow refreshed=requireTask(taskId,request.warehouseId());
-  if(Objects.equals(refreshed.getCountedCartons(),refreshed.getTotalCartons()) &&
-     Objects.equals(refreshed.getAllocatedCartons(),refreshed.getTotalCartons()) && mapper.openPalletCount(taskId)==0){
-   if(mapper.completeTask(taskId)!=1 || mapper.completeInbound(taskId,refreshed.getTenantId(),refreshed.getInboundId(),operatorId)!=1)
-    throw conflict("组托完成状态已变化，请刷新后重试");
+  for(Long participatingTaskId:mapper.taskIdsByPallet(palletId)){
+   TaskRow participating=requireTask(participatingTaskId,request.warehouseId());
+   if(Objects.equals(participating.getCountedCartons(),participating.getTotalCartons()) &&
+      Objects.equals(participating.getAllocatedCartons(),participating.getTotalCartons()) && mapper.openPalletCount(participatingTaskId)==0){
+    if(mapper.completeTask(participatingTaskId)!=1 || mapper.completeInbound(participatingTaskId,participating.getTenantId(),participating.getInboundId(),operatorId)!=1)
+     throw conflict("组托完成状态已变化，请刷新后重试");
+   }
   }
   return view(requireTask(taskId,request.warehouseId()));
  }
@@ -162,18 +150,23 @@ public class DropshipPalletizationService {
   if(code==null) throw new BizException(ResultCode.NOT_FOUND,"入库单不存在");
   return mapper.palletsByInbound(tenantId,inboundId).stream().map(p->palletView(p,code)).toList();
  }
+ public String inboundCode(long tenantId,long inboundId){
+  String code=mapper.inboundCode(tenantId,inboundId);
+  if(code==null) throw new BizException(ResultCode.NOT_FOUND,"入库单不存在");
+  return code;
+ }
 
- private PalletRow getOrCreatePallet(TaskRow task,String palletNo,String operation,long operatorId,String operatorName){
+ public List<Pallet> generatedPallets(long taskId,long warehouseId,long operatorId){
+  TaskRow task=requireTask(taskId,warehouseId);
+  if(task.getAssigneeId()!=null && task.getAssigneeId()!=operatorId) throw conflict("任务已由其他人员领取");
+  return mapper.generatedPallets(taskId).stream().map(p->palletView(p,task.getInboundCode())).toList();
+ }
+
+ private PalletRow requireAssignablePallet(TaskRow task,String palletNo){
   PalletRow existing=mapper.palletByNo(palletNo);
-  if(existing!=null){
-   if(!Objects.equals(existing.getTaskId(),task.getId()) || !Objects.equals(existing.getTenantId(),task.getTenantId())) throw conflict("托盘码已被其他客户或入仓任务占用");
-   if(!"OPEN".equals(existing.getPalletStatus())) throw conflict("托盘已封托，不能继续绑定箱");
-   return existing;
-  }
-  try{ mapper.insertPallet(IdWorker.getId(),task.getId(),task.getTenantId(),task.getInboundId(),task.getWarehouseId(),palletNo,operation,operatorId,operatorName); }
-  catch(DuplicateKeyException e){ existing=mapper.palletByNo(palletNo); if(existing==null) throw conflict("托盘码已被并发占用"); }
-  existing=mapper.palletByNo(palletNo);
-  if(existing==null || !Objects.equals(existing.getTaskId(),task.getId())) throw conflict("托盘码已被其他任务占用");
+  if(existing==null) throw new BizException(ResultCode.NOT_FOUND,"托盘码不存在，请扫描测量审核后生成的 DP 托盘码");
+  if(!Objects.equals(existing.getWarehouseId(),task.getWarehouseId())) throw conflict("托盘码不属于当前作业仓库");
+  if(!"OPEN".equals(existing.getPalletStatus())) throw conflict("托盘已封托，不能继续绑定箱");
   return existing;
  }
 
@@ -184,37 +177,73 @@ public class DropshipPalletizationService {
  }
 
  private Task view(TaskRow row){
+  List<Pallet> pallets=mapper.pallets(row.getId()).stream().map(p->palletView(p,row.getInboundCode())).toList();
+  int expected=row.getExpectedPalletCount()==null?0:row.getExpectedPalletCount();
+  int generated=mapper.palletCount(row.getId());
+  boolean palletSetupReady=expected>0 && generated==expected;
   return new Task(row.getId(),row.getInboundId(),row.getInboundCode(),row.getTenantId(),row.getCustomerName(),row.getWarehouseId(),row.getWarehouseName(),
    row.getTotalCartons(),row.getCountedCartons(),row.getAllocatedCartons(),row.getCountedCartons()-row.getAllocatedCartons(),row.getDiscrepancyCartons(),
-   row.getTaskStatus(),row.getAssigneeId(),row.getAssigneeName(),row.getVersion(),mapper.pallets(row.getId()).stream().map(p->palletView(p,row.getInboundCode())).toList(),
+   expected,generated,palletSetupReady,palletSetupReady?null:palletSetupMessage(expected,generated),
+   row.getTaskStatus(),row.getAssigneeId(),row.getAssigneeName(),row.getVersion(),pallets,
    mapper.unboundCartons(row.getId()).stream().map(c->cartonView(c,row.getInboundCode(),false,null)).toList());
  }
 
  private Pallet palletView(PalletRow row,String inboundCode){
-  List<CartonRow> cartons=mapper.cartons(row.getId()); Map<String,List<CartonRow>> groups=new LinkedHashMap<>();
-  for(CartonRow c:cartons) groups.computeIfAbsent(c.getInboundDetailId()+"|"+c.getSkuCode(),ignored->new ArrayList<>()).add(c);
-  List<SkuItem> items=groups.values().stream().map(values->{CartonRow first=values.get(0);return new SkuItem(first.getInboundId(),inboundCode,
-   first.getInboundDetailId(),first.getSkuCode(),first.getCargoName(),values.size(),values.stream().mapToInt(v->v.getActualSkuQuantity()==null?0:v.getActualSkuQuantity()).sum(),
-   values.stream().map(CartonRow::getBoxCode).toList());}).toList();
+  List<CartonRow> cartons=mapper.cartons(row.getId()); Map<String,List<CartonSkuWithBox>> groups=new LinkedHashMap<>();
+  for(CartonRow c:cartons) for(CartonSkuRow line:mapper.cartonSkus(c.getId()))
+   groups.computeIfAbsent(c.getInboundId()+"|"+line.getInboundDetailId()+"|"+line.getSkuCode(),ignored->new ArrayList<>())
+    .add(new CartonSkuWithBox(c,line));
+  List<SkuItem> items=groups.values().stream().map(values->{CartonSkuWithBox first=values.get(0);return new SkuItem(first.carton().getInboundId(),first.carton().getInboundCode(),
+   first.line().getInboundDetailId(),first.line().getSkuCode(),first.line().getCargoName(),values.size(),
+   values.stream().mapToInt(v->v.line().getActualQuantity()==null?0:v.line().getActualQuantity()).sum(),
+   values.stream().map(v->v.carton().getBoxCode()).toList());}).toList();
   int discrepancies=(int)cartons.stream().filter(c->"ACCEPTED_VARIANCE".equals(c.getDiscrepancyStatus())).count();
   PalletMetrics metrics=mapper.metrics(row.getId());
   return new Pallet(row.getId(),row.getPalletNo(),row.getPalletStatus(),cartons.size(),items.size(),discrepancies,
    metrics==null?BigDecimal.ZERO:metrics.weightKg(),metrics==null?BigDecimal.ZERO:metrics.volumeCbm(),row.getVersion(),items,
-   cartons.stream().map(c->cartonView(c,inboundCode,false,null)).toList(),row.getCompletedAt());
+   cartons.stream().map(c->cartonView(c,c.getInboundCode(),false,null)).toList(),row.getCompletedAt());
  }
 
  private Carton cartonView(CartonRow row,String inboundCode,boolean canCount,String blockReason){
-  return new Carton(row.getId(),row.getBoxCode(),row.getInboundId(),inboundCode,row.getInboundDetailId(),row.getSkuCode(),row.getCargoName(),
-   row.getExpectedSkuQuantity(),row.getActualSkuQuantity(),row.getDiscrepancyStatus(),row.getDiscrepancyRemark(),
+  List<CartonSkuLine> lines=mapper.cartonSkus(row.getId()).stream().map(line -> new CartonSkuLine(line.getInboundDetailId(),
+   line.getSkuCode(),line.getCargoName(),line.getExpectedQuantity(),line.getActualQuantity(),line.getDiscrepancyStatus(),line.getDiscrepancyRemark())).toList();
+  return new Carton(row.getId(),row.getBoxCode(),row.getInboundId(),inboundCode,lines,
    row.getPalletId()==null?"COUNTED_UNBOUND":"BOUND",row.getPalletId(),row.getPalletNo(),canCount,blockReason);
  }
- private LabelRow requireLabel(long taskId,String boxCode){ LabelRow label=mapper.label(taskId,boxCode.trim()); if(label==null) throw new BizException(ResultCode.NOT_FOUND,"箱码不属于当前一件代发入仓单"); if(!StringUtils.hasText(label.getSkuCode())) throw conflict("箱码缺少SKU快照，不能清点"); requireExpectedQuantity(label); return label; }
- private int requireExpectedQuantity(LabelRow label){ if(label.getUnitsPerCarton()==null||label.getUnitsPerCarton()<1) throw conflict("箱码缺少每箱SKU数量快照，不能清点"); return label.getUnitsPerCarton(); }
- private TaskRow requireWorkingTask(long taskId,long warehouseId,long operatorId){ TaskRow task=requireTask(taskId,warehouseId); if(!"CLAIMED".equals(task.getTaskStatus())) throw conflict("请先领取待清点组托任务"); if(!Objects.equals(task.getAssigneeId(),operatorId)) throw conflict("任务不属于当前操作员"); if(!"WAIT_PALLETIZE".equals(task.getProcessStatus())) throw conflict("入仓单已不在待清点组托状态"); return task; }
+ private LabelRow requireLabel(long taskId,String boxCode){ LabelRow label=mapper.label(taskId,boxCode.trim()); if(label==null) throw new BizException(ResultCode.NOT_FOUND,"箱码不属于当前一件代发入仓单"); if(labelSkuLines(taskId,label).isEmpty()) throw conflict("箱码缺少SKU快照，不能清点"); return label; }
+ private List<LabelSkuRow> labelSkuLines(long taskId,LabelRow label){ return mapper.labelSkus(taskId,label.getCartonLabelId()); }
+ private List<CountedLine> validateCountLines(List<LabelSkuRow> expected,List<CountSkuLine> actual){
+  Map<Long,CountSkuLine> submitted=new LinkedHashMap<>();
+  for(CountSkuLine line:actual) if(submitted.put(line.inboundDetailId(),line)!=null) throw invalid("同一SKU明细不能重复清点");
+  if(submitted.size()!=expected.size()) throw invalid("必须清点当前箱内全部SKU");
+  List<CountedLine> result=new ArrayList<>();
+  for(LabelSkuRow line:expected){
+   CountSkuLine input=submitted.get(line.getInboundDetailId());
+   if(input==null || !Objects.equals(line.getSkuCode(),input.skuCode().trim())) throw invalid("清点SKU与箱唛不一致");
+   boolean mismatch=!Objects.equals(line.getExpectedQuantity(),input.actualQuantity()); String remark=normalize(input.discrepancyRemark());
+   if(!mismatch && input.discrepancyAction()!=DiscrepancyAction.MATCH) throw invalid("实收数量一致时差异动作必须为 MATCH");
+   if(mismatch && input.discrepancyAction()!=DiscrepancyAction.ACCEPT_VARIANCE) throw conflict("实收数量存在差异，请确认差异处理结果");
+   if(mismatch && !StringUtils.hasText(remark)) throw invalid("接受数量差异时必须填写处理说明");
+   result.add(new CountedLine(line.getInboundDetailId(),line.getSkuCode(),line.getCargoName(),line.getExpectedQuantity(),input.actualQuantity(),remark,mismatch));
+  }
+  return result;
+ }
+ private boolean sameCountLines(List<CartonSkuRow> saved,List<CountSkuLine> submitted){
+  if(saved.size()!=submitted.size()) return false;
+  Map<Long,Integer> quantities=new HashMap<>(); for(CountSkuLine line:submitted) quantities.put(line.inboundDetailId(),line.actualQuantity());
+  return saved.stream().allMatch(line->Objects.equals(line.getActualQuantity(),quantities.get(line.getInboundDetailId())));
+ }
+ private TaskRow requireWorkingTask(long taskId,long warehouseId,long operatorId){ TaskRow task=requireTask(taskId,warehouseId); if(!"CLAIMED".equals(task.getTaskStatus())) throw conflict("请先领取待清点组托任务"); if(!Objects.equals(task.getAssigneeId(),operatorId)) throw conflict("任务不属于当前操作员"); if(!"WAIT_PALLETIZE".equals(task.getProcessStatus())) throw conflict("入仓单已不在待清点组托状态"); requirePalletSetup(task); return task; }
+ private void requirePalletSetup(TaskRow task){ if(!palletSetupReady(task)) throw conflict(palletSetupMessage(task)); }
+ private boolean palletSetupReady(TaskRow task){ return task.getExpectedPalletCount()!=null && task.getExpectedPalletCount()>0 && mapper.palletCount(task.getId())==task.getExpectedPalletCount(); }
+ private String palletSetupMessage(TaskRow task){ int expected=task.getExpectedPalletCount()==null?0:task.getExpectedPalletCount(); return palletSetupMessage(expected,mapper.palletCount(task.getId())); }
+ private static String palletSetupMessage(int expected,int generated){ return "预计 "+expected+" 托，当前仅生成 "+generated+" 个托盘码，请联系后台处理后刷新"; }
  private TaskRow requireTask(long taskId,long warehouseId){ TaskRow task=mapper.task(taskId,warehouseId); if(task==null) throw new BizException(ResultCode.NOT_FOUND,"未找到当前仓库的一件代发清点组托任务"); return task; }
  private PalletRow requireOpenPallet(long taskId,long palletId,long warehouseId){ PalletRow p=mapper.pallet(taskId,palletId,warehouseId); if(p==null) throw new BizException(ResultCode.NOT_FOUND,"托盘不存在"); if(!"OPEN".equals(p.getPalletStatus())) throw conflict("托盘已封托，不能修改"); return p; }
  private static String operation(String v){String n=normalize(v);if(!StringUtils.hasText(n))throw invalid("操作幂等号不能为空");return n;}
  private static String normalize(String v){return StringUtils.hasText(v)?v.trim():null;}
  private static BizException conflict(String m){return new BizException(ResultCode.CONFLICT,m);}
  private static BizException invalid(String m){return new BizException(ResultCode.VALIDATION_FAILED,m);}
+ private record CountedLine(long detailId,String skuCode,String cargoName,int expected,int actual,String remark,boolean mismatch){}
+ private record CartonSkuWithBox(CartonRow carton,CartonSkuRow line){}
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java
index 7d5fcda01..e27119f62 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java
@@ -98,8 +98,8 @@ public class FbaPricingService {
             if (published == null || !"SENT".equals(published.getFeeStatus())) {
                 throw conflict("费用状态已变化，请刷新后重试");
             }
-            if (feeRevisionLocked(inbound, published)) {
-                throw conflict("客户已确认且该票已装柜完成，不允许再修改或重新发送费用");
+            if (feeRevisionLocked(published)) {
+                throw conflict("客户已确认，不允许再修改或重新发送费用");
             }
         }
         var measurement = measurementRepository.findLatestMeasurement(tenantId, inboundId);
@@ -490,8 +490,8 @@ public class FbaPricingService {
         if (current == null || !List.of("CALCULATED", "CONFIRMED", "SENT").contains(current.getFeeStatus())) {
             throw conflict("入库单没有可修改的初算或已发布费用");
         }
-        if (feeRevisionLocked(inbound, current)) {
-            throw conflict("客户已确认且该票已装柜完成，不允许再修改费用");
+        if (feeRevisionLocked(current)) {
+            throw conflict("客户已确认，不允许再修改费用");
         }
         if (!request.expectedFeeVersion().equals(current.getFeeVersion())) {
             throw conflict("费用版本已变化，请刷新后重试");
@@ -613,9 +613,8 @@ public class FbaPricingService {
             .contains(processStatus);
     }
 
-    private static boolean feeRevisionLocked(InboundPricingEntity inbound, InboundFeeEntity fee) {
-        return fee != null && fee.getCustomerConfirmedAt() != null
-            && List.of("LOADED", "DELIVERED").contains(inbound.getProcessStatus());
+    private static boolean feeRevisionLocked(InboundFeeEntity fee) {
+        return fee != null && fee.getCustomerConfirmedAt() != null;
     }
 
     private static PricingDestinationType destinationType(InboundPricingEntity inbound) {
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java
index 065ebf1a1..a2cd51904 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java
@@ -25,6 +25,8 @@ import com.baiyue.firstleg.dto.DropshipPalletizationDtos.Pallet;
 @Service
 public class InboundCartonLabelPrintService {
     private static final BigDecimal PAGE_MM = new BigDecimal("100");
+    private static final BigDecimal A4_WIDTH_MM = new BigDecimal("210");
+    private static final BigDecimal A4_HEIGHT_MM = new BigDecimal("297");
     private static final List<String> SAFE_RESPONSE_HEADERS = List.of(
         HttpHeaders.CONTENT_DISPOSITION, HttpHeaders.CACHE_CONTROL, HttpHeaders.PRAGMA,
         "X-Print-Page-Count", "X-Request-Id", "X-Trace-Id");
@@ -113,28 +115,51 @@ public class InboundCartonLabelPrintService {
         return ResponseEntity.status(response.getStatusCode()).headers(headers).body(response.getBody());
     }
 
-    /** 一件代发托盘标签：托盘号、入仓码、SKU箱数和托盘二维码。 */
-    public ResponseEntity<byte[]> generateDropshipPallet(Pallet pallet, String requestId) {
-        if (pallet == null || !StringUtils.hasText(pallet.palletNo()) || pallet.items().isEmpty()) {
-            throw new BizException(ResultCode.CONFLICT, "只有已完成且包含货物的一件代发托盘可以打印");
+    /** 一件代发 A4 托盘信息单：托盘号、Code 128 一维码和 SKU 归托明细。 */
+    public ResponseEntity<byte[]> generateDropshipPallet(Pallet pallet, String inboundCode, String requestId) {
+        return generateDropshipPallets(List.of(pallet), inboundCode, requestId);
+    }
+
+    /** 一票预生成托盘码合并为一个多页 PDF，避免 PDA 展开或逐个下载大量空托盘。 */
+    public ResponseEntity<byte[]> generateDropshipPallets(List<Pallet> pallets, String inboundCode, String requestId) {
+        if (pallets == null || pallets.isEmpty()) {
+            throw new BizException(ResultCode.CONFLICT, "托盘码尚未生成，不能打印");
         }
-        String inboundCodes = pallet.items().stream().map(item -> item.inboundCode())
-            .filter(StringUtils::hasText).distinct().collect(java.util.stream.Collectors.joining("/"));
-        String skuSummary = pallet.items().stream()
-            .map(item -> item.skuCode() + "×" + item.cartonCount())
-            .collect(java.util.stream.Collectors.joining(" / "));
-        PrintPdfClient.Label label = new PrintPdfClient.Label(pallet.palletNo(), inboundCodes,
-            "CTNS:" + pallet.cartonCount(), skuSummary, pallet.palletNo(), null);
-        PrintPdfClient.InboundMarkPdfRequest request = new PrintPdfClient.InboundMarkPdfRequest(
-            "INBOUND_MARK_V1", new PrintPdfClient.PageSpec(PAGE_MM, PAGE_MM),
-            pallet.palletNo() + "-托盘唛.pdf", List.of(label));
+        List<PrintPdfClient.DropshipPalletDocument> documents = pallets.stream()
+            .map(pallet -> dropshipPalletDocument(pallet, inboundCode)).toList();
+        String fileName = pallets.size() == 1
+            ? pallets.get(0).palletNo() + "-A4托盘信息单.pdf"
+            : inboundCode + "-" + pallets.size() + "托-A4托盘信息单.pdf";
+        PrintPdfClient.DropshipPalletA4PdfRequest request = new PrintPdfClient.DropshipPalletA4PdfRequest(
+            "DROPSHIP_PALLET_A4_V1", new PrintPdfClient.PageSpec(A4_WIDTH_MM, A4_HEIGHT_MM),
+            fileName, documents);
         try {
-            return requirePdf(printClient.generateInboundMarks(internalToken, requestId, request));
+            return requirePdf(printClient.generateDropshipPalletA4Documents(internalToken, requestId, request));
         } catch (FeignException | NoFallbackAvailableException exception) {
             throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "打印服务暂不可用，请稍后重试");
         }
     }
 
+    private PrintPdfClient.DropshipPalletDocument dropshipPalletDocument(Pallet pallet, String inboundCode) {
+        if (pallet == null || !StringUtils.hasText(pallet.palletNo())) {
+            throw new BizException(ResultCode.CONFLICT, "托盘码尚未生成，不能打印");
+        }
+        String inboundCodes = pallet.items().stream().map(item -> item.inboundCode())
+            .filter(StringUtils::hasText).distinct().collect(java.util.stream.Collectors.joining("/"));
+        if (!StringUtils.hasText(inboundCodes)) inboundCodes = inboundCode;
+        List<PrintPdfClient.DropshipPalletSkuRow> skuRows = pallet.items().stream()
+            .map(item -> new PrintPdfClient.DropshipPalletSkuRow(item.inboundCode(), item.skuCode(),
+                item.cargoName(), number(item.cartonCount()), number(item.skuQuantity())))
+            .toList();
+        return new PrintPdfClient.DropshipPalletDocument(
+            pallet.palletNo(), inboundCodes, number(pallet.cartonCount()), number(pallet.skuCount()),
+            pallet.weightKg(), pallet.volumeCbm(), pallet.palletNo(), skuRows);
+    }
+
+    private int number(Integer value) {
+        return value == null ? 0 : value;
+    }
+
     private ResponseEntity<byte[]> generatePdf(String fileName, List<InboundCartonLabels.Label> labels,
                                                 String requestId) {
         PrintPdfClient.InboundMarkPdfRequest request = new PrintPdfClient.InboundMarkPdfRequest(
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelService.java
index 70edb6129..d26123817 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelService.java
@@ -10,6 +10,7 @@ import com.baiyue.firstleg.dto.InboundCartonLabels;
 import com.baiyue.firstleg.entity.InboundCartonLabelEntity;
 import com.baiyue.firstleg.entity.InboundOrderEntity;
 import com.baiyue.firstleg.repository.InboundCartonLabelRepository;
+import com.baiyue.firstleg.mapper.InboundCartonLabelSkuMapper;
 import feign.FeignException;
 import jakarta.annotation.Resource;
 import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
@@ -24,6 +25,8 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -36,6 +39,7 @@ public class InboundCartonLabelService implements CartonLabelBindingResolver {
     private static final Set<String> ALLOCATABLE_STATUSES = Set.of("PREPARING", "WAIT_MEASURE", "MEASURING");
 
     @Resource private InboundCartonLabelRepository repository;
+    @Resource private InboundCartonLabelSkuMapper labelSkus;
     @Resource private OrderCargoClient orderCargoClient;
     @Resource private PrintableOrderInboundClient printableOrderInboundClient;
     @Resource private InboundOrderCreationService inboundOrderCreationService;
@@ -76,7 +80,8 @@ public class InboundCartonLabelService implements CartonLabelBindingResolver {
             if (existingFingerprint.equals(fingerprint)) return batch(inbound, consistent);
             return batch(inbound, consistent);
         }
-        int total = cargoes.stream().mapToInt(this::requirePackageCount).sum();
+        List<CargoGroup> groups = cartonGroups(cargoes, inbound.getFulfillmentType());
+        int total = groups.stream().mapToInt(CargoGroup::packageCount).sum();
         if (total < 1 || total > MAX_LABELS) {
             throw new BizException(ResultCode.VALIDATION_FAILED, "唛头箱数必须为1至2000箱");
         }
@@ -86,12 +91,20 @@ public class InboundCartonLabelService implements CartonLabelBindingResolver {
 
         int cartonIndex = 0;
         LocalDateTime now = LocalDateTime.now();
-        for (OrderCargoClient.CargoLabelBinding cargo : cargoes) {
-            int detailCount = requirePackageCount(cargo);
+        for (CargoGroup group : groups) {
+            OrderCargoClient.CargoLabelBinding cargo = group.cargoes().get(0);
+            int detailCount = group.packageCount();
             for (int offset = 0; offset < detailCount; offset++) {
                 cartonIndex++;
                 InboundCartonLabelEntity label = label(inbound, cargo, total, cartonIndex, fingerprint, now);
                 repository.insert(label);
+                if ("ONE_CLICK_DROPSHIP".equals(inbound.getFulfillmentType())) {
+                    int lineNo = 0;
+                    for (OrderCargoClient.CargoLabelBinding line : group.cargoes()) {
+                        labelSkus.insert(IdWorker.getId(), inbound.getTenantId(), inbound.getId(), label.getId(),
+                            line.cargoId(), line.skuNo().trim(), line.cargoName(), line.unitsPerCarton(), ++lineNo);
+                    }
+                }
                 existing.add(label);
             }
         }
@@ -195,6 +208,27 @@ public class InboundCartonLabelService implements CartonLabelBindingResolver {
         return cargo.packageCount();
     }
 
+    private List<CargoGroup> cartonGroups(List<OrderCargoClient.CargoLabelBinding> cargoes, String fulfillmentType) {
+        if (!"ONE_CLICK_DROPSHIP".equals(fulfillmentType)) {
+            return cargoes.stream().map(cargo -> new CargoGroup(null, requirePackageCount(cargo), List.of(cargo))).toList();
+        }
+        Map<String, List<OrderCargoClient.CargoLabelBinding>> grouped = new LinkedHashMap<>();
+        int single = 0;
+        for (OrderCargoClient.CargoLabelBinding cargo : cargoes) {
+            requirePackageCount(cargo);
+            String group = StringUtils.hasText(cargo.packingGroupNo()) ? cargo.packingGroupNo().trim() : "__single_" + (++single);
+            grouped.computeIfAbsent(group, ignored -> new ArrayList<>()).add(cargo);
+        }
+        return grouped.entrySet().stream().map(entry -> {
+            List<OrderCargoClient.CargoLabelBinding> lines = entry.getValue();
+            int count = lines.get(0).packageCount();
+            if (lines.stream().anyMatch(line -> line.packageCount() != count)) {
+                throw new BizException(ResultCode.VALIDATION_FAILED, "同一混箱组合的箱数必须一致：" + entry.getKey());
+            }
+            return new CargoGroup(entry.getKey(), count, List.copyOf(lines));
+        }).toList();
+    }
+
     private void requirePrintableInboundCode(String inboundCode, int total) {
         if (!StringUtils.hasText(inboundCode) || !inboundCode.matches("[A-Za-z0-9._:-]+")) {
             throw new BizException(ResultCode.VALIDATION_FAILED, "入仓码不能生成可打印二维码");
@@ -276,6 +310,7 @@ public class InboundCartonLabelService implements CartonLabelBindingResolver {
             cargo.cargoName() == null ? "" : cargo.cargoName().trim(),
             cargo.skuNo() == null ? "" : cargo.skuNo().trim(), String.valueOf(cargo.packageCount()),
             String.valueOf(cargo.unitsPerCarton()),
+            cargo.packingGroupNo() == null ? "" : cargo.packingGroupNo().trim(),
             decimalOrEmpty(cargo.lengthCm()), decimalOrEmpty(cargo.widthCm()), decimalOrEmpty(cargo.heightCm())))
             .collect(java.util.stream.Collectors.joining("\n"));
         try {
@@ -296,11 +331,16 @@ public class InboundCartonLabelService implements CartonLabelBindingResolver {
 
     private InboundCartonLabels.Batch batch(InboundOrderEntity inbound,
                                              List<InboundCartonLabelEntity> entities) {
+        List<InboundCartonLabelSkuMapper.SkuRow> skuRows = labelSkus.findByInbound(inbound.getTenantId(), inbound.getId());
+        Map<Long, List<InboundCartonLabelSkuMapper.SkuRow>> skuRowsByLabel = skuRows == null ? Map.of()
+            : skuRows.stream().collect(java.util.stream.Collectors.groupingBy(
+                InboundCartonLabelSkuMapper.SkuRow::getCartonLabelId, LinkedHashMap::new,
+                java.util.stream.Collectors.toList()));
         List<InboundCartonLabels.Label> labels = entities.stream().map(entity ->
             new InboundCartonLabels.Label(entity.getId(), entity.getInboundDetailId(), entity.getCargoItemNo(),
                 entity.getCargoName(), entity.getDetailPackageCount(), entity.getBoxCode(),
                 entity.getTotalCartonCount(), entity.getCartonIndex(), entity.getBoxSpecification(),
-                entity.getLengthCm(), entity.getWidthCm(), entity.getHeightCm(), entity.getSkuCode(), inbound.getInboundCode(),
+                entity.getLengthCm(), entity.getWidthCm(), entity.getHeightCm(), displaySkuCodes(entity, skuRowsByLabel), inbound.getInboundCode(),
                 fallback(inbound.getWarehouseName(), "WAREHOUSE"),
                 "CTNS:" + entity.getTotalCartonCount() + "-" + entity.getCartonIndex(),
                 fallback(inbound.getChannelName(), fallback(inbound.getChannelCode(), "ROUTE"))))
@@ -314,9 +354,30 @@ public class InboundCartonLabelService implements CartonLabelBindingResolver {
         return StringUtils.hasText(value) ? value.trim() : fallback;
     }
 
+    private String displaySkuCodes(InboundCartonLabelEntity label,
+                                   Map<Long, List<InboundCartonLabelSkuMapper.SkuRow>> skuRowsByLabel) {
+        List<InboundCartonLabelSkuMapper.SkuRow> lines = skuRowsByLabel.get(label.getId());
+        if (lines == null || lines.isEmpty()) return label.getSkuCode();
+        List<String> skuCodes = lines.stream().map(InboundCartonLabelSkuMapper.SkuRow::getSkuCode)
+            .filter(StringUtils::hasText).map(String::trim).distinct().toList();
+        if (skuCodes.isEmpty()) return label.getSkuCode();
+        String joined = String.join(" / ", skuCodes);
+        if (joined.codePointCount(0, joined.length()) <= 64) return joined;
+        String suffix = " / +" + Math.max(0, skuCodes.size() - 1) + " SKU";
+        int firstLimit = 64 - suffix.codePointCount(0, suffix.length());
+        String first = skuCodes.get(0);
+        if (first.codePointCount(0, first.length()) > firstLimit) {
+            first = first.substring(0, first.offsetByCodePoints(0, firstLimit));
+        }
+        return first + suffix;
+    }
+
     private void requireIds(long tenantId, long inboundId) {
         if (tenantId <= 0 || inboundId <= 0) {
             throw new BizException(ResultCode.BAD_REQUEST, "客户ID和入库单ID必须大于0");
         }
     }
+
+    private record CargoGroup(String groupNo, int packageCount,
+                              List<OrderCargoClient.CargoLabelBinding> cargoes) {}
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java
index 66a9db379..6f84a362f 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java
@@ -131,6 +131,15 @@ public class InboundMeasurementService {
             throw new BizException(ResultCode.CONFLICT,
                 "测量已提交待审核，不能再保存整批测量数据；如需修改请先退回后重新提交");
         }
+        if ("ONE_CLICK_DROPSHIP".equals(inbound.getFulfillmentType())
+            && (request.expectedPalletCount() == null || request.expectedPalletCount() < 1)) {
+            throw new BizException(ResultCode.VALIDATION_FAILED, "一件代发必须录入预计托数");
+        }
+        if ("ONE_CLICK_DROPSHIP".equals(inbound.getFulfillmentType())
+            && inbound.getTotalPackageCount() != null
+            && request.expectedPalletCount() > inbound.getTotalPackageCount()) {
+            throw new BizException(ResultCode.VALIDATION_FAILED, "一件代发预计托数不能超过总箱数");
+        }
         validateInboundDetails(tenantId, inbound, request.items());
         request.items().stream().map(InboundMeasurementRequests.ItemRequest::chargeRuleId)
             .filter(java.util.Objects::nonNull).distinct().forEach(ruleId -> {
@@ -162,6 +171,11 @@ public class InboundMeasurementService {
                 item.overLimitWarning(), item.outerLengthCm(), item.outerWidthCm(), item.outerHeightCm(),
                 item.chargeRuleId(), item.coefficientMode(), item.remark())).toList());
         InboundMeasurementEntity saved = batchService.saveBatch(command);
+        if ("ONE_CLICK_DROPSHIP".equals(inbound.getFulfillmentType())) {
+            inbound.setPalletCount(request.expectedPalletCount());
+            inbound.setUpdatedBy(operatorId);
+            if (!repository.updateInbound(inbound)) throw concurrentModification();
+        }
         return new InboundMeasurementResponses.DraftSaved(saved.getId(), saved.getVersion(), saved.getStatus());
     }
 
@@ -247,7 +261,7 @@ public class InboundMeasurementService {
         ConfirmedWeightTotals confirmedTotals = confirmedWeightTotals(weights);
         if (confirmedTotals.palletCount() == 0) {
             throw new BizException(ResultCode.VALIDATION_FAILED,
-                "请至少上传并确认一张称重图片后再提交测量审核");
+                "即使只有一箱，也必须上传并确认至少一张称重图片后再提交测量审核");
         }
 
         requireConfirmedPackageTotal(inbound, items);
@@ -261,7 +275,13 @@ public class InboundMeasurementService {
         inbound.setMeasureCompletedAt(LocalDateTime.now());
         inbound.setActualGrossWeightKg(confirmedTotals.grossWeightKg());
         inbound.setActualNetWeightKg(confirmedTotals.netWeightKg());
-        inbound.setPalletCount(confirmedTotals.palletCount());
+        if ("ONE_CLICK_DROPSHIP".equals(inbound.getFulfillmentType())) {
+            if (inbound.getPalletCount() == null || inbound.getPalletCount() < 1) {
+                throw new BizException(ResultCode.VALIDATION_FAILED, "请先录入预计托数并保存，再提交测量审核");
+            }
+        } else {
+            inbound.setPalletCount(confirmedTotals.palletCount());
+        }
         if (measurement.getTotalVolumeCbm() != null) {
             inbound.setActualVolumeCbm(measurement.getTotalVolumeCbm());
         }
@@ -547,7 +567,8 @@ public class InboundMeasurementService {
         InboundMeasurementResponses.DeclarationSnapshot declaration = latestDeclaration.snapshot();
         return new InboundMeasurementResponses.Detail(
             inbound.getId(), inbound.getInboundCode(), inbound.getCompanyName(), inbound.getChannelCode(),
-            inbound.getChannelName(), inbound.getProcessStatus(), inbound.getMeasureReviewStatus(),
+            inbound.getChannelName(), inbound.getFulfillmentType(), inbound.getPalletCount(),
+            inbound.getProcessStatus(), inbound.getMeasureReviewStatus(),
             RECOMMENDED_PALLET_TYPE,
             review == null ? null : review.getReviewReason(), review == null ? null : review.getReviewerId(),
             review == null ? null : review.getReviewerName(), measurement == null ? null : measurement.getId(),
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingCompletedOutboxService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingCompletedOutboxService.java
index 1934f8a59..06296b222 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingCompletedOutboxService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingCompletedOutboxService.java
@@ -67,12 +67,14 @@ public class LoadingCompletedOutboxService {
         palletLabelService.prepare(planId, rows.get(0).getWarehouseId());
         Map<Long, List<String>> cartonMarks = cartonLabelPools(rows);
         List<PalletRow> palletRows = palletRows(planId);
+        Map<String, PalletManifest> palletManifests = palletManifests(palletRows);
         List<com.baiyue.firstleg.mapper.LoadingPalletLabelMapper.LabelRow> standardLabels = palletLabelMapper.labels(planId);
         return rows.stream().collect(java.util.stream.Collectors.groupingBy(Row::getAccountId,
             java.util.TreeMap::new, java.util.stream.Collectors.toList()))
             .entrySet().stream().map(entry -> envelope(entry.getKey(), entry.getValue(),
                 palletRows.stream().filter(item -> entry.getKey().equals(item.getAccountId())).toList(),
-                standardLabels.stream().filter(item -> entry.getKey().equals(item.getAccountId())).toList(), cartonMarks))
+                standardLabels.stream().filter(item -> entry.getKey().equals(item.getAccountId())).toList(), cartonMarks,
+                palletManifests))
             .toList();
     }
 
@@ -98,14 +100,16 @@ public class LoadingCompletedOutboxService {
 
     private EventEnvelope envelope(long accountId, List<Row> rows, List<PalletRow> palletRows,
                                    List<com.baiyue.firstleg.mapper.LoadingPalletLabelMapper.LabelRow> standardLabels,
-                                   Map<Long, List<String>> cartonMarks) {
+                                   Map<Long, List<String>> cartonMarks,
+                                   Map<String, PalletManifest> palletManifests) {
         Row first = rows.get(0);
         Map<Long, List<Row>> byInbound = rows.stream().collect(java.util.stream.Collectors.groupingBy(
             Row::getSourceInboundId, java.util.TreeMap::new, java.util.stream.Collectors.toList()));
         List<FirstLegLoadingPlanCompletedV2.Order> orders = byInbound.values().stream()
             .map(value -> order(value, palletRows.stream()
                 .filter(item -> Objects.equals(item.getSourceInboundId(), value.get(0).getSourceInboundId())).toList(),
-                standardLabels.stream().filter(item -> Objects.equals(item.getInboundId(), value.get(0).getSourceInboundId())).toList(), cartonMarks)).toList();
+                standardLabels.stream().filter(item -> Objects.equals(item.getInboundId(), value.get(0).getSourceInboundId())).toList(),
+                cartonMarks, palletManifests)).toList();
         var payload = new FirstLegLoadingPlanCompletedV2(String.valueOf(first.getLoadingPlanId()),
             first.getPlanNo(), string(first.getContainerBookingId()),
             ContainerNumbers.requireCanonical(first.getContainerNo()), first.getCabinetNo(),
@@ -123,7 +127,8 @@ public class LoadingCompletedOutboxService {
 
     private FirstLegLoadingPlanCompletedV2.Order order(List<Row> values, List<PalletRow> palletRows,
                                                        List<com.baiyue.firstleg.mapper.LoadingPalletLabelMapper.LabelRow> standardLabels,
-                                                       Map<Long, List<String>> cartonMarks) {
+                                                       Map<Long, List<String>> cartonMarks,
+                                                       Map<String, PalletManifest> palletManifests) {
         List<Row> sorted = values.stream().sorted(Comparator.comparing(Row::getSourceInboundDetailId)).toList();
         Row first = sorted.get(0);
         List<FirstLegLoadingPlanCompletedV2.Item> items = sorted.stream().map(row ->
@@ -138,7 +143,7 @@ public class LoadingCompletedOutboxService {
         String fulfillmentType = fulfillmentType(sorted);
         String orderType = dropship(fulfillmentType) ? "ONE_CLICK_DROPSHIP" : "FIRST_LEG";
         List<FirstLegLoadingPlanCompletedV2.PalletSnapshot> pallets = dropship(fulfillmentType)
-            ? palletSnapshots(sorted, palletRows) : standardLabels.stream()
+            ? palletSnapshots(sorted, palletRows, palletManifests) : standardLabels.stream()
                 .map(label -> new FirstLegLoadingPlanCompletedV2.PalletSnapshot(label.getPalletCode(), List.of())).toList();
         if ("ONE_CLICK_DROPSHIP".equals(orderType) && pallets.isEmpty()) {
             throw new BizException(ResultCode.CONFLICT, "一键代发入仓单缺少托盘冻结快照");
@@ -257,10 +262,11 @@ public class LoadingCompletedOutboxService {
     private record LabelPoolKey(long accountId, long inboundId) { }
     private record InboundPalletKey(long accountId, long inboundId) { }
 
-    private List<FirstLegLoadingPlanCompletedV2.PalletSnapshot> palletSnapshots(List<Row> values, List<PalletRow> source) {
+    private List<FirstLegLoadingPlanCompletedV2.PalletSnapshot> palletSnapshots(List<Row> values, List<PalletRow> source,
+                                                                                Map<String, PalletManifest> manifests) {
         if (source.isEmpty()) return List.of();
         if (source.stream().anyMatch(item -> Boolean.TRUE.equals(item.getActualBinding()))) {
-            return actualPalletSnapshots(values, source);
+            return actualPalletSnapshots(values, source, manifests);
         }
         Map<String, List<PalletRow>> byPallet = source.stream().collect(java.util.stream.Collectors.groupingBy(
             p -> (p.getAllocationNo() == null ? "" : p.getAllocationNo()) + "|" + p.getPalletCode(),
@@ -314,7 +320,7 @@ public class LoadingCompletedOutboxService {
 
     /** 现场逐箱扫描已给出精确箱到托关系，不再使用旧的按托盘容量顺序推算。 */
     private List<FirstLegLoadingPlanCompletedV2.PalletSnapshot> actualPalletSnapshots(
-        List<Row> values, List<PalletRow> source) {
+        List<Row> values, List<PalletRow> source, Map<String, PalletManifest> manifests) {
         Map<Long, Row> details = values.stream().collect(java.util.stream.Collectors.toMap(
             Row::getSourceInboundDetailId, value -> value, (left, right) -> left, LinkedHashMap::new));
         Map<String, List<PalletRow>> byPallet = source.stream().collect(java.util.stream.Collectors.groupingBy(
@@ -334,14 +340,17 @@ public class LoadingCompletedOutboxService {
                 if (marks.size() != detailRows.getValue().size()) {
                     throw new BizException(ResultCode.CONFLICT, "现场托盘包含空箱唛或重复箱唛");
                 }
-                int quantity = detail.getProductQuantity() == null ? marks.size()
-                    : (int) Math.round((double) detail.getProductQuantity() * marks.size()
-                        / Math.max(1, detail.getPackageCount()));
+                int quantity = detailRows.getValue().stream().map(PalletRow::getActualSkuQuantity)
+                    .filter(Objects::nonNull).mapToInt(Integer::intValue).sum();
+                if (quantity <= 0) throw new BizException(ResultCode.CONFLICT, "一件代发现场托盘缺少实点 SKU 数量");
                 skus.add(new FirstLegLoadingPlanCompletedV2.SkuPackageSnapshot(detail.getSourceInboundDetailId().toString(), detail.getSkuCode(),
                     detail.getProductNameZh(), marks.size(), quantity, marks));
                 actualPackages += marks.size();
             }
-            result.add(new FirstLegLoadingPlanCompletedV2.PalletSnapshot(pallet.getKey(), skus));
+            PalletManifest manifest = manifests.get(pallet.getKey());
+            if (manifest == null) throw new BizException(ResultCode.CONFLICT, "一件代发托盘缺少完整清单摘要");
+            result.add(new FirstLegLoadingPlanCompletedV2.PalletSnapshot(pallet.getKey(), skus,
+                manifest.version(), manifest.packageCount(), manifest.fragmentCount(), manifest.hash()));
         }
         if (actualPackages != sumInt(values, Row::getPackageCount)) {
             throw new BizException(ResultCode.CONFLICT, "一件代发现场托盘箱唛数与实装箱数不一致");
@@ -349,12 +358,37 @@ public class LoadingCompletedOutboxService {
         return result;
     }
 
+    private Map<String, PalletManifest> palletManifests(List<PalletRow> rows) {
+        Map<String, List<PalletRow>> grouped = rows.stream().filter(row -> Boolean.TRUE.equals(row.getActualBinding()))
+            .collect(java.util.stream.Collectors.groupingBy(PalletRow::getPalletCode, LinkedHashMap::new,
+                java.util.stream.Collectors.toList()));
+        Map<String, PalletManifest> result = new LinkedHashMap<>();
+        grouped.forEach((palletNo, values) -> {
+            List<PalletRow> sorted = values.stream().sorted(Comparator
+                .comparing(PalletRow::getAccountId).thenComparing(PalletRow::getSourceInboundId)
+                .thenComparing(PalletRow::getSourceInboundDetailId).thenComparing(PalletRow::getBoxCode)).toList();
+            String canonical = sorted.stream().map(value -> value.getAccountId() + "|" + value.getSourceInboundId()
+                + "|" + value.getSourceInboundDetailId() + "|" + value.getSkuCode() + "|" + value.getBoxCode()
+                + "|" + value.getActualSkuQuantity()).collect(java.util.stream.Collectors.joining("\n"));
+            int fragments = (int) sorted.stream().map(PalletRow::getAccountId).distinct().count();
+            result.put(palletNo, new PalletManifest(1, sorted.size(), fragments,
+                manifestHash(canonical)));
+        });
+        return result;
+    }
+
+    private String manifestHash(String canonical) {
+        String value = EventPayloadHash.sha256(canonical.getBytes(StandardCharsets.UTF_8));
+        return value.substring("sha256:".length());
+    }
+
     private static boolean dropship(String value) {
         return "ONE_CLICK_DROPSHIP".equals(value);
     }
 
     private record DetailSnapshot(Long detailId, String skuCode, String productName,
                                   Integer packageCount, Integer productQuantity, List<String> marks) {}
+    private record PalletManifest(int version, int packageCount, int fragmentCount, String hash) {}
 
     private void insert(EventEnvelope envelope) {
         InboundOutboxEntity value = new InboundOutboxEntity();
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingListService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingListService.java
index d1f32c420..182cdcfa3 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingListService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingListService.java
@@ -26,6 +26,7 @@ import com.baiyue.firstleg.repository.LoadingListRepository;
 import com.baiyue.firstleg.repository.LoadingPickRepository;
 import com.baiyue.firstleg.repository.ContainerRepository;
 import com.baiyue.firstleg.domain.Iso6346ContainerNumber;
+import com.baiyue.firstleg.domain.PriceBookChannelCatalog;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -138,7 +139,9 @@ public class LoadingListService {
     }
     public BusinessDocument containerLogisticsDocument(long bookingId,String type){ requireLogisticsType(type); requireBookingPlan(bookingId); return document(repository.document(bookingId,type)); }
     public BusinessDocument uploadContainerLogisticsDocument(long bookingId,String type,long operatorId,String operatorName,String key,int expectedVersion,String reason,MultipartFile file){
-        requireLogisticsType(type); String businessType=fileType(type); return uploadDocument(requireBookingPlan(bookingId),type,businessType,bookingId,Long.toString(bookingId),operatorId,operatorName,key,expectedVersion,reason,file);
+        requireLogisticsType(type); String businessType=fileType(type); AggregateRow plan=requireBookingPlan(bookingId);
+        requireDeliveryOrderUploadAllowed(plan);
+        return uploadDocument(plan,type,businessType,bookingId,Long.toString(bookingId),operatorId,operatorName,key,expectedVersion,reason,file);
     }
     public DocumentDownload downloadContainerDocument(long bookingId,String type,long fileId){
         requireLogisticsType(type); String businessType=fileType(type); requireBookingPlan(bookingId); ContainerDocumentEntity d=requireDocumentEntity(bookingId,type); if(!Long.valueOf(fileId).equals(d.getFileId())) throw notFound("货柜资料不存在");
@@ -190,6 +193,17 @@ public class LoadingListService {
     public record DocumentDownload(String fileName,MediaType contentType,byte[] content) {}
     private static void requireLogisticsType(String type){ if(!DELIVERY_ORDER.equals(type)) throw badRequest("documentType只能是DELIVERY_ORDER"); }
     private static String fileType(String type){ if (DELIVERY_ORDER.equals(type)) return DO_FILE_TYPE; throw badRequest("documentType只能是DELIVERY_ORDER"); }
+    private static void requireDeliveryOrderUploadAllowed(AggregateRow plan) {
+        if (!"COMPLETED".equals(plan.getPlanStatus()) || plan.getOutboundConfirmedAt() == null) {
+            throw conflict("货柜进入海外履约后才可上传DO资料");
+        }
+        if (plan.getActualEmptyReportedAt() != null) {
+            throw conflict("货柜已还柜，不可再上传DO资料");
+        }
+        if (PriceBookChannelCatalog.isSeaRail(plan.getChannelCode())) {
+            throw conflict("海铁渠道不适用DO资料");
+        }
+    }
 
     @Transactional
     @BusinessAudit(event = "CONTAINER_CLEARANCE_DOCUMENT_ATTACH", resourceType = "CONTAINER",
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java
index 383710d1b..d2ff2c773 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java
@@ -233,9 +233,9 @@ public class LoadingPickService {
         return view(requiredTask(taskId), warehouseId);
     }
 
-    public List<PendingTask> pendingTasks(long operatorId, String keyword) {
+    public List<PendingTask> pendingTasks(long operatorId, long warehouseId, String keyword) {
         String normalizedKeyword = StringUtils.hasText(keyword) ? keyword.trim() : null;
-        return repository.pendingTasks(operatorId, normalizedKeyword).stream()
+        return repository.pendingTasks(operatorId, warehouseId, normalizedKeyword).stream()
             .map(row -> new PendingTask(row.getTaskId(), row.getLoadingPlanId(), row.getContainerBookingId(),
                 row.getCabinetNo(), row.getContainerNo(),
                 row.getSourceType(), row.getRecordStatus(), row.getMergedIntoContainerBookingId(),
@@ -405,7 +405,7 @@ public class LoadingPickService {
         requirePackageUnit(item);
         if (repository.partial(itemId, request.finalPickedPackageCount(), request.version(),
             request.warehouseId()) != 1) {
-            throw conflict("部分拣货箱数必须大于已拣箱数且小于计划箱数，或明细版本已变化");
+            throw conflict("部分拣货最终箱数不能小于已拣箱数且必须小于计划箱数，或明细版本已变化");
         }
         insertHistory(taskId, itemId, operationId, requestHash, "PARTIAL",
             request.finalPickedPackageCount(), null, operatorId, operatorName);
@@ -1068,9 +1068,9 @@ public class LoadingPickService {
                 int current = count(item.getPickedPackageCount());
                 int planned = count(item.getPlannedPackageCount());
                 if (requestItem.finalPickedPackageCount() == null
-                    || requestItem.finalPickedPackageCount() <= current
+                    || requestItem.finalPickedPackageCount() < current
                     || requestItem.finalPickedPackageCount() >= planned) {
-                    throw conflict("PARTIAL最终箱数必须大于已拣且小于计划箱数");
+                    throw conflict("PARTIAL最终箱数不能小于已拣且必须小于计划箱数");
                 }
             } else if ("SKIP".equals(action)) {
                 if (requestItem.pickedPackageCount() != null || requestItem.finalPickedPackageCount() != null) {
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementReviewService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementReviewService.java
index 54175a32a..399d0c584 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementReviewService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementReviewService.java
@@ -92,14 +92,18 @@ public class MeasurementReviewService {
                     "人工确认箱数合计与入库单总箱数不一致，不能审核通过");
             }
             var weights = measurements.listWeights(tenantId, inboundId);
-            if (weights.isEmpty() || weights.stream().anyMatch(weight ->
+            if (weights.isEmpty()) {
+                throw new BizException(ResultCode.VALIDATION_FAILED,
+                    "该票测量已提交但没有称重图片；请先退回测量，上传并确认至少一张称重图片后重新提交（即使只有一箱也必须称重）");
+            }
+            if (weights.stream().anyMatch(weight ->
                 !"CONFIRMED".equals(weight.getRecognitionStatus())
                     || weight.getGrossWeightKg() == null
                     || weight.getGrossWeightKg().signum() <= 0
                     || weight.getNetWeightKg() == null
                     || weight.getNetWeightKg().signum() <= 0)) {
                 throw new BizException(ResultCode.VALIDATION_FAILED,
-                    "所有称重结果必须已确认且包含大于零的毛重和货物净重，才能审核通过");
+                    "该票存在未确认或重量无效的称重图片；请先在审核弹框逐张修正并确认后再审核");
             }
             BigDecimal grossWeight = weights.stream()
                 .map(com.baiyue.firstleg.entity.InboundWeightResultEntity::getGrossWeightKg)
@@ -139,7 +143,7 @@ public class MeasurementReviewService {
         repository.insertReview(reviewRecord(tenantId, inboundId, request.measurementId(), result,
             request.reason(), false, null, false, operatorId, operatorName));
         if (approved && "ONE_CLICK_DROPSHIP".equals(order.getFulfillmentType())) {
-            dropshipPalletization.createTask(order);
+            dropshipPalletization.createTask(order, operatorId, operatorName);
         }
         String approvedStatus = "ONE_CLICK_DROPSHIP".equals(order.getFulfillmentType())
             ? "WAIT_PALLETIZE" : "WAIT_SPLIT";
@@ -179,7 +183,7 @@ public class MeasurementReviewService {
             throw concurrentConflict();
         }
         if ("ONE_CLICK_DROPSHIP".equals(order.getFulfillmentType())) {
-            dropshipPalletization.createTask(order);
+            dropshipPalletization.createTask(order, operatorId, operatorName);
         }
         repository.insertReview(reviewRecord(tenantId, inboundId, request.measurementId(), "REJECTED",
             null, true, request.reason(), true, operatorId, operatorName));
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/PdaWarehouseCatalogService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/PdaWarehouseCatalogService.java
new file mode 100644
index 000000000..4dd10242e
--- /dev/null
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/PdaWarehouseCatalogService.java
@@ -0,0 +1,37 @@
+package com.baiyue.firstleg.service;
+
+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.client.WarehouseMasterDataClient.WarehouseOption;
+import jakarta.annotation.Resource;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/** 为国内 PDA 提供启用中的国内仓选择项，主档仍由 Warehouse Service 唯一维护。 */
+@Service
+public class PdaWarehouseCatalogService {
+    @Resource private WarehouseMasterDataClient warehouses;
+    @Value("${baiyue.security.internal-service-token:}") private String internalToken;
+
+    public List<WarehouseOption> activeDomesticWarehouses() {
+        try {
+            ApiResponse<List<WarehouseOption>> response = warehouses.domestic(internalToken);
+            if (response == null || !response.successful() || response.data() == null) {
+                throw unavailable();
+            }
+            return response.data();
+        } catch (BizException exception) {
+            throw exception;
+        } catch (RuntimeException exception) {
+            throw unavailable();
+        }
+    }
+
+    private static BizException unavailable() {
+        return new BizException(ResultCode.SERVICE_UNAVAILABLE, "国内仓目录暂时不可用，请稍后重试");
+    }
+}
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/PlatformPriceBookService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/PlatformPriceBookService.java
index 9adcf4617..5c1fa8ce2 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/PlatformPriceBookService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/PlatformPriceBookService.java
@@ -158,6 +158,11 @@ public class PlatformPriceBookService {
         if (candidate.getTenantId() == PriceBookVersionEntity.PLATFORM_SCOPE) repository.lockPlatformVersions();
         else repository.lockVersions(candidate.getTenantId());
         PriceBookVersionEntity version = requirePendingConfirmation(versionId);
+        List<PriceBookVersionEntity> activeVersions = version.getTenantId() == PriceBookVersionEntity.PLATFORM_SCOPE
+            ? repository.listActiveForUpdate() : repository.listActiveForUpdate(version.getTenantId());
+        if (activeVersions.stream().anyMatch(active -> active.getVersionNo() >= version.getVersionNo())) {
+            throw new BizException(ResultCode.CONFLICT, "该待确认版本早于当前生效版本，请作废后重新上传");
+        }
         List<PriceBookDtos.ParsedChannel> channels = repository.listChannels(versionId).stream().map(this::channelDto).toList();
         List<PriceBookDtos.ParsedRate> rates = repository.listRates(versionId).stream().map(this::rateDto).toList();
         MappingResult mapped = applyMappings(rates, confirmation);
@@ -174,14 +179,25 @@ public class PlatformPriceBookService {
         version.setChannelCount(channels.size());
         version.setRateCount(mapped.rates().size());
         LocalDateTime now = LocalDateTime.now();
-        (version.getTenantId() == PriceBookVersionEntity.PLATFORM_SCOPE
-            ? repository.listActiveForUpdate() : repository.listActiveForUpdate(version.getTenantId())).stream()
+        activeVersions.stream()
             .filter(active -> !Objects.equals(active.getId(), versionId))
             .forEach(active -> repository.supersede(active, now, operatorId));
         repository.activate(version, now, operatorId);
         return detail(versionId);
     }
 
+    @Transactional
+    public PriceBookDtos.PriceBookVersionDetail voidPending(long versionId, long operatorId,
+                                                             PriceBookDtos.PriceBookVoidRequest request) {
+        PriceBookVersionEntity candidate = requireVersion(versionId);
+        if (candidate.getTenantId() == PriceBookVersionEntity.PLATFORM_SCOPE) repository.lockPlatformVersions();
+        else repository.lockVersions(candidate.getTenantId());
+        PriceBookVersionEntity version = requirePendingConfirmation(versionId);
+        String reason = request.reason().trim();
+        repository.voidPending(version, LocalDateTime.now(), operatorId, reason);
+        return detail(versionId);
+    }
+
     public ResponseEntity<byte[]> source(long versionId, long operatorId) {
         PriceBookVersionEntity version = requireVersion(versionId);
         if (version.getSourceFileId() == null) throw new BizException(ResultCode.NOT_FOUND, "价格表原文件不存在");
@@ -562,7 +578,7 @@ public class PlatformPriceBookService {
             value.getSourceFileId(), value.getSourceSha256(), status,
             value.getChannelCount(), value.getRateCount(), value.getBlockingErrorCount(), value.getWarningCount(),
             value.getParseIssuesJson(), value.getCreatedBy(), value.getCreatedAt(), value.getPublishedBy(),
-            value.getPublishedAt(), value.getSupersededAt());
+            value.getPublishedAt(), value.getSupersededAt(), value.getVoidedBy(), value.getVoidedAt(), value.getVoidReason());
     }
 
     private static void requireScope(long customerId) {
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java
index 5806840b8..3e8b1e67c 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java
@@ -6,6 +6,7 @@ import com.baiyue.common.core.api.PageResult;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.common.audit.BusinessAudit;
 import com.baiyue.firstleg.dto.SmartLoadingDtos.*;
+import com.baiyue.firstleg.domain.SmartLoadingChannelGroupCatalog;
 import com.baiyue.firstleg.client.OrderCargoClient;
 import com.baiyue.firstleg.client.PendingReviewOrderClient;
 import com.baiyue.firstleg.entity.*;
@@ -42,17 +43,6 @@ import java.util.*;
 @Service
 public class SmartLoadingService {
     private static final BigDecimal CAPACITY_LIMIT_RATIO = new BigDecimal("1.50");
-    private static final Map<String, Set<String>> WORKBENCH_CHANNEL_GROUPS = Map.of(
-        "MATSON_CLX", Set.of("MATSON_CLX_TRUCK", "MATSON_CLX_PARCEL"),
-        "MATSON_MAX", Set.of("MATSON_MAX_TRUCK", "MATSON_MAX_PARCEL"),
-        "EXX", Set.of("EXX_TRUCK", "EXX_RAIL_NY"),
-        "HEDE", Set.of("HEDE_TRUCK", "HEDE_PARCEL"),
-        "OA_LA", Set.of("OA_LA_TRUCK", "OA_LA_FULL_TRUCK", "OA_PARCEL"),
-        "OA_CHICAGO", Set.of("OA_CHICAGO_RAIL"),
-        "OA_HOUSTON", Set.of("OA_HOUSTON_TRUCK"),
-        "OA_SAVANNAH", Set.of("OA_SAVANNAH_TRUCK"),
-        "OA_NEW_YORK_TRUCK", Set.of("OA_NEW_YORK_TRUCK")
-    );
     @Resource private SmartLoadingRepository repository;
     @Resource private com.baiyue.firstleg.mapper.DropshipPalletizationMapper dropshipPallets;
     @Resource private OrderCargoClient orderCargoClient;
@@ -102,7 +92,7 @@ public class SmartLoadingService {
     public List<Candidate> candidates(long bookingId, long warehouseId) {
         ContainerBookingEntity booking = requireBooking(bookingId);
         if (!Objects.equals(booking.getWarehouseId(), warehouseId)) throw validation("柜次仓库与候选仓库不一致");
-        if (!StringUtils.hasText(booking.getChannelCode())) throw validation("柜次缺少渠道快照，请先完成存量数据回填");
+        if (!StringUtils.hasText(booking.getChannelGroupCode())) throw validation("柜次缺少计划渠道，请重新创建模拟柜");
         List<Candidate> values = candidates(warehouseId).stream()
             .filter(candidate -> sameChannel(booking, candidate) && sameCustomerScope(booking, candidate)).toList();
         return enrichColoadCandidates(booking, repository.planByBooking(bookingId), values);
@@ -266,7 +256,7 @@ public class SmartLoadingService {
             && query.createdStart().isAfter(query.createdEnd())) {
             throw validation("创建开始日期不能晚于结束日期");
         }
-        return repository.workbenchContainers(query, actualChannels(query.channelGroupCodes()));
+        return repository.workbenchContainers(query, normalizedGroups(query.channelGroupCodes()));
     }
 
     private List<InboundCandidate> inboundCandidates(List<Candidate> details) {
@@ -384,13 +374,17 @@ public class SmartLoadingService {
     private static Set<String> actualChannels(List<String> groups) {
         Set<String> actual = new LinkedHashSet<>();
         for (String value : groups) {
-            String normalized = value == null ? "" : value.trim().toUpperCase(Locale.ROOT);
-            Set<String> mapped = WORKBENCH_CHANNEL_GROUPS.get(normalized);
-            if (mapped == null) throw validation("不支持的渠道分组: " + value);
-            actual.addAll(mapped);
+            try { actual.addAll(SmartLoadingChannelGroupCatalog.require(value).channelCodes()); }
+            catch (IllegalArgumentException exception) { throw validation(exception.getMessage()); }
         }
         return actual;
     }
+    private static Set<String> normalizedGroups(List<String> groups) {
+        return groups.stream().map(value -> {
+            try { return SmartLoadingChannelGroupCatalog.require(value).code(); }
+            catch (IllegalArgumentException exception) { throw validation(exception.getMessage()); }
+        }).collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new));
+    }
 
     @Transactional(readOnly = true)
     public Plan draftByBooking(long bookingId) {
@@ -1689,8 +1683,10 @@ public class SmartLoadingService {
     }
     private ContainerBookingEntity requireBooking(long id){ContainerBookingEntity b=repository.booking(id);if(b==null)throw new BizException(ResultCode.NOT_FOUND,"货柜预订不存在");return b;}
     private static boolean sameChannel(ContainerBookingEntity booking, Candidate candidate) {
-        return StringUtils.hasText(booking.getChannelCode()) && StringUtils.hasText(candidate.channelCode())
-            && booking.getChannelCode().equals(candidate.channelCode());
+        SmartLoadingChannelGroupCatalog.Definition candidateGroup =
+            SmartLoadingChannelGroupCatalog.resolveChannel(candidate.channelCode());
+        return StringUtils.hasText(booking.getChannelGroupCode()) && candidateGroup != null
+            && booking.getChannelGroupCode().equals(candidateGroup.code());
     }
     private static boolean sameCustomerScope(ContainerBookingEntity booking, Candidate candidate) {
         return booking.getCustomerId() == null || Objects.equals(booking.getCustomerId(), candidate.accountId());
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/split/service/SplitPreloadService.java b/firstleg/src/main/java/com/baiyue/firstleg/split/service/SplitPreloadService.java
index 14c5fdf5b..3d9fb3f29 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/split/service/SplitPreloadService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/split/service/SplitPreloadService.java
@@ -82,8 +82,8 @@ public class SplitPreloadService {
         }
         PreloadPlanEntity plan = repository.findPlan(tenantId, inboundId);
         if (plan != null) {
-            if (!PreloadStatus.PENDING.equals(plan.getStatus())) {
-                throw new BizException(ResultCode.CONFLICT, "预装计划已进入确认流程，不能修改智能装柜分配");
+            if (!reusableForLoadingAllocation(plan.getStatus())) {
+                throw new BizException(ResultCode.CONFLICT, "预装计划当前状态不能修改智能装柜分配");
             }
             return;
         }
@@ -96,17 +96,13 @@ public class SplitPreloadService {
             repository.createPlan(plan);
         } catch (DuplicateKeyException exception) {
             PreloadPlanEntity concurrent = repository.findPlan(tenantId, inboundId);
-            if (concurrent == null || !PreloadStatus.PENDING.equals(concurrent.getStatus())) {
+            if (concurrent == null || !reusableForLoadingAllocation(concurrent.getStatus())) {
                 throw new BizException(ResultCode.CONFLICT, "预装计划已被并发修改，请刷新后重试");
             }
         }
     }
 
-    /**
-     * A running PDA task may restore or add an unpicked allocation after the plan-level preload
-     * confirmation. A running PDA task owns the mutation lock, so CONFIRMING and CONFIRMED
-     * lifecycles may be reused while the restored loading item is synchronised atomically.
-     */
+    /** Reuses the confirmed preload lifecycle while a running PDA task owns the mutation lock. */
     @Transactional
     public void ensureForRunningLoadingAllocation(long tenantId, long inboundId, long operatorId,
                                                    String operatorName) {
@@ -126,10 +122,8 @@ public class SplitPreloadService {
             throw new BizException(ResultCode.CONFLICT, "装柜中的订单缺少既有预装计划，不能新增分配");
         }
         if (plan != null) {
-            if (!PreloadStatus.PENDING.equals(plan.getStatus())
-                && !(running && Set.of(PreloadStatus.CONFIRMING, PreloadStatus.CONFIRMED)
-                    .contains(plan.getStatus()))) {
-                throw new BizException(ResultCode.CONFLICT, "预装计划已进入确认流程，不能修改智能装柜分配");
+            if (!reusableForLoadingAllocation(plan.getStatus())) {
+                throw new BizException(ResultCode.CONFLICT, "预装计划当前状态不能修改智能装柜分配");
             }
             return;
         }
@@ -142,12 +136,17 @@ public class SplitPreloadService {
             repository.createPlan(plan);
         } catch (DuplicateKeyException exception) {
             PreloadPlanEntity concurrent = repository.findPlan(tenantId, inboundId);
-            if (concurrent == null || !PreloadStatus.PENDING.equals(concurrent.getStatus())) {
+            if (concurrent == null || !reusableForLoadingAllocation(concurrent.getStatus())) {
                 throw new BizException(ResultCode.CONFLICT, "预装计划已被并发修改，请刷新后重试");
             }
         }
     }
 
+    private static boolean reusableForLoadingAllocation(String status) {
+        return Set.of(PreloadStatus.PENDING, PreloadStatus.CONFIRMING, PreloadStatus.CONFIRMED)
+            .contains(status);
+    }
+
     public PreloadPlanResponse detail(long tenantId, long inboundId) {
         requireInbound(tenantId, inboundId);
         return response(requirePlan(tenantId, inboundId));
diff --git a/firstleg/src/main/resources/db/phase2-inbound-carton-label.sql b/firstleg/src/main/resources/db/phase2-inbound-carton-label.sql
index 02f34e80f..b7c2dbe4a 100644
--- a/firstleg/src/main/resources/db/phase2-inbound-carton-label.sql
+++ b/firstleg/src/main/resources/db/phase2-inbound-carton-label.sql
@@ -33,3 +33,19 @@ CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
   KEY idx_carton_label_detail (tenant_id, inbound_id, inbound_detail_id),
   CONSTRAINT fk_carton_label_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)
 ) ENGINE=InnoDB COMMENT='首次打印前冻结的实际箱号与订单货物明细映射';
+CREATE TABLE IF NOT EXISTS fl_inbound_carton_label_sku (
+  id BIGINT UNSIGNED NOT NULL COMMENT '箱唛SKU快照ID',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '客户ID和数据隔离键',
+  inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
+  carton_label_id BIGINT UNSIGNED NOT NULL COMMENT '物理箱唛ID',
+  inbound_detail_id BIGINT UNSIGNED NOT NULL COMMENT '订单货物明细ID',
+  sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码快照',
+  cargo_name VARCHAR(255) NULL COMMENT '货物名称快照',
+  expected_quantity INT UNSIGNED NOT NULL COMMENT '该物理箱内应收SKU数量',
+  line_no INT UNSIGNED NOT NULL COMMENT '箱内SKU展示顺序',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_carton_label_sku_detail (carton_label_id,inbound_detail_id),
+  KEY idx_carton_label_sku_code (tenant_id,inbound_id,sku_code),
+  CONSTRAINT fk_carton_label_sku_label FOREIGN KEY (carton_label_id) REFERENCES fl_inbound_carton_label(id)
+) ENGINE=InnoDB COMMENT='物理箱唛内的多SKU冻结快照';
diff --git a/firstleg/src/main/resources/db/phase2-inbound-schema.sql b/firstleg/src/main/resources/db/phase2-inbound-schema.sql
index 0bbb5be2d..9ae7b8d18 100644
--- a/firstleg/src/main/resources/db/phase2-inbound-schema.sql
+++ b/firstleg/src/main/resources/db/phase2-inbound-schema.sql
@@ -230,6 +230,23 @@ CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
   KEY idx_carton_label_detail (tenant_id, inbound_id, inbound_detail_id),
   CONSTRAINT fk_carton_label_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)
 ) ENGINE=InnoDB COMMENT='首次打印前冻结的实际箱号与订单货物明细映射';
+CREATE TABLE IF NOT EXISTS fl_inbound_carton_label_sku (
+  id BIGINT UNSIGNED NOT NULL COMMENT '箱唛SKU快照ID',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '客户ID和数据隔离键',
+  inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
+  carton_label_id BIGINT UNSIGNED NOT NULL COMMENT '物理箱唛ID',
+  inbound_detail_id BIGINT UNSIGNED NOT NULL COMMENT '订单货物明细ID',
+  sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码快照',
+  cargo_name VARCHAR(255) NULL COMMENT '货物名称快照',
+  expected_quantity INT UNSIGNED NOT NULL COMMENT '该物理箱内应收SKU数量',
+  line_no INT UNSIGNED NOT NULL COMMENT '箱内SKU展示顺序',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_carton_label_sku_detail (carton_label_id,inbound_detail_id),
+  KEY idx_carton_label_sku_code (tenant_id,inbound_id,sku_code),
+  CONSTRAINT fk_carton_label_sku_label FOREIGN KEY (carton_label_id) REFERENCES fl_inbound_carton_label(id)
+) ENGINE=InnoDB COMMENT='物理箱唛内的多SKU冻结快照';
+
 
 CREATE TABLE IF NOT EXISTS fl_inbound_measurement (
   id BIGINT UNSIGNED NOT NULL COMMENT '测量批次ID',
@@ -541,7 +558,7 @@ CREATE TABLE IF NOT EXISTS fl_price_book_version (
   original_file_name VARCHAR(255) NOT NULL COMMENT '原始Excel文件名',
   source_file_id BIGINT UNSIGNED NULL COMMENT 'File服务原始文件ID',
   source_sha256 CHAR(64) NULL COMMENT '原始文件SHA-256',
-  status VARCHAR(24) NOT NULL DEFAULT 'PENDING_CONFIRMATION' COMMENT '价格版本状态：PENDING_CONFIRMATION待确认、ACTIVE已生效、SUPERSEDED已被替代、FAILED解析失败',
+  status VARCHAR(24) NOT NULL DEFAULT 'PENDING_CONFIRMATION' COMMENT '价格版本状态：PENDING_CONFIRMATION待确认、ACTIVE已生效、SUPERSEDED已被替代、VOIDED已作废、FAILED解析失败',
   blocking_error_count INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '阻断错误数',
   warning_count INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '警告数',
   parse_issues_json JSON NULL COMMENT '上传解析问题及待确认重新校验结果',
@@ -552,6 +569,9 @@ CREATE TABLE IF NOT EXISTS fl_price_book_version (
   published_by BIGINT UNSIGNED NULL COMMENT '确认并发布价格版本的操作人ID',
   published_at DATETIME(3) NULL COMMENT '确认并生效时间',
   superseded_at DATETIME(3) NULL COMMENT '被下一版本替换时间',
+  voided_by BIGINT UNSIGNED NULL COMMENT '作废操作人ID',
+  voided_at DATETIME(3) NULL COMMENT '作废时间',
+  void_reason VARCHAR(500) NULL COMMENT '作废原因',
   updated_by BIGINT UNSIGNED NOT NULL COMMENT '最后修改人ID',
   updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '最后更新时间',
   deleted TINYINT(1) NOT NULL DEFAULT 0 COMMENT '逻辑删除标记：0未删除、1已删除',
@@ -1030,3 +1050,19 @@ CREATE TABLE IF NOT EXISTS fl_dropship_pallet_carton (
   CONSTRAINT fk_dropship_carton_pallet FOREIGN KEY (pallet_id) REFERENCES fl_dropship_pallet(id),
   CONSTRAINT fk_dropship_carton_label FOREIGN KEY (carton_label_id) REFERENCES fl_inbound_carton_label(id)
 ) ENGINE=InnoDB COMMENT='一件代发托盘内逐箱SKU和入仓单明细';
+CREATE TABLE IF NOT EXISTS fl_dropship_pallet_carton_sku (
+  id BIGINT UNSIGNED NOT NULL COMMENT '清点箱SKU明细ID',
+  carton_id BIGINT UNSIGNED NOT NULL COMMENT '清点物理箱ID',
+  inbound_detail_id BIGINT UNSIGNED NOT NULL COMMENT '入仓货物明细ID',
+  sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码快照',
+  cargo_name VARCHAR(255) NULL COMMENT '货物名称快照',
+  expected_quantity INT UNSIGNED NOT NULL COMMENT '应收数量',
+  actual_quantity INT UNSIGNED NOT NULL COMMENT '实收数量',
+  discrepancy_status VARCHAR(24) NOT NULL COMMENT 'MATCH或ACCEPTED_VARIANCE',
+  discrepancy_remark VARCHAR(500) NULL COMMENT '差异处理说明',
+  line_no INT UNSIGNED NOT NULL COMMENT '箱内SKU顺序',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_dropship_carton_sku_detail (carton_id,inbound_detail_id),
+  KEY idx_dropship_carton_sku_code (sku_code,carton_id),
+  CONSTRAINT fk_dropship_carton_sku_carton FOREIGN KEY (carton_id) REFERENCES fl_dropship_pallet_carton(id)
+) ENGINE=InnoDB COMMENT='一件代发物理箱内逐SKU清点事实';
diff --git a/firstleg/src/main/resources/db/phase3-channel-container-migration.sql b/firstleg/src/main/resources/db/phase3-channel-container-migration.sql
index 253376b8c..c7ca8bad3 100644
--- a/firstleg/src/main/resources/db/phase3-channel-container-migration.sql
+++ b/firstleg/src/main/resources/db/phase3-channel-container-migration.sql
@@ -34,6 +34,9 @@ BEGIN
   IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='fl_container_booking' AND column_name='channel_code') THEN
     ALTER TABLE fl_container_booking ADD COLUMN channel_code VARCHAR(64) NULL COMMENT '订舱渠道编码快照' AFTER cabinet_no;
   END IF;
+  IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='fl_container_booking' AND column_name='channel_group_code') THEN
+    ALTER TABLE fl_container_booking ADD COLUMN channel_group_code VARCHAR(64) NULL COMMENT '模拟柜计划渠道分组；关联真实订舱后继续保留' AFTER merged_into_container_booking_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='channel_name') THEN
     ALTER TABLE fl_container_booking ADD COLUMN channel_name VARCHAR(128) NULL COMMENT '订舱渠道名称快照' AFTER channel_code;
   END IF;
@@ -93,6 +96,7 @@ BEGIN
   IF current_plan_status IN ('LOADING', 'COMPLETED') AND (
        NOT (OLD.id <=> NEW.id) OR NOT (OLD.booking_no <=> NEW.booking_no)
     OR NOT (OLD.cabinet_no <=> NEW.cabinet_no)
+    OR NOT (OLD.channel_group_code <=> NEW.channel_group_code)
     OR NOT (OLD.channel_code <=> NEW.channel_code) OR NOT (OLD.channel_name <=> NEW.channel_name)
     OR NOT (OLD.ocean_booking_id <=> NEW.ocean_booking_id)
     OR NOT (OLD.ocean_booking_requirement_id <=> NEW.ocean_booking_requirement_id)
diff --git a/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql b/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql
index 25e445f75..5d20f8dcf 100644
--- a/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql
+++ b/firstleg/src/main/resources/db/phase3-smart-loading-schema.sql
@@ -41,6 +41,7 @@ CREATE TABLE IF NOT EXISTS fl_container_booking (
   source_type VARCHAR(24) NOT NULL DEFAULT 'SIMULATION' COMMENT '记录来源：SIMULATION内部模拟柜、OCEAN_BOOKING订舱真实柜',
   record_status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE' COMMENT '记录状态：ACTIVE可操作、MERGED已合并历史',
   merged_into_container_booking_id BIGINT UNSIGNED NULL COMMENT '真实柜被模拟柜吸收后的目标稳定柜次ID',
+  channel_group_code VARCHAR(64) NULL COMMENT '模拟柜计划渠道分组；关联真实订舱后继续保留',
   channel_code VARCHAR(64) NULL COMMENT '订舱渠道编码快照；存量回填前禁止混装',
   channel_name VARCHAR(128) NULL COMMENT '订舱渠道名称快照',
   ocean_booking_id BIGINT UNSIGNED NULL COMMENT '来源订舱ID',
@@ -149,11 +150,14 @@ BEGIN
     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 EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema=DATABASE()
+      AND table_name='fl_ocean_booking') THEN
+    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;
+  END IF;
   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
@@ -465,6 +469,7 @@ BEGIN
   DECLARE source_exists INT DEFAULT 0;
   DECLARE source_total_columns INT DEFAULT 0;
   DECLARE source_smart_columns INT DEFAULT 0;
+  DECLARE source_current_columns INT DEFAULT 0;
   DECLARE source_inbound_columns INT DEFAULT 0;
   DECLARE target_exists INT DEFAULT 0;
   DECLARE target_total_columns INT DEFAULT 0;
@@ -509,7 +514,45 @@ BEGIN
        OR (column_name = 'updated_at' AND data_type = 'datetime' AND datetime_precision = 3 AND is_nullable = 'NO' AND LOWER(column_default) LIKE 'current_timestamp%' AND LOWER(extra) LIKE '%on update current_timestamp%')
      );
 
-    IF source_total_columns = 11 AND source_smart_columns = 11 AND source_inbound_columns < 12
+    SELECT COUNT(*) INTO source_current_columns
+      FROM information_schema.columns
+     WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task' AND (
+       (column_name = 'id' AND LOWER(column_type) = 'bigint unsigned' AND is_nullable = 'NO')
+       OR (column_name = 'loading_plan_id' AND LOWER(column_type) = 'bigint unsigned' AND is_nullable = 'NO')
+       OR (column_name = 'container_booking_id' AND LOWER(column_type) = 'bigint unsigned' AND is_nullable = 'NO')
+       OR (column_name = 'cabinet_no' AND LOWER(column_type) = 'varchar(64)' AND is_nullable = 'NO')
+       OR (column_name = 'container_no' AND LOWER(column_type) = 'varchar(64)' AND is_nullable = 'YES')
+       OR (column_name = 'task_status' AND LOWER(column_type) = 'varchar(24)' AND is_nullable = 'NO' AND column_default = 'LOADING')
+       OR (column_name = 'started_by' AND LOWER(column_type) = 'bigint unsigned' AND is_nullable = 'NO')
+       OR (column_name = 'started_by_name' AND LOWER(column_type) = 'varchar(64)' AND is_nullable = 'YES')
+       OR (column_name = 'started_at' AND data_type = 'datetime' AND datetime_precision = 3 AND is_nullable = 'NO' AND LOWER(column_default) LIKE 'current_timestamp%')
+       OR (column_name = 'completed_by' AND LOWER(column_type) = 'bigint unsigned' AND is_nullable = 'YES')
+       OR (column_name = 'completed_by_name' AND LOWER(column_type) = 'varchar(64)' AND is_nullable = 'YES')
+       OR (column_name = 'completed_at' AND data_type = 'datetime' AND datetime_precision = 3 AND is_nullable = 'YES')
+       OR (column_name = 'version' AND LOWER(column_type) = 'int unsigned' AND is_nullable = 'NO' AND CAST(column_default AS CHAR) = '0')
+     );
+
+    IF source_total_columns = 13 AND source_current_columns = 13
+       AND (SELECT COUNT(*) FROM information_schema.statistics
+             WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task'
+               AND index_name = 'uk_loading_pick_task_plan' AND non_unique = 0
+               AND seq_in_index = 1 AND column_name = 'loading_plan_id') = 1
+       AND (SELECT COUNT(*) FROM information_schema.statistics
+             WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task'
+               AND index_name = 'uk_loading_pick_task_booking' AND non_unique = 0
+               AND seq_in_index = 1 AND column_name = 'container_booking_id') = 1
+       AND (SELECT COUNT(*) FROM information_schema.statistics
+             WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task'
+               AND index_name = 'idx_loading_pick_container'
+               AND ((seq_in_index = 1 AND column_name = 'container_no')
+                 OR (seq_in_index = 2 AND column_name = 'task_status')
+                 OR (seq_in_index = 3 AND column_name = 'started_at'))) = 3
+       AND (SELECT COUNT(*) FROM information_schema.key_column_usage
+             WHERE constraint_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task'
+               AND column_name = 'loading_plan_id' AND referenced_table_name = 'fl_loading_plan'
+               AND referenced_column_name = 'id') = 1 THEN
+      SET source_exists = 1;
+    ELSEIF source_total_columns = 11 AND source_smart_columns = 11 AND source_inbound_columns < 12
        AND (SELECT COUNT(*) FROM information_schema.statistics
              WHERE table_schema = 'baiyue_firstleg' AND table_name = 'fl_loading_pick_task'
                AND index_name = 'uk_loading_pick_task_plan' AND non_unique = 0
@@ -1430,14 +1473,13 @@ FROM iam_role role
  JOIN iam_permission permission
   ON permission.tenant_id = 0
  AND permission.permission_code IN (
-   'platform:firstleg:container:list', 'platform:firstleg:container:view',
+   'platform:firstleg:container:list',
    'platform:firstleg:container:create',
    'platform:firstleg:container:edit', 'platform:firstleg:smart-loading:list',
    'platform:firstleg:smart-loading:assign', 'platform:firstleg:smart-loading:delete',
-   'platform:firstleg:preload:list', 'platform:firstleg:preload:view',
+   'platform:firstleg:preload:list',
    'platform:firstleg:preload:edit', 'platform:firstleg:preload:complete',
-   'platform:firstleg:preload:confirm', 'platform:firstleg:loading-list:list',
-   'platform:firstleg:loading-list:view')
+   'platform:firstleg:preload:confirm', 'platform:firstleg:loading-list:list')
 WHERE role.tenant_id = 0
   AND role.role_code IN ('PLATFORM_ADMIN', 'ORDER_OPERATOR');
 
@@ -1562,13 +1604,13 @@ BEGIN
   IF (SELECT COUNT(DISTINCT permission_code) FROM baiyue_iam.iam_permission
        WHERE tenant_id = 0 AND app_code = 'PLATFORM' AND status = 'ACTIVE' AND deleted = 0
          AND permission_code IN (
-           'platform:firstleg:container:list', 'platform:firstleg:container:view',
+           'platform:firstleg:container:list',
            'platform:firstleg:container:create', 'platform:firstleg:container:edit',
            'platform:firstleg:smart-loading:list', 'platform:firstleg:smart-loading:assign',
            'platform:firstleg:smart-loading:delete', 'platform:firstleg:preload:list',
-           'platform:firstleg:preload:view', 'platform:firstleg:preload:edit',
+           'platform:firstleg:preload:edit',
            'platform:firstleg:preload:complete', 'platform:firstleg:preload:confirm',
-           'platform:firstleg:loading-list:list', 'platform:firstleg:loading-list:view')) <> 14 THEN
+           'platform:firstleg:loading-list:list')) <> 11 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '智能装柜迁移失败：平台权限资源未完整创建';
   END IF;
   IF (SELECT COUNT(DISTINCT CONCAT(role.role_code, ':', permission.permission_code))
@@ -1578,14 +1620,13 @@ BEGIN
        WHERE role.tenant_id = 0 AND role.role_code IN ('PLATFORM_ADMIN', 'ORDER_OPERATOR')
          AND permission.tenant_id = 0
          AND permission.permission_code IN (
-           'platform:firstleg:container:list', 'platform:firstleg:container:view',
+           'platform:firstleg:container:list',
            'platform:firstleg:container:create',
            'platform:firstleg:container:edit', 'platform:firstleg:smart-loading:list',
            'platform:firstleg:smart-loading:assign', 'platform:firstleg:smart-loading:delete',
-           'platform:firstleg:preload:list', 'platform:firstleg:preload:view',
+           'platform:firstleg:preload:list',
            'platform:firstleg:preload:edit', 'platform:firstleg:preload:complete',
-           'platform:firstleg:preload:confirm', 'platform:firstleg:loading-list:list',
-           'platform:firstleg:loading-list:view')) <> 28 THEN
+           'platform:firstleg:preload:confirm', 'platform:firstleg:loading-list:list')) <> 22 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '智能装柜迁移失败：平台角色授权未完整写入';
   END IF;
 END$$
diff --git a/firstleg/src/main/resources/openapi/dashboard-metrics-v1.yaml b/firstleg/src/main/resources/openapi/dashboard-metrics-v1.yaml
new file mode 100644
index 000000000..3c7c73c2c
--- /dev/null
+++ b/firstleg/src/main/resources/openapi/dashboard-metrics-v1.yaml
@@ -0,0 +1,64 @@
+openapi: 3.0.3
+info:
+  title: Platform dashboard operational metrics
+  version: 1.0.0
+paths:
+  /api/platform/v1/first-leg/dashboard/operational-metrics:
+    get:
+      summary: 查询首页货柜与清关实时指标
+      description: >-
+        在途柜量按已实际开船且尚未到达海外仓的有效物理柜去重，TEU 按 20*=1、40*=2、45*=2.25
+        折算，未知箱型不计入 TEU；待清关票数按已进入整柜清关且清关未完成的去重订单统计。
+        本接口只返回当前时点事实，不提供历史环比。
+      responses:
+        '200':
+          description: 查询成功
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OperationalMetricsEnvelope'
+        '401': {description: 需要登录}
+        '403': {description: 需要货柜列表与报关列表权限}
+components:
+  schemas:
+    OperationalMetricsEnvelope:
+      type: object
+      required: [code, message, data]
+      properties:
+        code: {type: string, example: '200'}
+        message: {type: string}
+        data: {$ref: '#/components/schemas/OperationalMetrics'}
+    OperationalMetrics:
+      type: object
+      required:
+        - inTransitContainerCount
+        - inTransitTeu
+        - unknownContainerTypeCount
+        - pendingCustomsOrderCount
+      properties:
+        inTransitContainerCount:
+          type: integer
+          format: int64
+          minimum: 0
+          description: 已开船未到海外仓的物理柜数
+        inTransitTeu:
+          type: number
+          format: decimal
+          multipleOf: 0.01
+          minimum: 0
+          description: 已知箱型的在途柜 TEU 合计
+        unknownContainerTypeCount:
+          type: integer
+          format: int64
+          minimum: 0
+          description: 未计入 TEU 的未知箱型在途柜数
+        pendingCustomsOrderCount:
+          type: integer
+          format: int64
+          minimum: 0
+          description: 已进入整柜清关且清关未完成的去重订单数
+        asOf:
+          type: string
+          format: date-time
+          nullable: true
+          description: 数据库统计时点
diff --git a/firstleg/src/main/resources/openapi/dropship-palletization-v1.yaml b/firstleg/src/main/resources/openapi/dropship-palletization-v1.yaml
index bd26d6110..afa76cfd2 100644
--- a/firstleg/src/main/resources/openapi/dropship-palletization-v1.yaml
+++ b/firstleg/src/main/resources/openapi/dropship-palletization-v1.yaml
@@ -1,13 +1,14 @@
 openapi: 3.0.3
 info:
   title: 一件代发国内清点组托 API
-  version: 2.0.0
-  description: 测量、计费后独立下发。箱码逐箱确认 SKU 实收数量；托盘码可先扫或后扫，封托后作为不可拆分柜单元。
+  version: 3.0.0
+  description: 测量环节录入预计托数，审核通过后预生成全部 DP 托盘码并可合并打印。PDA 支持先扫箱或先扫托，同一国内作业仓可跨票共用开放托盘，实物装满后再封托。
 paths:
   /api/platform/v1/first-leg/pda-dropship/tasks/pending:
     get:
       summary: 查询待领取或本人已领取任务
       x-required-authority: platform:firstleg:pda:view
+      parameters: [{$ref: '#/components/parameters/WarehouseId'}, {name: keyword, in: query, required: false, schema: {type: string, maxLength: 64}}]
       responses: {'200': {description: OK}}
   /api/platform/v1/first-leg/pda-dropship/tasks/{taskId}:
     get:
@@ -33,8 +34,8 @@ paths:
       responses: {'200': {description: OK}}
   /api/platform/v1/first-leg/pda-dropship/tasks/{taskId}/cartons/count:
     post:
-      summary: 逐箱确认 SKU 实收数量，可同时绑定当前托盘
-      description: palletNo 为空时进入 COUNTED_UNBOUND；不为空时幂等获取或创建 OPEN 托盘并绑定。数量不一致必须 ACCEPT_VARIANCE 且填写说明。
+      summary: 逐箱确认 SKU 实收数量
+      description: 未传 palletNo 时进入待归托区；传入同一国内作业仓的 OPEN 托盘码时直接归托。数量不一致必须 ACCEPT_VARIANCE 且填写说明。
       x-required-authority: platform:firstleg:pda:work
       parameters: [{$ref: '#/components/parameters/TaskId'}]
       requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/CountCartonRequest'}}}}
@@ -46,14 +47,6 @@ paths:
       parameters: [{$ref: '#/components/parameters/TaskId'}]
       requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/BindPendingRequest'}}}}
       responses: {'200': {description: OK}}
-  /api/platform/v1/first-leg/pda-dropship/tasks/{taskId}/pallets/create-and-bind:
-    post:
-      summary: 系统生成 DP 托盘码并原子绑定全部待绑箱
-      description: 仅当前仓库本人已领取的待组托任务可执行。没有待绑箱时不发码、不建空托。operationId 在同任务和仓库重放不重复创建；不同任务使用同幂等号拒绝。返回当前 Task。
-      x-required-authority: platform:firstleg:pda:work
-      parameters: [{$ref: '#/components/parameters/TaskId'}]
-      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/CreateAndBindRequest'}}}}
-      responses: {'200': {description: Task}}
   /api/platform/v1/first-leg/pda-dropship/tasks/{taskId}/cartons/{cartonId}/move:
     post:
       summary: 换托，targetPalletNo 为空时退回待绑区
@@ -65,13 +58,32 @@ paths:
       responses: {'200': {description: OK}}
   /api/platform/v1/first-leg/pda-dropship/tasks/{taskId}/pallets/{palletId}/seal:
     post:
-      summary: 封托；禁止空托、待绑箱、版本冲突和重复归托
+      summary: 封托；禁止空托、版本冲突和重复归托
       x-required-authority: platform:firstleg:pda:work
       parameters:
         - {$ref: '#/components/parameters/TaskId'}
         - {name: palletId, in: path, required: true, schema: {type: integer, format: int64}}
       requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/SealPalletRequest'}}}}
       responses: {'200': {description: OK}}
+  /api/platform/v1/first-leg/pda-dropship/tasks/{taskId}/pallets/{palletId}/print:
+    get:
+      summary: PDA 获取预生成托盘码的 A4 托盘信息单
+      description: 测量审核通过并生成托盘码后即可获取；每个托盘固定一页 A4，包含托盘号及其 Code 128 一维码、入仓码、箱数以及已归托 SKU、商品名称和实点数量，不展示作业状态。空托显示暂无已归托 SKU。仅当前仓库、当前操作员可访问。
+      x-required-authority: platform:firstleg:pda:view
+      parameters:
+        - {$ref: '#/components/parameters/TaskId'}
+        - {name: palletId, in: path, required: true, schema: {type: integer, format: int64}}
+        - {$ref: '#/components/parameters/WarehouseId'}
+      responses:
+        '200': {description: A4 托盘信息单 PDF, content: {application/pdf: {schema: {type: string, format: binary}}}}
+  /api/platform/v1/first-leg/pda-dropship/tasks/{taskId}/pallets/print:
+    get:
+      summary: 合并获取本票全部预生成托盘码的多页 A4 PDF
+      description: 每个预生成托盘固定一页，PDA 无需展开托盘列表或逐个下载，最多按本票预计托数生成。
+      x-required-authority: platform:firstleg:pda:view
+      parameters: [{$ref: '#/components/parameters/TaskId'}, {$ref: '#/components/parameters/WarehouseId'}]
+      responses:
+        '200': {description: 多页 A4 托盘信息单 PDF, content: {application/pdf: {schema: {type: string, format: binary}}}}
   /api/platform/v1/first-leg/pda-dropship/inbound-orders/{inboundId}/pallets:
     get:
       summary: Admin 查询入仓单权威托盘结果
@@ -79,7 +91,7 @@ paths:
       responses: {'200': {description: OK}}
   /api/platform/v1/first-leg/pda-dropship/inbound-orders/{inboundId}/pallets/{palletId}/print:
     get:
-      summary: 打印托盘码、入仓码和 SKU 实收汇总
+      summary: 获取包含托盘码、入仓码和 SKU 实收汇总的 A4 托盘信息单
       x-required-authority: firstleg:inbound:list
       responses: {'200': {description: PDF}}
 components:
@@ -87,6 +99,22 @@ components:
     TaskId: {name: taskId, in: path, required: true, schema: {type: integer, format: int64}}
     WarehouseId: {name: warehouseId, in: query, required: true, schema: {type: integer, format: int64}}
   schemas:
+    Task:
+      type: object
+      description: 一件代发清点组托任务；palletSetupReady=false 时禁止领取、解析箱码和提交清点。
+      required: [taskId, totalCartons, countedCartons, boundCartons, unboundCartons, expectedPalletCount, generatedPalletCount, palletSetupReady, taskStatus, pallets]
+      properties:
+        taskId: {type: integer, format: int64}
+        totalCartons: {type: integer, minimum: 1}
+        countedCartons: {type: integer, minimum: 0}
+        boundCartons: {type: integer, minimum: 0}
+        unboundCartons: {type: integer, minimum: 0}
+        expectedPalletCount: {type: integer, minimum: 1}
+        generatedPalletCount: {type: integer, minimum: 0}
+        palletSetupReady: {type: boolean}
+        palletSetupMessage: {type: string, nullable: true}
+        taskStatus: {type: string, enum: [PENDING, CLAIMED, COMPLETED]}
+        pallets: {type: array, items: {$ref: '#/components/schemas/Pallet'}}
     Carton:
       type: object
       properties:
@@ -94,18 +122,23 @@ components:
         boxCode: {type: string}
         inboundId: {type: integer, format: int64}
         inboundCode: {type: string}
-        inboundDetailId: {type: integer, format: int64}
-        skuCode: {type: string}
-        cargoName: {type: string, nullable: true}
-        expectedSkuQuantity: {type: integer, minimum: 1}
-        actualSkuQuantity: {type: integer, minimum: 1, nullable: true}
-        discrepancyStatus: {type: string, enum: [MATCH, ACCEPTED_VARIANCE], nullable: true}
-        discrepancyRemark: {type: string, nullable: true}
+        skuLines: {type: array, minItems: 1, items: {$ref: '#/components/schemas/CartonSkuLine'}, description: 当前物理箱内全部SKU清点行}
         countStatus: {type: string, enum: [UNCOUNTED, COUNTED_UNBOUND, BOUND]}
         palletId: {type: integer, format: int64, nullable: true}
         palletNo: {$ref: '#/components/schemas/NullablePalletNo'}
         canCount: {type: boolean}
         blockReason: {type: string, nullable: true}
+    CartonSkuLine:
+      type: object
+      required: [inboundDetailId, skuCode, expectedQuantity]
+      properties:
+        inboundDetailId: {type: integer, format: int64}
+        skuCode: {type: string}
+        cargoName: {type: string, nullable: true}
+        expectedQuantity: {type: integer, minimum: 1}
+        actualQuantity: {type: integer, minimum: 0, nullable: true}
+        discrepancyStatus: {type: string, enum: [MATCH, ACCEPTED_VARIANCE], nullable: true}
+        discrepancyRemark: {type: string, nullable: true}
     Pallet:
       type: object
       properties:
@@ -127,14 +160,23 @@ components:
       properties: {warehouseId: {type: integer, format: int64}}
     CountCartonRequest:
       type: object
-      required: [warehouseId, boxCode, actualSkuQuantity, discrepancyAction, operationId]
+      required: [warehouseId, boxCode, skuLines, operationId]
       properties:
         warehouseId: {type: integer, format: int64}
         boxCode: {type: string, maxLength: 80}
-        actualSkuQuantity: {type: integer, minimum: 1}
-        discrepancyAction: {type: string, enum: [MATCH, ACCEPT_VARIANCE]}
-        discrepancyRemark: {type: string, maxLength: 500, nullable: true}
         palletNo: {$ref: '#/components/schemas/NullablePalletNo'}
+        skuLines:
+          type: array
+          minItems: 1
+          items:
+            type: object
+            required: [inboundDetailId, skuCode, actualQuantity, discrepancyAction]
+            properties:
+              inboundDetailId: {type: integer, format: int64}
+              skuCode: {type: string, maxLength: 128}
+              actualQuantity: {type: integer, minimum: 0}
+              discrepancyAction: {type: string, enum: [MATCH, ACCEPT_VARIANCE]}
+              discrepancyRemark: {type: string, maxLength: 500, nullable: true}
         operationId: {type: string, maxLength: 128}
     BindPendingRequest:
       type: object
@@ -158,10 +200,4 @@ components:
         expectedVersion: {type: integer, minimum: 1}
         operationId: {type: string, maxLength: 128}
     PalletNo: {type: string, pattern: '^DP-[0-9]{6}-[0-9]{4}$'}
-    CreateAndBindRequest:
-      type: object
-      required: [warehouseId, operationId]
-      properties:
-        warehouseId: {type: integer, format: int64, minimum: 1}
-        operationId: {type: string, minLength: 1, maxLength: 128}
     NullablePalletNo: {type: string, pattern: '^DP-[0-9]{6}-[0-9]{4}$', nullable: true}
diff --git a/firstleg/src/main/resources/openapi/fba-pricing-v1.yaml b/firstleg/src/main/resources/openapi/fba-pricing-v1.yaml
index 580aaad9b..8ee870441 100644
--- a/firstleg/src/main/resources/openapi/fba-pricing-v1.yaml
+++ b/firstleg/src/main/resources/openapi/fba-pricing-v1.yaml
@@ -112,6 +112,13 @@ paths:
       parameters: [{$ref: '#/components/parameters/VersionId'}]
       requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/PriceBookConfirmationRequest'}}}}
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
+  /api/platform/v1/fba-pricing/carrier-rates/price-books/{versionId}/void:
+    post:
+      summary: 作废待确认船期价格表版本
+      description: 仅允许作废 PENDING_CONFIRMATION 版本；保留版本、原始文件和审计记录，作废后不可再确认生效。需要 firstleg:fba-pricing:rate:edit 权限。
+      parameters: [{$ref: '#/components/parameters/VersionId'}]
+      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/PriceBookVoidRequest'}}}}
+      responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/fba-pricing/carrier-rates/price-books/{versionId}/source:
     get:
       summary: 下载船期价格表原始文件
@@ -528,7 +535,7 @@ components:
         effectiveTo: {type: string, format: date-time, nullable: true}
     PriceBookStatus:
       type: string
-      enum: [PENDING_CONFIRMATION, ACTIVE, SUPERSEDED, FAILED]
+      enum: [PENDING_CONFIRMATION, ACTIVE, SUPERSEDED, VOIDED, FAILED]
     PriceModel:
       type: string
       enum: [FBA_WAREHOUSE_RATE, REGION_WEIGHT_TIER]
@@ -564,6 +571,9 @@ components:
         publishedBy: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
         publishedAt: {type: string, format: date-time, nullable: true}
         supersededAt: {type: string, format: date-time, nullable: true}
+        voidedBy: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        voidedAt: {type: string, format: date-time, nullable: true}
+        voidReason: {type: string, maxLength: 500, nullable: true}
     PriceBookVersionDetail:
       type: object
       required: [version, channels, rates, issues]
@@ -600,6 +610,11 @@ components:
           type: array
           maxItems: 2
           items: {$ref: '#/components/schemas/PriceBookOverseasMapping'}
+    PriceBookVoidRequest:
+      type: object
+      required: [reason]
+      properties:
+        reason: {type: string, minLength: 1, maxLength: 500, description: 人工作废原因}
     PriceBookOriginMapping:
       type: object
       required: [originWarehouseCode, warehouseId]
diff --git a/firstleg/src/main/resources/openapi/firstleg-v1.yaml b/firstleg/src/main/resources/openapi/firstleg-v1.yaml
index 8c9a4e852..21375b117 100644
--- a/firstleg/src/main/resources/openapi/firstleg-v1.yaml
+++ b/firstleg/src/main/resources/openapi/firstleg-v1.yaml
@@ -1224,7 +1224,7 @@ paths:
   /api/platform/v1/inbounds/{inboundId}/measurements/approve:
     post:
       summary: 审核通过测量
-      description: 需要 firstleg:inbound:measurement-review 权限，且 Order 权威订单必须已审核通过。订单待审核期间可保留并提交到仓测量数据，但不能审核测量。标准头程审核通过后进入 WAIT_SPLIT；一件代发进入 WAIT_PALLETIZE，完成逐箱清点和封托后再进入 WAIT_SPLIT。审核时按该次测量数据尽力生成 CALCULATED 初算费用；价格未覆盖或初算异常只返回非阻断提示，不影响审核结果和后续履约状态。
+      description: 需要 firstleg:inbound:measurement-review 权限，且 Order 权威订单必须已审核通过。订单待审核期间可保留并提交到仓测量数据，但不能审核测量。审核通过前必须存在至少一张已确认的称重图片；历史异常数据若已提交但没有称重图片，必须先退回测量后补录。标准头程审核通过后进入 WAIT_SPLIT；一件代发进入 WAIT_PALLETIZE，完成逐箱清点和封托后再进入 WAIT_SPLIT。审核时按该次测量数据尽力生成 CALCULATED 初算费用；价格未覆盖或初算异常只返回非阻断提示，不影响审核结果和后续履约状态。
       parameters:
         - {name: inboundId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
         - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
@@ -1245,7 +1245,7 @@ paths:
   /api/platform/v1/inbounds/{inboundId}/measurements/submit:
     post:
       summary: 提交测量完成
-      description: 提交只校验并复用称重图片确认阶段已经 OCCUPIED 且绑定完整的权威整票库位块，然后进入客服待审核；不会首次分配、重建或更换已显示槽位。Order 仍待审核时允许提交并冻结到仓测量证据，但不得继续审核测量或进入计费、分柜和装柜。
+      description: 即使只有一箱，也必须先上传并确认至少一张称重图片。提交只校验并复用称重图片确认阶段已经 OCCUPIED 且绑定完整的权威整票库位块，然后进入客服待审核；不会首次分配、重建或更换已显示槽位。Order 仍待审核时允许提交并冻结到仓测量证据，但不得继续审核测量或进入计费、分柜和装柜。
       parameters:
         - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
         - {name: inboundId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
@@ -1605,6 +1605,8 @@ components:
         lxCode: {type: string, nullable: true, description: 一件代发线路或履约产品编码快照}
         channelCode: {type: string, nullable: true}
         channelName: {type: string, nullable: true}
+        fulfillmentType: {type: string, nullable: true, enum: [STANDARD, ONE_CLICK_DROPSHIP]}
+        expectedPalletCount: {type: integer, minimum: 1, maximum: 1000, nullable: true, description: 一件代发预计托数；测量审核通过后按此数量预生成 DP 托盘码}
         taxMode: {type: string, nullable: true}
         pricingTaxMode: {type: string, nullable: true}
         containerMode: {type: string, nullable: true}
@@ -2000,6 +2002,7 @@ components:
         measurementId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
         version: {type: integer, minimum: 0}
         actualGoodsName: {type: string, maxLength: 255, nullable: true}
+        expectedPalletCount: {type: integer, minimum: 1, maximum: 1000, nullable: true, description: 一件代发必填；普通入库可不传}
         items:
           type: array
           minItems: 1
@@ -2174,7 +2177,7 @@ components:
         allowedActions: {type: array, items: {type: string, enum: [SELECT_FLEET, SCHEDULE_PICKUP, RECORD_PICKUP, RECORD_EMPTY_RETURN, SEND_PICKUP_EMAIL]}}
     ContainerBooking:
       type: object
-      required: [id, bookingNo, cabinetNo, sourceType, recordStatus, warehouseId, warehouseName, containerType, capacityCbm, maxWeightKg, planStatus, exceptionActive, destinationClearanceDocumentStatus, customsDeclarationDocumentStatus, deliveryOrderDocumentStatus, version]
+      required: [id, bookingNo, cabinetNo, sourceType, recordStatus, warehouseId, warehouseName, channelGroupCode, containerType, capacityCbm, maxWeightKg, planStatus, exceptionActive, destinationClearanceDocumentStatus, customsDeclarationDocumentStatus, deliveryOrderDocumentStatus, version]
       properties:
         id: {type: string, pattern: '^[1-9][0-9]*$'}
         planId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true, description: 关联智能装柜计划ID；未创建计划时为空}
@@ -2185,8 +2188,9 @@ components:
         sourceType: {type: string, enum: [SIMULATION, OCEAN_BOOKING], description: SIMULATION 为内部模拟柜；OCEAN_BOOKING 为订舱登记直接生成的真实柜}
         recordStatus: {type: string, enum: [ACTIVE, MERGED], description: 正常列表和详情仅返回 ACTIVE；真实订舱柜被模拟柜消费后变为 MERGED 且不再作为可操作柜返回}
         mergedIntoContainerBookingId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true, description: MERGED 源真实柜指向保留的模拟柜稳定 containerBookingId；ACTIVE 时为空}
-        channelCode: {type: string, maxLength: 64, nullable: true, description: Missing legacy snapshots are blocked from loading until explicitly backfilled}
-        channelName: {type: string, maxLength: 128, nullable: true}
+        channelGroupCode: {type: string, maxLength: 64, enum: [MATSON_CLX, MATSON_MAX, EXX, HEDE, OA_LA, OA_CHICAGO, OA_HOUSTON, OA_SAVANNAH, OA_NEW_YORK_TRUCK], description: 模拟柜创建时确定的九类计划渠道分组，关联真实订舱后继续保留}
+        channelCode: {type: string, maxLength: 64, nullable: true, description: 关联真实订舱后冻结的实际物流渠道编码}
+        channelName: {type: string, maxLength: 128, nullable: true, description: 关联真实订舱后冻结的实际物流渠道名称}
         oceanBookingId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
         oceanBookingRequirementId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
         warehouseId: {type: string, pattern: '^[1-9][0-9]*$'}
@@ -2444,8 +2448,8 @@ components:
             pages: {type: string, pattern: '^[0-9]+$'}
     SmartLoadingWorkbenchContainer:
       type: object
-      required: [bookingId, bookingNo, cabinetNo, warehouseId, warehouseName, channelCode,
-        channelName, containerType, capacityCbm, maxWeightKg, planStatus, version]
+      required: [bookingId, bookingNo, cabinetNo, warehouseId, warehouseName, channelGroupCode,
+        containerType, capacityCbm, maxWeightKg, planStatus, version]
       properties:
         bookingId: {type: string, pattern: '^[1-9][0-9]*$', description: containerBookingId 技术关联}
         bookingNo: {type: string, description: 货柜登记业务号}
@@ -2453,8 +2457,9 @@ components:
         containerNo: {type: string, nullable: true, description: 真实集装箱号，允许在装柜前后补}
         warehouseId: {type: string, pattern: '^[1-9][0-9]*$'}
         warehouseName: {type: string}
-        channelCode: {type: string}
-        channelName: {type: string}
+        channelGroupCode: {type: string, enum: [MATSON_CLX, MATSON_MAX, EXX, HEDE, OA_LA, OA_CHICAGO, OA_HOUSTON, OA_SAVANNAH, OA_NEW_YORK_TRUCK], description: 智能装柜匹配使用的计划渠道分组}
+        channelCode: {type: string, nullable: true, description: 关联真实订舱后冻结的实际物流渠道编码}
+        channelName: {type: string, nullable: true, description: 关联真实订舱后冻结的实际物流渠道名称}
         containerType: {type: string}
         capacityCbm: {type: number, nullable: true, description: 柜型基础容积；装柜上限按正式规则计算}
         maxWeightKg: {type: number, nullable: true, description: 柜型基础载重；装柜上限按正式规则计算}
@@ -2706,9 +2711,9 @@ components:
         reason: {type: string, maxLength: 500}
     ContainerSimulationCreateRequest:
       type: object
-      required: [channelCode, warehouseId, containerType, capacityCbm, maxWeightKg]
+      required: [channelGroupCode, warehouseId, containerType, capacityCbm, maxWeightKg]
       properties:
-        channelCode: {type: string, maxLength: 64, description: 当前 ACTIVE 价格簿中的真实物流渠道}
+        channelGroupCode: {type: string, maxLength: 64, enum: [MATSON_CLX, MATSON_MAX, EXX, HEDE, OA_LA, OA_CHICAGO, OA_HOUSTON, OA_SAVANNAH, OA_NEW_YORK_TRUCK], description: 智能装柜使用的九类计划渠道分组}
         warehouseId: {type: integer, format: int64, minimum: 1}
         containerType: {type: string, enum: [20GP, 40GP, 40HC, 40NR, 45HC], description: 与订舱共用的平台固定柜型}
         capacityCbm: {type: number, minimum: 0, exclusiveMinimum: true, description: 必须等于柜型固定容量}
diff --git a/firstleg/src/main/resources/openapi/ocean-bookings-v1.yaml b/firstleg/src/main/resources/openapi/ocean-bookings-v1.yaml
index 1ef8cff2c..35fbed98f 100644
--- a/firstleg/src/main/resources/openapi/ocean-bookings-v1.yaml
+++ b/firstleg/src/main/resources/openapi/ocean-bookings-v1.yaml
@@ -89,7 +89,7 @@ paths:
   /api/platform/v1/ocean-bookings/{oceanBookingId}/prints/shipping-instruction:
     get:
       summary: Render the current saved booking as an export shipping instruction PDF
-      description: Firstleg maps the authoritative saved aggregate (DRAFT or RELEASED, with missing fields displayed as —) to SEA_FREIGHT_SHIPPING_INSTRUCTION_A4_V1 and synchronously proxies the generated PDF.
+      description: Firstleg maps the authoritative saved aggregate (DRAFT or RELEASED, with missing fields displayed as —) to SEA_FREIGHT_SHIPPING_INSTRUCTION_A4_V1 and synchronously proxies the generated PDF. Container requirements are not treated as actual cargo quantity, weight, volume, marks, packaging, or goods descriptions.
       x-permission: platform:firstleg:ocean-booking:list
       parameters: [{$ref: '#/components/parameters/OceanBookingId'}]
       responses:
@@ -97,7 +97,7 @@ paths:
   /api/platform/v1/ocean-bookings/{oceanBookingId}/prints/bill-of-lading-confirmation:
     get:
       summary: Render the current saved booking as a bill-of-lading confirmation PDF
-      description: Firstleg maps the authoritative saved aggregate (DRAFT or RELEASED, with missing fields displayed as —) to BILL_OF_LADING_CONFIRMATION_A4_V1 and synchronously proxies the generated PDF.
+      description: Firstleg maps the authoritative saved aggregate (DRAFT or RELEASED, with missing fields displayed as —) to BILL_OF_LADING_CONFIRMATION_A4_V1 and synchronously proxies the generated PDF. Container requirements remain a container summary and are not treated as actual cargo facts.
       x-permission: platform:firstleg:ocean-booking:list
       parameters: [{$ref: '#/components/parameters/OceanBookingId'}]
       responses:
@@ -107,7 +107,8 @@ paths:
       summary: Page released booking requirement candidates for one container
       description: >-
         Requires platform:firstleg:ocean-booking:list. Returns only linkable requirement candidates:
-        RELEASED, remainingQuantity greater than zero, and exact warehouseId, channelCode and containerType.
+        RELEASED, remainingQuantity greater than zero, exact warehouseId and containerType, and a concrete
+        booking channel belonging to channelGroupCode.
         Capacity and max weight are derived display snapshots and never eligibility fields. Allocated quantity
         counts only ACTIVE containers still pointing to the same booking requirement and is calculated by one
         bounded set query; booking detail calls are not used. An empty result is a normal successful page.
@@ -115,7 +116,7 @@ paths:
       x-permission: platform:firstleg:ocean-booking:list
       parameters:
         - {name: warehouseId, in: query, required: true, schema: {type: integer, format: int64, minimum: 1}}
-        - {name: channelCode, in: query, required: true, schema: {type: string, maxLength: 64}}
+        - {name: channelGroupCode, in: query, required: true, schema: {type: string, maxLength: 64}}
         - {name: containerType, in: query, required: true, schema: {type: string, maxLength: 32}}
         - {name: page, in: query, required: false, schema: {type: integer, format: int64, minimum: 1, default: 1}}
         - {name: size, in: query, required: false, schema: {type: integer, format: int64, minimum: 1, maximum: 200, default: 20}}
diff --git a/firstleg/src/main/resources/openapi/phase3-container-overview-v1.yaml b/firstleg/src/main/resources/openapi/phase3-container-overview-v1.yaml
index 4c4a1797b..73a9812f9 100644
--- a/firstleg/src/main/resources/openapi/phase3-container-overview-v1.yaml
+++ b/firstleg/src/main/resources/openapi/phase3-container-overview-v1.yaml
@@ -39,10 +39,10 @@ paths:
   /api/platform/v1/containers/{id}/documents/{documentType}/upload:
     post:
       operationId: uploadContainerDocument
-      description: '权限：platform:firstleg:terminal-drayage:document:edit；仅国外工作台DO，无完成动作'
+      description: '权限：platform:firstleg:terminal-drayage:document:edit；仅已进入海外履约且未还柜的非海铁渠道可上传DO，无完成动作'
       parameters: [{$ref: '#/components/parameters/ContainerId'}, {$ref: '#/components/parameters/DocumentType'}, {name: Idempotency-Key, in: header, required: true, schema: {type: string}}]
       requestBody: {required: true, content: {multipart/form-data: {schema: {type: object, required: [file, expectedVersion], properties: {file: {type: string, format: binary}, expectedVersion: {type: integer, minimum: 0}, operationReason: {type: string, maxLength: 500}}}}}}
-      responses: {'200': {description: OK, content: {application/json: {schema: {$ref: '#/components/schemas/DocumentEnvelope'}}}}}
+      responses: {'200': {description: OK, content: {application/json: {schema: {$ref: '#/components/schemas/DocumentEnvelope'}}}}, '409': {description: '尚未进入海外履约、海铁渠道不适用DO或货柜已还柜'}}
   /api/platform/v1/containers/{id}/documents/{documentType}/{fileId}/download:
     get:
       operationId: downloadContainerDocument
diff --git a/firstleg/src/main/resources/openapi/phase3-pda-convergence-v1.yaml b/firstleg/src/main/resources/openapi/phase3-pda-convergence-v1.yaml
index 2678da454..be0584e55 100644
--- a/firstleg/src/main/resources/openapi/phase3-pda-convergence-v1.yaml
+++ b/firstleg/src/main/resources/openapi/phase3-pda-convergence-v1.yaml
@@ -3,6 +3,17 @@ info:
   title: Phase 3 Container PDA Picking API
   version: 1.0.0
 paths:
+  /api/platform/v1/first-leg/pda-loading/warehouses:
+    get:
+      summary: List active domestic warehouses available to the PDA operator
+      responses:
+        '200':
+          description: Warehouse master-data options used to scope PDA pending-task lists
+          content:
+            application/json:
+              schema:
+                type: array
+                items: {$ref: '#/components/schemas/WarehouseOption'}
   /api/platform/v1/first-leg/pda-loading/tasks:
     get:
       summary: Find the active container picking task in one platform warehouse
@@ -18,6 +29,7 @@ paths:
     get:
       summary: List active tasks available to the authenticated PDA operator
       parameters:
+        - {name: warehouseId, in: query, required: true, schema: {type: integer, format: int64, minimum: 1}}
         - {name: keyword, in: query, required: false, schema: {type: string, maxLength: 64}}
       responses:
         '200':
@@ -175,6 +187,13 @@ components:
     TaskId: {name: taskId, in: path, required: true, schema: {type: integer, format: int64, minimum: 1}}
     ItemId: {name: itemId, in: path, required: true, schema: {type: integer, format: int64, minimum: 1}}
   schemas:
+    WarehouseOption:
+      type: object
+      required: [id, warehouseCode, warehouseName]
+      properties:
+        id: {type: integer, format: int64}
+        warehouseCode: {type: string}
+        warehouseName: {type: string}
     Task:
       type: object
       required: [id, loadingPlanId, containerBookingId, inboundId, inboundVersion, loadingVersion, cabinetNo, sourceType, recordStatus, taskStatus, workflowStatus, version, items]
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/controller/InboundMeasurementEvidenceOpenApiContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/controller/InboundMeasurementEvidenceOpenApiContractTest.java
index 6954b2e87..3b363d893 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/controller/InboundMeasurementEvidenceOpenApiContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/controller/InboundMeasurementEvidenceOpenApiContractTest.java
@@ -27,7 +27,11 @@ class InboundMeasurementEvidenceOpenApiContractTest {
         Map<String, Object> submitOperation = stringMap(stringMap(paths.get(
             "/api/platform/v1/inbounds/{inboundId}/measurements/submit")).get("post"));
         assertThat(submitOperation.get("description").toString())
-            .contains("只校验并复用", "不会首次分配");
+            .contains("即使只有一箱", "上传并确认至少一张称重图片", "只校验并复用", "不会首次分配");
+        Map<String, Object> approveOperation = stringMap(stringMap(paths.get(
+            "/api/platform/v1/inbounds/{inboundId}/measurements/approve")).get("post"));
+        assertThat(approveOperation.get("description").toString())
+            .contains("已确认的称重图片", "历史异常数据", "先退回测量");
 
         Map<String, Object> schemas = stringMap(stringMap(document.get("components")).get("schemas"));
         Map<String, Object> detailProperties = properties(schemas, "InboundMeasurementDetail");
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformInboundMeasurementControllerContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformInboundMeasurementControllerContractTest.java
index b70b2dd77..fae7ddf8a 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformInboundMeasurementControllerContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformInboundMeasurementControllerContractTest.java
@@ -37,7 +37,7 @@ class PlatformInboundMeasurementControllerContractTest {
     void draftRequestOnlyAcceptsEditableGoodsNameAndMeasurementItems() {
         assertThat(Arrays.stream(InboundMeasurementRequests.SaveDraftRequest.class.getRecordComponents())
             .map(RecordComponent::getName)).containsExactly(
-                "measurementId", "version", "actualGoodsName", "items");
+                "measurementId", "version", "actualGoodsName", "expectedPalletCount", "items");
     }
 
     @Test
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformLoadingPdaControllerContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformLoadingPdaControllerContractTest.java
index c544acbb8..2c58647f8 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformLoadingPdaControllerContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/controller/PlatformLoadingPdaControllerContractTest.java
@@ -13,7 +13,7 @@ class PlatformLoadingPdaControllerContractTest {
     @Test
     void exposesAssignmentWorkAndReviewWithDedicatedAuthorities() throws Exception {
         authority("task", "platform:firstleg:pda:view", AuthenticatedUser.class, String.class, Long.class, long.class);
-        authority("pendingTasks", "platform:firstleg:pda:view", AuthenticatedUser.class, String.class);
+        authority("pendingTasks", "platform:firstleg:pda:view", AuthenticatedUser.class, long.class, String.class);
         authority("inventorySnapshot", "platform:firstleg:pda:view", AuthenticatedUser.class, long.class, long.class);
         authority("claim", "platform:firstleg:pda:work", AuthenticatedUser.class, long.class, ClaimRequest.class);
         authority("assign", "platform:firstleg:pda:assign", AuthenticatedUser.class, long.class, AssignRequest.class);
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/controller/PriceBookContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/controller/PriceBookContractTest.java
index ae0a6d745..cc32c2703 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/controller/PriceBookContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/controller/PriceBookContractTest.java
@@ -60,7 +60,7 @@ class PriceBookContractTest {
     void keepsPricingTaxModeSeparate() {
         assertThat(PriceBookStatus.values()).containsExactly(
             PriceBookStatus.PENDING_CONFIRMATION, PriceBookStatus.ACTIVE,
-            PriceBookStatus.SUPERSEDED, PriceBookStatus.FAILED);
+            PriceBookStatus.SUPERSEDED, PriceBookStatus.VOIDED, PriceBookStatus.FAILED);
         assertThat(PricingTaxMode.values()).containsExactly(PricingTaxMode.TAX_INCLUDED, PricingTaxMode.TAX_EXCLUDED);
         assertThat(PricingDestinationType.values()).containsExactly(PricingDestinationType.FBA, PricingDestinationType.OVERSEAS);
         assertThat(PriceBookDtos.ParsedRate.class.getRecordComponents())
@@ -99,6 +99,7 @@ class PriceBookContractTest {
             .contains("/api/platform/v1/fba-pricing/carrier-rates/price-books:")
             .contains("/api/platform/v1/fba-pricing/carrier-rates/price-books/{versionId}:")
             .contains("/api/platform/v1/fba-pricing/carrier-rates/price-books/{versionId}/publish:")
+            .contains("/api/platform/v1/fba-pricing/carrier-rates/price-books/{versionId}/void:")
             .contains("/api/merchant/v1/first-leg/pricing/channels:")
             .contains("/api/merchant/v1/first-leg/pricing/estimate:")
             .contains("PriceBookStatus")
@@ -114,6 +115,8 @@ class PriceBookContractTest {
             .contains("PriceBookParseIssue")
             .contains("/api/platform/v1/fba-pricing/carrier-rates/price-books/{versionId}/source")
             .contains("确认并立即生效")
+            .contains("PriceBookVoidRequest")
+            .contains("VOIDED")
             .contains("SUPERSEDED");
 
         String firstlegOpenapi = new ClassPathResource("openapi/firstleg-v1.yaml")
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/dashboard/DashboardMetricsContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/dashboard/DashboardMetricsContractTest.java
new file mode 100644
index 000000000..e34d835d8
--- /dev/null
+++ b/firstleg/src/test/java/com/baiyue/firstleg/dashboard/DashboardMetricsContractTest.java
@@ -0,0 +1,43 @@
+package com.baiyue.firstleg.dashboard;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.Arrays;
+import java.nio.charset.StandardCharsets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class DashboardMetricsContractTest {
+    @Test void exposesThePlatformDashboardEndpointWithBothReadPermissions() throws Exception {
+        assertThat(PlatformDashboardMetricsController.class.getAnnotation(RequestMapping.class).value())
+            .containsExactly("/api/platform/v1/first-leg/dashboard");
+        var method = PlatformDashboardMetricsController.class.getDeclaredMethod(
+            "metrics", com.baiyue.common.security.AuthenticatedUser.class);
+        assertThat(method.getAnnotation(GetMapping.class).value()).containsExactly("/operational-metrics");
+        assertThat(method.getAnnotation(PreAuthorize.class).value())
+            .contains("platform:firstleg:container:list", "platform:firstleg:customs:list");
+    }
+
+    @Test void queryCountsPhysicalTransitContainersAndDistinctPendingOrders() {
+        var sql = Arrays.stream(DashboardMetricsMapper.class.getDeclaredMethods())
+            .filter(method -> method.getName().equals("read"))
+            .findFirst().orElseThrow().getAnnotation(org.apache.ibatis.annotations.Select.class).value();
+        var statement = String.join("\n", sql);
+        assertThat(statement).contains("actual_sailing_at IS NOT NULL", "actual_warehouse_arrival_at IS NULL",
+            "booking.record_status = 'ACTIVE'", "ocean.status <> 'CANCELLED'",
+            "COUNT(DISTINCT inbound.order_id)", "customs_container.status <> 'COMPLETED'",
+            "item.deleted = 0", "inbound.deleted = 0", "LIKE '20%'", "LIKE '40%'", "LIKE '45%'");
+    }
+
+    @Test void openApiDocumentsTheCurrentPointInTimeDefinitions() throws Exception {
+        var openApi = new ClassPathResource("openapi/dashboard-metrics-v1.yaml")
+            .getContentAsString(StandardCharsets.UTF_8);
+        assertThat(openApi).contains("/api/platform/v1/first-leg/dashboard/operational-metrics:",
+            "inTransitContainerCount:", "inTransitTeu:", "unknownContainerTypeCount:",
+            "pendingCustomsOrderCount:", "本接口只返回当前时点事实，不提供历史环比");
+    }
+}
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/dashboard/DashboardMetricsServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/dashboard/DashboardMetricsServiceTest.java
new file mode 100644
index 000000000..c25fb5d20
--- /dev/null
+++ b/firstleg/src/test/java/com/baiyue/firstleg/dashboard/DashboardMetricsServiceTest.java
@@ -0,0 +1,43 @@
+package com.baiyue.firstleg.dashboard;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class DashboardMetricsServiceTest {
+    @Mock DashboardMetricsMapper mapper;
+    @InjectMocks DashboardMetricsService service;
+
+    @Test void preservesOperationalCountsAndDecimalTeu() {
+        var asOf = LocalDateTime.of(2026, 9, 11, 12, 0);
+        when(mapper.read()).thenReturn(new DashboardMetricsMapper.MetricsProjection(
+            3L, new BigDecimal("4.25"), 1L, 7L, asOf));
+
+        var result = service.read();
+
+        assertThat(result.inTransitContainerCount()).isEqualTo(3);
+        assertThat(result.inTransitTeu()).isEqualByComparingTo("4.25");
+        assertThat(result.unknownContainerTypeCount()).isEqualTo(1);
+        assertThat(result.pendingCustomsOrderCount()).isEqualTo(7);
+        assertThat(result.asOf()).isEqualTo(asOf);
+    }
+
+    @Test void returnsZerosWhenTheDatabaseProjectionIsAbsent() {
+        when(mapper.read()).thenReturn(null);
+
+        var result = service.read();
+
+        assertThat(result.inTransitContainerCount()).isZero();
+        assertThat(result.inTransitTeu()).isEqualByComparingTo("0");
+        assertThat(result.pendingCustomsOrderCount()).isZero();
+    }
+}
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/domain/SmartLoadingChannelGroupCatalogTest.java b/firstleg/src/test/java/com/baiyue/firstleg/domain/SmartLoadingChannelGroupCatalogTest.java
new file mode 100644
index 000000000..100d3dd35
--- /dev/null
+++ b/firstleg/src/test/java/com/baiyue/firstleg/domain/SmartLoadingChannelGroupCatalogTest.java
@@ -0,0 +1,17 @@
+package com.baiyue.firstleg.domain;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SmartLoadingChannelGroupCatalogTest {
+    @Test
+    void exposesNinePlanningGroupsAndMapsBothExxBookingChannels() {
+        assertThat(SmartLoadingChannelGroupCatalog.GROUPS).hasSize(9);
+        assertThat(SmartLoadingChannelGroupCatalog.require("EXX").channelCodes())
+            .contains("EXX_TRUCK", "EXX_RAIL_NY", "EXXHK", "EXXHWK", "NYEXX");
+        assertThat(SmartLoadingChannelGroupCatalog.contains("EXX", "EXX_TRUCK")).isTrue();
+        assertThat(SmartLoadingChannelGroupCatalog.contains("EXX", "EXX_RAIL_NY")).isTrue();
+        assertThat(SmartLoadingChannelGroupCatalog.contains("EXX", "MATSON_CLX_TRUCK")).isFalse();
+    }
+}
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/loading/bridge/service/LoadingModelBridgeServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/loading/bridge/service/LoadingModelBridgeServiceTest.java
index 67d4b2ed2..9059491b7 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/loading/bridge/service/LoadingModelBridgeServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/loading/bridge/service/LoadingModelBridgeServiceTest.java
@@ -278,6 +278,20 @@ class LoadingModelBridgeServiceTest {
         verify(repository).confirmIncrementalPreload(30L, 10L, 20L, 4, 7L, "admin");
     }
 
+    @Test
+    void bindsConfirmingPreloadToEditingPlanWithoutFinalizingIt() {
+        when(repository.byPair(10, 20, 40)).thenReturn(null);
+        when(repository.loadingPlan(40)).thenReturn(new LoadingPlanSnapshot(40L, 50L, "C1", "EDITING", 3));
+        when(repository.allocatedPackages(10, 20, 40)).thenReturn(2);
+        when(repository.preload(10, 20)).thenReturn(new PreloadSnapshot(30L, 10L, 20L, "CONFIRMING", 4));
+
+        service.bindIncrementalAllocation(40L, 10L, 20L, 7L, "admin", "assign-confirming-editing");
+
+        verify(repository).insert(any());
+        verify(repository, never()).confirmIncrementalPreload(anyLong(), anyLong(), anyLong(),
+            anyInt(), anyLong(), anyString());
+    }
+
     private static Link link(String preloadStatus, int preloadVersion, String loadingStatus,
                              int loadingVersion, int packages) {
         return new Link(1L, 10L, 20L, 30L, preloadStatus, preloadVersion, 40L, 50L, "C1",
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/controller/PlatformOceanBookingControllerContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/controller/PlatformOceanBookingControllerContractTest.java
index ac8b24244..c58a9e2cf 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/controller/PlatformOceanBookingControllerContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/controller/PlatformOceanBookingControllerContractTest.java
@@ -80,7 +80,7 @@ class PlatformOceanBookingControllerContractTest {
         assertThat(yaml)
             .contains("/api/platform/v1/ocean-bookings/link-candidates:")
             .contains("x-permission: platform:firstleg:ocean-booking:list")
-            .contains("warehouseId", "channelCode", "containerType")
+            .contains("warehouseId", "channelGroupCode", "containerType")
             .contains("LinkCandidateResponse", "requiredQuantity", "allocatedQuantity", "remainingQuantity")
             .contains("Capacity and max weight are derived display snapshots and never eligibility fields")
             .contains("Returns only linkable requirement candidates")
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/repository/OceanBookingMapperContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/repository/OceanBookingMapperContractTest.java
index 622b9844c..156feea9c 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/repository/OceanBookingMapperContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/repository/OceanBookingMapperContractTest.java
@@ -49,12 +49,12 @@ class OceanBookingMapperContractTest {
     @Test
     void linkCandidatesUsesOneBoundedSetQueryAndExactRemainingSemantics() throws Exception {
         String sql = String.join("\n", OceanBookingMapper.class.getDeclaredMethod("selectLinkCandidates",
-            com.baomidou.mybatisplus.extension.plugins.pagination.Page.class, LinkCandidateQuery.class)
+            com.baomidou.mybatisplus.extension.plugins.pagination.Page.class, LinkCandidateQuery.class, java.util.Set.class)
             .getAnnotation(Select.class).value());
         assertThat(sql)
             .contains("booking.status='RELEASED'")
             .contains("booking.warehouse_id=#{query.warehouseId}")
-            .contains("booking.channel_code=#{query.channelCode}")
+            .contains("<foreach collection=\"channelCodes\"", "#{channelCode}")
             .contains("requirement.container_type=#{query.containerType}")
             .contains("FROM fl_ocean_booking_container_allocation")
             .contains("container.record_status='ACTIVE'")
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingPrintServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingPrintServiceTest.java
index 25068db02..a27196d45 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingPrintServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingPrintServiceTest.java
@@ -31,7 +31,7 @@ class OceanBookingPrintServiceTest {
 
     @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); ReflectionTestUtils.setField(service, "internalToken", "token"); }
 
-    @Test void shippingInstructionUsesOnlyAuthoritativeReleasedAggregate() {
+    @Test void shippingInstructionDoesNotTreatContainerCapacityAsActualCargo() {
         when(bookings.detail(10L)).thenReturn(detail("RELEASED"));
         HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_PDF);
         headers.set("X-Print-Page-Count", "1");
@@ -49,12 +49,17 @@ class OceanBookingPrintServiceTest {
         assertThat(document.fields()).containsEntry("jobNumber", "OB-1")
             .containsEntry("shipper", "Shipper\nAddress")
             .containsEntry("oceanVesselVoyage", "Vessel / V001")
+            .containsEntry("cargoQuantity", "—")
+            .containsEntry("totalPackagesInWords", "—")
             .containsKeys("toCompany", "consignee", "notifyParty", "cargoQuantity",
                 "portOfLoading", "portOfDischarge", "placeOfDelivery", "totalPackagesInWords");
         assertThat(document.cargoRows()).singleElement().satisfies(row -> {
-            assertThat(row.quantity()).isEqualTo("2");
-            assertThat(row.descriptionOfGoods()).isEqualTo("40HQ DRY x 2");
-            assertThat(row.grossWeight()).isEqualTo("56000.000 KGS");
+            assertThat(row.marksAndNos()).isEqualTo("—");
+            assertThat(row.quantity()).isEqualTo("—");
+            assertThat(row.packaging()).isEqualTo("—");
+            assertThat(row.descriptionOfGoods()).isEqualTo("—");
+            assertThat(row.grossWeight()).isEqualTo("—");
+            assertThat(row.measurement()).isEqualTo("—");
         });
     }
 
@@ -85,7 +90,11 @@ class OceanBookingPrintServiceTest {
                 .containsEntry("serviceTerm", "—")
                 .containsEntry("freightTerm", "—");
         }
-        assertThat(request.getValue().documents().get(0).fields()).containsEntry("bookingNumber", "—");
+        assertThat(request.getValue().documents().get(0).fields())
+            .containsEntry("bookingNumber", "—")
+            .containsEntry("containerSpec", "40HQ DRY x 2")
+            .containsEntry("containerSummary", "40HQ DRY x 2")
+            .containsEntry("totalPackagesInWords", "—");
     }
 
     private static Detail detail(String status) {
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingServiceTest.java
index 643aef318..07d011809 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingServiceTest.java
@@ -329,19 +329,21 @@ class OceanBookingServiceTest {
         LinkCandidate candidate = new LinkCandidate(101L, "OB-260818-0001", 201L, "40HC",
             new BigDecimal("76"), new BigDecimal("28000"), 3, 1, 2,
             "客户A", "深圳中转仓", "美西海运");
-        when(repository.linkCandidates(any())).thenReturn(new PageResult<>(List.of(candidate), 1, 20, 1, 1));
+        when(repository.linkCandidates(any(), anySet())).thenReturn(new PageResult<>(List.of(candidate), 1, 20, 1, 1));
 
         PageResult<LinkCandidate> result = service.linkCandidates(new LinkCandidateQuery(701L,
-            " SEA-US ", " 40HC ", null, null));
+            " MATSON_CLX ", " 40HC ", null, null));
 
         assertThat(result.records()).containsExactly(candidate);
         assertThat(result.records().get(0).remainingQuantity()).isEqualTo(2);
         ArgumentCaptor<LinkCandidateQuery> query = ArgumentCaptor.forClass(LinkCandidateQuery.class);
-        verify(repository).linkCandidates(query.capture());
-        assertThat(query.getValue().channelCode()).isEqualTo("SEA-US");
+        @SuppressWarnings("unchecked") ArgumentCaptor<java.util.Set<String>> channels = ArgumentCaptor.forClass(java.util.Set.class);
+        verify(repository).linkCandidates(query.capture(), channels.capture());
+        assertThat(query.getValue().channelGroupCode()).isEqualTo("MATSON_CLX");
         assertThat(query.getValue().containerType()).isEqualTo("40HC");
         assertThat(query.getValue().page()).isEqualTo(1L);
         assertThat(query.getValue().size()).isEqualTo(20L);
+        assertThat(channels.getValue()).contains("MATSON_CLX_TRUCK", "MATSON_CLX_PARCEL", "ZBYHK");
         verify(repository, never()).find(anyLong());
         verify(repository, never()).requirements(anyLong());
         verify(repository, never()).containers(anyLong());
@@ -349,15 +351,15 @@ class OceanBookingServiceTest {
 
     @Test
     void linkCandidatesReturnsNormalEmptyPageWithOneSetQueryAndNoDiagnosticFields() {
-        when(repository.linkCandidates(any())).thenReturn(new PageResult<>(List.of(), 1, 20, 0, 0));
+        when(repository.linkCandidates(any(), anySet())).thenReturn(new PageResult<>(List.of(), 1, 20, 0, 0));
 
         PageResult<LinkCandidate> result = service.linkCandidates(
-            new LinkCandidateQuery(701L, "SEA-US", "45HC", null, null));
+            new LinkCandidateQuery(701L, "MATSON_CLX", "45HC", null, null));
 
         assertThat(result.records()).isEmpty();
         assertThat(result.total()).isZero();
         assertThat(result.pages()).isZero();
-        verify(repository, times(1)).linkCandidates(any());
+        verify(repository, times(1)).linkCandidates(any(), anySet());
         assertThat(LinkCandidate.class.getRecordComponents()).extracting(java.lang.reflect.RecordComponent::getName)
             .doesNotContain("mismatchReasons", "disabledReason", "warehouseId", "channelCode");
     }
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/portschedule/service/CarrierScheduleQueryServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/portschedule/service/CarrierScheduleQueryServiceTest.java
index 0614e2eec..7449dfedd 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/portschedule/service/CarrierScheduleQueryServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/portschedule/service/CarrierScheduleQueryServiceTest.java
@@ -474,6 +474,58 @@ class CarrierScheduleQueryServiceTest {
         verify(repository).updateState(before, 3, 7L, "admin");
     }
 
+    @Test
+    void containerManualNodeJoinsAndAdvancesExistingCarrierTask() {
+        CarrierScheduleQueryEntity task = task(0, 8);
+        task.setTrackingType("CONTAINER_NO"); task.setTrackingNo("ZCSU7881970");
+        task.setStatus("READY"); task.setLatestStandardNode("PICKUP_READY");
+        task.setLatestNodeObservedAt(NOW.minusHours(1));
+        CarrierScheduleQueryEntity stored = copyTask(task);
+        stored.setVersion(9); stored.setLatestStandardNode("PICKED_UP");
+        stored.setLatestNodeObservedAt(NOW);
+        when(repository.findByContainerBookingId(20L)).thenReturn(task);
+        when(repository.lock(1L)).thenReturn(task);
+        when(repository.find(1L)).thenReturn(stored);
+        when(repository.insertIfAbsent(any(CarrierScheduleNodeFactEntity.class))).thenReturn(true);
+        when(repository.updateState(any(), eq(8), eq(7L), eq("admin"))).thenReturn(1);
+        when(repository.nodesByContainer(20L)).thenReturn(List.of());
+
+        service.addContainerManualNode(20L, 7L, "admin", "terminal-pickup",
+            new com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ContainerManualNodeRequest(
+                "PICKED_UP", NOW, null, NOW, "USLAX", "Los Angeles", "terminal pickup"));
+
+        verify(repository).insertIfAbsent(argThat((CarrierScheduleNodeFactEntity fact) -> Long.valueOf(1L).equals(fact.getQueryId())
+            && fact.getContainerBookingId() == 20L && "PICKED_UP".equals(fact.getStandardNode())));
+        verify(repository).updateState(task, 8, 7L, "admin");
+        verify(repository).insert(argThat((CarrierScheduleQueryHistoryEntity history) ->
+            "MANUAL_NODE".equals(history.getAction()) && Long.valueOf(1L).equals(history.getQueryId())
+                && Integer.valueOf(8).equals(history.getFromVersion())
+                && Integer.valueOf(9).equals(history.getToVersion())));
+        verify(nodeOutbox).publish(eq(stored), argThat(fact -> Long.valueOf(1L).equals(fact.getQueryId())),
+            eq("ZCSU7881970"));
+        verify(nodeOutbox, never()).publishContainerNode(any(), anyLong(), any(), anyString());
+    }
+
+    @Test
+    void manualActualFactRejectsCurrentOrEarlierBusinessNodeBeforeWritingFact() {
+        CarrierScheduleQueryEntity task = task(0, 3);
+        task.setStatus("READY"); task.setLatestStandardNode("AT_ORIGIN_PORT");
+        task.setLatestNodeObservedAt(NOW.minusHours(1));
+        when(repository.lock(1L)).thenReturn(task);
+
+        assertThatThrownBy(() -> service.addManualNode(1L, 7L, "admin", "manual-same-1",
+            new ManualNodeRequest(3, "AT_ORIGIN_PORT", NOW, null, NOW,
+                "CNSZX", "深圳", "重复当前节点")))
+            .isInstanceOf(BizException.class).hasMessageContaining("按业务顺序向后推进");
+        assertThatThrownBy(() -> service.addManualNode(1L, 7L, "admin", "manual-earlier-1",
+            new ManualNodeRequest(3, "DEPARTED_WAREHOUSE", NOW, null, NOW,
+                "CNSZX", "深圳", "补录更早节点")))
+            .isInstanceOf(BizException.class).hasMessageContaining("按业务顺序向后推进");
+
+        verify(repository, never()).insertIfAbsent(any(CarrierScheduleNodeFactEntity.class));
+        verify(repository, never()).updateState(any(), any(Integer.class), anyLong(), anyString());
+    }
+
     @Test
     void holdIsPersistedAsSeparateImmutableExceptionFact() {
         CarrierScheduleQueryEntity task = task(0, 1);
@@ -751,6 +803,14 @@ class CarrierScheduleQueryServiceTest {
         return value;
     }
 
+    private static CarrierScheduleQueryEntity copyTask(CarrierScheduleQueryEntity source) {
+        CarrierScheduleQueryEntity value = task(source.getAttemptCount(), source.getVersion());
+        value.setTrackingType(source.getTrackingType()); value.setTrackingNo(source.getTrackingNo());
+        value.setStatus(source.getStatus()); value.setLatestStandardNode(source.getLatestStandardNode());
+        value.setLatestNodeObservedAt(source.getLatestNodeObservedAt());
+        return value;
+    }
+
     private void set(String fieldName, Object value) throws Exception {
         var field = CarrierScheduleQueryService.class.getDeclaredField(fieldName);
         field.setAccessible(true); field.set(service, value);
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/CustomerDimensionConfigSqlContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/CustomerDimensionConfigSqlContractTest.java
index 783615014..aec810024 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/CustomerDimensionConfigSqlContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/CustomerDimensionConfigSqlContractTest.java
@@ -115,6 +115,9 @@ class CustomerDimensionConfigSqlContractTest {
             .contains("r.role_code = 'ORDER_OPERATOR'")
             .contains("index_name = 'uk_customer_dimension_config_tenant_box'")
             .contains("客户四箱规尺寸配置字段不完整")
+            .contains("客户默认计费规则初始化幂等字段未创建")
+            .contains("index_name = 'idx_charge_rule_initialization'")
+            .contains("客户默认计费规则初始化索引未完整创建")
             .contains("客户尺寸计算配置权限码、固定ID或父节点不正确");
     }
 
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/DropshipPalletizationSqlContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/DropshipPalletizationSqlContractTest.java
index e247cc0aa..b549689c2 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/DropshipPalletizationSqlContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/DropshipPalletizationSqlContractTest.java
@@ -1,6 +1,8 @@
 package com.baiyue.firstleg.repository;
 
 import org.junit.jupiter.api.Test;
+import org.apache.ibatis.annotations.Select;
+import com.baiyue.firstleg.mapper.DropshipPalletizationMapper;
 import org.springframework.core.io.ClassPathResource;
 
 import java.nio.charset.StandardCharsets;
@@ -10,6 +12,17 @@ import java.nio.file.Path;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class DropshipPalletizationSqlContractTest {
+    @Test
+    void pendingPdaTasksAreScopedByTheSelectedWarehouse() throws Exception {
+        String sql = DropshipPalletizationMapper.class
+            .getDeclaredMethod("pending", long.class, long.class, String.class)
+            .getAnnotation(Select.class).value()[0];
+
+        assertThat(sql)
+            .contains("t.warehouse_id=#{warehouseId}")
+            .contains("t.assignee_id IS NULL OR t.assignee_id=#{operatorId}");
+    }
+
     @Test
     void moduleAndUnifiedSchemasExposeCountingPalletAndWholePalletAssignmentFacts() throws Exception {
         String inbound = new ClassPathResource("db/phase2-inbound-schema.sql")
@@ -48,4 +61,19 @@ class DropshipPalletizationSqlContractTest {
             .contains("DROP INDEX uk_loading_item_plan_detail")
             .contains("ADD UNIQUE KEY uk_loading_item_plan_assignment (loading_plan_id,active_assignment_key)");
     }
+
+    @Test
+    void sharedPalletsAreVisibleAndOnlyParticipatingOpenPalletsBlockCompletion() throws Exception {
+        String pallets = DropshipPalletizationMapper.class.getDeclaredMethod("pallets", long.class)
+            .getAnnotation(Select.class).value()[0];
+        String open = DropshipPalletizationMapper.class.getDeclaredMethod("openPalletCount", long.class)
+            .getAnnotation(Select.class).value()[0];
+        String complete = DropshipPalletizationMapper.class.getDeclaredMethod("completeTask", long.class)
+            .getAnnotation(org.apache.ibatis.annotations.Update.class).value()[0];
+
+        assertThat(pallets).contains("c.pallet_id=p.id AND c.task_id=#{taskId}");
+        assertThat(open).contains("fl_dropship_pallet_carton c").contains("c.task_id=#{taskId}");
+        assertThat(complete).contains("fl_dropship_pallet_carton c JOIN fl_dropship_pallet p")
+            .doesNotContain("p.task_id=#{taskId}");
+    }
 }
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingListQueryMapperContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingListQueryMapperContractTest.java
index 659703cb6..063b025bb 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingListQueryMapperContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingListQueryMapperContractTest.java
@@ -34,6 +34,10 @@ class LoadingListQueryMapperContractTest {
             .contains("FROM fl_loading_plan p")
             .contains("JOIN fl_container_booking b")
             .contains("LEFT JOIN fl_loading_plan_item i")
+            .contains("FROM fl_outbound_dispatch outbound")
+            .contains("outbound.container_booking_id = p.container_booking_id")
+            .contains("AS outbound_confirmed_at")
+            .doesNotContain("b.outbound_confirmed_at")
             .doesNotContain("preload_pushed_at")
             .contains("p.plan_status IN ('EDITING', 'LOADING')")
             .doesNotContain("active_item.deleted = 0")
@@ -47,6 +51,8 @@ class LoadingListQueryMapperContractTest {
             .doesNotContain("PRELOAD_PUSHED");
         assertThat(confirmed)
             .contains("FROM fl_loading_plan p")
+            .contains("FROM fl_outbound_dispatch outbound")
+            .doesNotContain("b.outbound_confirmed_at")
             .contains("p.plan_status = 'COMPLETED'")
             .contains("customer_item.account_id = #{query.customerId}")
             .contains("b.warehouse_id = #{query.warehouseId}")
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickItemMapperContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickItemMapperContractTest.java
index 3050653cc..f7c09f27e 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickItemMapperContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickItemMapperContractTest.java
@@ -100,5 +100,17 @@ class LoadingPickItemMapperContractTest {
         assertThat(pick.getAnnotation(Update.class).value()[0])
             .doesNotContain("booking.warehouse_id = #{warehouseId}")
             .contains("plan_item.deleted = 0");
+	}
+
+    @Test
+    void partialCanFinalizeTheQuantityAlreadyPersistedByIncrementalScanning() throws Exception {
+        Method partial = LoadingPickItemMapper.class.getDeclaredMethod("partial", long.class, int.class,
+            int.class, long.class);
+        String sql = partial.getAnnotation(Update.class).value()[0];
+
+        assertThat(sql)
+            .contains("item_status IN ('PENDING', 'PICKING')")
+            .contains("picked_package_count <= #{finalCount}")
+            .contains("#{finalCount} < planned_package_count");
     }
 }
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickPdaTaskSqlContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickPdaTaskSqlContractTest.java
index ae16cb39a..20799bb0b 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickPdaTaskSqlContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickPdaTaskSqlContractTest.java
@@ -37,12 +37,13 @@ class LoadingPickPdaTaskSqlContractTest {
     @Test
     void pendingTasksAreLimitedToUnassignedOrCurrentOperatorWithoutCustomerInput() throws Exception {
         String sql = LoadingPickTaskMapper.class
-            .getDeclaredMethod("selectPendingForOperator", long.class, String.class)
+            .getDeclaredMethod("selectPendingForOperator", long.class, long.class, String.class)
             .getAnnotation(Select.class).value()[0];
 
         assertThat(sql)
             .contains("task.task_status IN ('LOADING','COMPLETING','COMPLETION_FAILED')")
             .contains("booking.record_status = 'ACTIVE'")
+            .contains("booking.warehouse_id = #{warehouseId}")
             .contains("booking.source_type AS sourceType")
             .contains("booking.record_status AS recordStatus")
             .contains("booking.merged_into_container_booking_id AS mergedIntoContainerBookingId")
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickStableLookupContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickStableLookupContractTest.java
index 9342ba8a4..3c921d8ec 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickStableLookupContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickStableLookupContractTest.java
@@ -15,10 +15,13 @@ class LoadingPickStableLookupContractTest {
         String legacy = LoadingPickTaskMapper.class.getMethod("selectLoadingByContainerAndAccount", String.class, long.class)
             .getAnnotation(Select.class).value()[0];
         assertThat(cabinet).contains("booking.cabinet_no=#{cabinetNo}", "booking.record_status='ACTIVE'")
+            .contains("booking.warehouse_id=#{warehouseId}")
             .doesNotContain("task.container_no");
         assertThat(plan).contains("task.loading_plan_id=#{loadingPlanId}", "booking.record_status='ACTIVE'")
+            .contains("booking.warehouse_id=#{warehouseId}")
             .doesNotContain("task.container_no");
         assertThat(legacy).contains("booking.container_no = #{containerNo}",
-            "booking.record_status = 'ACTIVE'").doesNotContain("task.container_no =");
+            "booking.record_status = 'ACTIVE'", "booking.warehouse_id = #{warehouseId}")
+            .doesNotContain("task.container_no =");
     }
 }
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/Phase3FinalUnifiedSqlContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/Phase3FinalUnifiedSqlContractTest.java
index b84c6a04f..2d812a167 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/Phase3FinalUnifiedSqlContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/Phase3FinalUnifiedSqlContractTest.java
@@ -188,7 +188,8 @@ class Phase3FinalUnifiedSqlContractTest {
         assertThat(sql)
             .contains("CALL queue_column_comment('baiyue_firstleg', 'fl_inbound_fee_detail', 'supplier_id'")
             .contains("CALL queue_column_comment('baiyue_firstleg', 'fl_inbound_fee_detail', 'supplier_name'")
-            .contains("CALL queue_column_comment('baiyue_firstleg', 'fl_inbound_fee_detail', 'supplier_category'");
+            .contains("CALL queue_column_comment('baiyue_firstleg', 'fl_inbound_fee_detail', 'supplier_category'")
+            .contains("CALL queue_column_comment('baiyue_firstleg', 'fl_carrier_schedule_node_fact', 'container_booking_id'");
         assertThat(sql.indexOf("CALL apply_queued_comments();",
             sql.indexOf("-- END GENERATED NINE-SCHEMA COMMENT UPGRADE CALLS")))
             .isGreaterThan(sql.indexOf("-- END GENERATED NINE-SCHEMA COMMENT UPGRADE CALLS"));
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingCandidateMapperContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingCandidateMapperContractTest.java
index d45182895..10087cbc4 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingCandidateMapperContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingCandidateMapperContractTest.java
@@ -180,7 +180,7 @@ class SmartLoadingCandidateMapperContractTest {
 
         assertThat(sql)
             .contains("p.plan_status IN ('EDITING','LOADING')")
-            .contains("b.channel_code IN")
+            .contains("b.channel_group_code IN")
             .contains("fl_loading_plan_item filter_item")
             .contains("fl_inbound_order filter_inbound")
             .contains("filter_item.inbound_code LIKE")
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingSqlContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingSqlContractTest.java
index 909474e2d..5a024d6e5 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingSqlContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/SmartLoadingSqlContractTest.java
@@ -18,14 +18,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 class SmartLoadingSqlContractTest {
     private static final Pattern PERMISSION_PATTERN = Pattern.compile("'((?:platform:firstleg:)[^']+)'");
     private static final Set<String> PHASE3_PERMISSIONS = Set.of(
-        "platform:firstleg:container:list", "platform:firstleg:container:view",
+        "platform:firstleg:container:list",
         "platform:firstleg:container:create", "platform:firstleg:container:edit",
         "platform:firstleg:smart-loading:list",
         "platform:firstleg:smart-loading:assign", "platform:firstleg:smart-loading:delete",
         "platform:firstleg:preload:list",
-        "platform:firstleg:preload:view", "platform:firstleg:preload:edit",
+        "platform:firstleg:preload:edit",
         "platform:firstleg:preload:complete", "platform:firstleg:preload:confirm",
-        "platform:firstleg:loading-list:list", "platform:firstleg:loading-list:view");
+        "platform:firstleg:loading-list:list");
 
     @Test
     @DisplayName("平台聚合与客户明细边界及原型快照字段完整")
@@ -193,7 +193,7 @@ class SmartLoadingSqlContractTest {
     }
 
     @Test
-    @DisplayName("模块脚本和统一脚本均校验14项权限与两个角色28项授权")
+    @DisplayName("模块脚本和统一脚本均校验11项权限与两个角色22项授权")
     void shouldAssertCompletePermissionGrants() throws Exception {
         assertPermissionContract(migration());
         assertPermissionContract(unifiedMigration());
@@ -238,6 +238,8 @@ class SmartLoadingSqlContractTest {
             .doesNotContain("WITHDRAWN");
         assertLoadingCompletionTrigger(migration());
         assertLoadingCompletionTrigger(unifiedMigration());
+        assertThat(unifiedMigration().indexOf("CALL phase3_add_container_channel_group()"))
+            .isLessThan(unifiedMigration().indexOf("CREATE TRIGGER trg_container_booking_before_update"));
     }
 
     private static void assertLoadingCompletionTrigger(String sql) {
@@ -266,6 +268,8 @@ class SmartLoadingSqlContractTest {
         assertThat(migration())
             .contains("CREATE TABLE IF NOT EXISTS fl_loading_pick_task")
             .contains("CALL migrate_legacy_loading_pick_task()")
+            .contains("source_total_columns = 13 AND source_current_columns = 13")
+            .contains("index_name = 'uk_loading_pick_task_booking'")
             .contains("RENAME TABLE fl_loading_pick_task TO fl_inbound_loading_pick_task")
             .contains("CREATE TABLE IF NOT EXISTS fl_loading_pick_item")
             .contains("CREATE TABLE IF NOT EXISTS fl_loading_pick_history")
@@ -371,7 +375,7 @@ class SmartLoadingSqlContractTest {
         int assertionStart = sql.lastIndexOf("IF (SELECT COUNT(DISTINCT CONCAT", message);
         String assertion = sql.substring(assertionStart, message);
         assertThat(permissions(assertion)).isEqualTo(PHASE3_PERMISSIONS);
-        assertThat(assertion).contains("<> 28 THEN");
+        assertThat(assertion).contains("<> 22 THEN");
     }
 
     private static Set<String> permissions(String sql) {
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/ContainerServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/ContainerServiceTest.java
index 09e195623..b173ab652 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/ContainerServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/ContainerServiceTest.java
@@ -80,7 +80,9 @@ class ContainerServiceTest {
         assertThat(saved.getCabinetNo()).isEqualTo("CAB-260818-0001");
         assertThat(saved.getContainerNo()).isNull();
         assertThat(saved.getOceanBookingId()).isNull();
-        assertThat(saved.getChannelName()).isEqualTo("美西海运");
+        assertThat(saved.getChannelGroupCode()).isEqualTo("MATSON_CLX");
+        assertThat(saved.getChannelCode()).isNull();
+        assertThat(saved.getChannelName()).isNull();
         assertThat(saved.getWarehouseId()).isEqualTo(101L);
         assertThat(saved.getWarehouseName()).isEqualTo("上海中转仓");
         assertThat(saved.getCapacityCbm()).isEqualByComparingTo("76.0000");
@@ -94,7 +96,7 @@ class ContainerServiceTest {
     @DisplayName("新增模拟柜拒绝柜型与固定规格不匹配")
     void rejectsSimulationWithNonCanonicalSpecification() {
         SimulationCreateRequest invalid = new SimulationCreateRequest(
-            "SEA-US", 101L, "40HC", new BigDecimal("100"), new BigDecimal("28000"));
+            "MATSON_CLX", 101L, "40HC", new BigDecimal("100"), new BigDecimal("28000"));
 
         assertThatThrownBy(() -> service.createSimulation(9L, "admin", invalid))
             .isInstanceOf(BizException.class)
@@ -202,10 +204,10 @@ class ContainerServiceTest {
         container.setPlanId(501L);
         container.setPlanNo("LP-260818-0001");
         container.setContainerNo(null);
-        container.setWarehouseId(101L); container.setChannelCode("SEA-US"); container.setContainerType("40HC");
+        container.setWarehouseId(101L); container.setChannelGroupCode("EXX"); container.setChannelCode(null); container.setContainerType("40HC");
         container.setCapacityCbm(new BigDecimal("85.5000")); container.setMaxWeightKg(new BigDecimal("27500.000"));
         OceanBookingEntity booking = new OceanBookingEntity();
-        booking.setId(21L); booking.setStatus("RELEASED"); booking.setWarehouseId(101L); booking.setChannelCode("SEA-US");
+        booking.setId(21L); booking.setStatus("RELEASED"); booking.setWarehouseId(101L); booking.setChannelCode("EXX_RAIL_NY");
         OceanBookingContainerRequirementEntity requirement = new OceanBookingContainerRequirementEntity();
         requirement.setId(31L); requirement.setQuantity(1); requirement.setContainerType("40HC"); requirement.setCapacityCbm(new BigDecimal("76.0000")); requirement.setMaxWeightKg(new BigDecimal("28000.000"));
         when(repository.find(11L)).thenReturn(container, container);
@@ -311,13 +313,13 @@ class ContainerServiceTest {
     void linksMultipleRealContainersToTheSameReleasedBookingRequirement() {
         ContainerBookingEntity first = booking("WAIT_LOADING", 2);
         first.setId(11L); first.setContainerNo(null); first.setWarehouseId(101L);
-        first.setChannelCode("SEA-US"); first.setContainerType("40HC");
+        first.setChannelGroupCode("MATSON_CLX"); first.setChannelCode(null); first.setContainerType("40HC");
         ContainerBookingEntity second = booking("WAIT_LOADING", 4);
         second.setId(12L); second.setContainerNo(null); second.setWarehouseId(101L);
-        second.setChannelCode("SEA-US"); second.setContainerType("40HC");
+        second.setChannelGroupCode("MATSON_CLX"); second.setChannelCode(null); second.setContainerType("40HC");
         OceanBookingEntity oceanBooking = new OceanBookingEntity();
         oceanBooking.setId(21L); oceanBooking.setStatus("RELEASED");
-        oceanBooking.setWarehouseId(101L); oceanBooking.setChannelCode("SEA-US");
+        oceanBooking.setWarehouseId(101L); oceanBooking.setChannelCode("MATSON_CLX_TRUCK");
         OceanBookingContainerRequirementEntity requirement = new OceanBookingContainerRequirementEntity();
         requirement.setId(31L); requirement.setQuantity(2); requirement.setContainerType("40HC");
         when(repository.find(11L)).thenReturn(first);
@@ -360,19 +362,19 @@ class ContainerServiceTest {
     @Test
     @DisplayName("首次关联拒绝装柜仓库不一致")
     void rejectsLinkWhenWarehouseDiffers() {
-        assertThreeFieldMismatch(102L, "SEA-US", "40HC");
+        assertThreeFieldMismatch(102L, "MATSON_CLX_TRUCK", "40HC");
     }
 
     @Test
     @DisplayName("首次关联拒绝物流渠道不一致")
     void rejectsLinkWhenChannelDiffers() {
-        assertThreeFieldMismatch(101L, "SEA-EU", "40HC");
+        assertThreeFieldMismatch(101L, "HEDE_TRUCK", "40HC");
     }
 
     @Test
     @DisplayName("首次关联拒绝柜型不一致")
     void rejectsLinkWhenContainerTypeDiffers() {
-        assertThreeFieldMismatch(101L, "SEA-US", "45HC");
+        assertThreeFieldMismatch(101L, "MATSON_CLX_TRUCK", "45HC");
     }
 
     @Test
@@ -415,7 +417,7 @@ class ContainerServiceTest {
                                           String requirementType) {
         ContainerBookingEntity container = booking("WAIT_LOADING", 2);
         container.setContainerNo(null);
-        container.setWarehouseId(101L); container.setChannelCode("SEA-US");
+        container.setWarehouseId(101L); container.setChannelGroupCode("MATSON_CLX"); container.setChannelCode(null);
         container.setContainerType("40HC");
         OceanBookingEntity oceanBooking = new OceanBookingEntity();
         oceanBooking.setId(21L); oceanBooking.setStatus("RELEASED");
@@ -429,7 +431,7 @@ class ContainerServiceTest {
 
         assertThatThrownBy(() -> service.linkOceanBooking(11L, 9L, "admin",
             new OceanBookingLinkRequest(21L, 31L, "MSCU6639870", 2)))
-            .isInstanceOf(BizException.class).hasMessageContaining("仓库、渠道或柜型不一致");
+            .isInstanceOf(BizException.class).hasMessageContaining("仓库、渠道分组或柜型不一致");
         verify(repository, never()).linkReleasedBooking(anyLong(), anyLong(), anyLong(), anyString(),
             any(), anyInt(), anyLong(), anyString());
     }
@@ -437,11 +439,11 @@ class ContainerServiceTest {
     private void stubLinkContext() {
         ContainerBookingEntity container = booking("WAIT_LOADING", 2);
         container.setContainerNo(null);
-        container.setWarehouseId(101L); container.setChannelCode("SEA-US");
+        container.setWarehouseId(101L); container.setChannelGroupCode("MATSON_CLX"); container.setChannelCode(null);
         container.setContainerType("40HC");
         OceanBookingEntity oceanBooking = new OceanBookingEntity();
         oceanBooking.setId(21L); oceanBooking.setStatus("RELEASED");
-        oceanBooking.setWarehouseId(101L); oceanBooking.setChannelCode("SEA-US");
+        oceanBooking.setWarehouseId(101L); oceanBooking.setChannelCode("MATSON_CLX_TRUCK");
         OceanBookingContainerRequirementEntity requirement = new OceanBookingContainerRequirementEntity();
         requirement.setId(31L); requirement.setQuantity(2); requirement.setContainerType("40HC");
         when(repository.find(11L)).thenReturn(container);
@@ -491,10 +493,10 @@ class ContainerServiceTest {
     }
 
     private static SimulationCreateRequest simulation() {
-        return new SimulationCreateRequest("SEA-US", 101L, "40HC", new BigDecimal("76.0000"), new BigDecimal("28000.000"));
+        return new SimulationCreateRequest("MATSON_CLX", 101L, "40HC", new BigDecimal("76.0000"), new BigDecimal("28000.000"));
     }
 
     private static ChannelRow channel() {
-        ChannelRow channel = new ChannelRow(); channel.setChannelCode("SEA-US"); channel.setChannelName("美西海运"); return channel;
+        ChannelRow channel = new ChannelRow(); channel.setChannelCode("MATSON_CLX_TRUCK"); channel.setChannelName("美西海运"); return channel;
     }
 }
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/DropshipPalletizationServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/DropshipPalletizationServiceTest.java
index 248544add..b985a88d6 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/DropshipPalletizationServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/DropshipPalletizationServiceTest.java
@@ -3,11 +3,15 @@ package com.baiyue.firstleg.service;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.firstleg.dto.DropshipPalletizationDtos.CountCartonRequest;
 import com.baiyue.firstleg.dto.DropshipPalletizationDtos.DiscrepancyAction;
+import com.baiyue.firstleg.dto.DropshipPalletizationDtos.CountSkuLine;
+import com.baiyue.firstleg.entity.InboundOrderEntity;
 import com.baiyue.firstleg.mapper.DropshipPalletizationMapper;
-import com.baiyue.firstleg.mapper.DropshipPalletizationMapper.CartonRow;
 import com.baiyue.firstleg.mapper.DropshipPalletizationMapper.LabelRow;
+import com.baiyue.firstleg.mapper.DropshipPalletizationMapper.CartonRow;
 import com.baiyue.firstleg.mapper.DropshipPalletizationMapper.PalletRow;
 import com.baiyue.firstleg.mapper.DropshipPalletizationMapper.TaskRow;
+import com.baiyue.firstleg.mapper.DropshipPalletizationMapper.LabelSkuRow;
+import com.baiyue.firstleg.mapper.DropshipPalletizationMapper.CartonSkuRow;
 import org.junit.jupiter.api.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
@@ -19,92 +23,75 @@ class DropshipPalletizationServiceTest {
  private final FirstlegDocumentNumberGenerator numbers=mock(FirstlegDocumentNumberGenerator.class);
  private final DropshipPalletizationMapper mapper=mock(DropshipPalletizationMapper.class);
  private final DropshipPalletizationService service=new DropshipPalletizationService();
+ DropshipPalletizationServiceTest(){ ReflectionTestUtils.setField(service,"mapper",mapper); ReflectionTestUtils.setField(service,"documentNumbers",numbers); when(mapper.labelSkus(anyLong(),anyLong())).thenAnswer(call -> java.util.List.of(labelSku())); when(mapper.cartonSkus(anyLong())).thenAnswer(call -> java.util.List.of(cartonSku())); }
 
- DropshipPalletizationServiceTest(){ ReflectionTestUtils.setField(service,"mapper",mapper); ReflectionTestUtils.setField(service,"documentNumbers",numbers); }
-
- @Test void generatesAndBindsOnlyWhenPendingCartonsExist(){
-  when(mapper.lockTask(10L,100L)).thenReturn(10L); when(mapper.task(10L,100L)).thenReturn(task());
-  when(mapper.unboundCount(10L)).thenReturn(2); when(numbers.next("DP")).thenReturn("DP-260909-0001");
-  when(mapper.bindPending(eq(10L),anyLong(),eq("create-1"),eq(7L),eq("张三"))).thenReturn(2);
-  when(mapper.adjustBound(10L,7L,2)).thenReturn(1);
-  service.createAndBind(10L,new com.baiyue.firstleg.dto.DropshipPalletizationDtos.CreateAndBindRequest(100L,"create-1"),7L,"张三");
-  verify(mapper).insertPallet(anyLong(),eq(10L),eq(1L),eq(30L),eq(100L),eq("DP-260909-0001"),eq("create-1"),eq(7L),eq("张三"));
-  verify(numbers,times(1)).next("DP");
+ @Test void reviewCreatesExpectedNumberOfPrintablePalletCodes(){
+  InboundOrderEntity inbound=dropshipInbound(); when(mapper.insertTask(anyLong(),eq(1L),eq(30L),eq(100L),eq(8))).thenReturn(1);
+  when(numbers.next("DP")).thenReturn("DP-260911-0001","DP-260911-0002");
+  service.createTask(inbound,7L,"张三");
+  verify(mapper,times(2)).insertPallet(anyLong(),anyLong(),eq(1L),eq(30L),eq(100L),startsWith("DP-"),startsWith("dropship-precreate-"),eq(7L),eq("张三"));
  }
 
- @Test void noPendingCartonsNeverAllocatesNumberOrEmptyPallet(){
-  when(mapper.lockTask(10L,100L)).thenReturn(10L); when(mapper.task(10L,100L)).thenReturn(task());
-  assertThatThrownBy(()->service.createAndBind(10L,new com.baiyue.firstleg.dto.DropshipPalletizationDtos.CreateAndBindRequest(100L,"empty"),7L,"张三")).hasMessageContaining("没有待绑托箱");
-  verifyNoInteractions(numbers);
-  verify(mapper,never()).insertPallet(anyLong(),anyLong(),anyLong(),anyLong(),anyLong(),anyString(),anyString(),anyLong(),anyString());
- }
-
- @Test void replaysAfterCompletionWithoutGeneratingAnotherPallet(){
-  TaskRow completed=task(); completed.setTaskStatus("COMPLETED"); completed.setProcessStatus("WAIT_SPLIT");
-  when(mapper.lockTask(10L,100L)).thenReturn(10L); when(mapper.task(10L,100L)).thenReturn(completed);
-  when(mapper.palletByOpenOperation("replay")).thenReturn(pallet());
-  service.createAndBind(10L,new com.baiyue.firstleg.dto.DropshipPalletizationDtos.CreateAndBindRequest(100L,"replay"),7L,"张三");
-  verifyNoInteractions(numbers); verify(mapper,never()).unboundCount(anyLong());
- }
-
- @Test void rejectsOtherOperatorAndCrossTaskReplay(){
-  when(mapper.lockTask(10L,100L)).thenReturn(10L); when(mapper.task(10L,100L)).thenReturn(task());
-  var request=new com.baiyue.firstleg.dto.DropshipPalletizationDtos.CreateAndBindRequest(100L,"replay");
-  assertThatThrownBy(()->service.createAndBind(10L,request,8L,"李四")).hasMessageContaining("当前操作员");
-  PalletRow other=pallet(); other.setTaskId(11L); when(mapper.palletByOpenOperation("replay")).thenReturn(other);
-  assertThatThrownBy(()->service.createAndBind(10L,request,7L,"张三")).hasMessageContaining("不同任务");
-  verifyNoInteractions(numbers);
- }
-
- @Test void rejectsUnknownWarehouseAndChangedBindCount(){
-  var request=new com.baiyue.firstleg.dto.DropshipPalletizationDtos.CreateAndBindRequest(100L,"new");
-  assertThatThrownBy(()->service.createAndBind(10L,request,7L,"张三")).hasMessageContaining("当前仓库");
-  when(mapper.lockTask(10L,100L)).thenReturn(10L); when(mapper.task(10L,100L)).thenReturn(task());
-  when(mapper.unboundCount(10L)).thenReturn(2); when(numbers.next("DP")).thenReturn("DP-260909-0002");
-  assertThatThrownBy(()->service.createAndBind(10L,request,7L,"张三")).hasMessageContaining("待绑托箱已变化");
-  verify(mapper,never()).adjustBound(anyLong(),anyLong(),anyInt());
+ @Test void replayedReviewDoesNotGenerateDuplicatePalletCodes(){
+  when(mapper.insertTask(anyLong(),anyLong(),anyLong(),anyLong(),anyInt())).thenReturn(0);
+  service.createTask(dropshipInbound(),7L,"张三");
+  verifyNoInteractions(numbers); verify(mapper,never()).insertPallet(anyLong(),anyLong(),anyLong(),anyLong(),anyLong(),anyString(),anyString(),anyLong(),anyString());
  }
 
  @Test void resolvesUncountedCartonBeforeQuantityConfirmation(){
-  TaskRow task=task(); LabelRow label=label();
-  when(mapper.task(10L,100L)).thenReturn(task); when(mapper.label(10L,"BOX-1")).thenReturn(label);
+  when(mapper.task(10L,100L)).thenReturn(task()); when(mapper.palletCount(10L)).thenReturn(2); when(mapper.label(10L,"BOX-1")).thenReturn(label());
   var result=service.resolveCarton(10L,100L,"BOX-1",7L);
-  assertThat(result.inboundCode()).isEqualTo("IN-1");
-  assertThat(result.skuCode()).isEqualTo("SKU-1");
-  assertThat(result.expectedSkuQuantity()).isEqualTo(12);
-  assertThat(result.countStatus()).isEqualTo("UNCOUNTED");
-  assertThat(result.canCount()).isTrue();
+  assertThat(result.inboundCode()).isEqualTo("IN-1"); assertThat(result.skuLines()).extracting("expectedQuantity").containsExactly(12); assertThat(result.canCount()).isTrue();
  }
 
- @Test void mismatchCannotBeRecordedWithoutAcceptedVarianceAndRemark(){
-  when(mapper.task(10L,100L)).thenReturn(task()); when(mapper.label(10L,"BOX-1")).thenReturn(label());
-  var wrongAction=new CountCartonRequest(100L,"BOX-1",11,DiscrepancyAction.MATCH,null,null,"op-1");
-  assertThatThrownBy(()->service.countCarton(10L,wrongAction,7L,"张三"))
-   .isInstanceOf(BizException.class).hasMessageContaining("确认差异处理结果");
-  var noRemark=new CountCartonRequest(100L,"BOX-1",11,DiscrepancyAction.ACCEPT_VARIANCE,null,null,"op-2");
-  assertThatThrownBy(()->service.countCarton(10L,noRemark,7L,"张三"))
-   .isInstanceOf(BizException.class).hasMessageContaining("处理说明");
-  verify(mapper,never()).insertCarton(anyLong(),anyLong(),any(),anyLong(),anyLong(),anyLong(),anyLong(),any(),any(),any(),anyInt(),anyInt(),any(),any(),any(),anyLong(),any());
+ @Test void cartonCanBindDirectlyToAPreGeneratedPallet(){
+  when(mapper.task(10L,100L)).thenReturn(task()); when(mapper.palletCount(10L)).thenReturn(2); when(mapper.label(10L,"BOX-1")).thenReturn(label()); when(mapper.palletByNo("DP-260911-0001")).thenReturn(pallet());
+  when(mapper.addCounted(10L,7L,1,0)).thenReturn(1); when(mapper.carton(eq(10L),anyLong())).thenReturn(carton());
+  when(mapper.pallet(10L,20L,100L)).thenReturn(pallet()); when(mapper.cartons(20L)).thenReturn(java.util.List.of());
+  service.countCarton(10L,countRequest("DP-260911-0001"),7L,"张三");
+  verify(mapper).insertCarton(anyLong(),eq(10L),eq(20L),eq(1L),eq(30L),eq(40L),eq(50L),eq("SKU-1"),any(),eq("BOX-1"),eq(12),eq(12),eq("MATCH"),isNull(),eq("op-1"),eq(7L),eq("张三"));
+  verify(mapper).insertCartonSku(anyLong(),anyLong(),eq(40L),eq("SKU-1"),any(),eq(12),eq(12),eq("MATCH"),isNull(),eq(1));
  }
 
- @Test void countsOneCartonDirectlyIntoScannedPallet(){
-  TaskRow before=task(),after=task(); after.setCountedCartons(1); after.setAllocatedCartons(1);
-  LabelRow label=label(); PalletRow pallet=pallet(); CartonRow carton=carton();
-  when(mapper.task(10L,100L)).thenReturn(before,after);
-  when(mapper.label(10L,"BOX-1")).thenReturn(label); when(mapper.palletByNo("DP-260908-0001")).thenReturn(pallet);
-  when(mapper.addCounted(10L,7L,1,0)).thenReturn(1); when(mapper.carton(eq(10L),anyLong())).thenReturn(carton);
-  when(mapper.pallet(10L,20L,100L)).thenReturn(pallet); when(mapper.cartons(20L)).thenReturn(java.util.List.of(carton));
-  when(mapper.metrics(20L)).thenReturn(new DropshipPalletizationMapper.PalletMetrics(java.math.BigDecimal.ONE,java.math.BigDecimal.TEN));
-  var request=new CountCartonRequest(100L,"BOX-1",12,DiscrepancyAction.MATCH,null,"DP-260908-0001","op-1");
-  var result=service.countCarton(10L,request,7L,"张三");
-  assertThat(result.carton().countStatus()).isEqualTo("BOUND");
-  assertThat(result.pallet().status()).isEqualTo("OPEN");
-  verify(mapper).insertCarton(anyLong(),eq(10L),eq(20L),eq(1L),eq(30L),eq(40L),eq(50L),eq("SKU-1"),
-   eq("货物"),eq("BOX-1"),eq(12),eq(12),eq("MATCH"),isNull(),eq("op-1"),eq(7L),eq("张三"));
+ @Test void cartonCanBindToAnOpenPalletGeneratedForAnotherTaskInTheSameWarehouse(){
+  TaskRow current=task(); PalletRow shared=pallet(); shared.setTaskId(99L); shared.setTenantId(2L); shared.setInboundId(88L);
+  when(mapper.task(10L,100L)).thenReturn(current); when(mapper.palletCount(10L)).thenReturn(2);
+  when(mapper.label(10L,"BOX-1")).thenReturn(label()); when(mapper.palletByNo("DP-260911-0001")).thenReturn(shared);
+  when(mapper.addCounted(10L,7L,1,0)).thenReturn(1); when(mapper.carton(eq(10L),anyLong())).thenReturn(carton());
+  when(mapper.pallet(10L,20L,100L)).thenReturn(shared); when(mapper.cartons(20L)).thenReturn(java.util.List.of());
+  service.countCarton(10L,countRequest("DP-260911-0001"),7L,"张三");
+  verify(mapper).insertCarton(anyLong(),eq(10L),eq(20L),eq(1L),eq(30L),anyLong(),anyLong(),anyString(),any(),eq("BOX-1"),anyInt(),anyInt(),eq("MATCH"),isNull(),eq("op-1"),eq(7L),eq("张三"));
  }
 
- private static TaskRow task(){ TaskRow t=new TaskRow();t.setId(10L);t.setTenantId(1L);t.setInboundId(30L);t.setWarehouseId(100L);t.setInboundCode("IN-1");t.setTaskStatus("CLAIMED");t.setAssigneeId(7L);t.setProcessStatus("WAIT_PALLETIZE");t.setTotalCartons(2);t.setCountedCartons(0);t.setAllocatedCartons(0);t.setDiscrepancyCartons(0);t.setVersion(1);return t; }
+ @Test void palletFromAnotherWarehouseCannotBeMixed(){
+  PalletRow other=pallet(); other.setWarehouseId(101L);
+  when(mapper.task(10L,100L)).thenReturn(task()); when(mapper.palletCount(10L)).thenReturn(2);
+  when(mapper.label(10L,"BOX-1")).thenReturn(label()); when(mapper.palletByNo("DP-260911-0001")).thenReturn(other);
+  assertThatThrownBy(()->service.countCarton(10L,countRequest("DP-260911-0001"),7L,"张三"))
+   .isInstanceOf(BizException.class).hasMessageContaining("当前作业仓库");
+ }
+
+ @Test void unknownPalletCodeCannotCreateAnAdHocPallet(){
+  when(mapper.task(10L,100L)).thenReturn(task()); when(mapper.palletCount(10L)).thenReturn(2); when(mapper.label(10L,"BOX-1")).thenReturn(label());
+  var request=countRequest("DP-260911-9999");
+  assertThatThrownBy(()->service.countCarton(10L,request,7L,"张三")).isInstanceOf(BizException.class).hasMessageContaining("测量审核后生成");
+  verify(mapper,never()).insertPallet(anyLong(),anyLong(),anyLong(),anyLong(),anyLong(),anyString(),anyString(),anyLong(),anyString());
+ }
+
+ private static InboundOrderEntity dropshipInbound(){InboundOrderEntity i=new InboundOrderEntity();i.setId(30L);i.setTenantId(1L);i.setWarehouseId(100L);i.setFulfillmentType("ONE_CLICK_DROPSHIP");i.setTotalPackageCount(8);i.setPalletCount(2);return i;}
+ @Test void incompletePreGeneratedPalletsBlockCounting(){
+  when(mapper.task(10L,100L)).thenReturn(task()); when(mapper.palletCount(10L)).thenReturn(0); when(mapper.label(10L,"BOX-1")).thenReturn(label());
+  var result=service.resolveCarton(10L,100L,"BOX-1",7L);
+  assertThat(result.canCount()).isFalse(); assertThat(result.blockReason()).contains("预计 2 托").contains("当前仅生成 0 个托盘码");
+  assertThatThrownBy(()->service.countCarton(10L,countRequest(null),7L,"张三"))
+   .isInstanceOf(BizException.class).hasMessageContaining("预计 2 托");
+ }
+
+ private static TaskRow task(){TaskRow t=new TaskRow();t.setId(10L);t.setTenantId(1L);t.setInboundId(30L);t.setWarehouseId(100L);t.setInboundCode("IN-1");t.setTaskStatus("CLAIMED");t.setAssigneeId(7L);t.setProcessStatus("WAIT_PALLETIZE");t.setTotalCartons(2);t.setCountedCartons(0);t.setAllocatedCartons(0);t.setDiscrepancyCartons(0);t.setExpectedPalletCount(2);t.setVersion(1);return t;}
  private static LabelRow label(){LabelRow l=new LabelRow();l.setCartonLabelId(50L);l.setInboundDetailId(40L);l.setSkuCode("SKU-1");l.setCargoName("货物");l.setUnitsPerCarton(12);l.setInboundCode("IN-1");l.setBoxCode("BOX-1");return l;}
- private static PalletRow pallet(){PalletRow p=new PalletRow();p.setId(20L);p.setTaskId(10L);p.setTenantId(1L);p.setInboundId(30L);p.setWarehouseId(100L);p.setPalletNo("DP-260908-0001");p.setPalletStatus("OPEN");p.setVersion(1);return p;}
- private static CartonRow carton(){CartonRow c=new CartonRow();c.setId(60L);c.setTaskId(10L);c.setPalletId(20L);c.setPalletNo("DP-260908-0001");c.setInboundId(30L);c.setInboundDetailId(40L);c.setSkuCode("SKU-1");c.setCargoName("货物");c.setBoxCode("BOX-1");c.setExpectedSkuQuantity(12);c.setActualSkuQuantity(12);c.setDiscrepancyStatus("MATCH");return c;}
+ private static LabelSkuRow labelSku(){LabelSkuRow l=new LabelSkuRow();l.setInboundDetailId(40L);l.setSkuCode("SKU-1");l.setCargoName("货物");l.setExpectedQuantity(12);l.setLineNo(1);return l;}
+ private static CartonSkuRow cartonSku(){CartonSkuRow l=new CartonSkuRow();l.setInboundDetailId(40L);l.setSkuCode("SKU-1");l.setCargoName("货物");l.setExpectedQuantity(12);l.setActualQuantity(12);l.setDiscrepancyStatus("MATCH");l.setLineNo(1);return l;}
+ private static CountCartonRequest countRequest(String palletNo){return new CountCartonRequest(100L,"BOX-1",java.util.List.of(new CountSkuLine(40L,"SKU-1",12,DiscrepancyAction.MATCH,null)),palletNo,"op-1");}
+ private static PalletRow pallet(){PalletRow p=new PalletRow();p.setId(20L);p.setTaskId(10L);p.setTenantId(1L);p.setInboundId(30L);p.setWarehouseId(100L);p.setPalletNo("DP-260911-0001");p.setPalletStatus("OPEN");p.setVersion(1);return p;}
+ private static CartonRow carton(){CartonRow c=new CartonRow();c.setId(60L);c.setTaskId(10L);c.setPalletId(20L);c.setInboundId(30L);c.setInboundDetailId(40L);c.setPalletNo("DP-260911-0001");c.setSkuCode("SKU-1");c.setCargoName("货物");c.setBoxCode("BOX-1");c.setExpectedSkuQuantity(12);c.setActualSkuQuantity(12);c.setDiscrepancyStatus("MATCH");return c;}
 }
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java
index b0b6aeebf..77b1c98a6 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java
@@ -461,7 +461,6 @@ class FbaPricingServiceTest {
         inbound.setProcessStatus("WAIT_SPLIT");
         inbound.setFeeStatus("SENT");
         InboundFeeEntity current = savedFee("SENT");
-        current.setCustomerConfirmedAt(NOW.minusHours(1));
         AtomicReference<InboundFeeEntity> inserted = new AtomicReference<>();
         when(repository.findInbound(TENANT, INBOUND)).thenReturn(inbound);
         when(repository.findLatestFee(TENANT, INBOUND)).thenReturn(current);
@@ -531,10 +530,10 @@ class FbaPricingServiceTest {
     }
 
     @Test
-    @DisplayName("客户已确认且装柜完成时拒绝平台再次修改")
+    @DisplayName("客户确认后即拒绝平台再次修改")
     void rejectsAdjustmentAfterCustomerConfirmation() {
         InboundPricingEntity inbound = inbound("10", "1");
-        inbound.setProcessStatus("LOADED");
+        inbound.setProcessStatus("WAIT_SPLIT");
         InboundFeeEntity current = savedFee("SENT");
         current.setCustomerConfirmedAt(NOW);
         when(repository.findInbound(TENANT, INBOUND)).thenReturn(inbound);
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
index 50df8f106..469493151 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
@@ -4,6 +4,8 @@ import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.firstleg.client.PrintPdfClient;
 import com.baiyue.firstleg.dto.InboundCartonLabels;
+import com.baiyue.firstleg.dto.DropshipPalletizationDtos.Pallet;
+import com.baiyue.firstleg.dto.DropshipPalletizationDtos.SkuItem;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,6 +37,63 @@ class InboundCartonLabelPrintServiceTest {
         ReflectionTestUtils.setField(service, "internalToken", "internal-token");
     }
 
+    @Test
+    void dropshipPalletLabelIsAvailableBeforeSeal() {
+        Pallet open = dropshipPallet("OPEN");
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_PDF);
+        when(print.generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.anyString(),
+            org.mockito.ArgumentMatchers.eq("request-open"), org.mockito.ArgumentMatchers.any()))
+            .thenReturn(new ResponseEntity<>(new byte[] {7, 8, 9}, headers,
+                org.springframework.http.HttpStatus.OK));
+
+        ResponseEntity<byte[]> response = service.generateDropshipPallet(open, "PCHK2608040174", "request-open");
+        assertThat(response.getBody()).containsExactly(7, 8, 9);
+
+        ArgumentCaptor<PrintPdfClient.DropshipPalletA4PdfRequest> request =
+            ArgumentCaptor.forClass(PrintPdfClient.DropshipPalletA4PdfRequest.class);
+        verify(print).generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.eq("internal-token"),
+            org.mockito.ArgumentMatchers.eq("request-open"), request.capture());
+        assertThat(request.getValue().templateCode()).isEqualTo("DROPSHIP_PALLET_A4_V1");
+        assertThat(request.getValue().pageSpec().widthMm()).isEqualByComparingTo("210");
+        assertThat(request.getValue().pageSpec().heightMm()).isEqualByComparingTo("297");
+        assertThat(request.getValue().documents()).singleElement().satisfies(document -> {
+            assertThat(document.palletNo()).isEqualTo("DP-260911-0001");
+            assertThat(document.inboundCodes()).isEqualTo("PCHK2608040174");
+            assertThat(document.skuRows()).singleElement().satisfies(row -> {
+                assertThat(row.skuCode()).isEqualTo("SKU-1");
+                assertThat(row.cargoName()).isEqualTo("音箱");
+                assertThat(row.cartonCount()).isEqualTo(1);
+                assertThat(row.skuQuantity()).isEqualTo(19);
+            });
+        });
+    }
+
+    @Test
+    void multiplePreGeneratedPalletsAreReturnedInOnePdf() {
+        Pallet first = dropshipPallet("OPEN");
+        Pallet second = new Pallet(90002L, "DP-260911-0002", "OPEN", 0, 0, 0,
+            BigDecimal.ZERO, BigDecimal.ZERO, 1, List.of(), List.of(), null);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_PDF);
+        when(print.generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.anyString(),
+            org.mockito.ArgumentMatchers.eq("request-all"), org.mockito.ArgumentMatchers.any()))
+            .thenReturn(new ResponseEntity<>(new byte[] {4, 5, 6}, headers,
+                org.springframework.http.HttpStatus.OK));
+
+        ResponseEntity<byte[]> response = service.generateDropshipPallets(
+            List.of(first, second), "PCHK2608040174", "request-all");
+
+        ArgumentCaptor<PrintPdfClient.DropshipPalletA4PdfRequest> request =
+            ArgumentCaptor.forClass(PrintPdfClient.DropshipPalletA4PdfRequest.class);
+        verify(print).generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.eq("internal-token"),
+            org.mockito.ArgumentMatchers.eq("request-all"), request.capture());
+        assertThat(request.getValue().documents()).extracting("palletNo")
+            .containsExactly("DP-260911-0001", "DP-260911-0002");
+        assertThat(request.getValue().downloadFileName()).contains("2托");
+        assertThat(response.getBody()).containsExactly(4, 5, 6);
+    }
+
     @Test
     void forwardsStableLabelsAndOnlySafePdfHeaders() {
         when(labels.list(10001L, 70001L, List.of(1))).thenReturn(batch());
@@ -159,4 +218,11 @@ class InboundCartonLabelPrintServiceTest {
             "PCHK2608040174", "MCC1", "CTNS:19-1", "洛杉矶普船海卡");
         return new InboundCartonLabels.Batch(70001L, 80001L, "PCHK2608040174", 19, List.of(label));
     }
+
+    private Pallet dropshipPallet(String status) {
+        SkuItem item = new SkuItem(70001L, "PCHK2608040174", 2L,
+            "SKU-1", "音箱", 1, 19, List.of("PCHK2608040174#19-1"));
+        return new Pallet(90001L, "DP-260911-0001", status, 1, 1, 0,
+            BigDecimal.ONE, BigDecimal.ONE, 1, List.of(item), List.of(), null);
+    }
 }
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelServiceTest.java
index fdc78fd50..505f3dfb2 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelServiceTest.java
@@ -7,6 +7,7 @@ import com.baiyue.firstleg.client.PrintableOrderInboundClient;
 import com.baiyue.firstleg.entity.InboundCartonLabelEntity;
 import com.baiyue.firstleg.entity.InboundOrderEntity;
 import com.baiyue.firstleg.repository.InboundCartonLabelRepository;
+import com.baiyue.firstleg.mapper.InboundCartonLabelSkuMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -18,6 +19,7 @@ import org.springframework.test.util.ReflectionTestUtils;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -32,6 +34,7 @@ class InboundCartonLabelServiceTest {
     @Mock private OrderCargoClient orderCargoClient;
     @Mock private PrintableOrderInboundClient printableOrderInboundClient;
     @Mock private InboundOrderCreationService inboundOrderCreationService;
+    @Mock private InboundCartonLabelSkuMapper labelSkus;
     private InboundCartonLabelService service;
 
     @BeforeEach
@@ -41,6 +44,7 @@ class InboundCartonLabelServiceTest {
         ReflectionTestUtils.setField(service, "orderCargoClient", orderCargoClient);
         ReflectionTestUtils.setField(service, "printableOrderInboundClient", printableOrderInboundClient);
         ReflectionTestUtils.setField(service, "inboundOrderCreationService", inboundOrderCreationService);
+        ReflectionTestUtils.setField(service, "labelSkus", labelSkus);
         ReflectionTestUtils.setField(service, "internalToken", "internal-token");
     }
 
@@ -75,6 +79,43 @@ class InboundCartonLabelServiceTest {
         verify(repository).updatePackageCount(10001L, 70001L, 5);
     }
 
+    @Test
+    void mixedCartonGroupCreatesOnePhysicalBoxSeriesWithEverySkuLine() {
+        InboundOrderEntity inbound = inbound();
+        inbound.setFulfillmentType("ONE_CLICK_DROPSHIP");
+        when(repository.lockInbound(10001L, 70001L)).thenReturn(inbound);
+        when(repository.findActiveByInbound(10001L, 70001L)).thenReturn(new ArrayList<>());
+        when(repository.findByInbound(10001L, 70001L)).thenReturn(new ArrayList<>());
+        var skuA = mixedCargo(80001L, 1, "SKU-A", 2, 3, "A");
+        var skuB = mixedCargo(80002L, 2, "SKU-B", 5, 3, "A");
+        when(orderCargoClient.listForCartonLabels("internal-token", 10001L, 60001L))
+            .thenReturn(ApiResponse.success(List.of(skuA, skuB)));
+
+        var batch = service.getOrCreate(10001L, 70001L);
+
+        assertThat(batch.totalCount()).isEqualTo(3);
+        verify(labelSkus, org.mockito.Mockito.times(6)).insert(any(Long.class),
+            org.mockito.ArgumentMatchers.eq(10001L), org.mockito.ArgumentMatchers.eq(70001L), any(Long.class),
+            any(Long.class), any(String.class), any(), any(Integer.class), any(Integer.class));
+    }
+
+    @Test
+    void mixedCartonSkuSummaryStaysWithinPrintContractLimit() {
+        InboundCartonLabelEntity label = new InboundCartonLabelEntity();
+        label.setId(90001L);
+        List<InboundCartonLabelSkuMapper.SkuRow> rows = List.of(
+            skuRow(90001L, "SKU-SMALL-ADMIN-API-20260911081504632"),
+            skuRow(90001L, "SKU-MEDIUM-ADMIN-API-20260911081504632"),
+            skuRow(90001L, "SKU-LARGE-ADMIN-API-20260911081504632"),
+            skuRow(90001L, "SKU-EXTRA-LARGE-ADMIN-API-20260911081504632"));
+
+        String summary = ReflectionTestUtils.invokeMethod(service, "displaySkuCodes", label,
+            Map.of(90001L, rows));
+
+        assertThat(summary.codePointCount(0, summary.length())).isLessThanOrEqualTo(64);
+        assertThat(summary).startsWith("SKU-SMALL-").endsWith(" / +3 SKU");
+    }
+
     @Test
     void repeatedAndPartialPrintsReadFrozenMappingWithoutReallocation() {
         InboundOrderEntity inbound = inbound();
@@ -283,6 +324,19 @@ class InboundCartonLabelServiceTest {
             new BigDecimal(length), new BigDecimal(width), new BigDecimal(height));
     }
 
+    private OrderCargoClient.CargoLabelBinding mixedCargo(long id, int itemNo, String sku,
+                                                           int units, int count, String group) {
+        return new OrderCargoClient.CargoLabelBinding(id, 60001L, itemNo, "货物" + itemNo, sku, count,
+            units, new BigDecimal("60"), new BigDecimal("40"), new BigDecimal("30"), null, group);
+    }
+
+    private InboundCartonLabelSkuMapper.SkuRow skuRow(long labelId, String skuCode) {
+        InboundCartonLabelSkuMapper.SkuRow row = new InboundCartonLabelSkuMapper.SkuRow();
+        row.setCartonLabelId(labelId);
+        row.setSkuCode(skuCode);
+        return row;
+    }
+
     private List<InboundCartonLabelEntity> labels(InboundOrderEntity inbound, int total) {
         List<InboundCartonLabelEntity> values = new ArrayList<>();
         for (int index = 1; index <= total; index++) {
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundMeasurementServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundMeasurementServiceTest.java
index b4aeb5d9f..dbb5b29cc 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundMeasurementServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundMeasurementServiceTest.java
@@ -1188,7 +1188,8 @@ class InboundMeasurementServiceTest {
         assertThatThrownBy(() -> service.submit(1L, 10L, 9L,
             new InboundMeasurementRequests.SubmitRequest(30L, 0)))
             .isInstanceOf(BizException.class)
-            .hasMessageContaining("至少上传并确认一张称重图片");
+            .hasMessageContaining("即使只有一箱")
+            .hasMessageContaining("上传并确认至少一张称重图片");
 
         verify(repository, never()).updateMeasurement(any());
         verify(repository, never()).updateInbound(any());
@@ -1212,7 +1213,8 @@ class InboundMeasurementServiceTest {
         assertThatThrownBy(() -> service.submit(1L, 10L, 9L,
             new InboundMeasurementRequests.SubmitRequest(30L, 0)))
             .isInstanceOf(BizException.class)
-            .hasMessageContaining("至少上传并确认一张称重图片");
+            .hasMessageContaining("即使只有一箱")
+            .hasMessageContaining("上传并确认至少一张称重图片");
 
         verify(repository, never()).updateMeasurement(any());
         verify(repository, never()).updateInbound(any());
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java
index 76adbe620..09ca1e1d2 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java
@@ -290,8 +290,8 @@ class LoadingCompletedOutboxServiceTest {
         if (actualBinding) {
             when(snapshots.workPalletCount(90L)).thenReturn(1);
             when(snapshots.actualPalletRows(90L)).thenReturn(List.of(
-                actualPallet(11,100,"DP-260909-0001",102,"SAME-SKU","BOX-102"),
-                actualPallet(11,100,"DP-260909-0001",101,"SAME-SKU","BOX-101")));
+                actualPallet(11,100,"DP-260909-0001",102,"SAME-SKU","BOX-102",20),
+                actualPallet(11,100,"DP-260909-0001",101,"SAME-SKU","BOX-101",10)));
         } else {
             when(snapshots.palletRows(90L)).thenReturn(List.of(
                 pallet(11,100,1,"DP-260909-0001",2,102,"SAME-SKU",1,20,"BOX-102"),
@@ -348,10 +348,10 @@ class LoadingCompletedOutboxServiceTest {
         when(snapshots.rows(90L)).thenReturn(List.of(first, second));
         when(snapshots.workPalletCount(90L)).thenReturn(2);
         when(snapshots.actualPalletRows(90L)).thenReturn(List.of(
-            actualPallet(11,100,"PLT-01",101,"SKU-A","BOX-A2"),
-            actualPallet(11,100,"PLT-01",102,"SKU-B","BOX-B1"),
-            actualPallet(11,100,"PLT-02",101,"SKU-A","BOX-A1"),
-            actualPallet(11,100,"PLT-02",102,"SKU-B","BOX-B2")));
+            actualPallet(11,100,"PLT-01",101,"SKU-A","BOX-A2",10),
+            actualPallet(11,100,"PLT-01",102,"SKU-B","BOX-B1",5),
+            actualPallet(11,100,"PLT-02",101,"SKU-A","BOX-A1",10),
+            actualPallet(11,100,"PLT-02",102,"SKU-B","BOX-B2",5)));
 
         service.publish(90L);
 
@@ -362,6 +362,9 @@ class LoadingCompletedOutboxServiceTest {
             .isEqualTo("BOX-A2");
         assertThat(event.payload().at("/orders/0/pallets/1/skuPackages/0/cartonMarks/0").asText())
             .isEqualTo("BOX-A1");
+        assertThat(event.payload().at("/orders/0/pallets/0/manifestHash").asText())
+            .matches("[0-9a-f]{64}")
+            .doesNotStartWith("sha256:");
     }
 
     @Test
@@ -422,9 +425,10 @@ class LoadingCompletedOutboxServiceTest {
     }
 
     private PalletRow actualPallet(long account,long inbound,String palletNo,long detail,
-                                   String sku,String boxCode) {
+                                   String sku,String boxCode,int actualSkuQuantity) {
         PalletRow row = pallet(account,inbound,0,palletNo,1,detail,sku,1,1,boxCode);
         row.setActualBinding(true);
+        row.setActualSkuQuantity(actualSkuQuantity);
         return row;
     }
 
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingListServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingListServiceTest.java
index fe004951c..1302c4097 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingListServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingListServiceTest.java
@@ -681,6 +681,48 @@ class LoadingListServiceTest {
             eq("COMPLETED"), eq("COMPLETED"), anyString(), anyString(), eq(9L), eq("operator"), isNull());
     }
 
+    @Test
+    void seaRailContainerCannotUploadDeliveryOrder() {
+        AggregateRow plan = row("COMPLETED", 4);
+        plan.setChannelCode("OA_CHICAGO_RAIL");
+        var file = new MockMultipartFile("file", "do.pdf", "application/pdf", "do".getBytes());
+        when(repository.aggregateByBooking(30L)).thenReturn(plan);
+
+        assertThatThrownBy(() -> service.uploadContainerLogisticsDocument(30L,
+            LoadingListService.DELIVERY_ORDER, 9L, "operator", "do-rail", 0, null, file))
+            .isInstanceOf(BizException.class)
+            .hasMessageContaining("海铁渠道不适用DO资料");
+        verifyNoInteractions(documentFiles);
+    }
+
+    @Test
+    void domesticStageContainerCannotUploadDeliveryOrder() {
+        AggregateRow plan = row("COMPLETED", 4);
+        plan.setOutboundConfirmedAt(null);
+        var file = new MockMultipartFile("file", "do.pdf", "application/pdf", "do".getBytes());
+        when(repository.aggregateByBooking(30L)).thenReturn(plan);
+
+        assertThatThrownBy(() -> service.uploadContainerLogisticsDocument(30L,
+            LoadingListService.DELIVERY_ORDER, 9L, "operator", "do-domestic", 0, null, file))
+            .isInstanceOf(BizException.class)
+            .hasMessageContaining("进入海外履约后");
+        verifyNoInteractions(documentFiles);
+    }
+
+    @Test
+    void returnedContainerCannotUploadDeliveryOrder() {
+        AggregateRow plan = row("COMPLETED", 4);
+        plan.setActualEmptyReportedAt(java.time.LocalDateTime.now());
+        var file = new MockMultipartFile("file", "do.pdf", "application/pdf", "do".getBytes());
+        when(repository.aggregateByBooking(30L)).thenReturn(plan);
+
+        assertThatThrownBy(() -> service.uploadContainerLogisticsDocument(30L,
+            LoadingListService.DELIVERY_ORDER, 9L, "operator", "do-returned", 0, null, file))
+            .isInstanceOf(BizException.class)
+            .hasMessageContaining("已还柜");
+        verifyNoInteractions(documentFiles);
+    }
+
     @Test
     void staleDeliveryOrderVersionReturnsConflictBeforeUploadingAnotherFile() {
         AggregateRow plan = row("COMPLETED", 4);
@@ -918,6 +960,8 @@ class LoadingListServiceTest {
         row.setContainerBookingId(30L);
         row.setPlanStatus(status);
         row.setWarehouseId(100L);
+        row.setChannelCode("OA_LA_TRUCK");
+        row.setOutboundConfirmedAt(java.time.LocalDateTime.now());
         row.setVersion(version);
         return row;
     }
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java
index 2f93adf23..10c5cfe43 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java
@@ -337,9 +337,9 @@ class LoadingPickServiceTest {
         row.setAssignmentVersion(0);
         row.setItemCount(1);
         row.setPendingItemCount(0);
-        when(repository.pendingTasks(9L, null)).thenReturn(List.of(row));
+        when(repository.pendingTasks(9L, 200001L, null)).thenReturn(List.of(row));
 
-        var result = service.pendingTasks(9L, null).get(0);
+        var result = service.pendingTasks(9L, 200001L, null).get(0);
 
         assertThat(result.sourceType()).isEqualTo("SIMULATION");
         assertThat(result.recordStatus()).isEqualTo("ACTIVE");
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/MeasurementReviewServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/MeasurementReviewServiceTest.java
index 47d037ebd..291dc1e8f 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/MeasurementReviewServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/MeasurementReviewServiceTest.java
@@ -135,6 +135,41 @@ class MeasurementReviewServiceTest {
         verify(fixture.repository, never()).transitionReview(anyLong(), anyLong(), anyLong(), anyInt(), anyBoolean(), anyLong());
     }
 
+    @Test
+    @DisplayName("历史异常测量已提交但没有称重图片时提示退回补录")
+    void shouldExplainHowToRecoverSubmittedMeasurementWithoutWeightImage() {
+        Fixture fixture = fixture(false);
+        when(measurements.listWeights(10001L, 10L)).thenReturn(List.of());
+
+        assertThatThrownBy(() -> fixture.service.approve(10001L, 9L, "审核员", 10L,
+            "approve-without-weight", new MeasurementReviewRequest(20L, 3, null)))
+            .isInstanceOf(BizException.class)
+            .hasMessageContaining("已提交但没有称重图片")
+            .hasMessageContaining("先退回测量")
+            .hasMessageContaining("即使只有一箱也必须称重");
+
+        verify(fixture.repository, never()).transitionReview(
+            anyLong(), anyLong(), anyLong(), anyInt(), anyBoolean(), anyLong());
+    }
+
+    @Test
+    @DisplayName("已上传但未确认的称重图片提示在审核弹框修正")
+    void shouldExplainHowToConfirmInvalidWeightImageDuringReview() {
+        Fixture fixture = fixture(false);
+        InboundWeightResultEntity pending = confirmedWeight("357.500", "349.500");
+        pending.setRecognitionStatus("PENDING_CONFIRM");
+        when(measurements.listWeights(10001L, 10L)).thenReturn(List.of(pending));
+
+        assertThatThrownBy(() -> fixture.service.approve(10001L, 9L, "审核员", 10L,
+            "approve-pending-weight", new MeasurementReviewRequest(20L, 3, null)))
+            .isInstanceOf(BizException.class)
+            .hasMessageContaining("未确认或重量无效")
+            .hasMessageContaining("在审核弹框逐张修正并确认");
+
+        verify(fixture.repository, never()).transitionReview(
+            anyLong(), anyLong(), anyLong(), anyInt(), anyBoolean(), anyLong());
+    }
+
     @Test
     @DisplayName("多SKU测量行的箱数、重量、体积和体积重守恒后才能进入WAIT_SPLIT")
     void shouldApproveMultipleCargoLinesOnlyWhenAllFrozenTotalsMatch() {
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/PdaWarehouseCatalogServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/PdaWarehouseCatalogServiceTest.java
new file mode 100644
index 000000000..521bb9f12
--- /dev/null
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/PdaWarehouseCatalogServiceTest.java
@@ -0,0 +1,39 @@
+package com.baiyue.firstleg.service;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.firstleg.client.WarehouseMasterDataClient;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class PdaWarehouseCatalogServiceTest {
+    @Test
+    void returnsDomesticWarehouseMasterDataWithoutHardcodedOptions() {
+        WarehouseMasterDataClient client = mock(WarehouseMasterDataClient.class);
+        PdaWarehouseCatalogService service = new PdaWarehouseCatalogService();
+        ReflectionTestUtils.setField(service, "warehouses", client);
+        ReflectionTestUtils.setField(service, "internalToken", "token");
+        var option = new WarehouseMasterDataClient.WarehouseOption(200001L, "CN-DONGGUAN-01", "东莞仓");
+        when(client.domestic("token")).thenReturn(ApiResponse.success(List.of(option)));
+
+        assertThat(service.activeDomesticWarehouses()).containsExactly(option);
+    }
+
+    @Test
+    void failsClosedWhenWarehouseDirectoryIsUnavailable() {
+        WarehouseMasterDataClient client = mock(WarehouseMasterDataClient.class);
+        PdaWarehouseCatalogService service = new PdaWarehouseCatalogService();
+        ReflectionTestUtils.setField(service, "warehouses", client);
+        ReflectionTestUtils.setField(service, "internalToken", "token");
+        when(client.domestic("token")).thenThrow(new IllegalStateException("down"));
+
+        assertThatThrownBy(service::activeDomesticWarehouses).isInstanceOf(BizException.class);
+    }
+}
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/PlatformPriceBookServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/PlatformPriceBookServiceTest.java
index 5729b9a57..1e6ff9f5a 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/PlatformPriceBookServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/PlatformPriceBookServiceTest.java
@@ -137,7 +137,30 @@ class PlatformPriceBookServiceTest {
         assertThat(Arrays.stream(PlatformPriceBookService.class.getDeclaredMethods())
             .filter(method -> java.lang.reflect.Modifier.isPublic(method.getModifiers()))
             .map(java.lang.reflect.Method::getName).toList())
-            .containsOnly("list", "upload", "detail", "publish", "source");
+            .containsOnly("list", "upload", "detail", "publish", "voidPending", "source");
+    }
+
+    @Test
+    void voidsPendingVersionAndRetainsReasonForAudit() {
+        PriceBookVersionEntity pending = version(41L, PriceBookStatus.PENDING_CONFIRMATION);
+        when(repository.findVersion(41L)).thenReturn(pending);
+        org.mockito.Mockito.doAnswer(invocation -> {
+            PriceBookVersionEntity value = invocation.getArgument(0);
+            value.setStatus(PriceBookStatus.VOIDED.name());
+            value.setVoidedBy(7L);
+            value.setVoidReason(invocation.getArgument(3));
+            return null;
+        }).when(repository).voidPending(any(), any(), any(Long.class), any());
+        when(repository.listChannels(41L)).thenReturn(List.of());
+        when(repository.listRates(41L)).thenReturn(List.of());
+
+        var result = service.voidPending(41L, 7L, new PriceBookDtos.PriceBookVoidRequest("  上传错误  "));
+
+        assertThat(result.version().status()).isEqualTo(PriceBookStatus.VOIDED);
+        assertThat(result.version().voidedBy()).isEqualTo(7L);
+        assertThat(result.version().voidReason()).isEqualTo("上传错误");
+        verify(repository).lockPlatformVersions();
+        verify(repository).voidPending(any(), any(), any(Long.class), org.mockito.ArgumentMatchers.eq("上传错误"));
     }
 
     @Test
@@ -284,6 +307,21 @@ class PlatformPriceBookServiceTest {
         verify(repository, never()).activate(any(), any(), any(Long.class));
     }
 
+    @Test
+    void olderPendingVersionCannotReplaceNewerActiveVersion() {
+        PriceBookVersionEntity pending = version(5L, PriceBookStatus.PENDING_CONFIRMATION);
+        PriceBookVersionEntity active = version(8L, PriceBookStatus.ACTIVE);
+        when(repository.findVersion(5L)).thenReturn(pending);
+        when(repository.listActiveForUpdate()).thenReturn(List.of(active));
+
+        assertThatThrownBy(() -> service.publish(5L, 7L, confirmation("CN-YIWU-01", 501L)))
+            .isInstanceOf(BizException.class)
+            .hasMessageContaining("早于当前生效版本");
+
+        verify(repository).lockPlatformVersions();
+        verify(repository, never()).activate(any(), any(), any(Long.class));
+    }
+
     private static PriceBookVersionEntity version(long id, PriceBookStatus status) {
         PriceBookVersionEntity value = new PriceBookVersionEntity();
         value.setId(id);
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/SmartLoadingServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/SmartLoadingServiceTest.java
index fbae44ef2..c465a7e8f 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/SmartLoadingServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/SmartLoadingServiceTest.java
@@ -171,11 +171,11 @@ class SmartLoadingServiceTest {
     @Test
     void groupsCandidateSpecificationsByInboundCodeForQuantityOnlyPlanning() {
         Candidate first = new Candidate(9L, 10L, 20L, 30L, "O", "I", 100L,
-            "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "服装", 3,
+            "MATSON_CLX_TRUCK", "美森正班海卡", 200L, "FBA1", "FBA仓", "客户", "服装", 3,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.2"),
             null, null, null, null, null, null, "WAIT_SPLIT", LocalDateTime.parse("2026-09-10T09:30:00"));
         Candidate second = new Candidate(9L, 10L, 21L, 30L, "O", "I", 100L,
-            "FBA", "FBA渠道", 200L, "FBA1", "FBA仓", "客户", "鞋类", 7,
+            "MATSON_CLX_TRUCK", "美森正班海卡", 200L, "FBA1", "FBA仓", "客户", "鞋类", 7,
             new BigDecimal("2"), new BigDecimal("1.5"), new BigDecimal("0.5"),
             null, null, null, null, null, null, "WAIT_SPLIT", LocalDateTime.parse("2026-09-10T09:30:00"));
         when(repository.booking(99L)).thenReturn(booking());
@@ -515,7 +515,7 @@ class SmartLoadingServiceTest {
     @Test
     void pagesWorkbenchContainersWithTheSameGlobalFilters() {
         WorkbenchContainer container = new WorkbenchContainer(99L, "CB-1", "CAB-1", null,
-            100L, "义乌仓", "MATSON_CLX_TRUCK", "美森正班海卡", "40HC",
+            100L, "义乌仓", "MATSON_CLX", null, null, "40HC",
             new BigDecimal("68"), new BigDecimal("28000"),
             1L, "LP-1", "EDITING", 2);
         WorkbenchContainerQuery query = new WorkbenchContainerQuery(List.of("MATSON_CLX"), 100L,
@@ -530,8 +530,7 @@ class SmartLoadingServiceTest {
         @SuppressWarnings("unchecked") ArgumentCaptor<java.util.Set<String>> channels =
             ArgumentCaptor.forClass(java.util.Set.class);
         verify(repository).workbenchContainers(eq(query), channels.capture());
-        assertThat(channels.getValue()).containsExactlyInAnyOrder(
-            "MATSON_CLX_TRUCK", "MATSON_CLX_PARCEL");
+        assertThat(channels.getValue()).containsExactly("MATSON_CLX");
     }
 
     @Test
@@ -1694,7 +1693,7 @@ class SmartLoadingServiceTest {
     private static Candidate candidate(long tenantId, long inboundId, long detailId, long orderId, int boxes,
                                        String destinationCode) {
         return new Candidate(tenantId, inboundId, detailId, orderId, "O" + orderId, "I" + inboundId,
-            100L, "FBA", "FBA渠道", 200L, destinationCode, "FBA仓", "客户", "货物", boxes,
+            100L, "MATSON_CLX_TRUCK", "美森正班海卡", 200L, destinationCode, "FBA仓", "客户", "货物", boxes,
             new BigDecimal("2"), new BigDecimal("1.5"),
             new BigDecimal("0.5"), null, null, null, null, null, null, null, null);
     }
@@ -1771,7 +1770,7 @@ class SmartLoadingServiceTest {
     private static ContainerBookingEntity booking() {
         ContainerBookingEntity value = new ContainerBookingEntity();
         value.setId(99L); value.setWarehouseId(100L); value.setDestinationWarehouseCode("FBA1");
-        value.setChannelCode("FBA");
+        value.setChannelGroupCode("MATSON_CLX"); value.setChannelCode(null);
         value.setContainerNo("MSCU1234567");
         value.setCapacityCbm(new BigDecimal("60")); value.setMaxWeightKg(new BigDecimal("20000"));
         return value;
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/split/service/SplitPreloadServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/split/service/SplitPreloadServiceTest.java
index ceca203bf..0f52cade2 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/split/service/SplitPreloadServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/split/service/SplitPreloadServiceTest.java
@@ -84,14 +84,16 @@ class SplitPreloadServiceTest {
     }
 
     @Test
-    void loadingAllocationDoesNotOverwriteConfirmedPreload() {
+    void loadingAllocationMayReuseConfirmingAndConfirmedPreloads() {
         when(repository.findInbound(10, 20)).thenReturn(new InboundSnapshot(20L, 10L, "WAIT_SPLIT", 3));
-        PreloadPlanEntity plan = new PreloadPlanEntity();
-        plan.setStatus("CONFIRMING");
-        when(repository.findPlan(10, 20)).thenReturn(plan);
+        PreloadPlanEntity confirming = new PreloadPlanEntity();
+        confirming.setStatus("CONFIRMING");
+        PreloadPlanEntity confirmed = new PreloadPlanEntity();
+        confirmed.setStatus("CONFIRMED");
+        when(repository.findPlan(10, 20)).thenReturn(confirming, confirmed);
 
-        assertThatThrownBy(() -> service.ensurePendingForLoadingAllocation(10, 20, 7, "admin"))
-            .hasMessageContaining("已进入确认流程");
+        service.ensurePendingForLoadingAllocation(10, 20, 7, "admin");
+        service.ensurePendingForLoadingAllocation(10, 20, 7, "admin");
 
         verify(repository, never()).createPlan(any());
     }
diff --git a/iam/AGENTS.md b/iam/AGENTS.md
index ce4dddaca..e8e8b4c46 100644
--- a/iam/AGENTS.md
+++ b/iam/AGENTS.md
@@ -12,7 +12,7 @@
 
 | 目标 | 入口 |
 |---|---|
-| 客户资料/审核与企业联系信息 | `controller/PlatformTenantController.java`、`service/TenantService.java`；公司联系电话/邮箱属于企业资料，不作为登录标识且不要求跨企业唯一；审核必填资质仅营业执照与统一社会信用代码，法人身份证选填 |
+| 客户资料/审核与企业联系信息 | `controller/PlatformTenantController.java`、`service/TenantService.java`；企业客户编号由 `CustomerCodeRepository` 在创建事务内从 `00001` 起分配固定五位数字，平台技术主体仍为 `PLATFORM`；公司联系电话/邮箱属于企业资料，不作为登录标识且不要求跨企业唯一；审核必填资质仅营业执照与统一社会信用代码，法人身份证选填 |
 | 客户默认箱规与权重系数初始化、重试及补偿 | `service/CustomerDimensionRuleInitializationService.java`、`CustomerDimensionInitializationRelay.java`、`repository/CustomerDimensionInitializationRepository.java`、`client/CustomerDimensionRuleClient.java`、`model/CustomerDimensionInitializationTask.java`；持久任务异步调用 Firstleg `/internal/firstleg/v1/customer-dimension-configs/defaults`，尺寸配置和默认权重系数规则均返回成功后才标记 `READY` |
 | 商户成员、登录手机号与个人资料 | `controller/MerchantTenantController.java`、`service/MemberService.java`、`service/PersonalProfileService.java`、`client/AuthAccountClient.java`；成员手机号是可选登录标识，变更时同步 Auth、撤销该账号全部会话并审计，不与公司联系电话联动 |
 | 平台用户与海外 PDA 仓绑定 | `controller/PlatformUserManagementController.java`、`service/PlatformUserManagementService.java`、`dto/PlatformUserManagementDtos.java`、`entity/IamMembership.java`；`OVERSEAS_WAREHOUSE_PDA_OPERATOR` 必须且只能绑定一个 `overseasWarehouseId` |
diff --git a/iam/src/main/java/com/baiyue/iam/controller/InternalTenantController.java b/iam/src/main/java/com/baiyue/iam/controller/InternalTenantController.java
index c59fc9cd9..044f022c2 100644
--- a/iam/src/main/java/com/baiyue/iam/controller/InternalTenantController.java
+++ b/iam/src/main/java/com/baiyue/iam/controller/InternalTenantController.java
@@ -59,6 +59,14 @@ public class InternalTenantController {
         return ApiResponse.success(onboardingService.register(request));
     }
 
+    @GetMapping("/merchant-registrations/{authUserId}")
+    public ApiResponse<MerchantRegistrationResponse> registration(
+            @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
+            @PathVariable long authUserId) {
+        verify(token);
+        return ApiResponse.success(onboardingService.registration(authUserId));
+    }
+
     @DeleteMapping("/merchant-registrations/{authUserId}/compensation")
     public ApiResponse<Void> compensateRegistration(
             @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
@@ -127,7 +135,7 @@ public class InternalTenantController {
             @RequestParam(defaultValue = "500") @Min(1) @Max(500) int limit,
             @RequestParam(required = false) String keyword,
             @RequestParam(required = false)
-            @Pattern(regexp = "PROFILE_REQUIRED|PENDING|ACTIVE|REJECTED|DISABLED|ARCHIVED") String status) {
+            @Pattern(regexp = "PROFILE_REQUIRED|PENDING|ACTIVE|REJECTED|DISABLED") String status) {
         verify(token);
         return ApiResponse.success(tenantService.exportMerchants(cursor, limit, keyword, status));
     }
diff --git a/iam/src/main/java/com/baiyue/iam/controller/PlatformTenantController.java b/iam/src/main/java/com/baiyue/iam/controller/PlatformTenantController.java
index 004b32af5..7378bee76 100644
--- a/iam/src/main/java/com/baiyue/iam/controller/PlatformTenantController.java
+++ b/iam/src/main/java/com/baiyue/iam/controller/PlatformTenantController.java
@@ -63,7 +63,7 @@ public class PlatformTenantController {
             @RequestParam(defaultValue = "20") @Min(1) @Max(200) long size,
             @RequestParam(required = false) String keyword,
             @RequestParam(required = false)
-            @Pattern(regexp = "PROFILE_REQUIRED|PENDING|ACTIVE|REJECTED|DISABLED|ARCHIVED") String status,
+            @Pattern(regexp = "PROFILE_REQUIRED|PENDING|ACTIVE|REJECTED|DISABLED") String status,
             @AuthenticationPrincipal AuthenticatedUser user) {
         TenantGuard.tenant(user, "PLATFORM");
         return ApiResponse.success(service.pageMerchants(page, size, keyword, status));
diff --git a/iam/src/main/java/com/baiyue/iam/controller/ProfileResourceController.java b/iam/src/main/java/com/baiyue/iam/controller/ProfileResourceController.java
index 7d819fa3e..9929e5734 100644
--- a/iam/src/main/java/com/baiyue/iam/controller/ProfileResourceController.java
+++ b/iam/src/main/java/com/baiyue/iam/controller/ProfileResourceController.java
@@ -3,9 +3,10 @@ package com.baiyue.iam.controller;
 import com.baiyue.common.core.api.ApiResponse;
 import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.iam.dto.ProfileDtos.AddressRequest;
+import com.baiyue.iam.dto.ProfileDtos.QualificationDeletionResponse;
+import com.baiyue.iam.dto.ProfileDtos.QualificationResponse;
 import com.baiyue.iam.dto.PlatformInternalUserDtos.*;
 import com.baiyue.iam.entity.IamTenantAddress;
-import com.baiyue.iam.entity.IamTenantQualification;
 import com.baiyue.iam.service.ProfileResourceService;
 import com.baiyue.iam.service.PlatformInternalUserService;
 import com.baiyue.iam.service.TenantGuard;
@@ -108,21 +109,48 @@ public class ProfileResourceController {
     }
 
     @GetMapping("/api/merchant/v1/iam/tenant/qualifications")
+    @PreAuthorize("hasAuthority('merchant:profile:view')")
     @Operation(summary = "List enterprise qualifications / 查询企业资质", description = "List qualification files owned by the current tenant. / 查询当前租户的资质文件。")
     @ApiResponses({@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "Qualification list returned / 查询成功")})
-    public ApiResponse<List<IamTenantQualification>> qualifications(@AuthenticationPrincipal AuthenticatedUser user) {
+    public ApiResponse<List<QualificationResponse>> qualifications(@AuthenticationPrincipal AuthenticatedUser user) {
         return ApiResponse.success(service.qualifications(TenantGuard.tenant(user, "MERCHANT")));
     }
 
+    @GetMapping("/api/merchant/v1/iam/tenant/qualifications/{qualificationId}")
+    @PreAuthorize("hasAuthority('merchant:profile:view')")
+    @Operation(summary = "查询企业资质详情", description = "客户范围来自 JWT，跨客户资质按不存在处理。")
+    public ApiResponse<QualificationResponse> qualification(
+            @PathVariable long qualificationId, @AuthenticationPrincipal AuthenticatedUser user) {
+        return ApiResponse.success(service.qualification(TenantGuard.tenant(user, "MERCHANT"), qualificationId));
+    }
+
+    @DeleteMapping("/api/merchant/v1/iam/tenant/qualifications/{qualificationId}")
+    @PreAuthorize("hasAuthority('merchant:qualification:upload')")
+    @Operation(summary = "删除送审前企业资质", description = "仅待完善或已驳回客户可删除；提交审核后服务端拒绝。重复删除幂等成功。")
+    public ApiResponse<QualificationDeletionResponse> deleteQualification(
+            @PathVariable long qualificationId, @AuthenticationPrincipal AuthenticatedUser user) {
+        return ApiResponse.success(service.deleteQualification(TenantGuard.tenant(user, "MERCHANT"), qualificationId));
+    }
+
     @GetMapping("/api/platform/v1/iam/tenants/{tenantId}/qualifications")
     @PreAuthorize("hasAuthority('platform:customer:list')")
     @Operation(summary = "查询企业客户资质", description = "只读查询企业客户资质元数据，不授予审核能力。")
-    public ApiResponse<List<IamTenantQualification>> platformQualifications(
+    public ApiResponse<List<QualificationResponse>> platformQualifications(
             @PathVariable long tenantId, @AuthenticationPrincipal AuthenticatedUser user) {
         TenantGuard.tenant(user, "PLATFORM");
         return ApiResponse.success(service.platformQualifications(tenantId));
     }
 
+    @GetMapping("/api/platform/v1/iam/tenants/{tenantId}/qualifications/{qualificationId}")
+    @PreAuthorize("hasAuthority('platform:customer:list')")
+    @Operation(summary = "查询企业客户资质详情", description = "需要客户列表权限，且同时校验客户与资质归属。")
+    public ApiResponse<QualificationResponse> platformQualification(
+            @PathVariable long tenantId, @PathVariable long qualificationId,
+            @AuthenticationPrincipal AuthenticatedUser user) {
+        TenantGuard.tenant(user, "PLATFORM");
+        return ApiResponse.success(service.platformQualification(tenantId, qualificationId));
+    }
+
     @GetMapping("/api/platform/v1/iam/tenants/{tenantId}/addresses")
     @PreAuthorize("hasAuthority('platform:customer:list')")
     @Operation(summary = "查询企业客户地址", description = "只读查询企业客户地址，不开放平台端写入。")
diff --git a/iam/src/main/java/com/baiyue/iam/dto/OnboardingDtos.java b/iam/src/main/java/com/baiyue/iam/dto/OnboardingDtos.java
index 0383c9105..3b3d5fdb8 100644
--- a/iam/src/main/java/com/baiyue/iam/dto/OnboardingDtos.java
+++ b/iam/src/main/java/com/baiyue/iam/dto/OnboardingDtos.java
@@ -3,6 +3,7 @@ package com.baiyue.iam.dto;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import java.time.LocalDate;
 
@@ -13,7 +14,7 @@ public final class OnboardingDtos {
             @NotNull Long authUserId,
             @NotBlank String displayName,
             @NotBlank String companyName,
-            @NotBlank String legalPerson,
+            @Size(max = 64) String legalPerson,
             @NotBlank @Pattern(regexp = "^1[3-9]\\d{9}$") String administratorPhone,
             String contactEmail,
             String countryCode,
@@ -28,6 +29,7 @@ public final class OnboardingDtos {
             @NotBlank @Pattern(regexp = "BUSINESS_LICENSE|LEGAL_PERSON_ID|FREIGHT_FORWARDER_CERTIFICATE|BANK_ACCOUNT_LICENSE") String qualificationType,
             String certificateNo,
             @NotBlank String documentUrl,
+            @NotBlank @Size(max = 255) String originalFileName,
             LocalDate validTo,
             boolean replace
     ) { }
@@ -40,6 +42,7 @@ public final class OnboardingDtos {
             @NotBlank @Pattern(regexp = "BUSINESS_LICENSE|LEGAL_PERSON_ID|FREIGHT_FORWARDER_CERTIFICATE|BANK_ACCOUNT_LICENSE") String qualificationType,
             String certificateNo,
             @NotBlank String documentUrl,
+            @NotBlank @Size(max = 255) String originalFileName,
             LocalDate validTo,
             boolean replace
     ) { }
@@ -55,9 +58,11 @@ public final class OnboardingDtos {
             @NotNull Long tenantId,
             @NotBlank @Pattern(regexp = "[0-9A-Za-z]{18}") String unifiedSocialCreditCode,
             @NotBlank String businessLicenseDocumentUrl,
+            @NotBlank @Size(max = 255) String businessLicenseOriginalFileName,
             LocalDate businessLicenseValidTo,
             boolean replaceBusinessLicense,
             String legalPersonIdDocumentUrl,
+            @Size(max = 255) String legalPersonIdOriginalFileName,
             LocalDate legalPersonIdValidTo,
             Boolean replaceLegalPersonId
     ) { }
diff --git a/iam/src/main/java/com/baiyue/iam/dto/ProfileDtos.java b/iam/src/main/java/com/baiyue/iam/dto/ProfileDtos.java
index ac9a88edf..626fadd0e 100644
--- a/iam/src/main/java/com/baiyue/iam/dto/ProfileDtos.java
+++ b/iam/src/main/java/com/baiyue/iam/dto/ProfileDtos.java
@@ -5,6 +5,9 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 /** 用户档案、地址和资质的数据契约。 */
 public final class ProfileDtos {
     private ProfileDtos() { }
@@ -24,4 +27,12 @@ public final class ProfileDtos {
                                  String city, String district, @NotBlank String detail,
                                  String postalCode, Boolean isDefault) { }
 
+    public record QualificationResponse(Long id, Long tenantId, String qualificationType,
+                                        String certificateNo, String documentUrl, String originalFileName,
+                                        LocalDate validFrom, LocalDate validTo, String status,
+                                        String reviewComment, LocalDateTime createdAt,
+                                        LocalDateTime updatedAt) { }
+
+    public record QualificationDeletionResponse(Long qualificationId, String deletedDocumentUrl) { }
+
 }
diff --git a/iam/src/main/java/com/baiyue/iam/dto/TenantDtos.java b/iam/src/main/java/com/baiyue/iam/dto/TenantDtos.java
index 875d001a9..ae59df536 100644
--- a/iam/src/main/java/com/baiyue/iam/dto/TenantDtos.java
+++ b/iam/src/main/java/com/baiyue/iam/dto/TenantDtos.java
@@ -25,7 +25,7 @@ public final class TenantDtos {
     public record RegisterRequest(
         @Schema(description = "Enterprise display name / 企业名称", example = "深圳虫虫出海科技有限公司") @NotBlank String tenantName,
         @Schema(description = "Legal entity name / 企业法定名称", example = "深圳虫虫出海科技有限公司") @NotBlank String legalName,
-        @Schema(description = "Legal representative / 法定代表人", example = "张三") @NotBlank @Size(max = 64) String legalRepresentative,
+        @Schema(description = "Legal representative (optional) / 法定代表人（选填）", example = "张三") @Size(max = 64) String legalRepresentative,
         @Schema(description = "Primary contact / 联系人", example = "张三") @NotBlank String contactName,
         @Schema(description = "Company contact phone; also initializes the first administrator login phone at creation, then maintained independently / 公司联系电话；创建时同时初始化首个管理员登录手机号，之后独立维护", example = "13800138000")
         @NotBlank @Pattern(regexp = "^1[3-9]\\d{9}$") String contactPhone,
@@ -46,7 +46,7 @@ public final class TenantDtos {
     public record UpdateProfileRequest(
         @Schema(description = "Enterprise display name / 企业名称", example = "深圳虫虫出海科技有限公司") @NotBlank String tenantName,
         @Schema(description = "Legal entity name / 企业法定名称", example = "深圳虫虫出海科技有限公司") @NotBlank String legalName,
-        @Schema(description = "Legal representative / 法定代表人", example = "张三") @NotBlank @Size(max = 64) String legalRepresentative,
+        @Schema(description = "Legal representative (optional) / 法定代表人（选填）", example = "张三") @Size(max = 64) String legalRepresentative,
         @Schema(description = "Primary contact / 联系人", example = "李四") @NotBlank String contactName,
         @Schema(description = "Company contact phone, never used to resolve login identity / 公司联系电话，不作为登录标识", example = "0755-12345678")
         @NotBlank @Pattern(regexp = "[0-9-]{4,32}") String contactPhone,
@@ -58,7 +58,7 @@ public final class TenantDtos {
     public record UpdateTenantRequest(
         @NotBlank String tenantName,
         @NotBlank String legalName,
-        @NotBlank @Size(max = 64) String legalRepresentative,
+        @Size(max = 64) String legalRepresentative,
         @NotBlank String contactName,
         @Schema(description = "Company contact phone, independent from every member login phone / 公司联系电话，与所有成员登录手机号独立")
         @NotBlank @Pattern(regexp = "[0-9-]{4,32}") String contactPhone,
@@ -110,7 +110,7 @@ public final class TenantDtos {
         @Schema(description = "Review type / 审核类型", example = "REGISTER") String reviewType,
         @Schema(description = "Review status / 审核状态", example = "PENDING") String status,
         @Schema(description = "Customer name / 客户名称", example = "深圳虫虫出海科技有限公司") String tenantName,
-        @Schema(description = "Customer code / 客户编号", example = "TEN190000000000000002") String tenantCode,
+        @Schema(description = "Customer code / 五位客户编号", example = "00001") String tenantCode,
         @Schema(description = "Primary contact / 联系人", example = "张三") String contactName,
         @Schema(description = "Contact phone / 联系电话", example = "13800138000") String contactPhone,
         @Schema(description = "Contact email / 联系邮箱", example = "ops@example.com") String contactEmail,
diff --git a/iam/src/main/java/com/baiyue/iam/entity/IamTenantQualification.java b/iam/src/main/java/com/baiyue/iam/entity/IamTenantQualification.java
index eb5585fdb..af1a2bd5f 100644
--- a/iam/src/main/java/com/baiyue/iam/entity/IamTenantQualification.java
+++ b/iam/src/main/java/com/baiyue/iam/entity/IamTenantQualification.java
@@ -2,10 +2,10 @@ package com.baiyue.iam.entity;
 
 import lombok.Getter;
 import lombok.Setter;
-import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import java.time.LocalDate; import java.time.LocalDateTime;
 /**
  * 租户资质实体，对应表 {@code iam_tenant_qualification}；按租户保存营业执照等证照、有效期、文件位置和审核状态。
  */
 @Getter
 @Setter
-@TableName("iam_tenant_qualification") public class IamTenantQualification { @TableId private Long id; private Long tenantId; private String qualificationType; private String certificateNo; private String documentUrl; private LocalDate validFrom; private LocalDate validTo; private String status; private String reviewComment;           }
+@TableName("iam_tenant_qualification") public class IamTenantQualification { @TableId private Long id; private Long tenantId; private String qualificationType; private String certificateNo; private String documentUrl; private String originalFileName; private LocalDate validFrom; private LocalDate validTo; private String status; private String reviewComment; private LocalDateTime createdAt; private LocalDateTime updatedAt; @TableLogic private Boolean deleted; }
diff --git a/iam/src/main/java/com/baiyue/iam/repository/CustomerCodeRepository.java b/iam/src/main/java/com/baiyue/iam/repository/CustomerCodeRepository.java
new file mode 100644
index 000000000..8cca4e4d9
--- /dev/null
+++ b/iam/src/main/java/com/baiyue/iam/repository/CustomerCodeRepository.java
@@ -0,0 +1,51 @@
+package com.baiyue.iam.repository;
+
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import jakarta.annotation.Resource;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Locale;
+
+/** 在客户创建事务内串行分配固定五位客户编号。 */
+@Repository
+public class CustomerCodeRepository {
+    private static final String SEQUENCE_KEY = "CUSTOMER_CODE";
+    private static final long MAX_CUSTOMER_CODE = 99_999L;
+
+    @Resource
+    private JdbcTemplate jdbc;
+
+    @Transactional(propagation = Propagation.MANDATORY)
+    public String nextCode() {
+        jdbc.update("INSERT IGNORE INTO iam_number_sequence(sequence_key,next_value) VALUES (?,1)",
+            SEQUENCE_KEY);
+        Long value = jdbc.queryForObject(
+            "SELECT next_value FROM iam_number_sequence WHERE sequence_key=? FOR UPDATE",
+            Long.class, SEQUENCE_KEY);
+        if (value == null) {
+            throw new BizException(ResultCode.INTERNAL_ERROR, "客户编号序列状态异常");
+        }
+        String code = format(value);
+        int updated = jdbc.update(
+            "UPDATE iam_number_sequence SET next_value=next_value+1 WHERE sequence_key=? AND next_value=?",
+            SEQUENCE_KEY, value);
+        if (updated != 1) {
+            throw new BizException(ResultCode.CONFLICT, "客户编号分配冲突，请重试");
+        }
+        return code;
+    }
+
+    static String format(long value) {
+        if (value < 1) {
+            throw new BizException(ResultCode.INTERNAL_ERROR, "客户编号序列状态异常");
+        }
+        if (value > MAX_CUSTOMER_CODE) {
+            throw new BizException(ResultCode.CONFLICT, "五位客户编号已用完");
+        }
+        return String.format(Locale.ROOT, "%05d", value);
+    }
+}
diff --git a/iam/src/main/java/com/baiyue/iam/repository/ProfileResourceRepository.java b/iam/src/main/java/com/baiyue/iam/repository/ProfileResourceRepository.java
index 5fc245647..cf80bc93d 100644
--- a/iam/src/main/java/com/baiyue/iam/repository/ProfileResourceRepository.java
+++ b/iam/src/main/java/com/baiyue/iam/repository/ProfileResourceRepository.java
@@ -31,6 +31,18 @@ public class ProfileResourceRepository {
     public void saveQualification(IamTenantQualification qualification) { qualificationMapper.updateById(qualification); }
     public List<IamTenantAddress> findAddresses(long tenantId) { return addressMapper.selectList(new LambdaQueryWrapper<IamTenantAddress>().eq(IamTenantAddress::getTenantId, tenantId)); }
     public List<IamTenantQualification> findQualifications(long tenantId) { return qualificationMapper.selectList(new LambdaQueryWrapper<IamTenantQualification>().eq(IamTenantQualification::getTenantId, tenantId)); }
+    public IamTenantQualification findQualification(long tenantId, long qualificationId) {
+        return qualificationMapper.selectOne(new LambdaQueryWrapper<IamTenantQualification>()
+                .eq(IamTenantQualification::getTenantId, tenantId)
+                .eq(IamTenantQualification::getId, qualificationId));
+    }
+    public IamTenantQualification findQualificationForUpdate(long tenantId, long qualificationId) {
+        return qualificationMapper.selectOne(new LambdaQueryWrapper<IamTenantQualification>()
+                .eq(IamTenantQualification::getTenantId, tenantId)
+                .eq(IamTenantQualification::getId, qualificationId)
+                .last("FOR UPDATE"));
+    }
+    public void deleteQualification(IamTenantQualification qualification) { qualificationMapper.deleteById(qualification); }
     public List<IamTenantQualification> findQualificationsForUpdate(long tenantId) {
         return qualificationMapper.selectList(new LambdaQueryWrapper<IamTenantQualification>()
                 .eq(IamTenantQualification::getTenantId, tenantId)
diff --git a/iam/src/main/java/com/baiyue/iam/repository/TenantRepository.java b/iam/src/main/java/com/baiyue/iam/repository/TenantRepository.java
index c2fd87bae..ca8c1b9c4 100644
--- a/iam/src/main/java/com/baiyue/iam/repository/TenantRepository.java
+++ b/iam/src/main/java/com/baiyue/iam/repository/TenantRepository.java
@@ -83,6 +83,7 @@ public class TenantRepository {
     public PageResult<IamTenant> pageMerchants(long page, long size, String keyword, String status) {
         LambdaQueryWrapper<IamTenant> wrapper = new LambdaQueryWrapper<IamTenant>()
             .eq(IamTenant::getTenantType, "MERCHANT")
+            .ne(IamTenant::getStatus, "ARCHIVED")
             .eq(StringUtils.hasText(status), IamTenant::getStatus, status)
             .orderByDesc(IamTenant::getCreatedAt);
         if (StringUtils.hasText(keyword)) {
@@ -114,6 +115,7 @@ public class TenantRepository {
     public List<IamTenant> exportMerchants(Long cursor, int limit, String keyword, String status) {
         LambdaQueryWrapper<IamTenant> wrapper = new LambdaQueryWrapper<IamTenant>()
                 .eq(IamTenant::getTenantType, "MERCHANT")
+                .ne(IamTenant::getStatus, "ARCHIVED")
                 .gt(cursor != null, IamTenant::getId, cursor)
                 .eq(StringUtils.hasText(status), IamTenant::getStatus, status)
                 .orderByAsc(IamTenant::getId)
diff --git a/iam/src/main/java/com/baiyue/iam/service/MerchantOnboardingService.java b/iam/src/main/java/com/baiyue/iam/service/MerchantOnboardingService.java
index a38f0b668..5dd4d22fa 100644
--- a/iam/src/main/java/com/baiyue/iam/service/MerchantOnboardingService.java
+++ b/iam/src/main/java/com/baiyue/iam/service/MerchantOnboardingService.java
@@ -20,6 +20,7 @@ import com.baiyue.iam.mapper.IamTenantMapper;
 import com.baiyue.iam.mapper.IamTenantQualificationMapper;
 import com.baiyue.iam.mapper.IamTenantReviewMapper;
 import com.baiyue.iam.mapper.IamUserMapper;
+import com.baiyue.iam.repository.CustomerCodeRepository;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import jakarta.annotation.Resource;
@@ -43,6 +44,7 @@ public class MerchantOnboardingService {
     @Resource private CustomerDimensionRuleInitializationService dimensionRuleInitialization;
     @Resource private OverseasStorageFeeInitializationService overseasStorageFeeInitialization;
     @Resource private SecurityEventOutboxService securityEvents;
+    @Resource private CustomerCodeRepository customerCodes;
 
     @Transactional
     public MerchantRegistrationResponse register(MerchantRegistrationRequest request) {
@@ -66,13 +68,13 @@ public class MerchantOnboardingService {
 
         IamTenant tenant = new IamTenant();
         tenant.setId(tenantId);
-        tenant.setTenantCode("TEN" + tenantId);
+        tenant.setTenantCode(customerCodes.nextCode());
         tenant.setTenantName(request.companyName());
         tenant.setTenantType("MERCHANT");
         tenant.setStatus("PROFILE_REQUIRED");
         tenant.setDimensionInitializationStatus("PENDING");
         tenant.setLegalName(request.companyName());
-        tenant.setLegalRepresentative(request.legalPerson());
+        tenant.setLegalRepresentative(normalizeOptional(request.legalPerson()));
         tenant.setContactName(request.displayName());
         tenant.setContactPhone(request.administratorPhone());
         tenant.setContactEmail(request.contactEmail());
@@ -131,6 +133,32 @@ public class MerchantOnboardingService {
             tenant.getDimensionInitializationStatus());
     }
 
+    public MerchantRegistrationResponse registration(long authUserId) {
+        IamUser user = userMapper.selectOne(new LambdaQueryWrapper<IamUser>()
+                .eq(IamUser::getAuthUserId, authUserId)
+                .last("LIMIT 1"));
+        if (user == null) {
+            throw new BizException(ResultCode.NOT_FOUND, "Registration not found");
+        }
+        IamMembership membership = membershipMapper.selectOne(new LambdaQueryWrapper<IamMembership>()
+                .eq(IamMembership::getUserId, user.getId())
+                .eq(IamMembership::getMemberType, "OWNER")
+                .last("LIMIT 1"));
+        if (membership == null) {
+            throw new BizException(ResultCode.NOT_FOUND, "Registration not found");
+        }
+        IamTenant tenant = tenantMapper.selectById(membership.getTenantId());
+        if (tenant == null || !"MERCHANT".equals(tenant.getTenantType())) {
+            throw new BizException(ResultCode.NOT_FOUND, "Registration not found");
+        }
+        return new MerchantRegistrationResponse(tenant.getId(), membership.getId(), tenant.getStatus(),
+                tenant.getDimensionInitializationStatus());
+    }
+
+    private String normalizeOptional(String value) {
+        return StringUtils.hasText(value) ? value.trim() : null;
+    }
+
     /**
      * Removes a just-created IAM registration when Auth could not persist the paired login account.
      * Repeated calls are safe, while progressed onboarding data is deliberately protected.
diff --git a/iam/src/main/java/com/baiyue/iam/service/ProfileResourceService.java b/iam/src/main/java/com/baiyue/iam/service/ProfileResourceService.java
index af90e9bf5..4b1cc284a 100644
--- a/iam/src/main/java/com/baiyue/iam/service/ProfileResourceService.java
+++ b/iam/src/main/java/com/baiyue/iam/service/ProfileResourceService.java
@@ -10,6 +10,8 @@ import com.baiyue.iam.dto.OnboardingDtos.PlatformQualificationRegistrationRespon
 import com.baiyue.iam.dto.OnboardingDtos.RequiredQualificationPackageRequest;
 import com.baiyue.iam.dto.OnboardingDtos.RequiredQualificationPackageResponse;
 import com.baiyue.iam.dto.ProfileDtos.AddressRequest;
+import com.baiyue.iam.dto.ProfileDtos.QualificationDeletionResponse;
+import com.baiyue.iam.dto.ProfileDtos.QualificationResponse;
 import com.baiyue.iam.entity.IamTenant;
 import com.baiyue.iam.entity.IamTenantAddress;
 import com.baiyue.iam.entity.IamTenantQualification;
@@ -43,16 +45,50 @@ public class ProfileResourceService {
         repository.insertAddress(a); return a;
     }
 
-    public List<IamTenantQualification> qualifications(long tenant) { return repository.findQualifications(tenant); }
+    public List<QualificationResponse> qualifications(long tenant) {
+        return repository.findQualifications(tenant).stream().map(this::toQualificationResponse).toList();
+    }
+
+    public QualificationResponse qualification(long tenant, long qualificationId) {
+        IamTenantQualification qualification = repository.findQualification(tenant, qualificationId);
+        if (qualification == null) throw new BizException(ResultCode.NOT_FOUND, "Qualification not found / 企业资质不存在");
+        return toQualificationResponse(qualification);
+    }
 
     public List<IamTenantAddress> platformAddresses(long tenantId) {
         requireMerchant(tenantId);
         return repository.findAddresses(tenantId);
     }
 
-    public List<IamTenantQualification> platformQualifications(long tenantId) {
+    public List<QualificationResponse> platformQualifications(long tenantId) {
         requireMerchant(tenantId);
-        return repository.findQualifications(tenantId);
+        return qualifications(tenantId);
+    }
+
+    public QualificationResponse platformQualification(long tenantId, long qualificationId) {
+        requireMerchant(tenantId);
+        return qualification(tenantId, qualificationId);
+    }
+
+    @Transactional
+    @BusinessAudit(event = "TENANT_QUALIFICATION_DELETE", resourceType = "TENANT_QUALIFICATION",
+        resourceId = "#qualificationId", description = "删除送审前企业资质", captureAfter = false)
+    public QualificationDeletionResponse deleteQualification(long tenantId, long qualificationId) {
+        IamTenant tenant = tenantRepository.findTenantForUpdate(tenantId);
+        if (tenant == null || !"MERCHANT".equals(tenant.getTenantType())) {
+            throw new BizException(ResultCode.NOT_FOUND, "Enterprise not found / 企业客户不存在");
+        }
+        if (!"PROFILE_REQUIRED".equals(tenant.getStatus()) && !"REJECTED".equals(tenant.getStatus())) {
+            throw new BizException(ResultCode.CONFLICT,
+                    "Qualifications cannot be deleted after review submission / 资质提交审核后不可删除");
+        }
+        IamTenantQualification qualification = repository.findQualificationForUpdate(tenantId, qualificationId);
+        if (qualification == null) {
+            return new QualificationDeletionResponse(qualificationId, null);
+        }
+        String documentUrl = qualification.getDocumentUrl();
+        repository.deleteQualification(qualification);
+        return new QualificationDeletionResponse(qualificationId, documentUrl);
     }
 
     @Transactional
@@ -86,7 +122,7 @@ public class ProfileResourceService {
             repository.saveQualification(existing);
         }
         IamTenantQualification qualification = createQualification(tenant.getId(),
-                request.qualificationType(), certificateNo, request.documentUrl());
+                request.qualificationType(), certificateNo, request.documentUrl(), request.originalFileName());
         qualification.setValidTo(request.validTo());
         repository.saveQualification(qualification);
         return new QualificationSubmissionResponse(qualification.getId(), null, tenant.getStatus(), replacedDocumentUrl);
@@ -122,7 +158,7 @@ public class ProfileResourceService {
             repository.saveQualification(existing);
         }
         IamTenantQualification qualification = createQualification(tenant.getId(), request.qualificationType(),
-                certificateNo, request.documentUrl());
+                certificateNo, request.documentUrl(), request.originalFileName());
         qualification.setValidTo(request.validTo());
         repository.saveQualification(qualification);
         return new PlatformQualificationRegistrationResponse(
@@ -162,6 +198,7 @@ public class ProfileResourceService {
         requireReplaceAllowed(businessLicenses, request.replaceBusinessLicense(), "营业执照");
         boolean hasLegalPersonId = StringUtils.hasText(request.legalPersonIdDocumentUrl());
         if (hasLegalPersonId) {
+            normalizeOriginalFileName(request.legalPersonIdOriginalFileName());
             requireReplaceAllowed(legalPersonIds, Boolean.TRUE.equals(request.replaceLegalPersonId()), "法人身份证");
         } else if (Boolean.TRUE.equals(request.replaceLegalPersonId())) {
             throw new BizException(ResultCode.BAD_REQUEST, "未上传法人身份证时不能选择替换");
@@ -170,13 +207,13 @@ public class ProfileResourceService {
         String replacedBusinessLicenseUrl = supersede(businessLicenses, replacementComment);
         String replacedLegalPersonIdUrl = hasLegalPersonId ? supersede(legalPersonIds, replacementComment) : null;
         IamTenantQualification businessLicense = createQualification(tenant.getId(), "BUSINESS_LICENSE",
-                creditCode, request.businessLicenseDocumentUrl());
+                creditCode, request.businessLicenseDocumentUrl(), request.businessLicenseOriginalFileName());
         businessLicense.setValidTo(request.businessLicenseValidTo());
         repository.saveQualification(businessLicense);
         IamTenantQualification legalPersonId = null;
         if (hasLegalPersonId) {
             legalPersonId = createQualification(tenant.getId(), "LEGAL_PERSON_ID",
-                    null, request.legalPersonIdDocumentUrl().trim());
+                    null, request.legalPersonIdDocumentUrl().trim(), request.legalPersonIdOriginalFileName());
             legalPersonId.setValidTo(request.legalPersonIdValidTo());
             repository.saveQualification(legalPersonId);
         }
@@ -243,13 +280,32 @@ public class ProfileResourceService {
         return certificateNo;
     }
 
-    private IamTenantQualification createQualification(long tenant, String type, String certificateNo, String url) {
+    private IamTenantQualification createQualification(long tenant, String type, String certificateNo, String url,
+                                                       String originalFileName) {
         IamTenantQualification x = new IamTenantQualification();
         x.setId(IdWorker.getId()); x.setTenantId(tenant); x.setQualificationType(type);
-        x.setCertificateNo(certificateNo); x.setDocumentUrl(url); x.setStatus("PENDING");
+        x.setCertificateNo(certificateNo); x.setDocumentUrl(url);
+        x.setOriginalFileName(normalizeOriginalFileName(originalFileName)); x.setStatus("PENDING");
         repository.insertQualification(x); return x;
     }
 
+    private String normalizeOriginalFileName(String originalFileName) {
+        if (!StringUtils.hasText(originalFileName)) {
+            throw new BizException(ResultCode.BAD_REQUEST, "Original file name is required / 必须提供上传时原始文件名");
+        }
+        String normalized = originalFileName.trim();
+        if (normalized.length() > 255) {
+            throw new BizException(ResultCode.BAD_REQUEST, "Original file name is too long / 原始文件名不能超过255个字符");
+        }
+        return normalized;
+    }
+
+    private QualificationResponse toQualificationResponse(IamTenantQualification item) {
+        return new QualificationResponse(item.getId(), item.getTenantId(), item.getQualificationType(),
+                item.getCertificateNo(), item.getDocumentUrl(), item.getOriginalFileName(), item.getValidFrom(),
+                item.getValidTo(), item.getStatus(), item.getReviewComment(), item.getCreatedAt(), item.getUpdatedAt());
+    }
+
     private boolean isCurrentQualification(IamTenantQualification qualification) {
         return !"REJECTED".equals(qualification.getStatus())
                 && !"SUPERSEDED".equals(qualification.getStatus());
diff --git a/iam/src/main/java/com/baiyue/iam/service/SecurityEventOutboxService.java b/iam/src/main/java/com/baiyue/iam/service/SecurityEventOutboxService.java
index 674748ef8..6d5266658 100644
--- a/iam/src/main/java/com/baiyue/iam/service/SecurityEventOutboxService.java
+++ b/iam/src/main/java/com/baiyue/iam/service/SecurityEventOutboxService.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 public class SecurityEventOutboxService {
     private static final List<String> OVERSEAS_AUTHORITY_PREFIXES = List.of(
         "platform:overseas-warehouse:", "platform:overseas-business:",
-        "platform:overseas-master-data:", "merchant:warehouse:",
+        "platform:overseas-master-data:", "merchant:warehouse:", "merchant:overseas-warehouse:",
         "merchant:cross-border:", "platform:finance:", "lastleg:");
     @Resource private JdbcTemplate jdbc;
     @Resource private ObjectMapper objectMapper;
diff --git a/iam/src/main/java/com/baiyue/iam/service/TenantService.java b/iam/src/main/java/com/baiyue/iam/service/TenantService.java
index 50221060e..5659ec3de 100644
--- a/iam/src/main/java/com/baiyue/iam/service/TenantService.java
+++ b/iam/src/main/java/com/baiyue/iam/service/TenantService.java
@@ -11,6 +11,7 @@ import com.baiyue.iam.entity.IamTenant;
 import com.baiyue.iam.entity.IamTenantQualification;
 import com.baiyue.iam.entity.IamTenantReview;
 import com.baiyue.iam.repository.TenantRepository;
+import com.baiyue.iam.repository.CustomerCodeRepository;
 import com.baiyue.iam.repository.ProfileResourceRepository;
 import com.baiyue.iam.client.AuthAccountClient;
 import com.baiyue.iam.repository.MemberRepository;
@@ -56,6 +57,8 @@ public class TenantService {
     @Resource
     private TenantRepository repository;
     @Resource
+    private CustomerCodeRepository customerCodes;
+    @Resource
     private ProfileResourceRepository profileRepository;
     @Resource
     private AuthAccountClient authClient;
@@ -165,13 +168,13 @@ public class TenantService {
         ensureAdministratorPhoneAvailable(contactPhone);
         IamTenant tenant = new IamTenant();
         tenant.setId(IdWorker.getId());
-        tenant.setTenantCode("TEN" + tenant.getId());
+        tenant.setTenantCode(customerCodes.nextCode());
         tenant.setTenantName(request.tenantName());
         tenant.setTenantType("MERCHANT");
         tenant.setStatus("PROFILE_REQUIRED");
         tenant.setDimensionInitializationStatus("PENDING");
         tenant.setLegalName(request.legalName());
-        tenant.setLegalRepresentative(request.legalRepresentative());
+        tenant.setLegalRepresentative(normalizeOptional(request.legalRepresentative()));
         tenant.setUnifiedSocialCreditCode(null);
         tenant.setContactName(request.contactName());
         tenant.setContactPhone(contactPhone);
@@ -388,7 +391,7 @@ public class TenantService {
         String contactPhone = normalizeContactPhone(request.contactPhone());
         tenant.setTenantName(request.tenantName());
         tenant.setLegalName(request.legalName());
-        tenant.setLegalRepresentative(request.legalRepresentative());
+        tenant.setLegalRepresentative(normalizeOptional(request.legalRepresentative()));
         tenant.setContactName(request.contactName());
         tenant.setContactPhone(contactPhone);
         tenant.setContactEmail(request.contactEmail());
@@ -460,7 +463,7 @@ public class TenantService {
         ensureNotArchived(tenant);
         tenant.setTenantName(request.tenantName());
         tenant.setLegalName(request.legalName());
-        tenant.setLegalRepresentative(request.legalRepresentative());
+        tenant.setLegalRepresentative(normalizeOptional(request.legalRepresentative()));
         tenant.setContactName(request.contactName());
         tenant.setContactPhone(normalizeContactPhone(request.contactPhone()));
         tenant.setContactEmail(request.contactEmail());
@@ -482,6 +485,10 @@ public class TenantService {
         return contactPhone == null ? "" : contactPhone.trim();
     }
 
+    private String normalizeOptional(String value) {
+        return value == null || value.isBlank() ? null : value.trim();
+    }
+
     private void ensureAdministratorPhoneAvailable(String phone) {
         if (!administratorPhoneAvailable(phone)) {
             throw new BizException(ResultCode.CONFLICT, "管理员登录手机号已被其他账号使用");
diff --git a/iam/src/main/resources/db/iam.sql b/iam/src/main/resources/db/iam.sql
index 4b4dd4f59..0d7e51849 100644
--- a/iam/src/main/resources/db/iam.sql
+++ b/iam/src/main/resources/db/iam.sql
@@ -7,7 +7,7 @@ USE baiyue_iam;
 
 CREATE TABLE IF NOT EXISTS iam_tenant (
   id BIGINT NOT NULL COMMENT '客户主档ID（雪花ID）；0保留为平台技术作用域',
-  tenant_code VARCHAR(64) NOT NULL COMMENT '全局唯一客户编码',
+  tenant_code VARCHAR(8) NOT NULL COMMENT '客户编号：企业客户固定五位数字，平台技术主体为PLATFORM',
   tenant_name VARCHAR(128) NOT NULL COMMENT '客户企业名称',
   tenant_type VARCHAR(20) NOT NULL DEFAULT 'MERCHANT' COMMENT '主体类型：MERCHANT企业客户',
   status VARCHAR(20) NOT NULL DEFAULT 'PROFILE_REQUIRED' COMMENT '客户状态：PROFILE_REQUIRED待完善资料、PENDING待审核、ACTIVE正常、REJECTED已驳回、DISABLED已停用、ARCHIVED已归档',
@@ -43,6 +43,15 @@ CREATE TABLE IF NOT EXISTS iam_tenant (
   KEY idx_iam_tenant_status (status, created_at)
 ) ENGINE=InnoDB COMMENT='客户企业主档表：保存企业资料、审核结果和启停状态；ID同时作为客户数据隔离键';
 
+CREATE TABLE IF NOT EXISTS iam_number_sequence (
+  sequence_key VARCHAR(64) NOT NULL COMMENT '业务编号类型',
+  next_value BIGINT UNSIGNED NOT NULL COMMENT '下一待分配数字',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  PRIMARY KEY (sequence_key)
+) ENGINE=InnoDB COMMENT='IAM业务编号序列表';
+
+INSERT IGNORE INTO iam_number_sequence(sequence_key, next_value) VALUES ('CUSTOMER_CODE', 1);
+
 CREATE TABLE IF NOT EXISTS iam_customer_dimension_initialization_task (
   tenant_id BIGINT NOT NULL COMMENT '客户ID及任务聚合ID',
   operator_id BIGINT NOT NULL COMMENT '触发初始化的操作人ID；系统补偿为0',
@@ -103,6 +112,7 @@ CREATE TABLE IF NOT EXISTS iam_tenant_qualification (
   qualification_type VARCHAR(32) NOT NULL COMMENT '客户资质类型',
   certificate_no VARCHAR(128) NULL COMMENT '证书编号',
   document_url VARCHAR(500) NULL COMMENT '资质文件存储地址',
+  original_file_name VARCHAR(255) NOT NULL COMMENT '上传时原始文件名',
   valid_from DATE NULL COMMENT '有效期开始日期',
   valid_to DATE NULL COMMENT '有效期结束日期',
   status VARCHAR(20) NOT NULL DEFAULT 'PENDING' COMMENT '资质审核状态：PENDING待审核、APPROVED已通过、REJECTED已驳回',
diff --git a/iam/src/main/resources/openapi/iam-v1.yaml b/iam/src/main/resources/openapi/iam-v1.yaml
index 9d5da3f64..f5c939631 100644
--- a/iam/src/main/resources/openapi/iam-v1.yaml
+++ b/iam/src/main/resources/openapi/iam-v1.yaml
@@ -95,7 +95,7 @@ paths:
         - {name: page, in: query, required: false, schema: {type: integer, minimum: 1, default: 1}}
         - {name: size, in: query, required: false, schema: {type: integer, minimum: 1, maximum: 200, default: 20}}
         - {name: keyword, in: query, required: false, schema: {type: string}, description: 客户名称关键字，不支持客户编号、信用代码或联系人搜索}
-        - {name: status, in: query, required: false, schema: {type: string, enum: [PROFILE_REQUIRED, PENDING, ACTIVE, REJECTED, DISABLED, ARCHIVED]}}
+        - {name: status, in: query, required: false, schema: {type: string, enum: [PROFILE_REQUIRED, PENDING, ACTIVE, REJECTED, DISABLED]}}
       responses:
         '200':
           description: 企业客户分页查询成功
@@ -248,6 +248,22 @@ paths:
               schema: {$ref: '#/components/schemas/TenantQualificationListApiResponse'}
         '403': {$ref: '#/components/responses/Forbidden'}
         '404': {$ref: '#/components/responses/NotFound'}
+  /api/platform/v1/iam/tenants/{tenantId}/qualifications/{qualificationId}:
+    parameters:
+      - {$ref: '#/components/parameters/TenantId'}
+      - {name: qualificationId, in: path, required: true, schema: {type: integer, format: int64}}
+    get:
+      tags: [Platform Tenant / 平台租户]
+      summary: 查询企业客户资质详情
+      description: 需要 `platform:customer:list` 权限，并同时校验客户与资质归属。
+      responses:
+        '200':
+          description: 企业客户资质详情查询成功
+          content:
+            application/json:
+              schema: {$ref: '#/components/schemas/TenantQualificationApiResponse'}
+        '403': {$ref: '#/components/responses/Forbidden'}
+        '404': {$ref: '#/components/responses/NotFound'}
   /api/platform/v1/iam/tenants/{tenantId}/status:
     parameters:
       - {$ref: '#/components/parameters/TenantId'}
@@ -677,8 +693,39 @@ paths:
       tags: [IAM Resources / IAM 资源]
       summary: List tenant qualifications / 查询企业资质
       responses:
-        '200': {$ref: '#/components/responses/Success'}
+        '200':
+          description: 当前客户资质列表
+          content:
+            application/json:
+              schema: {$ref: '#/components/schemas/TenantQualificationListApiResponse'}
         '403': {$ref: '#/components/responses/Forbidden'}
+  /api/merchant/v1/iam/tenant/qualifications/{qualificationId}:
+    parameters:
+      - {name: qualificationId, in: path, required: true, schema: {type: integer, format: int64}}
+    get:
+      tags: [IAM Resources / IAM 资源]
+      summary: 查询当前客户资质详情
+      description: 需要 `merchant:profile:view` 权限；客户范围来自 JWT，跨客户资质按不存在处理。
+      responses:
+        '200':
+          description: 当前客户资质详情
+          content:
+            application/json:
+              schema: {$ref: '#/components/schemas/TenantQualificationApiResponse'}
+        '403': {$ref: '#/components/responses/Forbidden'}
+        '404': {$ref: '#/components/responses/NotFound'}
+    delete:
+      tags: [IAM Resources / IAM 资源]
+      summary: 删除送审前企业资质
+      description: 需要 `merchant:qualification:upload` 权限；仅客户状态为 `PROFILE_REQUIRED` 或 `REJECTED` 时允许，`PENDING`、`ACTIVE` 等提交审核后的状态由服务端拒绝。客户范围来自 JWT；重复删除或跨客户 ID 返回相同幂等结果，不泄露归属。
+      responses:
+        '200':
+          description: 删除成功或目标已不存在
+          content:
+            application/json:
+              schema: {$ref: '#/components/schemas/QualificationDeletionApiResponse'}
+        '403': {$ref: '#/components/responses/Forbidden'}
+        '409': {$ref: '#/components/responses/Conflict'}
   /api/merchant/v1/iam/tenant/qualifications/submit-review:
     post:
       tags: [IAM Resources / IAM 资源]
@@ -810,6 +857,69 @@ paths:
         '400': {$ref: '#/components/responses/BadRequest'}
         '403': {$ref: '#/components/responses/Forbidden'}
         '409': {$ref: '#/components/responses/Conflict'}
+  /internal/iam/merchant-registrations/{authUserId}:
+    get:
+      tags: [IAM Resources / IAM 资源]
+      summary: 查询已创建的企业注册状态
+      description: 仅供 Auth Service 对相同账号、手机号和密码的注册重试进行幂等确认，不创建或修改企业资料。
+      security: []
+      parameters:
+        - {$ref: '#/components/parameters/InternalServiceToken'}
+        - {name: authUserId, in: path, required: true, schema: {type: integer, format: int64}}
+      responses:
+        '200':
+          description: 注册状态查询成功
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - {$ref: '#/components/schemas/ApiResponse'}
+                  - type: object
+                    properties:
+                      data:
+                        type: object
+                        required: [tenantId, membershipId, tenantStatus, dimensionInitializationStatus]
+                        properties:
+                          tenantId: {type: integer, format: int64}
+                          membershipId: {type: integer, format: int64}
+                          tenantStatus: {type: string, enum: [PROFILE_REQUIRED, PENDING, ACTIVE, REJECTED, DISABLED, ARCHIVED]}
+                          dimensionInitializationStatus: {type: string, enum: [PENDING, READY, FAILED]}
+        '403': {$ref: '#/components/responses/Forbidden'}
+        '404': {$ref: '#/components/responses/NotFound'}
+  /internal/iam/qualifications:
+    post:
+      tags: [IAM Resources / IAM 资源]
+      summary: 登记客户单个选填资质
+      description: 仅供 File Service 调用；原始文件名必须由上传请求传入，不得从存储 URL 推断。
+      security: []
+      parameters:
+        - {$ref: '#/components/parameters/InternalServiceToken'}
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/QualificationSubmissionRequest'}
+      responses:
+        '200': {$ref: '#/components/responses/Success'}
+        '403': {$ref: '#/components/responses/Forbidden'}
+        '409': {$ref: '#/components/responses/Conflict'}
+  /internal/iam/platform-qualifications:
+    post:
+      tags: [IAM Resources / IAM 资源]
+      summary: 平台代客户登记单个选填资质
+      description: 仅供 File Service 调用；原始文件名必须由上传请求传入，不得从存储 URL 推断。
+      security: []
+      parameters:
+        - {$ref: '#/components/parameters/InternalServiceToken'}
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/QualificationSubmissionRequest'}
+      responses:
+        '200': {$ref: '#/components/responses/Success'}
+        '403': {$ref: '#/components/responses/Forbidden'}
+        '409': {$ref: '#/components/responses/Conflict'}
   /internal/iam/required-qualification-packages:
     post:
       tags: [IAM Resources / IAM 资源]
@@ -1113,7 +1223,7 @@ components:
         reviewType: {type: string, example: REGISTER}
         status: {type: string, enum: [PENDING]}
         tenantName: {type: string, description: 客户名称}
-        tenantCode: {type: string, description: 客户编号}
+        tenantCode: {type: string, pattern: '^\d{5}$', example: '00001', description: 五位客户编号}
         contactName: {type: string, description: 联系人}
         contactPhone: {type: string, nullable: true, description: 联系电话}
         contactEmail: {type: string, format: email, nullable: true, description: 联系邮箱}
@@ -1199,12 +1309,12 @@ components:
       required: [id, tenantCode, tenantName, status, dimensionInitializationStatus, servicePackage]
       properties:
         id: {type: string, pattern: '^\d+$', example: '190000000000000001'}
-        tenantCode: {type: string}
+        tenantCode: {type: string, pattern: '^\d{5}$', example: '00001'}
         tenantName: {type: string}
         status: {type: string, enum: [PROFILE_REQUIRED, PENDING, ACTIVE, REJECTED, DISABLED, ARCHIVED]}
         dimensionInitializationStatus: {type: string, enum: [PENDING, READY, FAILED], description: 客户默认尺寸初始化状态；未 READY 时依赖该配置的业务失败关闭}
         legalName: {type: string}
-        legalRepresentative: {type: string, maxLength: 64}
+        legalRepresentative: {type: string, maxLength: 64, nullable: true}
         unifiedSocialCreditCode: {type: string}
         contactName: {type: string}
         contactPhone: {type: string}
@@ -1237,7 +1347,7 @@ components:
       required: [id, tenantCode, tenantName, status]
       properties:
         id: {type: string, pattern: '^\d+$'}
-        tenantCode: {type: string}
+        tenantCode: {type: string, pattern: '^\d{5}$', example: '00001'}
         tenantName: {type: string}
         status: {type: string, enum: [ACTIVE, DISABLED]}
         contactName: {type: string, nullable: true}
@@ -1258,6 +1368,23 @@ components:
             data:
               type: array
               items: {$ref: '#/components/schemas/TenantQualification'}
+    TenantQualificationApiResponse:
+      allOf:
+        - {$ref: '#/components/schemas/ApiResponse'}
+        - type: object
+          properties:
+            data: {$ref: '#/components/schemas/TenantQualification'}
+    QualificationDeletionApiResponse:
+      allOf:
+        - {$ref: '#/components/schemas/ApiResponse'}
+        - type: object
+          properties:
+            data:
+              type: object
+              required: [qualificationId]
+              properties:
+                qualificationId: {type: string, pattern: '^\d+$'}
+                deletedDocumentUrl: {type: string, nullable: true, description: 首次删除时返回，供 File Service 回收文件；重复删除为空}
     TenantAddress:
       type: object
       properties:
@@ -1273,26 +1400,43 @@ components:
         isDefault: {type: boolean}
     TenantQualification:
       type: object
+      required: [id, tenantId, qualificationType, documentUrl, originalFileName, status, createdAt, updatedAt]
       properties:
         id: {type: string, pattern: '^\d+$'}
         tenantId: {type: string, pattern: '^\d+$'}
         qualificationType: {type: string, enum: [BUSINESS_LICENSE, LEGAL_PERSON_ID, FREIGHT_FORWARDER_CERTIFICATE, BANK_ACCOUNT_LICENSE]}
         certificateNo: {type: string}
         documentUrl: {type: string}
+        originalFileName: {type: string, description: 上传时原始文件名；前端不得从 URL 或内部 ID 推断}
         validFrom: {type: string, format: date}
         validTo: {type: string, format: date, nullable: true}
         status: {type: string, enum: [PENDING, APPROVED, REJECTED, SUPERSEDED]}
         reviewComment: {type: string}
+        createdAt: {type: string, format: date-time}
+        updatedAt: {type: string, format: date-time}
+    QualificationSubmissionRequest:
+      type: object
+      required: [tenantId, qualificationType, documentUrl, originalFileName, replace]
+      properties:
+        tenantId: {type: string, pattern: '^\d+$'}
+        qualificationType: {type: string, enum: [LEGAL_PERSON_ID, FREIGHT_FORWARDER_CERTIFICATE, BANK_ACCOUNT_LICENSE]}
+        certificateNo: {type: string, nullable: true}
+        documentUrl: {type: string, minLength: 1}
+        originalFileName: {type: string, minLength: 1, maxLength: 255}
+        validTo: {type: string, format: date, nullable: true}
+        replace: {type: boolean}
     RequiredQualificationPackageRequest:
       type: object
-      required: [tenantId, unifiedSocialCreditCode, businessLicenseDocumentUrl, replaceBusinessLicense]
+      required: [tenantId, unifiedSocialCreditCode, businessLicenseDocumentUrl, businessLicenseOriginalFileName, replaceBusinessLicense]
       properties:
         tenantId: {type: string, pattern: '^\d+$'}
         unifiedSocialCreditCode: {type: string, pattern: '^[0-9A-Za-z]{18}$'}
         businessLicenseDocumentUrl: {type: string, minLength: 1}
+        businessLicenseOriginalFileName: {type: string, minLength: 1, maxLength: 255}
         businessLicenseValidTo: {type: string, format: date, nullable: true}
         replaceBusinessLicense: {type: boolean}
         legalPersonIdDocumentUrl: {type: string, minLength: 1, nullable: true, description: 法人身份证选填}
+        legalPersonIdOriginalFileName: {type: string, maxLength: 255, nullable: true, description: 上传法人身份证时必传}
         legalPersonIdValidTo: {type: string, format: date, nullable: true}
         replaceLegalPersonId: {type: boolean, nullable: true, default: false}
     RequiredQualificationPackageResponse:
@@ -1312,11 +1456,11 @@ components:
             data: {$ref: '#/components/schemas/RequiredQualificationPackageResponse'}
     RegisterRequest:
       type: object
-      required: [tenantName, legalName, legalRepresentative, contactName, contactPhone, servicePackage]
+      required: [tenantName, legalName, contactName, contactPhone, servicePackage]
       properties:
         tenantName: {type: string, example: 深圳虫虫出海科技有限公司}
         legalName: {type: string, example: 深圳虫虫出海科技有限公司}
-        legalRepresentative: {type: string, maxLength: 64, example: 张三}
+        legalRepresentative: {type: string, maxLength: 64, nullable: true, example: 张三, description: 选填}
         contactName: {type: string, example: 李四}
         contactPhone: {type: string, pattern: '^1[3-9]\d{9}$', example: '13800138000', description: 创建时同时初始化公司联系电话与首个管理员登录手机号；创建后二者独立维护}
         contactEmail: {type: string, format: email, example: contact@example.com}
@@ -1332,21 +1476,21 @@ components:
         internalRemark: {type: string, maxLength: 1000}
     UpdateProfileRequest:
       type: object
-      required: [tenantName, legalName, legalRepresentative, contactName, contactPhone]
+      required: [tenantName, legalName, contactName, contactPhone]
       properties:
         tenantName: {type: string}
         legalName: {type: string}
-        legalRepresentative: {type: string, maxLength: 64}
+        legalRepresentative: {type: string, maxLength: 64, nullable: true, description: 选填}
         contactName: {type: string}
         contactPhone: {type: string, pattern: '^[0-9-]{4,32}$', description: 公司联系电话，不作为登录标识且不要求跨企业唯一}
         contactEmail: {type: string, format: email}
     UpdateTenantRequest:
       type: object
-      required: [tenantName, legalName, legalRepresentative, contactName, contactPhone]
+      required: [tenantName, legalName, contactName, contactPhone]
       properties:
         tenantName: {type: string}
         legalName: {type: string}
-        legalRepresentative: {type: string, maxLength: 64}
+        legalRepresentative: {type: string, maxLength: 64, nullable: true, description: 选填}
         contactName: {type: string}
         contactPhone: {type: string, pattern: '^[0-9-]{4,32}$', description: 公司联系电话，与管理员及成员登录手机号独立且不要求跨企业唯一}
         contactEmail: {type: string, format: email}
diff --git a/iam/src/test/java/com/baiyue/iam/controller/IamOpenApiContractTest.java b/iam/src/test/java/com/baiyue/iam/controller/IamOpenApiContractTest.java
index 12d675ba8..9223ad914 100644
--- a/iam/src/test/java/com/baiyue/iam/controller/IamOpenApiContractTest.java
+++ b/iam/src/test/java/com/baiyue/iam/controller/IamOpenApiContractTest.java
@@ -76,6 +76,12 @@ class IamOpenApiContractTest {
                 .contains("id: {type: string, pattern: '^\\d+$'")
                 .contains("/api/platform/v1/iam/tenants/{tenantId}/addresses:")
                 .contains("/api/platform/v1/iam/tenants/{tenantId}/qualifications:")
+                .contains("/api/platform/v1/iam/tenants/{tenantId}/qualifications/{qualificationId}:")
+                .contains("/api/merchant/v1/iam/tenant/qualifications/{qualificationId}:")
+                .contains("originalFileName: {type: string, description: 上传时原始文件名；前端不得从 URL 或内部 ID 推断}")
+                .contains("updatedAt: {type: string, format: date-time}")
+                .contains("仅客户状态为 `PROFILE_REQUIRED` 或 `REJECTED` 时允许")
+                .contains("merchant:qualification:upload")
                 .contains("platform:customer:list")
                 .doesNotContain("platform:customer:view")
                 .contains("TenantAddressListApiResponse:")
diff --git a/iam/src/test/java/com/baiyue/iam/controller/PlatformCustomerResourceContractTest.java b/iam/src/test/java/com/baiyue/iam/controller/PlatformCustomerResourceContractTest.java
index fdcb270cb..2c05b5d40 100644
--- a/iam/src/test/java/com/baiyue/iam/controller/PlatformCustomerResourceContractTest.java
+++ b/iam/src/test/java/com/baiyue/iam/controller/PlatformCustomerResourceContractTest.java
@@ -4,6 +4,7 @@ import com.baiyue.common.security.AuthenticatedUser;
 import org.junit.jupiter.api.Test;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 
 import java.lang.reflect.Method;
 
@@ -17,6 +18,22 @@ class PlatformCustomerResourceContractTest {
                 "/api/platform/v1/iam/tenants/{tenantId}/addresses");
         assertListPermissionContract("platformQualifications",
                 "/api/platform/v1/iam/tenants/{tenantId}/qualifications");
+        Method platformDetail = ProfileResourceController.class.getMethod(
+                "platformQualification", long.class, long.class, AuthenticatedUser.class);
+        assertEquals("/api/platform/v1/iam/tenants/{tenantId}/qualifications/{qualificationId}",
+                platformDetail.getAnnotation(GetMapping.class).value()[0]);
+        assertEquals("hasAuthority('platform:customer:list')",
+                platformDetail.getAnnotation(PreAuthorize.class).value());
+        Method merchantDetail = ProfileResourceController.class.getMethod(
+                "qualification", long.class, AuthenticatedUser.class);
+        assertEquals("hasAuthority('merchant:profile:view')",
+                merchantDetail.getAnnotation(PreAuthorize.class).value());
+        Method merchantDelete = ProfileResourceController.class.getMethod(
+                "deleteQualification", long.class, AuthenticatedUser.class);
+        assertEquals("/api/merchant/v1/iam/tenant/qualifications/{qualificationId}",
+                merchantDelete.getAnnotation(DeleteMapping.class).value()[0]);
+        assertEquals("hasAuthority('merchant:qualification:upload')",
+                merchantDelete.getAnnotation(PreAuthorize.class).value());
     }
 
     private void assertListPermissionContract(String methodName, String path) throws Exception {
diff --git a/iam/src/test/java/com/baiyue/iam/controller/PlatformTenantControllerContractTest.java b/iam/src/test/java/com/baiyue/iam/controller/PlatformTenantControllerContractTest.java
index a6fc8ce28..b2ed7fb78 100644
--- a/iam/src/test/java/com/baiyue/iam/controller/PlatformTenantControllerContractTest.java
+++ b/iam/src/test/java/com/baiyue/iam/controller/PlatformTenantControllerContractTest.java
@@ -31,7 +31,7 @@ class PlatformTenantControllerContractTest {
         assertNotNull(annotation(method, 0, Min.class));
         assertNotNull(annotation(method, 1, Min.class));
         assertEquals(200, annotation(method, 1, Max.class).value());
-        assertEquals("PROFILE_REQUIRED|PENDING|ACTIVE|REJECTED|DISABLED|ARCHIVED",
+        assertEquals("PROFILE_REQUIRED|PENDING|ACTIVE|REJECTED|DISABLED",
                 annotation(method, 3, Pattern.class).regexp());
 
         Set<String> statuses = Arrays.stream(method.getAnnotation(ApiResponses.class).value())
diff --git a/iam/src/test/java/com/baiyue/iam/repository/ArchivedCustomerListContractTest.java b/iam/src/test/java/com/baiyue/iam/repository/ArchivedCustomerListContractTest.java
new file mode 100644
index 000000000..b33acb2ac
--- /dev/null
+++ b/iam/src/test/java/com/baiyue/iam/repository/ArchivedCustomerListContractTest.java
@@ -0,0 +1,19 @@
+package com.baiyue.iam.repository;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ArchivedCustomerListContractTest {
+    @Test
+    void customerListAndExportExcludeArchivedTenants() throws Exception {
+        String source = Files.readString(Path.of(
+                "src/main/java/com/baiyue/iam/repository/TenantRepository.java"));
+
+        assertThat(source.split("\\.ne\\(IamTenant::getStatus, \\\"ARCHIVED\\\"\\)", -1))
+                .hasSizeGreaterThanOrEqualTo(3);
+    }
+}
diff --git a/iam/src/test/java/com/baiyue/iam/repository/CustomerCodeRepositoryTest.java b/iam/src/test/java/com/baiyue/iam/repository/CustomerCodeRepositoryTest.java
new file mode 100644
index 000000000..9b7f0ab7d
--- /dev/null
+++ b/iam/src/test/java/com/baiyue/iam/repository/CustomerCodeRepositoryTest.java
@@ -0,0 +1,23 @@
+package com.baiyue.iam.repository;
+
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class CustomerCodeRepositoryTest {
+    @Test
+    void allocatesFiveDigitCodeFromOne() {
+        assertEquals("00001", CustomerCodeRepository.format(1));
+        assertEquals("99999", CustomerCodeRepository.format(99_999));
+    }
+
+    @Test
+    void rejectsAllocationAfterFiveDigitCapacityIsExhausted() {
+        BizException failure = assertThrows(BizException.class,
+            () -> CustomerCodeRepository.format(100_000));
+
+        assertEquals(ResultCode.CONFLICT, failure.getResultCode());
+    }
+}
diff --git a/iam/src/test/java/com/baiyue/iam/repository/CustomerCodeSchemaContractTest.java b/iam/src/test/java/com/baiyue/iam/repository/CustomerCodeSchemaContractTest.java
new file mode 100644
index 000000000..27e88c17d
--- /dev/null
+++ b/iam/src/test/java/com/baiyue/iam/repository/CustomerCodeSchemaContractTest.java
@@ -0,0 +1,34 @@
+package com.baiyue.iam.repository;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.core.io.ClassPathResource;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CustomerCodeSchemaContractTest {
+    @Test
+    void baselineAndUnifiedSqlInitializeCustomerCodeSequenceAtOne() throws Exception {
+        String baseline = new ClassPathResource("db/iam.sql")
+            .getContentAsString(StandardCharsets.UTF_8);
+        Path unifiedPath = Path.of("deploy", "sql", "头程数据库统一增量-MySQL8.sql");
+        if (!Files.exists(unifiedPath)) {
+            unifiedPath = Path.of("..", "deploy", "sql", "头程数据库统一增量-MySQL8.sql");
+        }
+        String unified = Files.readString(unifiedPath, StandardCharsets.UTF_8);
+
+        assertSequenceDefinition(baseline);
+        assertSequenceDefinition(unified);
+    }
+
+    private static void assertSequenceDefinition(String sql) {
+        assertThat(sql)
+            .contains("tenant_code VARCHAR(8) NOT NULL")
+            .contains("CREATE TABLE IF NOT EXISTS iam_number_sequence")
+            .contains("PRIMARY KEY (sequence_key)")
+            .contains("INSERT IGNORE INTO iam_number_sequence(sequence_key, next_value) VALUES ('CUSTOMER_CODE', 1)");
+    }
+}
diff --git a/iam/src/test/java/com/baiyue/iam/repository/CustomerProfileMigrationContractTest.java b/iam/src/test/java/com/baiyue/iam/repository/CustomerProfileMigrationContractTest.java
index 48b2738bf..5fbd42587 100644
--- a/iam/src/test/java/com/baiyue/iam/repository/CustomerProfileMigrationContractTest.java
+++ b/iam/src/test/java/com/baiyue/iam/repository/CustomerProfileMigrationContractTest.java
@@ -78,7 +78,7 @@ class CustomerProfileMigrationContractTest {
                 .contains("phase1-onboarding.sql")
                 .contains("`PROFILE_REQUIRED` 默认状态、审核结果字段、资质审核备注及成员审计字段")
                 .contains("全局 `MERCHANT_OWNER` 角色模板")
-                .contains("测试环境只执行当前固定入口");
+                .contains("测试环境结构发布只执行全量固定入口");
     }
 
     @Test
diff --git a/iam/src/test/java/com/baiyue/iam/repository/QualificationSchemaContractTest.java b/iam/src/test/java/com/baiyue/iam/repository/QualificationSchemaContractTest.java
new file mode 100644
index 000000000..547e94802
--- /dev/null
+++ b/iam/src/test/java/com/baiyue/iam/repository/QualificationSchemaContractTest.java
@@ -0,0 +1,31 @@
+package com.baiyue.iam.repository;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.core.io.ClassPathResource;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class QualificationSchemaContractTest {
+    @Test
+    void baselineAndUnifiedSqlPersistTheUploadOriginalFileName() throws Exception {
+        String baseline = new ClassPathResource("db/iam.sql")
+                .getContentAsString(StandardCharsets.UTF_8);
+        Path unifiedPath = Path.of("deploy", "sql", "头程数据库统一增量-MySQL8.sql");
+        if (!Files.exists(unifiedPath)) {
+            unifiedPath = Path.of("..", "deploy", "sql", "头程数据库统一增量-MySQL8.sql");
+        }
+        String unified = Files.readString(unifiedPath, StandardCharsets.UTF_8);
+
+        assertThat(baseline).contains("original_file_name VARCHAR(255) NOT NULL COMMENT '上传时原始文件名'");
+        assertThat(unified)
+                .contains("original_file_name VARCHAR(255) NOT NULL COMMENT '上传时原始文件名'")
+                .contains("CALL phase1_iam_add_column('iam_tenant_qualification', 'original_file_name',")
+                .contains("table_name='iam_tenant_qualification'")
+                .contains("column_name='original_file_name'")
+                .contains("统一迁移失败：IAM客户资质缺少原始文件名列");
+    }
+}
diff --git a/iam/src/test/java/com/baiyue/iam/service/CustomerListExportProviderServiceTest.java b/iam/src/test/java/com/baiyue/iam/service/CustomerListExportProviderServiceTest.java
index 92f5639c6..68a289288 100644
--- a/iam/src/test/java/com/baiyue/iam/service/CustomerListExportProviderServiceTest.java
+++ b/iam/src/test/java/com/baiyue/iam/service/CustomerListExportProviderServiceTest.java
@@ -140,7 +140,7 @@ class CustomerListExportProviderServiceTest {
     private IamTenant tenant(long id) {
         IamTenant tenant = new IamTenant();
         tenant.setId(id);
-        tenant.setTenantCode("TEN" + id);
+        tenant.setTenantCode(String.format("%05d", id));
         tenant.setTenantName("柏悦物流" + id);
         tenant.setLegalName("柏悦物流有限公司");
         tenant.setUnifiedSocialCreditCode("91440000123456789X");
diff --git a/iam/src/test/java/com/baiyue/iam/service/MerchantOnboardingServiceTest.java b/iam/src/test/java/com/baiyue/iam/service/MerchantOnboardingServiceTest.java
index 2b48686ef..339dc050c 100644
--- a/iam/src/test/java/com/baiyue/iam/service/MerchantOnboardingServiceTest.java
+++ b/iam/src/test/java/com/baiyue/iam/service/MerchantOnboardingServiceTest.java
@@ -14,7 +14,9 @@ import com.baiyue.iam.mapper.IamTenantMapper;
 import com.baiyue.iam.mapper.IamTenantQualificationMapper;
 import com.baiyue.iam.mapper.IamTenantReviewMapper;
 import com.baiyue.iam.mapper.IamUserMapper;
+import com.baiyue.iam.repository.CustomerCodeRepository;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
 import org.mockito.ArgumentCaptor;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -23,6 +25,7 @@ import jakarta.annotation.Resource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
@@ -42,7 +45,14 @@ class MerchantOnboardingServiceTest {
     @MockBean private CustomerDimensionRuleInitializationService dimensionRuleInitialization;
     @MockBean private OverseasStorageFeeInitializationService overseasStorageFeeInitialization;
     @MockBean private SecurityEventOutboxService securityEvents;
+    @MockBean private CustomerCodeRepository customerCodes;
     @Resource private MerchantOnboardingService service;
+
+    @BeforeEach
+    void allocateCustomerCode() {
+        when(customerCodes.nextCode()).thenReturn("00001");
+    }
+
     @Test
     void clientRegistrationCreatesOwnerAndAssignsGlobalMerchantOwnerRole() {
 
@@ -76,6 +86,7 @@ class MerchantOnboardingServiceTest {
         assertEquals("PROFILE_REQUIRED", result.tenantStatus());
         assertEquals("PENDING", result.dimensionInitializationStatus());
         assertEquals("PENDING", tenant.getValue().getDimensionInitializationStatus());
+        assertEquals("00001", tenant.getValue().getTenantCode());
         assertEquals(result.tenantId(), tenant.getValue().getId());
         assertEquals("测试企业", tenant.getValue().getLegalName());
         assertEquals("张三", tenant.getValue().getLegalRepresentative());
@@ -93,6 +104,52 @@ class MerchantOnboardingServiceTest {
         assertNotNull(result.tenantId());
     }
 
+    @Test
+    void clientRegistrationAcceptsAnOmittedLegalRepresentative() {
+        IamRole ownerRole = new IamRole();
+        ownerRole.setId(4000100L);
+        ownerRole.setTenantId(0L);
+        ownerRole.setAppCode("MERCHANT");
+        ownerRole.setRoleCode("MERCHANT_OWNER");
+        ownerRole.setStatus("ACTIVE");
+        when(roles.selectOne(any())).thenReturn(ownerRole);
+
+        service.register(new MerchantRegistrationRequest(
+                9001L, "注册人", "测试企业", null, "13800138000",
+                "owner@example.com", "CN", "深圳市宝安区"));
+
+        ArgumentCaptor<IamTenant> tenant = ArgumentCaptor.forClass(IamTenant.class);
+        verify(tenants).insert(tenant.capture());
+        assertNull(tenant.getValue().getLegalRepresentative());
+    }
+
+    @Test
+    void registrationLookupReturnsTheExistingQualificationDraftState() {
+        IamUser user = new IamUser();
+        user.setId(20001L);
+        user.setAuthUserId(9001L);
+        IamMembership membership = new IamMembership();
+        membership.setId(30001L);
+        membership.setTenantId(10001L);
+        membership.setUserId(20001L);
+        membership.setMemberType("OWNER");
+        IamTenant tenant = new IamTenant();
+        tenant.setId(10001L);
+        tenant.setTenantType("MERCHANT");
+        tenant.setStatus("PROFILE_REQUIRED");
+        tenant.setDimensionInitializationStatus("READY");
+        when(users.selectOne(any())).thenReturn(user);
+        when(memberships.selectOne(any())).thenReturn(membership);
+        when(tenants.selectById(10001L)).thenReturn(tenant);
+
+        var result = service.registration(9001L);
+
+        assertEquals(10001L, result.tenantId());
+        assertEquals(30001L, result.membershipId());
+        assertEquals("PROFILE_REQUIRED", result.tenantStatus());
+        assertEquals("READY", result.dimensionInitializationStatus());
+    }
+
     @Test
     void compensationRemovesOnlyAnUnstartedRegistration() {
 
diff --git a/iam/src/test/java/com/baiyue/iam/service/MerchantQualificationUploadTest.java b/iam/src/test/java/com/baiyue/iam/service/MerchantQualificationUploadTest.java
index 80173ee17..ef40a7b22 100644
--- a/iam/src/test/java/com/baiyue/iam/service/MerchantQualificationUploadTest.java
+++ b/iam/src/test/java/com/baiyue/iam/service/MerchantQualificationUploadTest.java
@@ -15,6 +15,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import jakarta.annotation.Resource;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -43,7 +44,8 @@ class MerchantQualificationUploadTest {
 
         var response = service.submitQualification(new QualificationSubmissionRequest(
                 10001L, "FREIGHT_FORWARDER_CERTIFICATE", null,
-                "/api/merchant/v1/files/qualifications/freight-forwarder.png", LocalDate.of(2030, 1, 1), false));
+                "/api/merchant/v1/files/qualifications/freight-forwarder.png", "freight-forwarder.png",
+                LocalDate.of(2030, 1, 1), false));
 
         assertEquals("PROFILE_REQUIRED", response.tenantStatus());
         assertNull(response.reviewId());
@@ -68,6 +70,7 @@ class MerchantQualificationUploadTest {
         var response = service.submitQualification(new QualificationSubmissionRequest(
                 10001L, "LEGAL_PERSON_ID", null,
                 "/api/merchant/v1/files/qualifications/new-legal-person.png",
+                "new-legal-person.png",
                 LocalDate.of(2035, 12, 31), true));
 
         assertEquals("/api/merchant/v1/files/qualifications/old-legal-person.png",
@@ -92,7 +95,7 @@ class MerchantQualificationUploadTest {
         when(tenantRepository.findTenantForUpdate(10001L)).thenReturn(tenant);
         assertThrows(BizException.class, () -> service.submitQualification(new QualificationSubmissionRequest(
                 10001L, "BUSINESS_LICENSE", "91310101abcde12345",
-                "/api/merchant/v1/files/qualifications/license.png", null, false)));
+                "/api/merchant/v1/files/qualifications/license.png", "license.png", null, false)));
 
         verify(profileRepository, never()).insertQualification(any());
     }
@@ -108,8 +111,8 @@ class MerchantQualificationUploadTest {
 
         var response = service.submitRequiredQualificationPackage(new RequiredQualificationPackageRequest(
                 10001L, "91310101abcde12345",
-                "/api/merchant/v1/files/qualifications/license.png", null, false,
-                "/api/merchant/v1/files/qualifications/legal-person.png", null, false));
+                "/api/merchant/v1/files/qualifications/license.png", "license.png", null, false,
+                "/api/merchant/v1/files/qualifications/legal-person.png", "legal-person.png", null, false));
 
         assertEquals("PROFILE_REQUIRED", response.tenantStatus());
         assertEquals("91310101ABCDE12345", tenant.getUnifiedSocialCreditCode());
@@ -128,8 +131,8 @@ class MerchantQualificationUploadTest {
 
         var response = service.submitRequiredQualificationPackage(new RequiredQualificationPackageRequest(
                 10001L, "91310101abcde12345",
-                "/api/merchant/v1/files/qualifications/license.png", null, false,
-                null, null, null));
+                "/api/merchant/v1/files/qualifications/license.png", "license.png", null, false,
+                null, null, null, null));
 
         assertNull(response.legalPersonIdQualificationId());
         verify(profileRepository, times(1)).insertQualification(any());
@@ -147,12 +150,66 @@ class MerchantQualificationUploadTest {
 
         assertThrows(BizException.class, () -> service.submitRequiredQualificationPackage(
                 new RequiredQualificationPackageRequest(10001L, "91310101ABCDE12345",
-                        "/api/merchant/v1/files/qualifications/license.png", null, true,
-                        "/api/merchant/v1/files/qualifications/legal-person.png", null, true)));
+                        "/api/merchant/v1/files/qualifications/license.png", "license.png", null, true,
+                        "/api/merchant/v1/files/qualifications/legal-person.png", "legal-person.png", null, true)));
 
         verify(profileRepository, never()).insertQualification(any());
     }
 
+    @Test
+    void qualificationListReturnsPersistedOriginalFileNameAndUpdatedTime() {
+        IamTenantQualification item = qualification("LEGAL_PERSON_ID", "/files/qualification/1");
+        item.setOriginalFileName("法人身份证.png");
+        item.setUpdatedAt(LocalDateTime.of(2026, 9, 11, 10, 30));
+        when(profileRepository.findQualifications(10001L)).thenReturn(List.of(item));
+
+        var response = service.qualifications(10001L);
+
+        assertEquals("法人身份证.png", response.get(0).originalFileName());
+        assertEquals(LocalDateTime.of(2026, 9, 11, 10, 30), response.get(0).updatedAt());
+    }
+
+    @Test
+    void deletesDraftQualificationWithTenantLock() {
+        IamTenant tenant = new IamTenant();
+        tenant.setId(10001L); tenant.setTenantType("MERCHANT"); tenant.setStatus("PROFILE_REQUIRED");
+        IamTenantQualification item = qualification("LEGAL_PERSON_ID", "/files/qualification/1");
+        when(tenantRepository.findTenantForUpdate(10001L)).thenReturn(tenant);
+        when(profileRepository.findQualificationForUpdate(10001L, 1L)).thenReturn(item);
+
+        var response = service.deleteQualification(10001L, 1L);
+
+        assertEquals(1L, response.qualificationId());
+        assertEquals("/files/qualification/1", response.deletedDocumentUrl());
+        verify(profileRepository).deleteQualification(item);
+    }
+
+    @Test
+    void repeatedOrCrossTenantDeleteIsIdempotentAndDoesNotLeakOwnership() {
+        IamTenant tenant = new IamTenant();
+        tenant.setId(10001L); tenant.setTenantType("MERCHANT"); tenant.setStatus("REJECTED");
+        when(tenantRepository.findTenantForUpdate(10001L)).thenReturn(tenant);
+        when(profileRepository.findQualificationForUpdate(10001L, 99L)).thenReturn(null);
+
+        var response = service.deleteQualification(10001L, 99L);
+
+        assertEquals(99L, response.qualificationId());
+        assertNull(response.deletedDocumentUrl());
+        verify(profileRepository, never()).deleteQualification(any());
+    }
+
+    @Test
+    void rejectsDeleteAfterReviewSubmission() {
+        IamTenant tenant = new IamTenant();
+        tenant.setId(10001L); tenant.setTenantType("MERCHANT"); tenant.setStatus("PENDING");
+        when(tenantRepository.findTenantForUpdate(10001L)).thenReturn(tenant);
+
+        assertThrows(BizException.class, () -> service.deleteQualification(10001L, 1L));
+
+        verify(profileRepository, never()).findQualificationForUpdate(10001L, 1L);
+        verify(profileRepository, never()).deleteQualification(any());
+    }
+
     private static IamTenantQualification qualification(String type, String documentUrl) {
         IamTenantQualification qualification = new IamTenantQualification();
         qualification.setId(1L);
diff --git a/iam/src/test/java/com/baiyue/iam/service/PlatformQualificationRegistrationTest.java b/iam/src/test/java/com/baiyue/iam/service/PlatformQualificationRegistrationTest.java
index b6131881b..38c2d7ec3 100644
--- a/iam/src/test/java/com/baiyue/iam/service/PlatformQualificationRegistrationTest.java
+++ b/iam/src/test/java/com/baiyue/iam/service/PlatformQualificationRegistrationTest.java
@@ -35,7 +35,7 @@ class PlatformQualificationRegistrationTest {
 
         var response = service.registerPlatformQualification(new PlatformQualificationRegistrationRequest(
             10001L, "BANK_ACCOUNT_LICENSE", null, "/api/merchant/v1/files/qualifications/file.pdf",
-            LocalDate.of(2030, 12, 31), false));
+            "file.pdf", LocalDate.of(2030, 12, 31), false));
 
         ArgumentCaptor<IamTenantQualification> captor = ArgumentCaptor.forClass(IamTenantQualification.class);
         verify(repository).insertQualification(captor.capture());
@@ -60,7 +60,7 @@ class PlatformQualificationRegistrationTest {
 
         var response = service.registerPlatformQualification(new PlatformQualificationRegistrationRequest(
             10001L, "BANK_ACCOUNT_LICENSE", null, "/api/merchant/v1/files/qualifications/new-file.pdf",
-            LocalDate.of(2031, 12, 31), true));
+            "new-file.pdf", LocalDate.of(2031, 12, 31), true));
 
         ArgumentCaptor<IamTenantQualification> captor = ArgumentCaptor.forClass(IamTenantQualification.class);
         verify(repository, times(2)).saveQualification(captor.capture());
diff --git a/iam/src/test/java/com/baiyue/iam/service/SecurityEventOutboxServiceTest.java b/iam/src/test/java/com/baiyue/iam/service/SecurityEventOutboxServiceTest.java
index b66d458b7..b7e7f89c9 100644
--- a/iam/src/test/java/com/baiyue/iam/service/SecurityEventOutboxServiceTest.java
+++ b/iam/src/test/java/com/baiyue/iam/service/SecurityEventOutboxServiceTest.java
@@ -84,7 +84,7 @@ class SecurityEventOutboxServiceTest {
             .thenReturn(List.of("PLATFORM_ADMIN"));
         when(authorizationQueries.findPermissionsByIdentity(101L, 0L, "ADMIN"))
             .thenReturn(List.of("platform:overseas-warehouse:orders:view", "platform:iam:users:view",
-                "lastleg:orders:view"));
+                "merchant:overseas-warehouse:return-inventory:list", "lastleg:orders:view"));
 
         service.permissionChanged(101L, 0L, "ADMIN", "ROLE_CHANGED");
 
@@ -96,7 +96,8 @@ class SecurityEventOutboxServiceTest {
             envelope.payload(), IamSecurityEventsV1.PermissionVersionChanged.class);
         assertThat(payload.roles()).containsExactly("PLATFORM_ADMIN");
         assertThat(payload.authorities()).containsExactlyInAnyOrder(
-            "platform:overseas-warehouse:orders:view", "lastleg:orders:view");
+            "platform:overseas-warehouse:orders:view",
+            "merchant:overseas-warehouse:return-inventory:list", "lastleg:orders:view");
         assertThat(payload.authorities()).doesNotContain("platform:iam:users:view");
     }
 }
diff --git a/iam/src/test/java/com/baiyue/iam/service/TenantCustomerExportTest.java b/iam/src/test/java/com/baiyue/iam/service/TenantCustomerExportTest.java
index 6ff844faa..aa1f23fd3 100644
--- a/iam/src/test/java/com/baiyue/iam/service/TenantCustomerExportTest.java
+++ b/iam/src/test/java/com/baiyue/iam/service/TenantCustomerExportTest.java
@@ -5,6 +5,7 @@ import com.baiyue.iam.entity.IamTenant;
 import com.baiyue.iam.repository.ProfileResourceRepository;
 import com.baiyue.iam.repository.MemberRepository;
 import com.baiyue.iam.repository.TenantRepository;
+import com.baiyue.iam.repository.CustomerCodeRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -21,6 +22,7 @@ import static org.mockito.Mockito.when;
 @SpringJUnitConfig(TenantService.class)
 class TenantCustomerExportTest {
     @MockBean private TenantRepository repository;
+    @MockBean private CustomerCodeRepository customerCodes;
     @MockBean private ProfileResourceRepository profileRepository;
     @MockBean private MemberRepository memberRepository;
     @MockBean private AuthAccountClient authAccountClient;
@@ -34,7 +36,7 @@ class TenantCustomerExportTest {
     void returnsUnmaskedCustomerRowsAndAdvancingCursor() {
         IamTenant tenant = new IamTenant();
         tenant.setId(101L);
-        tenant.setTenantCode("TEN101");
+        tenant.setTenantCode("00101");
         tenant.setTenantName("柏悦物流");
         tenant.setContactPhone("13800138000");
         tenant.setContactEmail("ops@example.com");
diff --git a/iam/src/test/java/com/baiyue/iam/service/TenantServiceTest.java b/iam/src/test/java/com/baiyue/iam/service/TenantServiceTest.java
index e25b98c87..ce6928eb8 100644
--- a/iam/src/test/java/com/baiyue/iam/service/TenantServiceTest.java
+++ b/iam/src/test/java/com/baiyue/iam/service/TenantServiceTest.java
@@ -14,6 +14,7 @@ import com.baiyue.iam.dto.TenantDtos.ResetCustomerOwnerPasswordRequest;
 import com.baiyue.iam.dto.TenantDtos.CustomerImpersonationRequest;
 import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.iam.repository.TenantRepository;
+import com.baiyue.iam.repository.CustomerCodeRepository;
 import com.baiyue.iam.repository.ProfileResourceRepository;
 import com.baiyue.iam.repository.MemberRepository;
 import com.baiyue.iam.mapper.IamRoleMapper;
@@ -51,6 +52,7 @@ import com.baiyue.common.core.api.ResultCode;
 @TestPropertySource(properties = "baiyue.security.internal-service-token=internal-token")
 class TenantServiceTest {
     @MockBean private TenantRepository repository;
+    @MockBean private CustomerCodeRepository customerCodes;
     @MockBean private ProfileResourceRepository profileRepository;
     @MockBean private MemberRepository members;
     @MockBean private IamRoleMapper roles;
@@ -63,6 +65,7 @@ class TenantServiceTest {
 
     @BeforeEach
     void allowUnusedAdministratorPhone() {
+        when(customerCodes.nextCode()).thenReturn("00001");
         when(authClient.availability(eq("internal-token"), any()))
                 .thenReturn(com.baiyue.common.core.api.ApiResponse.success(true));
     }
@@ -72,7 +75,7 @@ class TenantServiceTest {
 
         IamTenant tenant = new IamTenant();
         tenant.setId(10001L);
-        tenant.setTenantCode("TEN10001");
+        tenant.setTenantCode("10001");
         tenant.setTenantName("Example Merchant");
         tenant.setStatus("ACTIVE");
         tenant.setLegalName("Example Merchant Ltd");
@@ -91,7 +94,7 @@ class TenantServiceTest {
         var result = service.pageMerchants(1, 10, "Example", "ACTIVE");
 
         assertEquals(1, result.total());
-        assertEquals("TEN10001", result.records().get(0).tenantCode());
+        assertEquals("10001", result.records().get(0).tenantCode());
         assertEquals("Alice", result.records().get(0).contactName());
         assertEquals("Sales Zhang", result.records().get(0).salesOwnerName());
         assertEquals(30, result.records().get(0).paymentTermDays());
@@ -108,7 +111,7 @@ class TenantServiceTest {
         review.setReviewType("REGISTER");
         review.setCreatedAt(LocalDateTime.of(2026, 8, 17, 10, 27));
         IamTenant tenant = merchant(10001L, "PENDING");
-        tenant.setTenantCode("TEN10001");
+        tenant.setTenantCode("10001");
         tenant.setTenantName("Example Merchant");
         tenant.setContactName("Alice");
         tenant.setContactPhone("13800138000");
@@ -124,7 +127,7 @@ class TenantServiceTest {
         assertEquals("REGISTER", result.get(0).reviewType());
         assertEquals("PENDING", result.get(0).status());
         assertEquals("Example Merchant", result.get(0).tenantName());
-        assertEquals("TEN10001", result.get(0).tenantCode());
+        assertEquals("10001", result.get(0).tenantCode());
         assertEquals("Alice", result.get(0).contactName());
         assertEquals("13800138000", result.get(0).contactPhone());
         assertEquals("alice@example.com", result.get(0).contactEmail());
@@ -136,7 +139,7 @@ class TenantServiceTest {
     @Test
     void pageFinanceCustomersKeepsFullContactSummaryForInternalFinance() {
         IamTenant tenant = merchant(10001L, "ACTIVE");
-        tenant.setTenantCode("TEN10001");
+        tenant.setTenantCode("10001");
         tenant.setTenantName("Example Merchant");
         tenant.setContactName("Alice");
         tenant.setContactPhone("13800138000");
@@ -145,7 +148,7 @@ class TenantServiceTest {
 
         var result = service.pageFinanceCustomers(1, 10, "Alice", "ACTIVE", null);
 
-        assertEquals("TEN10001", result.records().get(0).tenantCode());
+        assertEquals("10001", result.records().get(0).tenantCode());
         assertEquals("Alice", result.records().get(0).contactName());
         assertEquals("13800138000", result.records().get(0).contactPhone());
         verify(repository).pageFinanceCustomers(1, 10, "Alice", "ACTIVE", null);
@@ -320,6 +323,7 @@ class TenantServiceTest {
             9001L);
 
         assertEquals("PROFILE_REQUIRED", created.tenant().status());
+        assertEquals("00001", created.tenant().tenantCode());
         assertEquals("PENDING", created.tenant().dimensionInitializationStatus());
         assertEquals("Bob", created.tenant().legalRepresentative());
         assertEquals("基础版", created.tenant().servicePackage());
@@ -515,7 +519,7 @@ class TenantServiceTest {
     private IamTenant merchant(long id, String status) {
         IamTenant tenant = new IamTenant();
         tenant.setId(id);
-        tenant.setTenantCode("TEN" + id);
+        tenant.setTenantCode(String.format("%05d", id));
         tenant.setTenantType("MERCHANT");
         tenant.setStatus(status);
         tenant.setDimensionInitializationStatus("READY");
diff --git a/lastleg-service/AGENTS.md b/lastleg-service/AGENTS.md
index e97d75a18..e215e0bd1 100644
--- a/lastleg-service/AGENTS.md
+++ b/lastleg-service/AGENTS.md
@@ -9,6 +9,18 @@
 
 ## 快速索引
 
+退货预报、签收、库存、合箱与退货出库：
+
+- 客户预报 `returnreceipt/controller/MerchantReturnOrderController.java` → `returnreceipt/service/ReturnReceiptService.java`，路径 `/api/merchant/v1/last-leg/return-orders`；客户范围取认证身份，预报按 SKU 保存期望数量。状态 `PENDING_RECEIPT → PARTIALLY_RECEIVED → COMPLETED` 表示签收进度，不等于换标或出库完成。
+- PDA 后端签收 `returnreceipt/controller/PdaReturnReceiptController.java`，前缀 `/api/pda/v1/last-leg/return-receipts`，依次 `start/sku-candidates/confirm`；按冻结仓和退货单校验实收，不允许未预报 SKU 或超量，幂等重放不得重复入账。确认同时生成签收箱与 SKU 库存；设备页面是否接通另查 PDA 工作台，不能以 Controller 存在代替前端接入。
+- 库存/箱号 `returnreceipt/controller/PlatformReturnInventoryController.java`、`MerchantReturnInventoryController.java` → `returnreceipt/service/ReturnInventoryService.java`，前缀分别为 `/api/platform/v1/last-leg/return-inventory`、`/api/merchant/v1/last-leg/return-inventory`；PDA 合箱入口 `PdaReturnInventoryController.java` 的 `/packing/orders`、`/cartons/merge`、`/cartons/{cartonMark}/label`。同仓同客户选取退货单及可用 SKU，合箱扣减来源箱数量并生成目标箱，空来源箱标为 `MERGED`，不得跨客户或超出可用量。
+- 退货出库继续进入 `delivery/service/DeliveryTransferService.java` 的 `RETURN_OUTBOUND`，按退货库存可用箱唛创建与拣货；不能与 `exceptionorder/` 的派送退回恢复库存混用。契约见 `src/main/resources/openapi/overseas-business-v1.yaml`，表入口 `src/main/resources/db/lastleg.sql` 的 `ll_return_*`。
+- 客户箱号管理使用 `GET /api/merchant/v1/last-leg/return-inventory/cartons` 按实物箱分页，库存箱内 SKU 明细仍使用根查询；两者均按登录客户精确隔离。合箱 `sourceBatchNo/sourceReturnNo` 保存实际消耗来源的去重业务编号（多个以逗号分隔），不得写状态或包含未取货订单。`ReturnCartonBarcode` 按箱号生成 Code 128 SVG，打印内容不得使用内部客户/仓库 ID。
+
+人工计划自动生成托盘与资源重试：`inboundplan/controller/InboundPlanController.java` → `inboundplan/service/ContainerInboundPlanConversionCoordinator.java` 的 `convertManualAndAutoMaterialize`；保存单票后重读全柜预览，全员为 `PLANNED/RESOURCE_PENDING`、预览就绪且存在待绑定资源时自动调用柜级 `confirm`。一票柜立即触发，多票柜在最后一票齐全后触发；资源异常沿 `resourcePendingPlanCount` 和原柜级预览/确认入口重试，不新增独立正常人工步骤。回归入口为 `src/test/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinatorTest.java`。
+
+柜级预览同时返回 `sourcePalletCount/supplementPalletCount/targetPalletCount`：头程冻结托盘码原样保留，海外仓最终托数较多时按同柜同 FBA 编码序列补足差额，不因头尾装托密度不同阻断；页面必须分别展示头程已有、海外补充和最终托数，不能把最终总数误称为“本次新增”。
+
 头程来源托盘快照：`service/LoadingCompletedConsumer.java`、`mapper/LastlegSourcePalletMapper.java`；来源标签随装柜完成事件落入 `ll_order_source_pallet`，后续由 `inboundplan/service/InboundPlanService.java` 与 `ContainerInboundPlanConversionCoordinator.java` 传递给海外资源批量预留。排查标签跨区丢失时沿此链路核对，不能在尾程页面重新生成头程托盘码。
 
 | 功能 | 入口 |
@@ -122,5 +134,5 @@
 - 安全投影边界变更同时运行 `SecurityProjectionArchitectureTest` 与 `LastlegSecurityContractTest`；`security/controller|dto|service` 只允许依赖本子域和根 `InternalServiceTokenGuard`，其他 Lastleg 业务包不得直接依赖这些投影内部包。
 - 表字段、注释和索引同步维护基线 SQL 与统一增量 SQL；生产/存量库只执行增量脚本。
 - 事件契约变化同时检查 `common-event-contract` 版本、Event Bridge 消费方和旧 Payload 哈希兼容。
-- 定向验证：`mvn -pl lastleg -am test`。
+- 定向验证：从后端根执行 `mvn -pl lastleg-service -am test`。
 - 事件链路变更至少覆盖重复事件、相同来源入仓单、事务回滚、并发单号、内部令牌和租户越权测试。
diff --git a/lastleg-service/pom.xml b/lastleg-service/pom.xml
index 01edad467..1314eb0d7 100644
--- a/lastleg-service/pom.xml
+++ b/lastleg-service/pom.xml
@@ -5,6 +5,7 @@
     <parent><groupId>com.baiyue.firstleg</groupId><artifactId>baiyue-firstleg-platform</artifactId><version>1.0.0-SNAPSHOT</version><relativePath>../pom.xml</relativePath></parent>
     <artifactId>lastleg-service</artifactId>
     <dependencies>
+        <dependency><groupId>com.google.zxing</groupId><artifactId>core</artifactId><version>3.5.3</version></dependency>
         <dependency><groupId>com.baiyue.shared</groupId><artifactId>common-event-contract</artifactId><version>${project.version}</version></dependency>
         <dependency><groupId>com.baiyue.shared</groupId><artifactId>baiyue-common-openapi</artifactId><version>${project.version}</version></dependency>
 <dependency><groupId>com.baomidou</groupId><artifactId>mybatis-plus-spring-boot3-starter</artifactId></dependency>
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/client/DomesticWarehouseDirectoryClient.java b/lastleg-service/src/main/java/com/baiyue/lastleg/client/DomesticWarehouseDirectoryClient.java
index 2f3b48a3c..048206462 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/client/DomesticWarehouseDirectoryClient.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/client/DomesticWarehouseDirectoryClient.java
@@ -22,5 +22,6 @@ public interface DomesticWarehouseDirectoryClient {
     record Warehouse(Long id, Long tenantId, String warehouseCode, String warehouseName,
                      String warehouseType, String countryCode, String status) { }
 
-    record Address(String stateProvince) { }
+    record Address(String addressType, String countryCode, String stateProvince, String city,
+                   String district, String postalCode, String addressLine1, String addressLine2) { }
 }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/client/PrintPdfClient.java b/lastleg-service/src/main/java/com/baiyue/lastleg/client/PrintPdfClient.java
new file mode 100644
index 000000000..ed4ef5325
--- /dev/null
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/client/PrintPdfClient.java
@@ -0,0 +1,28 @@
+package com.baiyue.lastleg.client;
+
+import java.math.BigDecimal;
+import java.util.List;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+@FeignClient(name = "print-service", contextId = "lastlegPrintPdfClient",
+    url = "${baiyue.clients.print.url:}", path = "/internal/print/v1/pdfs")
+public interface PrintPdfClient {
+    @PostMapping(value = "/dispatch-bol-documents", consumes = "application/json")
+    ResponseEntity<byte[]> generateDispatchBol(
+        @RequestHeader("X-Internal-Service-Token") String token,
+        @RequestHeader(value = "X-Request-Id", required = false) String requestId,
+        @RequestBody Request request);
+
+    record Request(String templateCode, PageSpec pageSpec, String downloadFileName, List<Document> documents) {}
+    record PageSpec(BigDecimal widthMm, BigDecimal heightMm) {}
+    record Document(String shipFromName, String shipFromAddress, String carrierName, String isaNumber,
+                    String appointmentTime, String trailerNumber, String sealNumber, String fbaWarehouseCode,
+                    String shipToName, String shipToAddress, String dispatchNo, String fbaShipmentIds,
+                    String poReferenceNos, int totalPackages, int pageNumber, int pageCount, List<CargoRow> cargoRows) {}
+    record CargoRow(String containerNo, String palletNo, String fbaWarehouseCode, String warehouseNo,
+                    String fbaShipmentId, String poReferenceNo, int packageCount) {}
+}
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/controller/DispatchQueryController.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/controller/DispatchQueryController.java
index e01581530..feac81de7 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/controller/DispatchQueryController.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/controller/DispatchQueryController.java
@@ -6,6 +6,7 @@ import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.lastleg.dispatch.dto.DispatchRequests;
 import com.baiyue.lastleg.dispatch.dto.DispatchResponse;
 import com.baiyue.lastleg.dispatch.service.DispatchService;
+import com.baiyue.lastleg.dispatch.service.DispatchBolPrintService;
 import com.baiyue.lastleg.security.OverseasPermissions;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -13,6 +14,11 @@ import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.CacheControl;
+import org.springframework.http.ContentDisposition;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +26,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
+import jakarta.servlet.http.HttpServletRequest;
+import java.nio.charset.StandardCharsets;
 
 @RestController
 @ConditionalOnProperty(name = "lastleg.dispatch-query-api.enabled", havingValue = "true")
@@ -27,6 +35,7 @@ import org.springframework.web.server.ResponseStatusException;
 @Tag(name = "Tail-leg vehicle dispatch query")
 public class DispatchQueryController {
     @Resource private DispatchService service;
+    @Resource private DispatchBolPrintService printService;
 
     @GetMapping
     @PreAuthorize("hasAuthority('" + OverseasPermissions.DISPATCH_LIST + "')")
@@ -48,6 +57,21 @@ public class DispatchQueryController {
         return ApiResponse.success(service.platformDetail(dispatchNo));
     }
 
+    @GetMapping(value = "/{dispatchNo}/prints/bol", produces = MediaType.APPLICATION_PDF_VALUE)
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.DISPATCH_LIST + "')")
+    @Operation(summary = "Generate dispatch BOL as an A4 PDF")
+    public ResponseEntity<byte[]> printBol(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String dispatchNo, HttpServletRequest request) {
+        requirePlatform(user);
+        DispatchBolPrintService.GeneratedPdf pdf = printService.generate(dispatchNo, request.getHeader("X-Request-Id"));
+        ResponseEntity.BodyBuilder response = ResponseEntity.ok().contentType(MediaType.APPLICATION_PDF)
+            .cacheControl(CacheControl.noStore()).header(HttpHeaders.PRAGMA, "no-cache")
+            .header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment().filename(pdf.fileName(), StandardCharsets.UTF_8).build().toString())
+            .header("X-Content-Type-Options", "nosniff");
+        if (pdf.pageCount() != null) response.header("X-Print-Page-Count", pdf.pageCount());
+        return response.contentLength(pdf.content().length).body(pdf.content());
+    }
+
     private void requirePlatform(AuthenticatedUser user) {
         if (user == null || user.tenantId() == null) {
             throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/dto/DispatchResponse.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/dto/DispatchResponse.java
index 5e7d2a81d..7de25f0a8 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/dto/DispatchResponse.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/dto/DispatchResponse.java
@@ -12,11 +12,16 @@ public record DispatchResponse(Long id, String dispatchNo, String vehiclePlate,
                                int itemCount, int palletCount, int packageCount, int pickedPackageCount,
                                int shippedPackageCount, int remainingPackageCount, String partialCompletionReason,
                                LocalDateTime createdAt,
-                               List<Item> items) {
+                               List<Item> items, List<BolLine> bolLines) {
     public record Item(Long id, Long planPalletId, Long warehousePalletId, String palletNo,
                        String overseasWarehouseId, String overseasWarehouseName,
                        String orderNo, String orderRefs, String inboundCode, String destinationWarehouseCode,
                        String destinationWarehouseName, String fbaWarehouseCode, int packageCount,
                        BigDecimal volumeCbm, String sourceStage) {
     }
+
+    public record BolLine(String containerNo, String palletNo, String fbaWarehouseCode,
+                          String destinationWarehouseName, String warehouseNo, String fbaShipmentId,
+                          String poReferenceNo, int packageCount) {
+    }
 }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchBolMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchBolMapper.java
new file mode 100644
index 000000000..254dbdded
--- /dev/null
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchBolMapper.java
@@ -0,0 +1,35 @@
+package com.baiyue.lastleg.dispatch.mapper;
+
+import com.baiyue.lastleg.dispatch.dto.DispatchResponse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface DispatchBolMapper {
+    @Select("SELECT " +
+        "COALESCE(MAX(NULLIF(o.container_no,'')),MAX(NULLIF(ip.container_no,''))) AS containerNo," +
+        "MAX(NULLIF(di.pallet_no,'')) AS palletNo," +
+        "COALESCE(MAX(NULLIF(l.destination_warehouse_code,'')),MAX(NULLIF(di.fba_warehouse_code,''))," +
+        "MAX(NULLIF(di.destination_warehouse_code,''))) AS fbaWarehouseCode," +
+        "COALESCE(MAX(NULLIF(l.destination_warehouse_name,'')),MAX(NULLIF(di.destination_warehouse_name,''))) AS destinationWarehouseName," +
+        "COALESCE(MAX(NULLIF(l.inbound_code,'')),MAX(NULLIF(di.inbound_code,''))) AS warehouseNo," +
+        "GROUP_CONCAT(DISTINCT NULLIF(od.shipment_no,'') ORDER BY od.shipment_no SEPARATOR ', ') AS fbaShipmentId," +
+        "GROUP_CONCAT(DISTINCT NULLIF(od.fba_tracking_no,'') ORDER BY od.fba_tracking_no SEPARATOR ', ') AS poReferenceNo," +
+        "CASE WHEN MAX(l.id) IS NULL THEN COALESCE(MAX(di.package_count),0) " +
+        "WHEN COALESCE(MAX(a.picked_package_count),0)>0 THEN MAX(a.picked_package_count) " +
+        "ELSE COALESCE(MAX(a.planned_package_count),0) END AS packageCount " +
+        "FROM ll_dispatch_item di " +
+        "LEFT JOIN ll_inbound_plan_pallet p ON p.id=di.plan_pallet_id " +
+        "LEFT JOIN ll_inbound_plan ip ON ip.id=p.plan_id AND ip.customer_id=di.customer_id " +
+        "LEFT JOIN ll_inbound_plan_pallet_allocation a ON a.pallet_id=p.id " +
+        "LEFT JOIN ll_inbound_plan_line l ON l.id=a.line_id AND l.customer_id=di.customer_id " +
+        "LEFT JOIN ll_order o ON o.id=l.order_id AND o.customer_id=di.customer_id " +
+        "LEFT JOIN ll_order_detail od ON od.order_id=l.order_id AND od.customer_id=di.customer_id " +
+        "WHERE di.customer_id=#{customerId} AND di.dispatch_order_id=#{dispatchOrderId} " +
+        "GROUP BY di.id,l.id ORDER BY di.id,l.id")
+    List<DispatchResponse.BolLine> findByDispatchOrder(@Param("customerId") String customerId,
+                                                       @Param("dispatchOrderId") Long dispatchOrderId);
+}
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/service/DispatchBolPrintService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/service/DispatchBolPrintService.java
new file mode 100644
index 000000000..4ec0823cd
--- /dev/null
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/service/DispatchBolPrintService.java
@@ -0,0 +1,144 @@
+package com.baiyue.lastleg.dispatch.service;
+
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.lastleg.client.DomesticWarehouseDirectoryClient;
+import com.baiyue.lastleg.client.PrintPdfClient;
+import com.baiyue.lastleg.dispatch.dto.DispatchResponse;
+import feign.FeignException;
+import jakarta.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DispatchBolPrintService {
+    private static final String TEMPLATE = "DISPATCH_BILL_OF_LADING_A4_V2";
+    private static final int FIRST_PAGE_ROWS = 18;
+    private static final int CONTINUATION_PAGE_ROWS = 26;
+    private static final PrintPdfClient.PageSpec A4 = new PrintPdfClient.PageSpec(new BigDecimal("210"), new BigDecimal("297"));
+
+    @Resource private DispatchService dispatches;
+    @Resource private PrintPdfClient print;
+    @Resource private DomesticWarehouseDirectoryClient warehouses;
+    @Value("${baiyue.security.internal-service-token:}") private String internalToken;
+
+    public GeneratedPdf generate(String dispatchNo, String requestId) {
+        DispatchResponse detail = dispatches.platformDetail(dispatchNo);
+        if (detail.bolLines() == null || detail.bolLines().isEmpty()) {
+            throw new BizException(ResultCode.VALIDATION_FAILED, "排车单没有可打印的BOL明细");
+        }
+        List<PrintPdfClient.Document> documents = documents(detail);
+        String fileName = safeFilePart(detail.dispatchNo()) + "-BOL.pdf";
+        try {
+            ResponseEntity<byte[]> response = print.generateDispatchBol(internalToken, requestId,
+                    new PrintPdfClient.Request(TEMPLATE, A4, fileName, documents));
+            byte[] content = response.getBody();
+            MediaType contentType = response.getHeaders().getContentType();
+            if (!response.getStatusCode().is2xxSuccessful() || content == null || content.length == 0
+                    || contentType == null || !MediaType.APPLICATION_PDF.isCompatibleWith(contentType)) {
+                throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "打印服务未返回有效PDF");
+            }
+            return new GeneratedPdf(content, fileName, response.getHeaders().getFirst("X-Print-Page-Count"));
+        } catch (FeignException exception) {
+            throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "打印服务暂不可用");
+        }
+    }
+
+    private List<PrintPdfClient.Document> documents(DispatchResponse detail) {
+        String shipFromAddress = warehouseAddress(detail.overseasWarehouseId());
+        Map<String, List<DispatchResponse.BolLine>> groups = new LinkedHashMap<>();
+        for (DispatchResponse.BolLine line : detail.bolLines()) groups.computeIfAbsent(text(line.fbaWarehouseCode()), ignored -> new ArrayList<>()).add(line);
+        List<PrintPdfClient.Document> documents = new ArrayList<>();
+        for (Map.Entry<String, List<DispatchResponse.BolLine>> group : groups.entrySet()) {
+            List<DispatchResponse.BolLine> lines = group.getValue();
+            int pages = pageCount(lines.size());
+            int total = lines.stream().mapToInt(DispatchResponse.BolLine::packageCount).sum();
+            String destination = lines.stream().map(DispatchResponse.BolLine::destinationWarehouseName).filter(v -> v != null && !v.isBlank()).findFirst().orElse("—");
+            int offset = 0;
+            for (int page = 0; page < pages; page++) {
+                int capacity = page == 0 ? FIRST_PAGE_ROWS : CONTINUATION_PAGE_ROWS;
+                int end = Math.min(lines.size(), offset + capacity);
+                List<PrintPdfClient.CargoRow> rows = lines.subList(offset, end).stream()
+                        .map(line -> new PrintPdfClient.CargoRow(text(line.containerNo()), text(line.palletNo()), text(line.fbaWarehouseCode()),
+                                text(line.warehouseNo()), text(line.fbaShipmentId()), text(line.poReferenceNo()), line.packageCount())).toList();
+                documents.add(new PrintPdfClient.Document(text(detail.overseasWarehouseName()), shipFromAddress, text(detail.carrierName()),
+                        text(detail.fbaAppointmentNo()), dateTime(detail.estimatedArrivalAt()), text(detail.vehiclePlate()), "—",
+                        group.getKey(), destination, "—", text(detail.dispatchNo()), unique(lines, true), unique(lines, false),
+                        total, page + 1, pages, rows));
+                offset = end;
+            }
+        }
+        return List.copyOf(documents);
+    }
+
+    private String warehouseAddress(String warehouseId) {
+        long id;
+        try {
+            id = Long.parseLong(warehouseId == null ? "" : warehouseId.strip());
+        } catch (NumberFormatException exception) {
+            throw new BizException(ResultCode.VALIDATION_FAILED, "排车单未关联有效的海外仓");
+        }
+        try {
+            var response = warehouses.activeWarehouse(id, internalToken);
+            if (response == null || !response.successful() || response.data() == null) {
+                throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "仓库主数据暂不可用，无法生成BOL");
+            }
+            List<DomesticWarehouseDirectoryClient.Address> addresses = response.data().addresses();
+            if (addresses == null || addresses.isEmpty()) return "—";
+            DomesticWarehouseDirectoryClient.Address address = addresses.stream().filter(Objects::nonNull)
+                    .filter(value -> "OPERATING".equals(value.addressType())).findFirst()
+                    .orElseGet(() -> addresses.stream().filter(Objects::nonNull).findFirst().orElse(null));
+            if (address == null) return "—";
+            List<String> parts = new ArrayList<>();
+            add(parts, address.addressLine1());
+            add(parts, address.addressLine2());
+            String city = trimmed(address.city());
+            String state = trimmed(address.stateProvince());
+            String postalCode = trimmed(address.postalCode());
+            String region = city == null ? state : state == null ? city : city + ", " + state;
+            if (postalCode != null) region = region == null ? postalCode : region + " " + postalCode;
+            add(parts, region);
+            add(parts, address.countryCode());
+            return parts.isEmpty() ? "—" : String.join(", ", parts);
+        } catch (FeignException exception) {
+            throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "仓库主数据暂不可用，无法生成BOL");
+        }
+    }
+
+    private void add(List<String> parts, String value) {
+        if (value != null && !value.isBlank()) parts.add(value.strip());
+    }
+
+    private String trimmed(String value) {
+        return value == null || value.isBlank() ? null : value.strip();
+    }
+
+    static int pageCount(int rowCount) {
+        if (rowCount <= FIRST_PAGE_ROWS) return 1;
+        return 1 + (rowCount - FIRST_PAGE_ROWS + CONTINUATION_PAGE_ROWS - 1) / CONTINUATION_PAGE_ROWS;
+    }
+
+    private String unique(List<DispatchResponse.BolLine> lines, boolean shipment) {
+        LinkedHashSet<String> values = new LinkedHashSet<>();
+        for (DispatchResponse.BolLine line : lines) {
+            String raw = shipment ? line.fbaShipmentId() : line.poReferenceNo();
+            if (raw != null) for (String value : raw.split(",")) if (!value.isBlank()) values.add(value.strip());
+        }
+        return values.isEmpty() ? "—" : String.join(", ", values);
+    }
+    private String dateTime(java.time.LocalDateTime value) { return value == null ? "—" : value.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); }
+    private String text(String value) { return value == null || value.isBlank() ? "—" : value.strip(); }
+    private String safeFilePart(String value) { return text(value).replaceAll("[\\\\/:*?\"<>|]", "-"); }
+
+    public record GeneratedPdf(byte[] content, String fileName, String pageCount) {}
+}
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/service/DispatchService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/service/DispatchService.java
index 7e10b3f08..15b0e762f 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/service/DispatchService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/service/DispatchService.java
@@ -12,6 +12,7 @@ import com.baiyue.lastleg.dispatch.entity.DispatchPalletLock;
 import com.baiyue.lastleg.dispatch.entity.DispatchDraft;
 import com.baiyue.lastleg.dispatch.entity.DispatchDraftContainer;
 import com.baiyue.lastleg.dispatch.mapper.DispatchCandidateMapper;
+import com.baiyue.lastleg.dispatch.mapper.DispatchBolMapper;
 import com.baiyue.lastleg.dispatch.mapper.DispatchItemMapper;
 import com.baiyue.lastleg.dispatch.mapper.DispatchOrderMapper;
 import com.baiyue.lastleg.dispatch.mapper.DispatchPalletLockMapper;
@@ -52,6 +53,7 @@ public class DispatchService {
 
     @Resource private DispatchOrderMapper orders;
     @Resource private DispatchItemMapper items;
+    @Resource private DispatchBolMapper bolLines;
     @Resource private DispatchPalletLockMapper locks;
     @Resource private DispatchDraftMapper drafts;
     @Resource private DispatchDraftContainerMapper draftContainers;
@@ -475,7 +477,8 @@ public class DispatchService {
 
     public DispatchResponse detail(String customerId, String dispatchNo) {
         DispatchOrder dispatch = find(customerId, dispatchNo);
-        return response(dispatch, items.findByDispatchOrder(dispatch.getCustomerId(), dispatch.getId()));
+        return response(dispatch, items.findByDispatchOrder(dispatch.getCustomerId(), dispatch.getId()),
+            bolLines.findByDispatchOrder(dispatch.getCustomerId(), dispatch.getId()));
     }
 
     public DispatchResponse platformDetail(String dispatchNo) {
@@ -483,7 +486,8 @@ public class DispatchService {
         if (dispatch == null) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Dispatch order not found");
         }
-        return response(dispatch, items.findByDispatchOrder(dispatch.getCustomerId(), dispatch.getId()));
+        return response(dispatch, items.findByDispatchOrder(dispatch.getCustomerId(), dispatch.getId()),
+            bolLines.findByDispatchOrder(dispatch.getCustomerId(), dispatch.getId()));
     }
 
     @Transactional
@@ -593,6 +597,11 @@ public class DispatchService {
     }
 
     private DispatchResponse response(DispatchOrder order, List<DispatchItem> itemList) {
+        return response(order, itemList, List.of());
+    }
+
+    private DispatchResponse response(DispatchOrder order, List<DispatchItem> itemList,
+                                      List<DispatchResponse.BolLine> bolLineList) {
         String orderNos = itemList.stream().flatMap(item -> splitOrderRefs(item.getOrderRefs(), item.getOrderNo()).stream())
             .distinct().collect(Collectors.joining(","));
         return new DispatchResponse(order.getId(), order.getDispatchNo(), order.getVehiclePlate(), order.getDriverName(),
@@ -609,7 +618,8 @@ public class DispatchService {
                 item.getWarehousePalletId(), item.getPalletNo(), item.getOverseasWarehouseId(), item.getOverseasWarehouseName(),
                 item.getOrderNo(), item.getOrderRefs(), item.getInboundCode(),
                 item.getDestinationWarehouseCode(), item.getDestinationWarehouseName(), item.getFbaWarehouseCode(),
-                Objects.requireNonNullElse(item.getPackageCount(), 0), item.getVolumeCbm(), item.getSourceStage())).toList());
+                Objects.requireNonNullElse(item.getPackageCount(), 0), item.getVolumeCbm(), item.getSourceStage())).toList(),
+            bolLineList == null ? List.of() : bolLineList);
     }
 
     private static String route(List<DispatchPalletCandidate> selected) {
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/dto/DropshipRequests.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/dto/DropshipRequests.java
index 1f16c8c93..98054de3f 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/dto/DropshipRequests.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/dto/DropshipRequests.java
@@ -8,7 +8,11 @@ public final class DropshipRequests {
     private DropshipRequests() {}
     public record Receive(@NotBlank String customerId, @NotNull Long orderId, @NotNull Long warehouseId,
                           @NotBlank String idempotencyKey, @NotEmpty List<@Valid Pallet> pallets) {}
-    public record Pallet(@NotBlank String palletNo, @NotEmpty List<@Valid SkuPackages> skuPackages) {}
+    public record Pallet(@NotBlank String palletNo, @NotEmpty List<@Valid SkuPackages> skuPackages,
+                         @NotNull @Positive Integer manifestVersion,
+                         @NotNull @Positive Integer manifestPackageCount,
+                         @NotNull @Positive Integer manifestFragmentCount,
+                         @NotBlank @Size(max = 64) String manifestHash) {}
     public record SkuPackages(@NotBlank String skuCode, String productName, @Positive long packageCount,
                               @Positive long productQuantity,
                               @NotEmpty List<@NotBlank String> cartonMarks) {}
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/entity/DropshipOrderProfile.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/entity/DropshipOrderProfile.java
index 15bc5046a..c91c0aff7 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/entity/DropshipOrderProfile.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/entity/DropshipOrderProfile.java
@@ -13,6 +13,10 @@ public class DropshipOrderProfile {
     private String palletNo;
     /** Immutable pallet number snapshot supplied by the first-leg handover event. */
     private String sourcePalletNo;
+    private Integer manifestVersion;
+    private Integer manifestPackageCount;
+    private Integer manifestFragmentCount;
+    private String manifestHash;
     private Long inventoryPositionId;
     private String status;
     private String idempotencyKey;
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/mapper/DropshipCartonMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/mapper/DropshipCartonMapper.java
index 383c34665..624db797d 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/mapper/DropshipCartonMapper.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/mapper/DropshipCartonMapper.java
@@ -17,6 +17,14 @@ public interface DropshipCartonMapper extends BaseMapper<DropshipCarton> {
 
     @Select("SELECT * FROM ll_dropship_carton WHERE customer_id=#{customerId} AND order_id=#{orderId} ORDER BY profile_id,carton_sequence")
     List<DropshipCarton> listOrder(@Param("customerId") String customerId, @Param("orderId") Long orderId);
+    @Select("""
+        SELECT DISTINCT p.source_pallet_no FROM ll_dropship_carton c
+        JOIN ll_dropship_order_profile p ON p.id=c.profile_id AND p.customer_id=c.customer_id
+        JOIN ll_order o ON o.id=c.order_id AND o.customer_id=c.customer_id
+        WHERE o.container_no=#{containerNo} AND c.carton_mark=#{cartonMark}
+        """)
+    List<String> sourcePalletsInContainer(@Param("containerNo") String containerNo,
+                                          @Param("cartonMark") String cartonMark);
     @Select("SELECT * FROM ll_dropship_carton WHERE customer_id=#{customerId} AND profile_id=#{profileId} AND sku_code=#{sku} AND status='AVAILABLE' ORDER BY carton_sequence LIMIT #{packages} FOR UPDATE")
     List<DropshipCarton> lockAvailable(@Param("customerId") String customerId, @Param("profileId") Long profileId, @Param("sku") String sku, @Param("packages") long packages);
     @Update("UPDATE ll_dropship_carton SET status='AVAILABLE', outbound_order_no=NULL, updated_at=NOW(3) WHERE customer_id=#{customerId} AND outbound_order_no=#{outboundNo} AND status='SHIPPED'")
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/mapper/DropshipOrderProfileMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/mapper/DropshipOrderProfileMapper.java
index 0d3bf6f05..d881788e1 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/mapper/DropshipOrderProfileMapper.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/mapper/DropshipOrderProfileMapper.java
@@ -39,6 +39,14 @@ public interface DropshipOrderProfileMapper extends BaseMapper<DropshipOrderProf
     List<DropshipOrderProfile> listOrder(@Param("customerId") String customerId, @Param("orderId") Long orderId);
     @Select("SELECT * FROM ll_dropship_order_profile WHERE customer_id=#{customerId} AND inventory_position_id=#{positionId} LIMIT 1")
     DropshipOrderProfile findPosition(@Param("customerId") String customerId, @Param("positionId") Long positionId);
+    @Select("""
+        SELECT p.* FROM ll_dropship_order_profile p
+        JOIN ll_order o ON o.id=p.order_id AND o.customer_id=p.customer_id
+        WHERE o.container_no=#{containerNo} AND p.source_pallet_no=#{sourcePalletNo}
+        ORDER BY p.customer_id,p.order_id,p.id
+        """)
+    List<DropshipOrderProfile> listContainerPallet(@Param("containerNo") String containerNo,
+                                                   @Param("sourcePalletNo") String sourcePalletNo);
 
     @Select("<script>" + OUTBOUND_CANDIDATE_SELECT + OUTBOUND_CANDIDATE_WHERE +
         "<if test='warehouseId != null and warehouseId != \"\"'>AND pos.overseas_warehouse_id=#{warehouseId} </if>" +
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/service/DropshipOrderService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/service/DropshipOrderService.java
index 3c75db35d..f36ed59ff 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/service/DropshipOrderService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dropship/service/DropshipOrderService.java
@@ -51,6 +51,17 @@ public class DropshipOrderService {
             Set<String> requestedPallets = request.pallets().stream().map(value -> value.palletNo().trim())
                 .collect(java.util.stream.Collectors.toSet());
             if (!existingPallets.equals(requestedPallets)) throw conflict("Dropship order pallet snapshot conflicts with existing data");
+            Map<String, DropshipOrderProfile> byPallet = existing.stream().collect(Collectors.toMap(
+                DropshipOrderProfile::getSourcePalletNo, value -> value));
+            for (DropshipRequests.Pallet requested : request.pallets()) {
+                DropshipOrderProfile stored = byPallet.get(requested.palletNo().trim());
+                if (!java.util.Objects.equals(stored.getManifestVersion(), requested.manifestVersion())
+                    || !java.util.Objects.equals(stored.getManifestPackageCount(), requested.manifestPackageCount())
+                    || !java.util.Objects.equals(stored.getManifestFragmentCount(), requested.manifestFragmentCount())
+                    || !java.util.Objects.equals(stored.getManifestHash(), requested.manifestHash())) {
+                    throw conflict("Dropship pallet manifest conflicts with existing data: " + requested.palletNo());
+                }
+            }
             return Math.toIntExact(totalPackages);
         }
 
@@ -104,6 +115,10 @@ public class DropshipOrderService {
         DropshipOrderProfile profile = new DropshipOrderProfile();
         profile.setId(IdWorker.getId()); profile.setCustomerId(request.customerId()); profile.setOrderId(order.getId());
         profile.setSourcePalletNo(input.palletNo().trim());
+        profile.setManifestVersion(input.manifestVersion());
+        profile.setManifestPackageCount(input.manifestPackageCount());
+        profile.setManifestFragmentCount(input.manifestFragmentCount());
+        profile.setManifestHash(input.manifestHash().trim().toLowerCase(java.util.Locale.ROOT));
         profile.setStatus("PENDING_INBOUND"); profile.setVersion(0L);
         profile.setIdempotencyKey(request.idempotencyKey() + ":" + input.palletNo().trim());
         profile.setCreatedAt(now); profile.setUpdatedAt(now);
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/dto/LastlegOrderSummary.java b/lastleg-service/src/main/java/com/baiyue/lastleg/dto/LastlegOrderSummary.java
index c6f0a5782..43088f10c 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/dto/LastlegOrderSummary.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/dto/LastlegOrderSummary.java
@@ -29,6 +29,8 @@ public record LastlegOrderSummary(
     String transferWarehouseName,
     String fbaWarehouseCode,
     String containerNo,
+    @Schema(description = "由柜级船节点门禁读取的最新标准货柜节点")
+    String containerNode,
     Boolean abnormal,
     Boolean detained,
     Boolean heldChargeable,
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/entity/LastlegOrder.java b/lastleg-service/src/main/java/com/baiyue/lastleg/entity/LastlegOrder.java
index b86b2a53f..574def390 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/entity/LastlegOrder.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/entity/LastlegOrder.java
@@ -36,7 +36,6 @@ public class LastlegOrder {
     private String transferWarehouseId;
     private String transferWarehouseCode;
     private String transferWarehouseName;
-    private String containerStatus;
     private Boolean abnormal;
     private Boolean detained;
     private Boolean holdChargeable;
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/ContainerInboundPlanPreviewResponse.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/ContainerInboundPlanPreviewResponse.java
index 145aacd90..639b9851e 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/ContainerInboundPlanPreviewResponse.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/ContainerInboundPlanPreviewResponse.java
@@ -17,6 +17,8 @@ public record ContainerInboundPlanPreviewResponse(
     int blockedOrderCount,
     int pendingOrderCount,
     int pendingPalletCount,
+    int sourcePalletCount,
+    int supplementPalletCount,
     int existingPlannedPalletCount,
     int totalSuggestedPalletCount,
     int totalPlannedPalletCount,
@@ -31,6 +33,8 @@ public record ContainerInboundPlanPreviewResponse(
         int orderCount,
         int pendingOrderCount,
         int pendingPalletCount,
+        int sourcePalletCount,
+        int supplementPalletCount,
         int existingPlannedPalletCount,
         int suggestedPalletCount,
         int plannedPalletCount,
@@ -52,6 +56,9 @@ public record ContainerInboundPlanPreviewResponse(
         int packageCount,
         BigDecimal volumeCbm,
         Integer suggestedPalletCount,
+        int sourcePalletCount,
+        int targetPalletCount,
+        int supplementPalletCount,
         Integer plannedPalletCount,
         String existingPlanNo,
         String planStatus,
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/InboundPlanResponse.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/InboundPlanResponse.java
index 8188d0a75..f36ce2706 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/InboundPlanResponse.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/InboundPlanResponse.java
@@ -10,6 +10,9 @@ public record InboundPlanResponse(
     String planNo,
     String customerId,
     Long sourceOrderId,
+    String sourceOrderNo,
+    String customerName,
+    String orderType,
     String containerNo,
     String overseasWarehouseCode,
     String overseasWarehouseName,
@@ -29,7 +32,9 @@ public record InboundPlanResponse(
     boolean mergeRequired,
     boolean urgent,
     String creationMode,
-    String remark
+    String remark,
+    LocalDateTime createdAt,
+    LocalDateTime updatedAt
 ) {
     public record Line(Long id, Long orderId, String inboundCode, String fbaWarehouseCode, String destinationWarehouseId,
                        String destinationWarehouseCode, String destinationWarehouseName,
@@ -44,7 +49,8 @@ public record InboundPlanResponse(
                          int actualPackageCount) {
     }
 
-    public record Allocation(Long lineId, Long palletId, BigDecimal allocatedVolumeCbm,
+    public record Allocation(Long lineId, Long palletId, String palletNo, String palletOwnerPlanNo,
+                             boolean palletOwnedByCurrentPlan, BigDecimal allocatedVolumeCbm,
                              int plannedPackageCount, int countedPackageCount, int pickedPackageCount,
                              BigDecimal actualVolumeCbm, String status, int version) {
     }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/entity/InboundPlanPallet.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/entity/InboundPlanPallet.java
index 5e2085168..409059fca 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/entity/InboundPlanPallet.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/entity/InboundPlanPallet.java
@@ -3,6 +3,7 @@ package com.baiyue.lastleg.inboundplan.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -31,4 +32,6 @@ public class InboundPlanPallet {
     private LocalDateTime lockedAt;
     private BigDecimal actualVolumeCbm;
     private Integer actualPackageCount;
+    @Version
+    private Integer version;
 }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanOrderMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanOrderMapper.java
index a4e84580b..35c6d97ed 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanOrderMapper.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanOrderMapper.java
@@ -16,6 +16,7 @@ public interface InboundPlanOrderMapper {
                              String orderType) { }
     record ReceivingWarehouseSnapshot(String overseasWarehouseId, String overseasWarehouseCode,
                                       String overseasWarehouseName) { }
+    record DetailOrderSnapshot(String orderNo, String customerName, String orderType) { }
     record ContainerWarehouseRef(String customerId, Long orderId, String sourceContainerBookingId,
                                  String overseasWarehouseId) { }
     record ContainerPreviewOrderRow(
@@ -26,7 +27,7 @@ public interface InboundPlanOrderMapper {
         String overseasWarehouseName, String fbaWarehouseCode, String destinationWarehouseId,
         String destinationWarehouseCode, String destinationWarehouseName, int destinationCount,
         boolean detained, int version, String planNo, String planStatus,
-        Integer plannedPalletCount, Integer materializedPalletCount
+        Integer plannedPalletCount, Integer materializedPalletCount, Integer sourcePalletCount
     ) { }
 
     @Select("SELECT o.customer_id AS customerId,o.id AS orderId,o.order_no AS orderNo," +
@@ -44,7 +45,9 @@ public interface InboundPlanOrderMapper {
         "o.detained AS detained,o.version AS version,p.plan_no AS planNo,p.status AS planStatus," +
         "p.pallet_count AS plannedPalletCount," +
         "(SELECT COUNT(*) FROM ll_inbound_plan_pallet pp WHERE pp.customer_id=p.customer_id " +
-        "AND pp.plan_id=p.id AND pp.warehouse_pallet_id IS NOT NULL) AS materializedPalletCount " +
+        "AND pp.plan_id=p.id AND pp.warehouse_pallet_id IS NOT NULL) AS materializedPalletCount," +
+        "(SELECT COUNT(*) FROM ll_order_source_pallet sp WHERE sp.customer_id=o.customer_id " +
+        "AND sp.order_id=o.id) AS sourcePalletCount " +
         "FROM ll_order o LEFT JOIN ll_inbound_plan p ON p.customer_id=o.customer_id AND p.source_order_id=o.id " +
         "WHERE o.source_container_booking_id=#{sourceContainerBookingId} ORDER BY o.customer_id,o.id")
     List<ContainerPreviewOrderRow> containerPreviewOrders(
@@ -99,6 +102,11 @@ public interface InboundPlanOrderMapper {
     ReceivingWarehouseSnapshot findReceivingWarehouse(@Param("customerId") String customerId,
                                                        @Param("orderId") Long orderId);
 
+    @Select("SELECT order_no AS orderNo,customer_name AS customerName,order_type AS orderType " +
+        "FROM ll_order WHERE customer_id=#{customerId} AND id=#{orderId} LIMIT 1")
+    DetailOrderSnapshot findDetailOrder(@Param("customerId") String customerId,
+                                        @Param("orderId") Long orderId);
+
     @Update("UPDATE ll_order SET inbound_order_no=#{planNo},current_status='INBOUND_PLANNED'," +
         "pallet_merge_flag='MERGED',pallet_count=#{palletCount},updated_at=#{updatedAt} " +
         "WHERE customer_id=#{customerId} AND id=#{orderId}")
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/controller/ReceivingContainerController.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/controller/ReceivingContainerController.java
index a05442781..b359e1e9e 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/controller/ReceivingContainerController.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/controller/ReceivingContainerController.java
@@ -144,7 +144,7 @@ public class ReceivingContainerController {
 
     @PostMapping("/current/complete")
     public ApiResponse<ReceivingContainerResponses.Session> complete(@AuthenticationPrincipal AuthenticatedUser user,
-        @Valid @RequestBody ReceivingContainerRequests.Action request) {
+        @Valid @RequestBody ReceivingContainerRequests.Complete request) {
         PdaWarehouseIdentity identity = currentIdentity(user);
         return ApiResponse.success(service.complete(identity.operatorKey(), request));
     }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/dto/ReceivingContainerRequests.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/dto/ReceivingContainerRequests.java
index 613a7d18e..424d1a0de 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/dto/ReceivingContainerRequests.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/dto/ReceivingContainerRequests.java
@@ -13,14 +13,22 @@ public final class ReceivingContainerRequests {
     private ReceivingContainerRequests() { }
 
     public record Action(@NotBlank @Size(max = 255) String idempotencyKey) { }
+    public record Complete(boolean allowDifference,
+                           @NotBlank @Size(max = 255) String idempotencyKey) { }
     public record Sign(@NotNull @Size(min = 3, max = 3) List<@Valid SignedPhoto> photos,
                        @NotBlank @Size(max = 255) String idempotencyKey) { }
     public record SignedPhoto(@NotNull ReceivingPhotoRole role,
                               @NotBlank @Pattern(regexp = "^[1-9][0-9]{0,18}$") String fileId) { }
     public record CartonResolve(@NotBlank String cartonMark) { }
     public record PalletResolve(@NotBlank String palletCode, @NotBlank String inboundCode) { }
+    /** packageCount 是该托当前累计实收箱数，不是本次增量。 */
     public record BulkReceive(@NotBlank String inboundCode, @NotBlank String palletCode,
-                              @Positive int packageCount, @NotBlank @Size(max = 255) String idempotencyKey) { }
+                              @Positive int packageCount, Integer expectedPalletVersion,
+                              @NotBlank @Size(max = 255) String idempotencyKey) {
+        public BulkReceive(String inboundCode, String palletCode, int packageCount, String idempotencyKey) {
+            this(inboundCode, palletCode, packageCount, null, idempotencyKey);
+        }
+    }
     public record CartonReceive(@NotBlank String cartonMark, @NotBlank String palletCode,
                                 @NotBlank @Size(max = 255) String idempotencyKey) { }
     public record WholePalletReceive(@NotBlank String sourcePalletNo,
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/dto/ReceivingContainerResponses.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/dto/ReceivingContainerResponses.java
index b24602126..3319713ba 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/dto/ReceivingContainerResponses.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/dto/ReceivingContainerResponses.java
@@ -35,7 +35,7 @@ public final class ReceivingContainerResponses {
                           List<SignedPhoto> photos, LocalDateTime preparedAt, LocalDateTime signedAt,
                           LocalDateTime receivingAt, LocalDateTime completedAt,
                           int totalPackages, int receivedPackages, int pendingPackages,
-                          List<Inbound> inbounds) {
+                          boolean hasDifference, List<Inbound> inbounds) {
         public Session(String containerNo, Long overseasWarehouseId, String overseasWarehouseName,
                        String status, String operatorName, int version, List<SignedPhoto> photos,
                        LocalDateTime preparedAt, LocalDateTime signedAt, LocalDateTime receivingAt,
@@ -43,7 +43,17 @@ public final class ReceivingContainerResponses {
                        int pendingPackages, List<Inbound> inbounds) {
             this(containerNo, overseasWarehouseId, null, overseasWarehouseName, status, operatorName,
                 version, photos, preparedAt, signedAt, receivingAt, completedAt, totalPackages,
-                receivedPackages, pendingPackages, inbounds);
+                receivedPackages, pendingPackages, false, inbounds);
+        }
+
+        public Session(String containerNo, Long overseasWarehouseId, String overseasWarehouseCode,
+                       String overseasWarehouseName, String status, String operatorName, int version,
+                       List<SignedPhoto> photos, LocalDateTime preparedAt, LocalDateTime signedAt,
+                       LocalDateTime receivingAt, LocalDateTime completedAt, int totalPackages,
+                       int receivedPackages, int pendingPackages, List<Inbound> inbounds) {
+            this(containerNo, overseasWarehouseId, overseasWarehouseCode, overseasWarehouseName,
+                status, operatorName, version, photos, preparedAt, signedAt, receivingAt,
+                completedAt, totalPackages, receivedPackages, pendingPackages, false, inbounds);
         }
     }
 
@@ -65,7 +75,20 @@ public final class ReceivingContainerResponses {
                                  String fbaWarehouseCode, int plannedPalletCount, int totalPackages,
                                  int receivedPackages, int pendingPackages,
                                  boolean assigned, boolean mergeAllowed, boolean urgent,
-                                 String mergeHint) {
+                                 String mergeHint, String operationMode, String groupKey,
+                                 List<String> inboundCodes, String sourcePalletNo) {
+        public CartonResolved(String cartonMark, String inboundCode, String destinationType,
+                              String overseasWarehouseId, String overseasWarehouseName,
+                              String destinationWarehouseId, String destinationWarehouseCode,
+                              String destinationWarehouseName, String fbaWarehouseCode,
+                              int plannedPalletCount, int totalPackages, int receivedPackages,
+                              int pendingPackages, boolean assigned, boolean mergeAllowed,
+                              boolean urgent, String mergeHint) {
+            this(cartonMark, inboundCode, destinationType, overseasWarehouseId, overseasWarehouseName,
+                destinationWarehouseId, destinationWarehouseCode, destinationWarehouseName,
+                fbaWarehouseCode, plannedPalletCount, totalPackages, receivedPackages, pendingPackages,
+                assigned, mergeAllowed, urgent, mergeHint, null, null, List.of(inboundCode), null);
+        }
         public CartonResolved(String cartonMark, String inboundCode, String destinationType,
                               String overseasWarehouseId, String overseasWarehouseName,
                               String destinationWarehouseId, String destinationWarehouseCode,
@@ -75,24 +98,41 @@ public final class ReceivingContainerResponses {
             this(cartonMark, inboundCode, destinationType, overseasWarehouseId, overseasWarehouseName,
                 destinationWarehouseId, destinationWarehouseCode, destinationWarehouseName,
                 fbaWarehouseCode, plannedPalletCount, totalPackages, receivedPackages,
-                pendingPackages, false, false, false, null);
+                pendingPackages, false, false, false, null, null, null, List.of(inboundCode), null);
         }
     }
 
     public record PalletResolved(String palletCode, long warehouseId, String status,
                                  String fbaWarehouseCode, String inboundCode,
-                                 String destinationType, boolean compatible) { }
+                                 String destinationType, boolean compatible, int version,
+                                 int currentReceivedPackages) {
+        public PalletResolved(String palletCode, long warehouseId, String status,
+                              String fbaWarehouseCode, String inboundCode,
+                              String destinationType, boolean compatible) {
+            this(palletCode, warehouseId, status, fbaWarehouseCode, inboundCode,
+                destinationType, compatible, 0, 0);
+        }
+    }
 
     public record Receipt(String result, String containerNo, String inboundCode,
                           String destinationType, String palletCode, int acceptedPackages,
                           int receivedPackages, int pendingPackages, String sessionStatus,
                           boolean assigned, boolean mergeAllowed, boolean urgent,
-                          String mergeHint) {
+                          String mergeHint, String groupKey, List<String> inboundCodes) {
+        public Receipt(String result, String containerNo, String inboundCode,
+                       String destinationType, String palletCode, int acceptedPackages,
+                       int receivedPackages, int pendingPackages, String sessionStatus,
+                       boolean assigned, boolean mergeAllowed, boolean urgent, String mergeHint) {
+            this(result, containerNo, inboundCode, destinationType, palletCode, acceptedPackages,
+                receivedPackages, pendingPackages, sessionStatus, assigned, mergeAllowed, urgent,
+                mergeHint, null, List.of(inboundCode));
+        }
         public Receipt(String result, String containerNo, String inboundCode,
                        String destinationType, String palletCode, int acceptedPackages,
                        int receivedPackages, int pendingPackages, String sessionStatus) {
             this(result, containerNo, inboundCode, destinationType, palletCode, acceptedPackages,
-                receivedPackages, pendingPackages, sessionStatus, false, false, false, null);
+                receivedPackages, pendingPackages, sessionStatus, false, false, false, null,
+                null, List.of(inboundCode));
         }
     }
 
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/entity/ReceivingFbaPalletCount.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/entity/ReceivingFbaPalletCount.java
new file mode 100644
index 000000000..98baa0053
--- /dev/null
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/entity/ReceivingFbaPalletCount.java
@@ -0,0 +1,21 @@
+package com.baiyue.lastleg.inboundplan.pda.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("ll_receiving_fba_pallet_count")
+public class ReceivingFbaPalletCount {
+    @TableId(type = IdType.INPUT)
+    private Long id;
+    private Long sessionId;
+    private String groupKey;
+    private String palletCode;
+    private Integer actualPackages;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+}
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/mapper/ReceivingFbaPalletCountMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/mapper/ReceivingFbaPalletCountMapper.java
new file mode 100644
index 000000000..42dc501b2
--- /dev/null
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/mapper/ReceivingFbaPalletCountMapper.java
@@ -0,0 +1,19 @@
+package com.baiyue.lastleg.inboundplan.pda.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingFbaPalletCount;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface ReceivingFbaPalletCountMapper extends BaseMapper<ReceivingFbaPalletCount> {
+    @Select("SELECT * FROM ll_receiving_fba_pallet_count WHERE session_id=#{sessionId} " +
+        "AND group_key=#{groupKey} AND pallet_code=#{palletCode} LIMIT 1")
+    ReceivingFbaPalletCount find(@Param("sessionId") long sessionId, @Param("groupKey") String groupKey,
+                                 @Param("palletCode") String palletCode);
+
+    @Select("SELECT COALESCE(SUM(actual_packages),0) FROM ll_receiving_fba_pallet_count " +
+        "WHERE session_id=#{sessionId} AND group_key=#{groupKey}")
+    int sumActual(@Param("sessionId") long sessionId, @Param("groupKey") String groupKey);
+}
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/repository/PdaWorkflowRepository.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/repository/PdaWorkflowRepository.java
index 3968df33d..ac1bc3d3a 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/repository/PdaWorkflowRepository.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/repository/PdaWorkflowRepository.java
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Repository;
 import jakarta.annotation.Resource;
 
 import java.util.List;
+import java.util.Set;
 
 @Repository
 public class PdaWorkflowRepository {
@@ -91,6 +92,11 @@ public class PdaWorkflowRepository {
         return pallets.selectList(new LambdaQueryWrapper<InboundPlanPallet>().eq(InboundPlanPallet::getPlanId, planId));
     }
 
+    /** FBA destination groups may allocate several customers onto one logical pallet owned by another plan. */
+    public List<InboundPlanPallet> palletsByIds(Set<Long> palletIds) {
+        return palletIds == null || palletIds.isEmpty() ? List.of() : pallets.selectBatchIds(palletIds);
+    }
+
     public List<InboundPlanPalletAllocation> allocations(Long planId) {
         return allocations.selectList(new LambdaQueryWrapper<InboundPlanPalletAllocation>()
             .eq(InboundPlanPalletAllocation::getPlanId, planId));
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/InboundPdaWorkflowService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/InboundPdaWorkflowService.java
index 03f8b1ac9..2f955b56b 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/InboundPdaWorkflowService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/InboundPdaWorkflowService.java
@@ -45,6 +45,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 @Service
 public class InboundPdaWorkflowService {
@@ -578,6 +579,58 @@ public class InboundPdaWorkflowService {
         return contexts.stream().map(context -> task(context.task(), context.plan().getPlanNo())).toList();
     }
 
+    /**
+     * 现场允许带差异结束：核平计划正常入库；差异计划只冻结为待核平，继续占用实物托盘和库位，
+     * 不生成客户可用库存。柜级卸货事实仍只发布一次。
+     */
+    @Transactional
+    public void completeContainerWithDifferences(List<InboundPlan> containerPlans,
+                                                 List<InboundPlan> reconciledPlans) {
+        if (containerPlans == null || containerPlans.isEmpty()) throw conflict("Receiving container has no inbound plans");
+        Set<Long> reconciledIds = reconciledPlans.stream().map(InboundPlan::getId).collect(java.util.stream.Collectors.toSet());
+        LocalDateTime now = LocalDateTime.now();
+        List<InboundPdaTask> allTasks = new ArrayList<>();
+        for (InboundPlan plan : containerPlans.stream().sorted(Comparator.comparing(InboundPlan::getId)).toList()) {
+            InboundPdaTask task = repository.lockTask(plan.getCustomerId(), plan.getId());
+            if (task == null || unloadPhotoFileIds(task).isEmpty() || task.getUnloadPhotoUploadedAt() == null) {
+                throw conflict("Every plan must have the signed unload evidence before onsite completion");
+            }
+            if (reconciledIds.contains(plan.getId())) {
+                CompletionContext context = completionContext(plan.getCustomerId(), plan);
+                completePlan(plan.getCustomerId(), context, now);
+                allTasks.add(context.task());
+            } else {
+                task.setStatus("PENDING_RECONCILIATION"); task.setCompletedAt(now); task.setUpdatedAt(now);
+                task.setVersion(value(task.getVersion()) + 1); repository.update(task);
+                plan.setStatus("PENDING_RECONCILIATION"); plan.setUpdatedAt(now); repository.update(plan);
+                allTasks.add(task);
+            }
+        }
+        String containerNo = containerPlans.get(0).getContainerNo();
+        if (containerPlans.stream().anyMatch(plan -> !Objects.equals(containerNo, plan.getContainerNo()))) {
+            throw conflict("Inbound plans must belong to one physical container");
+        }
+        String sourceContainerBookingId = sourceContainerBookingIdForPlans(containerPlans);
+        LocalDateTime photoUploadedAt = allTasks.stream().map(InboundPdaTask::getUnloadPhotoUploadedAt)
+            .max(LocalDateTime::compareTo).orElseThrow();
+        long aggregateVersion = allTasks.stream().map(InboundPdaTask::getVersion).filter(Objects::nonNull)
+            .mapToLong(Integer::longValue).max().orElse(1L);
+        unloadCompletedOutbox.publishContainerCompleted(sourceContainerBookingId, containerNo,
+            now.toInstant(ZoneOffset.UTC), photoUploadedAt.toInstant(ZoneOffset.UTC), aggregateVersion);
+    }
+
+    private String sourceContainerBookingIdForPlans(List<InboundPlan> plans) {
+        List<String> values = plans.stream().map(plan -> {
+            LastlegOrder order = orders.selectById(plan.getSourceOrderId());
+            if (order == null || order.getSourceContainerBookingId() == null || order.getSourceContainerBookingId().isBlank()) {
+                throw new IllegalStateException("Inbound plan has no source container booking ID");
+            }
+            return order.getSourceContainerBookingId();
+        }).distinct().toList();
+        if (values.size() != 1) throw conflict("Container plans reference different source container bookings");
+        return values.get(0);
+    }
+
     private String sourceContainerBookingId(List<CompletionContext> contexts) {
         List<String> bookingIds = contexts.stream().map(context -> {
             LastlegOrder order = orders.selectById(context.plan().getSourceOrderId());
@@ -628,8 +681,15 @@ public class InboundPdaWorkflowService {
     private void completePlan(String customerId, CompletionContext context, LocalDateTime now) {
         InboundPlan plan = context.plan();
         InboundPdaTask task = context.task();
+        List<InboundPlanPallet> receiptPallets = new ArrayList<>(repository.pallets(plan.getId()));
+        Set<Long> presentPalletIds = receiptPallets.stream().map(InboundPlanPallet::getId)
+            .collect(java.util.stream.Collectors.toSet());
+        Set<Long> sharedPalletIds = context.allocations().stream().map(InboundPlanPalletAllocation::getPalletId)
+            .filter(Objects::nonNull).filter(id -> !presentPalletIds.contains(id))
+            .collect(java.util.stream.Collectors.toSet());
+        receiptPallets.addAll(repository.palletsByIds(sharedPalletIds));
         stockReceipts.stockIn(customerId, plan, task, context.lines(), context.allocations(),
-            repository.pallets(plan.getId()), now);
+            receiptPallets, now);
         for (InboundPlanCarton carton : context.cartons()) {
             carton.setStatus("ON_PALLET".equals(carton.getStatus()) ? "AVAILABLE" : "BULK_RECEIVED");
             carton.setReceivedAt(now); carton.setUpdatedAt(now);
@@ -1164,7 +1224,10 @@ public class InboundPdaWorkflowService {
                                      List<InboundPlanCarton> cartons) { }
 
     private static int value(Integer value) { return value == null ? 0 : value; }
-    private static boolean terminal(String status) { return "COMPLETED".equals(status) || "PARTIAL_INBOUND".equals(status); }
+    private static boolean terminal(String status) {
+        return "COMPLETED".equals(status) || "PARTIAL_INBOUND".equals(status)
+            || "PENDING_RECONCILIATION".equals(status);
+    }
     private static BigDecimal volume(BigDecimal value) { return value == null ? ZERO_VOLUME : value; }
     private static BigDecimal nonNegative(BigDecimal value) { return value.signum() < 0 ? ZERO_VOLUME : value.setScale(4, RoundingMode.HALF_UP); }
     private static ResponseStatusException conflict(String message) { return new ResponseStatusException(HttpStatus.CONFLICT, message); }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerService.java
index 80c77aac2..dbe1e4b04 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerService.java
@@ -20,15 +20,20 @@ import com.baiyue.lastleg.inboundplan.pda.dto.ReceivingContainerResponses;
 import com.baiyue.lastleg.inboundplan.pda.dto.ReceivingPhotoRole;
 import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingContainerOperation;
 import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingContainerSession;
+import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingFbaPalletCount;
 import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingSkuReceipt;
 import com.baiyue.lastleg.inboundplan.pda.gateway.UnloadPhotoFileGateway;
 import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingContainerOperationMapper;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingContainerSessionMapper;
+import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingFbaPalletCountMapper;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingSkuReceiptMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderDetailMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.shipping.mapper.ContainerShippingGateMapper;
+import com.baiyue.lastleg.dropship.entity.DropshipOrderProfile;
+import com.baiyue.lastleg.dropship.mapper.DropshipCartonMapper;
+import com.baiyue.lastleg.dropship.mapper.DropshipOrderProfileMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.MapperFeature;
@@ -74,8 +79,11 @@ public class ReceivingContainerService {
     @Resource private LastlegOrderDetailMapper orderDetails;
     @Resource private ReceivingContainerSessionMapper sessions;
     @Resource private ReceivingContainerOperationMapper operations;
+    @Resource private ReceivingFbaPalletCountMapper fbaPalletCounts;
     @Resource private ReceivingSkuReceiptMapper skuReceipts;
     @Resource private ContainerShippingGateMapper shippingGates;
+    @Resource private DropshipCartonMapper dropshipCartons;
+    @Resource private DropshipOrderProfileMapper dropshipProfiles;
     @Resource private WarehouseResourceGateway warehouse;
     @Resource private UnloadPhotoFileGateway unloadPhotos;
     @Resource private InboundPdaWorkflowService workflow;
@@ -246,13 +254,34 @@ public class ReceivingContainerService {
     public ReceivingContainerResponses.CartonResolved resolveCarton(String operatorKey,
                                                                     ReceivingContainerRequests.CartonResolve request) {
         ReceivingContainerSession session = requireSigned(operatorKey);
+        List<InboundRef> currentRefs = refs(session.getContainerNo());
+        String sourcePalletNo = dropshipSourcePallet(currentRefs, session.getContainerNo(), request.cartonMark());
+        if (sourcePalletNo != null) {
+            List<DropshipPalletRef> palletRefs = dropshipPalletRefs(session.getContainerNo(), sourcePalletNo);
+            requireCompleteManifest(session.getContainerNo(), sourcePalletNo);
+            List<InboundRef> group = palletRefs.stream().map(DropshipPalletRef::ref).distinct().toList();
+            InboundRef first = group.get(0);
+            List<String> inboundCodes = group.stream().map(value -> value.line().getInboundCode()).distinct().sorted().toList();
+            int total = palletRefs.stream().mapToInt(value -> value(value.allocation().getPlannedPackageCount())).sum();
+            int received = palletRefs.stream().mapToInt(value -> value(value.allocation().getPickedPackageCount())).sum();
+            ReceivingContainerResponses.Inbound inbound = inbound(first);
+            return new ReceivingContainerResponses.CartonResolved(request.cartonMark().trim(),
+                inboundCodes.get(0), inbound.destinationType(), inbound.overseasWarehouseId(),
+                inbound.overseasWarehouseName(), inbound.destinationWarehouseId(), inbound.destinationWarehouseCode(),
+                inbound.destinationWarehouseName(), inbound.fbaWarehouseCode(), 1, total, received,
+                Math.max(0, total-received), true, false, urgent(first.plan()), null,
+                "DROPSHIP_PALLET", "DP:" + sourcePalletNo, inboundCodes, sourcePalletNo);
+        }
         String inboundCode = cartonInboundCode(request.cartonMark());
-        List<InboundRef> matches = refs(session.getContainerNo()).stream()
+        List<InboundRef> matches = currentRefs.stream()
             .filter(value -> inboundCode.equals(value.line().getInboundCode())).toList();
         CartonRef carton;
         if (matches.size() > 1) {
             throw conflict("Carton mark inbound code is ambiguous in the current container");
         } else if (matches.size() == 1 && "FBA".equals(destinationType(matches.get(0).line(), matches.get(0).order()))) {
+            if (request.cartonMark().trim().equals(inboundCode)) {
+                throw conflict("Scan one FBA carton code, not the inbound code");
+            }
             carton = new CartonRef(matches.get(0));
         } else if (matches.size() == 1) {
             carton = requireCartonRef(matches.get(0).order().getCustomerId(), session.getContainerNo(), request.cartonMark());
@@ -260,6 +289,22 @@ public class ReceivingContainerService {
             carton = requireUnmatchedFbaCartonPrefix(inboundCode);
         }
         InboundRef ref = carton.ref();
+        if ("FBA".equals(destinationType(ref.line(), ref.order()))
+            && !"ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType())) {
+            List<InboundRef> group = requireFbaPlanRefs(session.getContainerNo(), ref);
+            List<String> inboundCodes = group.stream().map(value -> value.line().getInboundCode()).distinct().sorted().toList();
+            int total = group.stream().mapToInt(value -> value(value.line().getRequiredPackageCount())).sum();
+            int received = group.stream().mapToInt(this::receivedLinePackages).sum();
+            ReceivingContainerResponses.Inbound inbound = inbound(ref);
+            int palletCount = (int) group.stream().flatMap(value -> pallets.selectList(
+                new LambdaQueryWrapper<InboundPlanPallet>().eq(InboundPlanPallet::getPlanId, value.plan().getId())).stream())
+                .map(InboundPlanPallet::getWarehousePalletId).filter(Objects::nonNull).distinct().count();
+            return new ReceivingContainerResponses.CartonResolved(request.cartonMark().trim(), inboundCodes.get(0),
+                "FBA", inbound.overseasWarehouseId(), inbound.overseasWarehouseName(), inbound.destinationWarehouseId(),
+                inbound.destinationWarehouseCode(), inbound.destinationWarehouseName(), inbound.fbaWarehouseCode(),
+                palletCount, total, received, Math.max(0,total-received), true, false, urgent(ref.plan()), null,
+                "FBA_GROUP", fbaGroupKey(session.getContainerNo(), ref), inboundCodes, null);
+        }
         ReceivingContainerResponses.Inbound inbound = inbound(ref);
         return new ReceivingContainerResponses.CartonResolved(request.cartonMark().trim(),
             inbound.inboundCode(), inbound.destinationType(), inbound.overseasWarehouseId(),
@@ -273,10 +318,26 @@ public class ReceivingContainerService {
                                                                     ReceivingContainerRequests.PalletResolve request) {
         ReceivingContainerSession session = requireSigned(operatorKey);
         InboundRef ref = requireInbound(session.getContainerNo(), request.inboundCode());
-        PalletSelection selection = resolveReceivingPallet(ref, request.palletCode(), false);
+        List<InboundRef> group = "FBA".equals(destinationType(ref.line(), ref.order()))
+            && !"ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType())
+            ? requireFbaPlanRefs(session.getContainerNo(), ref) : List.of(ref);
+        PalletSelection selection = group.size() == 1 && !"FBA".equals(destinationType(ref.line(), ref.order()))
+            ? resolveReceivingPallet(ref, request.palletCode(), false) : resolveFbaGroupPallet(group, request.palletCode());
         WarehouseResourceGateway.WarehousePalletReference pallet = selection.resource();
+        int received = selection.pallet() == null ? 0 : group.stream().mapToInt(value -> allocations.selectList(
+            new LambdaQueryWrapper<InboundPlanPalletAllocation>()
+                .eq(InboundPlanPalletAllocation::getPlanId, value.plan().getId())
+                .eq(InboundPlanPalletAllocation::getLineId, value.line().getId())
+                .eq(InboundPlanPalletAllocation::getPalletId, selection.pallet().getId())).stream()
+            .mapToInt(item -> value(item.getPickedPackageCount())).sum()).sum();
+        if (selection.pallet() != null && "FBA".equals(destinationType(ref.line(), ref.order()))) {
+            ReceivingFbaPalletCount physical = fbaPalletCounts.find(session.getId(),
+                fbaGroupKey(session.getContainerNo(), ref), pallet.palletNo());
+            if (physical != null) received = value(physical.getActualPackages());
+        }
         return new ReceivingContainerResponses.PalletResolved(pallet.palletNo(), pallet.warehouseId(), pallet.status(),
-            pallet.fbaWarehouseCode(), ref.line().getInboundCode(), destinationType(ref.line(), ref.order()), true);
+            pallet.fbaWarehouseCode(), ref.line().getInboundCode(), destinationType(ref.line(), ref.order()), true,
+            selection.pallet() == null ? 0 : value(selection.pallet().getVersion()), received);
     }
 
     @Transactional
@@ -286,7 +347,6 @@ public class ReceivingContainerService {
         if (replay != null) return read(replay, ReceivingContainerResponses.Receipt.class);
         ReceivingContainerSession session = requireSigned(operatorKey);
         InboundRef ref = requireInbound(session.getContainerNo(), request.inboundCode());
-        String customerId = ref.order().getCustomerId();
         if ("ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType())) {
             throw conflict("One-click dropship inbound must be operated by complete source pallet");
         }
@@ -294,31 +354,70 @@ public class ReceivingContainerService {
             throw conflict("OVERSEAS destination must use carton-by-carton scanning; bulk count is forbidden");
         }
         List<InboundRef> fbaPlanRefs = requireFbaPlanRefs(session.getContainerNo(), ref);
-        List<FbaSkuAllocation> skuAllocations = allocateFbaSkuReceipts(customerId, fbaPlanRefs, request.packageCount());
-        skuAllocations.forEach(allocation -> workflow.validateBulkResolved(customerId, allocation.ref().plan(),
-            allocation.ref().line(), allocation.packages()));
-        PalletSelection selection = resolveReceivingPallet(ref, request.palletCode(), true);
+        PalletSelection selection = resolveFbaGroupPallet(fbaPlanRefs, request.palletCode());
         WarehouseResourceGateway.WarehousePalletReference resource = selection.resource();
         InboundPlanPallet pallet = selection.pallet();
-        Long resourceLockId = workflow.assignResolvedPallet(customerId, ref.plan(), pallet, resource);
+        if (request.expectedPalletVersion() != null && !Objects.equals(request.expectedPalletVersion(), pallet.getVersion())) {
+            throw conflict("Pallet receiving version changed; refresh the group before saving");
+        }
+        int allocatedOnPallet = fbaPlanRefs.stream().mapToInt(value -> allocations.selectList(
+            new LambdaQueryWrapper<InboundPlanPalletAllocation>()
+                .eq(InboundPlanPalletAllocation::getPlanId, value.plan().getId())
+                .eq(InboundPlanPalletAllocation::getLineId, value.line().getId())
+            .eq(InboundPlanPalletAllocation::getPalletId, pallet.getId())).stream()
+            .mapToInt(item -> value(item.getPickedPackageCount())).sum()).sum();
+        String groupKey = fbaGroupKey(session.getContainerNo(), ref);
+        ReceivingFbaPalletCount physicalCount = fbaPalletCounts.find(session.getId(), groupKey, resource.palletNo());
+        int previous = physicalCount == null ? allocatedOnPallet : value(physicalCount.getActualPackages());
+        if (request.packageCount() < previous) {
+            throw conflict("Cumulative pallet quantity cannot be reduced after saving; use correction operation");
+        }
+        int physicalDelta = request.packageCount() - previous;
+        List<String> inboundCodes = fbaPlanRefs.stream().map(value -> value.line().getInboundCode()).distinct().sorted().toList();
+        if (physicalDelta == 0) {
+            int total = fbaPlanRefs.stream().mapToInt(value -> value(value.line().getRequiredPackageCount())).sum();
+            ReceivingContainerResponses.Receipt result = new ReceivingContainerResponses.Receipt("ALREADY_RECEIVED",
+                session.getContainerNo(), inboundCodes.get(0), "FBA", resource.palletNo(), 0,
+                fbaPlanRefs.stream().mapToInt(this::receivedLinePackages).sum(),
+                Math.max(0,total-fbaPlanRefs.stream().mapToInt(this::receivedLinePackages).sum()), session.getStatus(),
+                true, mergeAllowed(ref.plan()), urgent(ref.plan()), mergeHint(ref.plan()), groupKey, inboundCodes);
+            save(session, "BULK_RECEIVE", request.idempotencyKey(), request, result);
+            return result;
+        }
+        int groupTotal = fbaPlanRefs.stream().mapToInt(value -> value(value.line().getRequiredPackageCount())).sum();
+        int groupReceived = fbaPlanRefs.stream().mapToInt(this::receivedLinePackages).sum();
+        int allocatable = Math.min(physicalDelta, Math.max(0, groupTotal - groupReceived));
+        List<FbaSkuAllocation> skuAllocations = allocateFbaSkuReceipts(fbaPlanRefs, allocatable);
+        skuAllocations.forEach(allocation -> workflow.validateBulkResolved(allocation.ref().order().getCustomerId(), allocation.ref().plan(),
+            allocation.ref().line(), allocation.packages()));
+        String palletCustomerId = pallet.getCustomerId();
+        InboundRef palletOwner = fbaPlanRefs.stream().filter(value -> Objects.equals(value.plan().getId(), pallet.getPlanId()))
+            .findFirst().orElseThrow(() -> conflict("FBA pallet does not belong to the current destination group"));
+        Long resourceLockId = allocatable == 0 ? null
+            : workflow.assignResolvedPallet(palletCustomerId, palletOwner.plan(), pallet, resource);
         try {
             int accepted = 0;
             for (FbaSkuAllocation allocation : skuAllocations) {
-                accepted += workflow.receiveBulkResolved(customerId, allocation.ref().plan(), allocation.ref().line(), pallet,
+                String allocationCustomerId = allocation.ref().order().getCustomerId();
+                accepted += workflow.receiveBulkResolved(allocationCustomerId, allocation.ref().plan(), allocation.ref().line(), pallet,
                     allocation.packages(), operatorKey, operatorName);
                 recordSkuReceipt(session, allocation, pallet);
             }
+            savePhysicalFbaCount(session.getId(), groupKey, resource.palletNo(), request.packageCount(), physicalCount);
             markReceiving(session);
             int received = fbaPlanRefs.stream().mapToInt(this::receivedLinePackages).sum();
             int total = fbaPlanRefs.stream().mapToInt(refValue -> value(refValue.line().getRequiredPackageCount())).sum();
-            ReceivingContainerResponses.Receipt result = new ReceivingContainerResponses.Receipt("RECEIVED",
-                session.getContainerNo(), ref.line().getInboundCode(), "FBA", resource.palletNo(), accepted,
+            boolean overReceived = fbaPalletCounts.sumActual(session.getId(), groupKey) > total;
+            ReceivingContainerResponses.Receipt result = new ReceivingContainerResponses.Receipt(
+                overReceived ? "DIFFERENCE_RECORDED" : "RECEIVED",
+                session.getContainerNo(), inboundCodes.get(0), "FBA", resource.palletNo(), physicalDelta,
                 received, Math.max(0, total - received), session.getStatus(), assigned(ref.plan()),
-                mergeAllowed(ref.plan()), urgent(ref.plan()), mergeHint(ref.plan()));
+                mergeAllowed(ref.plan()), urgent(ref.plan()), mergeHint(ref.plan()),
+                groupKey, inboundCodes);
             save(session, "BULK_RECEIVE", request.idempotencyKey(), request, result);
             return result;
         } catch (RuntimeException failure) {
-            workflow.compensateReservation(customerId, resourceLockId, failure);
+            workflow.compensateReservation(palletCustomerId, resourceLockId, failure);
             throw failure;
         }
     }
@@ -370,59 +469,89 @@ public class ReceivingContainerService {
         ReceivingContainerOperation replay = replay(operatorKey, "PALLET_RECEIVE", request.idempotencyKey(), request);
         if (replay != null) return read(replay, ReceivingContainerResponses.Receipt.class);
         ReceivingContainerSession session = requireSigned(operatorKey);
-        List<DropshipPalletRef> matches = new ArrayList<>();
-        for (InboundRef ref : refs(session.getContainerNo())) {
-            if (!"ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType())) continue;
-            String customerId = ref.order().getCustomerId();
-            List<InboundPlanPallet> sourcePallets = pallets.selectList(new LambdaQueryWrapper<InboundPlanPallet>()
-                .eq(InboundPlanPallet::getCustomerId, customerId)
-                .eq(InboundPlanPallet::getPlanId, ref.plan().getId())
-                .eq(InboundPlanPallet::getSourcePalletNo, request.sourcePalletNo()));
-            for (InboundPlanPallet pallet : sourcePallets) {
-                List<InboundPlanPalletAllocation> palletAllocations = allocations.selectList(
-                    new LambdaQueryWrapper<InboundPlanPalletAllocation>()
-                        .eq(InboundPlanPalletAllocation::getCustomerId, customerId)
-                        .eq(InboundPlanPalletAllocation::getPlanId, ref.plan().getId())
-                        .eq(InboundPlanPalletAllocation::getLineId, ref.line().getId())
-                        .eq(InboundPlanPalletAllocation::getPalletId, pallet.getId()));
-                palletAllocations.forEach(allocation -> matches.add(new DropshipPalletRef(ref, pallet, allocation)));
+        String sourcePalletNo = dropshipSourcePallet(session.getContainerNo(), request.sourcePalletNo());
+        if (sourcePalletNo == null) throw notFound("DP or carton is not part of the current container");
+        requireCompleteManifest(session.getContainerNo(), sourcePalletNo);
+        List<DropshipPalletRef> matches = dropshipPalletRefs(session.getContainerNo(), sourcePalletNo);
+        boolean alreadyReceived = matches.stream().allMatch(match ->
+            value(match.allocation().getPickedPackageCount()) == value(match.allocation().getPlannedPackageCount()));
+        int accepted = 0;
+        if (!alreadyReceived) {
+            if (matches.stream().anyMatch(match -> value(match.allocation().getPickedPackageCount()) != 0)) {
+                throw conflict("DP pallet is only partially received; reconcile it before retrying");
+            }
+            for (DropshipPalletRef match : matches) {
+                int packages = value(match.allocation().getPlannedPackageCount());
+                workflow.pickWholePallet(match.ref().order().getCustomerId(), match.ref().plan().getPlanNo(),
+                    match.allocation().getId(), new PdaRequests.WholePalletOperation(
+                        request.idempotencyKey() + ":PICK:" + match.allocation().getId(), operatorKey, operatorName));
+                accepted += packages;
+                match.allocation().setPickedPackageCount(packages);
             }
         }
-        if (matches.isEmpty()) throw notFound("Source pallet is not part of the current container");
-        if (matches.size() != 1) throw conflict("Source pallet is duplicated inside the current container");
-        DropshipPalletRef match = matches.get(0);
-        String customerId = match.ref().order().getCustomerId();
-        int accepted = value(match.allocation().getPlannedPackageCount());
-        workflow.pickWholePallet(customerId, match.ref().plan().getPlanNo(), match.allocation().getId(),
-            new PdaRequests.WholePalletOperation(request.idempotencyKey() + ":PICK", operatorKey, operatorName));
         markReceiving(session);
-        ReceivingContainerResponses.Inbound inbound = inbound(match.ref());
-        ReceivingContainerResponses.Receipt result = new ReceivingContainerResponses.Receipt("RECEIVED",
-            session.getContainerNo(), inbound.inboundCode(), inbound.destinationType(), match.pallet().getPalletNo(),
-            accepted, inbound.receivedPackages(), inbound.pendingPackages(), session.getStatus(),
-            inbound.assigned(), inbound.mergeAllowed(), inbound.urgent(), inbound.mergeHint());
+        List<InboundRef> group = matches.stream().map(DropshipPalletRef::ref).distinct().toList();
+        List<String> inboundCodes = group.stream().map(value -> value.line().getInboundCode()).distinct().sorted().toList();
+        int total = matches.stream().mapToInt(value -> value(value.allocation().getPlannedPackageCount())).sum();
+        int received = matches.stream().mapToInt(value -> value(value.allocation().getPickedPackageCount())).sum();
+        InboundRef first = group.get(0);
+        ReceivingContainerResponses.Inbound inbound = inbound(first);
+        ReceivingContainerResponses.Receipt result = new ReceivingContainerResponses.Receipt(
+            alreadyReceived ? "ALREADY_RECEIVED" : "RECEIVED", session.getContainerNo(), inboundCodes.get(0),
+            inbound.destinationType(), sourcePalletNo, accepted, received, Math.max(0,total-received), session.getStatus(),
+            true, false, urgent(first.plan()), null, "DP:" + sourcePalletNo, inboundCodes);
         save(session, "PALLET_RECEIVE", request.idempotencyKey(), request, result);
         return result;
     }
 
     @Transactional(isolation = Isolation.READ_COMMITTED)
     public ReceivingContainerResponses.Session complete(String operatorKey,
-                                                         ReceivingContainerRequests.Action request) {
+                                                         ReceivingContainerRequests.Complete request) {
         ReceivingContainerOperation replay = replay(operatorKey, "COMPLETE", request.idempotencyKey(), request);
         if (replay != null) return read(replay, ReceivingContainerResponses.Session.class);
         ReceivingContainerSession session = requireSigned(operatorKey);
         List<InboundPlan> containerPlans = requirePlans(session.getContainerNo());
         Totals totals = totals(containerPlans);
-        if (totals.total() != totals.received()) throw conflict("Every inbound code must be fully received before completing the container");
-        validateFbaSkuBalance(session.getContainerNo());
-        workflow.completeContainer(containerPlans);
+        boolean hasDifference = totals.total() != totals.received() || hasFbaOverReceipt(session, containerPlans);
+        if (hasDifference && !request.allowDifference()) {
+            throw conflict("Container has a receiving difference; confirm onsite completion with difference");
+        }
+        if (!hasDifference) {
+            validateFbaSkuBalance(session.getContainerNo());
+            workflow.completeContainer(containerPlans);
+        } else {
+            workflow.completeContainerWithDifferences(containerPlans, reconciledPlans(containerPlans));
+        }
         LocalDateTime now = LocalDateTime.now();
-        session.setStatus("COMPLETED"); session.setCompletedAt(now); session.setUpdatedAt(now);
+        session.setStatus(hasDifference ? "COMPLETED_WITH_DIFFERENCE" : "COMPLETED");
+        session.setCompletedAt(now); session.setUpdatedAt(now);
         session.setActiveOperatorKey(null); session.setActiveContainerKey(null); update(session);
         ReceivingContainerResponses.Session result = snapshot(session, containerPlans);
         save(session, "COMPLETE", request.idempotencyKey(), request, result); return result;
     }
 
+    private List<InboundPlan> reconciledPlans(List<InboundPlan> containerPlans) {
+        Set<Long> complete = refs(containerPlans.get(0).getContainerNo()).stream()
+            .collect(Collectors.groupingBy(value -> value.plan().getId(), LinkedHashMap::new, Collectors.toList()))
+            .entrySet().stream().filter(entry -> entry.getValue().stream().allMatch(ref ->
+                receivedLinePackages(ref) == value(ref.line().getRequiredPackageCount())))
+            .map(Map.Entry::getKey).collect(Collectors.toSet());
+        Set<String> incompleteFbaGroups = refs(containerPlans.get(0).getContainerNo()).stream()
+            .filter(ref -> !"ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType()))
+            .filter(ref -> "FBA".equals(destinationType(ref.line(), ref.order())))
+            .filter(ref -> !complete.contains(ref.plan().getId()))
+            .map(ref -> normalizedFba(ref.line().getFbaWarehouseCode())).collect(Collectors.toSet());
+        refs(containerPlans.get(0).getContainerNo()).stream()
+            .filter(ref -> "FBA".equals(destinationType(ref.line(), ref.order())))
+            .filter(ref -> fbaGroupHasOverReceipt(findSession(containerPlans.get(0).getContainerNo()), ref))
+            .map(ref -> normalizedFba(ref.line().getFbaWarehouseCode())).forEach(incompleteFbaGroups::add);
+        return containerPlans.stream().filter(plan -> complete.contains(plan.getId()))
+            .filter(plan -> refs(plan.getContainerNo()).stream().filter(ref -> Objects.equals(ref.plan().getId(), plan.getId()))
+                .noneMatch(ref -> "FBA".equals(destinationType(ref.line(), ref.order()))
+                    && incompleteFbaGroups.contains(normalizedFba(ref.line().getFbaWarehouseCode()))))
+            .toList();
+    }
+
     private ReceivingContainerSession requireCurrent(String operatorKey, boolean lock) {
         String key = activeOperatorKey(operatorKey);
         ReceivingContainerSession session = lock ? sessions.lockActiveByOperator(key)
@@ -503,7 +632,8 @@ public class ReceivingContainerService {
         List<InboundPlan> containerPlans = planFacts.stream()
             .filter(plan -> containerNo.equals(plan.getContainerNo())).toList();
         boolean allPlansCompleted = !containerPlans.isEmpty()
-            && containerPlans.stream().allMatch(plan -> "COMPLETED".equals(plan.getStatus()));
+            && containerPlans.stream().allMatch(plan -> List.of("COMPLETED", "PENDING_RECONCILIATION")
+                .contains(plan.getStatus()));
         boolean shippingReady = shippingGates.receivingAvailable(sourceContainerBookingId, containerNo) == 1;
         boolean operable = allPlansReady && shippingReady && warehouseSnapshotConsistent;
         int pending = Math.max(0, totalOrders - plannedOrders);
@@ -565,7 +695,8 @@ public class ReceivingContainerService {
         if (values.stream().anyMatch(value -> trim(value.getCustomerId()) == null)) {
             throw conflict("Every inbound plan in the receiving container must have an owning customer");
         }
-        if (values.stream().allMatch(value -> "COMPLETED".equals(value.getStatus()))) {
+        if (values.stream().allMatch(value -> List.of("COMPLETED", "PENDING_RECONCILIATION")
+            .contains(value.getStatus()))) {
             throw conflict("Receiving container is already completed");
         }
         return values;
@@ -634,16 +765,20 @@ public class ReceivingContainerService {
 
     private List<InboundRef> requireFbaPlanRefs(String containerNo, InboundRef selected) {
         List<InboundRef> values = refs(containerNo).stream()
-            .filter(value -> Objects.equals(value.plan().getId(), selected.plan().getId()))
-            .sorted(Comparator.comparing(value -> value.line().getId())).toList();
+            .filter(value -> !"ONE_CLICK_DROPSHIP".equals(value.order().getOrderType()))
+            .filter(value -> "FBA".equals(destinationType(value.line(), value.order())))
+            .filter(value -> Objects.equals(normalizedFba(value.line().getFbaWarehouseCode()),
+                normalizedFba(selected.line().getFbaWarehouseCode())))
+            .sorted(Comparator.comparing((InboundRef value) -> value.line().getInboundCode())
+                .thenComparing(value -> value.line().getId())).toList();
         if (values.isEmpty() || values.stream().anyMatch(value ->
             !"FBA".equals(destinationType(value.line(), value.order())))) {
-            throw conflict("FBA bulk receiving requires every line in the selected inbound plan to be FBA");
+            throw conflict("FBA receiving group is invalid");
         }
         Set<String> destinations = values.stream().map(value -> trim(value.line().getFbaWarehouseCode()))
             .collect(Collectors.toSet());
         if (destinations.size() != 1 || destinations.contains(null)) {
-            throw conflict("FBA bulk receiving requires one destination warehouse per inbound plan");
+            throw conflict("FBA receiving group requires one destination warehouse");
         }
         return values;
     }
@@ -694,6 +829,29 @@ public class ReceivingContainerService {
         return new PalletSelection(pallet, resource);
     }
 
+    private PalletSelection resolveFbaGroupPallet(List<InboundRef> refs, String palletCode) {
+        String normalized = palletCode.trim();
+        List<InboundPlanPallet> matches = refs.stream().flatMap(ref -> pallets.selectList(
+            new LambdaQueryWrapper<InboundPlanPallet>()
+                .eq(InboundPlanPallet::getCustomerId, ref.order().getCustomerId())
+                .eq(InboundPlanPallet::getPlanId, ref.plan().getId())).stream())
+            .filter(value -> matchesPlannedPalletCode(value, normalized)).filter(this::hasConfirmedReservation)
+            .collect(Collectors.toMap(InboundPlanPallet::getId, value -> value, (left,right)->left,
+                LinkedHashMap::new)).values().stream().toList();
+        if (matches.isEmpty()) throw notFound("Pallet code is not part of the current FBA destination group");
+        if (matches.size() != 1) throw conflict("Pallet code is duplicated in the current FBA destination group");
+        InboundPlanPallet pallet = matches.get(0);
+        InboundRef owner = refs.stream().filter(ref -> Objects.equals(ref.plan().getId(), pallet.getPlanId()))
+            .findFirst().orElseThrow(() -> conflict("Pallet owner plan is not part of the FBA destination group"));
+        long warehouseId = owner.plan().getOverseasWarehouseId() == null
+            ? Long.parseLong(owner.order().getOverseasWarehouseId()) : owner.plan().getOverseasWarehouseId();
+        WarehouseResourceGateway.WarehousePalletReference resource = warehouse.resolveReservedPallet(
+            pallet.getPalletNo(), owner.order().getCustomerId(), warehouseId, pallet.getWarehousePalletId(),
+            pallet.getWarehouseLocationId(), pallet.getWarehouseResourceLockId());
+        validatePallet(owner, resource);
+        return new PalletSelection(pallet, resource);
+    }
+
     private boolean matchesPlannedPalletCode(InboundPlanPallet pallet, String scannedCode) {
         return scannedCode.equals(trim(pallet.getPalletNo()))
             || scannedCode.equals(trim(pallet.getSourcePalletNo()));
@@ -750,6 +908,68 @@ public class ReceivingContainerService {
         return Objects.equals(line.getDestinationWarehouseCode(), pallet.getDestinationWarehouseCode());
     }
 
+    private String dropshipSourcePallet(String containerNo, String scanCode) {
+        return dropshipSourcePallet(refs(containerNo), containerNo, scanCode);
+    }
+
+    private String dropshipSourcePallet(List<InboundRef> currentRefs, String containerNo, String scanCode) {
+        String normalized = trim(scanCode);
+        if (normalized == null) return null;
+        List<InboundRef> dropshipRefs = currentRefs.stream()
+            .filter(ref -> "ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType())).toList();
+        if (dropshipRefs.isEmpty()) return null;
+        boolean direct = normalized.toUpperCase(java.util.Locale.ROOT).startsWith("DP") && dropshipRefs.stream()
+            .anyMatch(ref -> pallets.selectCount(new LambdaQueryWrapper<InboundPlanPallet>()
+                .eq(InboundPlanPallet::getPlanId, ref.plan().getId())
+                .eq(InboundPlanPallet::getSourcePalletNo, normalized)) > 0);
+        if (direct) return normalized;
+        List<String> resolved = dropshipCartons.sourcePalletsInContainer(containerNo, normalized);
+        if (resolved.size() > 1) throw conflict("Carton belongs to more than one DP in the current container");
+        return resolved.isEmpty() ? null : resolved.get(0);
+    }
+
+    private List<DropshipPalletRef> dropshipPalletRefs(String containerNo, String sourcePalletNo) {
+        List<DropshipPalletRef> result = new ArrayList<>();
+        for (InboundRef ref : refs(containerNo)) {
+            if (!"ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType())) continue;
+            List<InboundPlanPallet> sourcePallets = pallets.selectList(new LambdaQueryWrapper<InboundPlanPallet>()
+                .eq(InboundPlanPallet::getCustomerId, ref.order().getCustomerId())
+                .eq(InboundPlanPallet::getPlanId, ref.plan().getId())
+                .eq(InboundPlanPallet::getSourcePalletNo, sourcePalletNo));
+            for (InboundPlanPallet pallet : sourcePallets) {
+                allocations.selectList(new LambdaQueryWrapper<InboundPlanPalletAllocation>()
+                    .eq(InboundPlanPalletAllocation::getCustomerId, ref.order().getCustomerId())
+                    .eq(InboundPlanPalletAllocation::getPlanId, ref.plan().getId())
+                    .eq(InboundPlanPalletAllocation::getLineId, ref.line().getId())
+                    .eq(InboundPlanPalletAllocation::getPalletId, pallet.getId()))
+                    .forEach(allocation -> result.add(new DropshipPalletRef(ref, pallet, allocation)));
+            }
+        }
+        if (result.isEmpty()) throw notFound("DP is not part of the current container");
+        Set<Long> physicalPallets = result.stream().map(value -> value.pallet().getWarehousePalletId())
+            .filter(Objects::nonNull).collect(Collectors.toSet());
+        if (physicalPallets.size() != 1) throw conflict("DP customer fragments do not share one physical pallet");
+        return result;
+    }
+
+    private void requireCompleteManifest(String containerNo, String sourcePalletNo) {
+        List<DropshipOrderProfile> profiles = dropshipProfiles.listContainerPallet(containerNo, sourcePalletNo);
+        if (profiles.isEmpty()) throw notFound("DP manifest was not found in the current container");
+        Set<Integer> versions = profiles.stream().map(DropshipOrderProfile::getManifestVersion).collect(Collectors.toSet());
+        Set<Integer> totals = profiles.stream().map(DropshipOrderProfile::getManifestPackageCount).collect(Collectors.toSet());
+        Set<Integer> fragments = profiles.stream().map(DropshipOrderProfile::getManifestFragmentCount).collect(Collectors.toSet());
+        Set<String> hashes = profiles.stream().map(DropshipOrderProfile::getManifestHash).collect(Collectors.toSet());
+        if (versions.size()!=1 || totals.size()!=1 || fragments.size()!=1 || hashes.size()!=1) {
+            throw conflict("DP manifest fragments are inconsistent");
+        }
+        long customerFragments = profiles.stream().map(DropshipOrderProfile::getCustomerId).distinct().count();
+        long cartons = profiles.stream().mapToLong(profile ->
+            dropshipCartons.listProfile(profile.getCustomerId(), profile.getId()).size()).sum();
+        if (customerFragments != fragments.iterator().next() || cartons != totals.iterator().next()) {
+            throw conflict("DP manifest fragments are incomplete; wait for all customer fragments");
+        }
+    }
+
     private record PalletSelection(InboundPlanPallet pallet,
                                    WarehouseResourceGateway.WarehousePalletReference resource) { }
 
@@ -764,7 +984,40 @@ public class ReceivingContainerService {
         return new ReceivingContainerResponses.Session(session.getContainerNo(), session.getOverseasWarehouseId(),
             session.getOverseasWarehouseCode(), session.getOverseasWarehouseName(), session.getStatus(), session.getOperatorName(),
             value(session.getVersion()), signPhotos(session), session.getPreparedAt(), session.getSignedAt(),
-            session.getReceivingAt(), session.getCompletedAt(), total, received, Math.max(0, total - received), inbounds);
+            session.getReceivingAt(), session.getCompletedAt(), total, received, Math.max(0, total - received),
+            hasFbaOverReceipt(session, containerPlans), inbounds);
+    }
+
+    private void savePhysicalFbaCount(long sessionId, String groupKey, String palletCode, int actualPackages,
+                                      ReceivingFbaPalletCount existing) {
+        LocalDateTime now = LocalDateTime.now();
+        if (existing == null) {
+            ReceivingFbaPalletCount value = new ReceivingFbaPalletCount();
+            value.setId(IdWorker.getId()); value.setSessionId(sessionId); value.setGroupKey(groupKey);
+            value.setPalletCode(palletCode); value.setActualPackages(actualPackages);
+            value.setCreatedAt(now); value.setUpdatedAt(now); fbaPalletCounts.insert(value);
+        } else {
+            existing.setActualPackages(actualPackages); existing.setUpdatedAt(now); fbaPalletCounts.updateById(existing);
+        }
+    }
+
+    private boolean hasFbaOverReceipt(ReceivingContainerSession session, List<InboundPlan> containerPlans) {
+        if (session == null || containerPlans == null || containerPlans.isEmpty()) return false;
+        return refs(session.getContainerNo()).stream()
+            .filter(ref -> !"ONE_CLICK_DROPSHIP".equals(ref.order().getOrderType()))
+            .filter(ref -> "FBA".equals(destinationType(ref.line(), ref.order())))
+            .anyMatch(ref -> fbaGroupHasOverReceipt(session, ref));
+    }
+
+    private boolean fbaGroupHasOverReceipt(ReceivingContainerSession session, InboundRef ref) {
+        if (session == null || session.getId() == null) return false;
+        int planned = requireFbaPlanRefs(session.getContainerNo(), ref).stream()
+            .mapToInt(value -> value(value.line().getRequiredPackageCount())).sum();
+        return fbaPalletCounts.sumActual(session.getId(), fbaGroupKey(session.getContainerNo(), ref)) > planned;
+    }
+
+    private ReceivingContainerSession findSession(String containerNo) {
+        return sessions.findActiveByContainer(activeContainerKey(containerNo));
     }
 
     private ReceivingContainerResponses.Inbound inbound(InboundRef ref) {
@@ -844,10 +1097,11 @@ public class ReceivingContainerService {
         throw conflict("Unload photo file ID must be a positive decimal string");
     }
 
-    private List<FbaSkuAllocation> allocateFbaSkuReceipts(String customerId, List<InboundRef> refs, int packageCount) {
+    private List<FbaSkuAllocation> allocateFbaSkuReceipts(List<InboundRef> refs, int packageCount) {
         int remaining = packageCount;
         List<FbaSkuAllocation> result = new ArrayList<>();
         for (InboundRef ref : refs) {
+            String customerId = ref.order().getCustomerId();
             int linePending = value(ref.line().getRequiredPackageCount()) - receivedLinePackages(ref);
             List<SkuExpectation> expectations = skuExpectations(ref);
             int skuPending = expectations.stream().mapToInt(expectation -> expectation.expectedPackages()
@@ -958,6 +1212,15 @@ public class ReceivingContainerService {
         return value;
     }
 
+    private String fbaGroupKey(String containerNo, InboundRef ref) {
+        return "FBA:" + containerNo + ":" + normalizedFba(ref.line().getFbaWarehouseCode());
+    }
+
+    private String normalizedFba(String value) {
+        String normalized = trim(value);
+        return normalized == null ? null : normalized.toUpperCase(java.util.Locale.ROOT);
+    }
+
     private void markReceiving(ReceivingContainerSession session) {
         if (!"RECEIVING".equals(session.getStatus())) {
             session.setStatus("RECEIVING"); session.setReceivingAt(LocalDateTime.now());
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinator.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinator.java
index 255e764bf..c95a433ac 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinator.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinator.java
@@ -253,7 +253,7 @@ public class ContainerInboundPlanConversionCoordinator {
                 throw new ResponseStatusException(HttpStatus.CONFLICT, "计划托数不能少于已生成的头程托盘码数量");
             }
             String fbaCode = trimToNull(order.fbaWarehouseCode());
-            if (fbaCode != null) {
+            if (fbaCode != null && !"ONE_CLICK_DROPSHIP".equals(order.orderType())) {
                 for (String palletCode : sourcePalletNos) {
                     PalletCodeParts parts = palletCodeParts(preview.containerNo(), palletCode);
                     String previousPrefix = prefixByFba.putIfAbsent(fbaCode, parts.prefix());
@@ -329,10 +329,7 @@ public class ContainerInboundPlanConversionCoordinator {
                 throw new ResponseStatusException(HttpStatus.CONFLICT, "海外仓托盘批次包含重复业务键");
             }
         }
-        if (response.items().stream().map(WarehouseResourceGateway.PalletBatchItem::palletId).distinct().count() != response.items().size()
-            || response.items().stream().map(WarehouseResourceGateway.PalletBatchItem::resourceLockId).distinct().count() != response.items().size()) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "海外仓托盘批次包含重复托盘或资源锁");
-        }
+        validateSharedPallets(preparation.items(), byKey);
         return preparation.items().stream().collect(Collectors.groupingBy(PreparedItem::orderId)).values().stream()
             .map(items -> {
                 PreparedItem first = items.get(0);
@@ -356,6 +353,22 @@ public class ContainerInboundPlanConversionCoordinator {
         return value;
     }
 
+    private void validateSharedPallets(List<PreparedItem> expected,
+        Map<String, WarehouseResourceGateway.PalletBatchItem> actual) {
+        Map<Long, List<PreparedItem>> byPallet = expected.stream().collect(Collectors.groupingBy(item ->
+            requiredReservation(actual.get(item.businessKey()), item).palletId()));
+        for (List<PreparedItem> values : byPallet.values()) {
+            if (values.size() == 1) continue;
+            Set<String> codes = values.stream().map(PreparedItem::palletCode).collect(Collectors.toSet());
+            Set<Long> locks = values.stream().map(item -> requiredReservation(actual.get(item.businessKey()), item).resourceLockId())
+                .collect(Collectors.toSet());
+            if (codes.size() != 1 || codes.iterator().next() == null
+                || !codes.iterator().next().toUpperCase(java.util.Locale.ROOT).startsWith("DP") || locks.size() != 1) {
+                throw new ResponseStatusException(HttpStatus.CONFLICT, "只有同一码的一件代发 DP 才能共享实物托盘");
+            }
+        }
+    }
+
     private void requireBatch(WarehouseResourceGateway.PalletBatchResponse response, String batchKey, int size,
                               String... acceptedStatuses) {
         if (response == null || response.batchId() <= 0 || response.attemptNo() <= 0
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundPlanService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundPlanService.java
index b54b94c02..930b74881 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundPlanService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundPlanService.java
@@ -207,6 +207,10 @@ public class InboundPlanService {
                 items.stream().filter(InboundPlanService::requiresContainerConversion)
                     .map(InboundPlanService::pendingPalletCount)
                     .filter(Objects::nonNull).mapToInt(Integer::intValue).sum(),
+                items.stream().filter(InboundPlanService::requiresContainerConversion)
+                    .mapToInt(ContainerInboundPlanPreviewResponse.Order::sourcePalletCount).sum(),
+                items.stream().filter(InboundPlanService::requiresContainerConversion)
+                    .mapToInt(ContainerInboundPlanPreviewResponse.Order::supplementPalletCount).sum(),
                 items.stream().filter(item -> "PLANNED".equals(item.readiness()))
                     .map(ContainerInboundPlanPreviewResponse.Order::plannedPalletCount)
                     .filter(Objects::nonNull).mapToInt(Integer::intValue).sum(),
@@ -220,6 +224,10 @@ public class InboundPlanService {
         int pendingPallets = orders.stream().filter(InboundPlanService::requiresContainerConversion)
             .map(InboundPlanService::pendingPalletCount)
             .filter(Objects::nonNull).mapToInt(Integer::intValue).sum();
+        int sourcePallets = orders.stream().filter(InboundPlanService::requiresContainerConversion)
+            .mapToInt(ContainerInboundPlanPreviewResponse.Order::sourcePalletCount).sum();
+        int supplementPallets = orders.stream().filter(InboundPlanService::requiresContainerConversion)
+            .mapToInt(ContainerInboundPlanPreviewResponse.Order::supplementPalletCount).sum();
         int existingPallets = orders.stream().filter(item -> "PLANNED".equals(item.readiness()))
             .map(ContainerInboundPlanPreviewResponse.Order::plannedPalletCount)
             .filter(Objects::nonNull).mapToInt(Integer::intValue).sum();
@@ -228,7 +236,7 @@ public class InboundPlanService {
             bookingId, containerNo, warehouseId, snapshotVersion, orders));
         return new ContainerInboundPlanPreviewResponse(bookingId, containerNo, warehouseId, warehouseCode,
             warehouseName, snapshotVersion, snapshotHash, orders.size(), orders.size() - blocked, blocked,
-            pendingOrders, pendingPallets, existingPallets,
+            pendingOrders, pendingPallets, sourcePallets, supplementPallets, existingPallets,
             orders.stream().map(ContainerInboundPlanPreviewResponse.Order::suggestedPalletCount)
                 .filter(Objects::nonNull).mapToInt(Integer::intValue).sum(),
             orders.stream().map(ContainerInboundPlanPreviewResponse.Order::plannedPalletCount)
@@ -258,6 +266,12 @@ public class InboundPlanService {
                 || row.packageCount() > 0 && row.volumeCbm().signum() == 0) blockers.add("CARGO_FACT_INVALID");
         }
         Integer suggested = suggestedPalletCount(row, blockers);
+        int sourcePalletCount = "ONE_CLICK_DROPSHIP".equals(row.orderType())
+            ? Objects.requireNonNullElse(suggested, 0)
+            : Objects.requireNonNullElse(row.sourcePalletCount(), 0);
+        int targetPalletCount = Objects.requireNonNullElse(row.plannedPalletCount(),
+            Objects.requireNonNullElse(suggested, 0));
+        int supplementPalletCount = Math.max(0, targetPalletCount - sourcePalletCount);
         if (!planned && (suggested == null || suggested <= 0)) blockers.add("PALLET_COUNT_NOT_READY");
         String destinationType = destinationType(row);
         String fbaWarehouseCode = isFbaDestination(row) ? trimToNull(row.fbaWarehouseCode()) : null;
@@ -281,7 +295,8 @@ public class InboundPlanService {
             String.valueOf(row.orderId()), trimToNull(row.orderNo()) == null ? row.sourceOrderNo() : row.orderNo(),
             row.inboundCode(), row.orderType(), destinationType, row.destinationWarehouseId(),
             destinationCode, row.destinationWarehouseName(), fbaWarehouseCode, row.packageCount(), row.volumeCbm(),
-            suggested, row.plannedPalletCount(), row.planNo(), row.planStatus(), row.version(), readiness,
+            suggested, sourcePalletCount, targetPalletCount, supplementPalletCount,
+            row.plannedPalletCount(), row.planNo(), row.planStatus(), row.version(), readiness,
             List.copyOf(blockers));
     }
 
@@ -321,9 +336,7 @@ public class InboundPlanService {
     }
 
     private static Integer pendingPalletCount(ContainerInboundPlanPreviewResponse.Order order) {
-        return "RESOURCE_PENDING".equals(order.readiness())
-            ? Objects.requireNonNullElse(order.plannedPalletCount(), 0)
-            : Objects.requireNonNullElse(order.suggestedPalletCount(), 0);
+        return order.targetPalletCount();
     }
 
     private static String destinationType(InboundPlanOrderMapper.ContainerPreviewOrderRow row) {
@@ -842,7 +855,9 @@ public class InboundPlanService {
         InboundPlan plan = planMapper.selectOne(new LambdaQueryWrapper<InboundPlan>()
             .eq(InboundPlan::getCustomerId, customerId).eq(InboundPlan::getPlanNo, planNo).last("FOR UPDATE"));
         if (plan == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Inbound plan not found");
-        if ("COMPLETED".equals(plan.getStatus())) throw new ResponseStatusException(HttpStatus.CONFLICT, "Completed plan cannot add pallets");
+        if (List.of("COMPLETED", "PENDING_RECONCILIATION").contains(plan.getStatus())) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "Completed plan cannot add pallets");
+        }
         List<InboundPlanLine> lines = lineMapper.selectList(new LambdaQueryWrapper<InboundPlanLine>()
             .eq(InboundPlanLine::getPlanId, plan.getId()));
         boolean destinationExists = lines.stream().anyMatch(line -> request.destinationWarehouseId().equals(line.getDestinationWarehouseId()));
@@ -998,6 +1013,11 @@ public class InboundPlanService {
         }
         WarehouseResourceGateway.WarehouseReference authoritativeWarehouse = resolvedWarehouse == null
             ? requiredReceivingWarehouse(receivingWarehouse.overseasWarehouseId()) : resolvedWarehouse;
+        InboundPlanOrderMapper.DetailOrderSnapshot sourceOrder = plan.getSourceOrderId() == null ? null
+            : orderMapper.findDetailOrder(plan.getCustomerId(), plan.getSourceOrderId());
+        if (plan.getSourceOrderId() != null && sourceOrder == null) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "入库计划关联订单不存在");
+        }
         List<InboundPlanLine> lines = lineMapper.selectList(new LambdaQueryWrapper<InboundPlanLine>()
             .eq(InboundPlanLine::getPlanId, plan.getId()).orderByAsc(InboundPlanLine::getId));
         List<InboundPlanPallet> pallets = palletMapper.selectList(new LambdaQueryWrapper<InboundPlanPallet>()
@@ -1006,8 +1026,39 @@ public class InboundPlanService {
             new LambdaQueryWrapper<InboundPlanPalletAllocation>()
                 .eq(InboundPlanPalletAllocation::getPlanId, plan.getId())
                 .orderByAsc(InboundPlanPalletAllocation::getId));
+        List<Long> referencedPalletIds = allocations.stream()
+            .map(InboundPlanPalletAllocation::getPalletId)
+            .filter(Objects::nonNull)
+            .distinct()
+            .toList();
+        Map<Long, InboundPlanPallet> referencedPallets = referencedPalletIds.isEmpty()
+            ? Map.of()
+            : palletMapper.selectBatchIds(referencedPalletIds).stream()
+                .collect(Collectors.toMap(InboundPlanPallet::getId, pallet -> pallet));
+        if (referencedPallets.size() != referencedPalletIds.size()) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "入库计划分配引用的托盘不存在");
+        }
+        List<Long> externalOwnerPlanIds = referencedPallets.values().stream()
+            .map(InboundPlanPallet::getPlanId)
+            .filter(Objects::nonNull)
+            .filter(ownerPlanId -> !Objects.equals(ownerPlanId, plan.getId()))
+            .distinct()
+            .toList();
+        Map<Long, String> palletOwnerPlanNos = new HashMap<>();
+        palletOwnerPlanNos.put(plan.getId(), plan.getPlanNo());
+        if (!externalOwnerPlanIds.isEmpty()) {
+            palletOwnerPlanNos.putAll(planMapper.selectBatchIds(externalOwnerPlanIds).stream()
+                .collect(Collectors.toMap(InboundPlan::getId, InboundPlan::getPlanNo)));
+        }
+        if (referencedPallets.values().stream().anyMatch(pallet ->
+            pallet.getPlanId() == null || !palletOwnerPlanNos.containsKey(pallet.getPlanId()))) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "入库计划分配引用的托盘所属计划不存在");
+        }
         return new InboundPlanResponse(plan.getId(), plan.getPlanNo(), plan.getCustomerId(), plan.getSourceOrderId(),
-            plan.getContainerNo(), authoritativeWarehouse.warehouseCode(), authoritativeWarehouse.warehouseName(),
+            sourceOrder == null ? null : sourceOrder.orderNo(),
+            sourceOrder == null ? null : sourceOrder.customerName(),
+            sourceOrder == null ? null : sourceOrder.orderType(), plan.getContainerNo(),
+            authoritativeWarehouse.warehouseCode(), authoritativeWarehouse.warehouseName(),
             plan.getStatus(), plan.getLineCount(), plan.getPalletCount(), plan.getTotalVolumeCbm(),
             lines.stream().mapToInt(InboundPlanLine::getRequiredPackageCount).sum(),
             allocations.stream().mapToInt(InboundPlanPalletAllocation::getPickedPackageCount).sum(),
@@ -1020,12 +1071,18 @@ public class InboundPlanService {
                 pallet.getWarehousePalletId(), pallet.getWarehouseLocationId(), pallet.getWarehouseResourceLockId(),
                 pallet.getPalletType(), pallet.getAssignmentStatus(), pallet.getLockedAt(), pallet.getActualVolumeCbm(),
                 pallet.getActualPackageCount())).toList(),
-            allocations.stream().map(item -> new InboundPlanResponse.Allocation(item.getLineId(), item.getPalletId(),
+            allocations.stream().map(item -> {
+                InboundPlanPallet referencedPallet = referencedPallets.get(item.getPalletId());
+                return new InboundPlanResponse.Allocation(item.getLineId(), item.getPalletId(),
+                referencedPallet.getPalletNo(), palletOwnerPlanNos.get(referencedPallet.getPlanId()),
+                Objects.equals(referencedPallet.getPlanId(), plan.getId()),
                 item.getAllocatedVolumeCbm(), item.getPlannedPackageCount(), item.getCountedPackageCount(),
-                item.getPickedPackageCount(), item.getActualVolumeCbm(), item.getStatus(), item.getVersion())).toList(),
+                item.getPickedPackageCount(), item.getActualVolumeCbm(), item.getStatus(), item.getVersion());
+            }).toList(),
             plan.getVersion() == null ? 0 : plan.getVersion(), plan.getPlannedArrivalDate(), plan.getPalletType(),
             Boolean.TRUE.equals(plan.getAssignedFlag()), Boolean.TRUE.equals(plan.getMergeRequired()),
-            Boolean.TRUE.equals(plan.getUrgentFlag()), plan.getCreationMode(), plan.getPlanRemark());
+            Boolean.TRUE.equals(plan.getUrgentFlag()), plan.getCreationMode(), plan.getPlanRemark(),
+            plan.getCreatedAt(), plan.getUpdatedAt());
     }
 
     private WarehouseResourceGateway.WarehouseReference requiredReceivingWarehouse(String warehouseId) {
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/mapper/InventoryCommandMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/mapper/InventoryCommandMapper.java
index 34d97a640..c55c2d00c 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/mapper/InventoryCommandMapper.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/mapper/InventoryCommandMapper.java
@@ -23,8 +23,8 @@ public interface InventoryCommandMapper {
                                  @Param("balanceId") Long balanceId);
 
     @Select("SELECT COALESCE(SUM(available_packages+hold_packages+allocated_packages+picked_packages+receiving_packages),0) " +
-        "FROM ll_inventory_position WHERE customer_id=#{customerId} AND pallet_id=#{palletId}")
-    long palletPackages(@Param("customerId") String customerId, @Param("palletId") Long palletId);
+        "FROM ll_inventory_position WHERE pallet_id=#{palletId}")
+    long palletPackages(@Param("palletId") Long palletId);
 
     @Select("SELECT * FROM ll_inventory_balance WHERE customer_id=#{customerId} " +
         "AND inbound_order_id=#{inboundOrderId} AND inbound_code=#{inboundCode} " +
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/service/InventoryCommandService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/service/InventoryCommandService.java
index 9b7511135..e4f703b6b 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/service/InventoryCommandService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/service/InventoryCommandService.java
@@ -239,7 +239,7 @@ public class InventoryCommandService {
             balance.setPickedPackages(value(balance.getPickedPackages()) - request.packages());
             touch(balance);
             balances.updateById(balance);
-            boolean palletEmpty = commands.palletPackages(customerId, position.getPalletId()) == 0;
+            boolean palletEmpty = commands.palletPackages(position.getPalletId()) == 0;
             if (palletEmpty) warehouseGateway.scrapPallet(customerId, position.getPalletId());
             ledger(customerId, operatorId, operation.getId(), balance, position, balance.getSkuCode(), "SHIP",
                 "PICKED", "SHIPPED", before, -request.packages(), before - request.packages(),
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/procurement/service/OverseasProcurementService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/procurement/service/OverseasProcurementService.java
index 360e9832b..dc93177b3 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/procurement/service/OverseasProcurementService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/procurement/service/OverseasProcurementService.java
@@ -417,6 +417,9 @@ public class OverseasProcurementService implements WalletResultHandler {
         } catch (NumberFormatException exception) {
             throw badRequest("purchaseWarehouseId must be a numeric overseas partner warehouse ID");
         }
+        // Keep the warehouse snapshot already frozen on a historical order. A later master-data
+        // deactivation must not block unrelated edits such as recording outbound details.
+        if (Long.toString(numericId).equals(order.getPurchaseWarehouseId())) return;
         var option = warehouseDirectory.required(numericId);
         order.setPurchaseWarehouseId(option.warehouseId());
         order.setPurchaseWarehouseName(option.warehouseName());
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java
index 9dd5acad8..7fe3a3590 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java
@@ -267,7 +267,7 @@ public class RelabelApplicationService implements WalletResultHandler {
         if (!StringUtils.hasText(request.operationWarehouseId())) throw badRequest("Operation warehouse is required");
         boolean requiresOutbound = request.items().stream().anyMatch(item -> !"SKU_LABEL".equals(operationType(item)));
         String deliveryMethod = trim(request.deliveryMethod());
-        if (requiresOutbound && !DELIVERY_METHODS.contains(deliveryMethod)) {
+        if (requiresOutbound && (!StringUtils.hasText(deliveryMethod) || !DELIVERY_METHODS.contains(deliveryMethod))) {
             throw badRequest("Delivery method must be TRUCK, PICKUP or EXPRESS when carton labels are changed");
         }
         if (!requiresOutbound && StringUtils.hasText(deliveryMethod)) {
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/MerchantReturnInventoryController.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/MerchantReturnInventoryController.java
index 144050b21..0713b49bc 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/MerchantReturnInventoryController.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/MerchantReturnInventoryController.java
@@ -37,6 +37,13 @@ public class MerchantReturnInventoryController {
         return ApiResponse.success(service.summaryPage(customer(user), request));
     }
 
+    @GetMapping("/cartons")
+    @PreAuthorize("hasAuthority('" + LIST_PERMISSION + "')")
+    public ApiResponse<PageResult<ReturnInventoryResponses.CartonSummary>> cartons(@AuthenticationPrincipal AuthenticatedUser user,
+        @Valid ReturnInventoryRequests.Query request) {
+        return ApiResponse.success(service.cartonPage(customer(user), request));
+    }
+
     @GetMapping("/cartons/{cartonMark}")
     @PreAuthorize("hasAuthority('" + LIST_PERMISSION + "')")
     public ApiResponse<ReturnInventoryResponses.CartonDetail> carton(@AuthenticationPrincipal AuthenticatedUser user,
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnInventoryResponses.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnInventoryResponses.java
index deb12c93f..5130349d8 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnInventoryResponses.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnInventoryResponses.java
@@ -7,6 +7,11 @@ import java.util.List;
 public final class ReturnInventoryResponses {
     private ReturnInventoryResponses() { }
 
+    public record CartonSummary(String cartonMark, String overseasWarehouseId, String sourceBatchNo,
+                                String sourceReturnNo, String status, int skuTypes, long totalQuantity,
+                                BigDecimal length, BigDecimal width, BigDecimal height, BigDecimal weight,
+                                LocalDateTime createdAt) { }
+
     public record InventoryItem(String overseasWarehouseId, String cartonMark, String sourceBatchNo, String status, String skuCode,
                                 String productNameZh, long quantity, int cartonSkuTypes, long cartonTotalQuantity,
                                 LocalDateTime receivedAt) { }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryBalanceMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryBalanceMapper.java
index 18ef9bfa0..9aaeeb487 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryBalanceMapper.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryBalanceMapper.java
@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -20,6 +21,12 @@ public interface ReturnInventoryBalanceMapper extends BaseMapper<ReturnInventory
                @Param("totalQuantity") long totalQuantity, @Param("availableQuantity") long availableQuantity,
                @Param("cartons") long cartons);
 
+    @Update("UPDATE ll_return_inventory_balance SET carton_quantity=carton_quantity+#{cartons},updated_at=NOW(3) " +
+        "WHERE customer_id=#{customerId} AND overseas_warehouse_id=#{warehouseId} AND sku_code=#{skuCode} " +
+        "AND carton_quantity+#{cartons}>=0")
+    int adjustCartonQuantity(@Param("customerId") String customerId, @Param("warehouseId") String warehouseId,
+                             @Param("skuCode") String skuCode, @Param("cartons") long cartons);
+
     @Select("<script>SELECT COUNT(*) FROM ll_return_inventory_balance WHERE customer_id=#{customerId} " +
         "<if test='warehouseId != null and warehouseId != \"\"'>AND overseas_warehouse_id=#{warehouseId} </if>" +
         "<if test='skuCode != null and skuCode != \"\"'>AND sku_code LIKE CONCAT('%',#{skuCode},'%') </if></script>")
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java
index d2e200ab5..c2ddec712 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java
@@ -9,6 +9,21 @@ import java.util.List;
 
 @Mapper
 public interface ReturnInventoryCartonMapper extends BaseMapper<ReturnInventoryCarton> {
+    String MERCHANT_FILTER = " FROM ll_return_inventory_carton c WHERE c.customer_id=#{customerId} " +
+        "<if test='query.overseasWarehouseId != null and query.overseasWarehouseId != \"\"'>AND c.overseas_warehouse_id=#{query.overseasWarehouseId} </if>" +
+        "<if test='query.cartonMark != null and query.cartonMark != \"\"'>AND c.carton_mark LIKE CONCAT('%',#{query.cartonMark},'%') </if>" +
+        "<if test='query.returnNo != null and query.returnNo != \"\"'>AND c.source_return_no LIKE CONCAT('%',#{query.returnNo},'%') </if>" +
+        "<if test='query.status != null and query.status != \"\"'>AND c.status=#{query.status} </if>" +
+        "<if test='query.skuCode != null and query.skuCode != \"\"'>AND EXISTS(SELECT 1 FROM ll_return_inventory_carton_item i WHERE i.carton_id=c.id AND i.sku_code LIKE CONCAT('%',#{query.skuCode},'%')) </if>";
+
+    @Select("<script>SELECT COUNT(*)" + MERCHANT_FILTER + "</script>")
+    long merchantCount(@Param("customerId") String customerId,
+        @Param("query") com.baiyue.lastleg.returnreceipt.dto.ReturnInventoryRequests.Query query);
+
+    @Select("<script>SELECT c.*" + MERCHANT_FILTER + "ORDER BY c.created_at DESC,c.id DESC LIMIT #{offset},#{query.size}</script>")
+    List<ReturnInventoryCarton> merchantPage(@Param("customerId") String customerId,
+        @Param("query") com.baiyue.lastleg.returnreceipt.dto.ReturnInventoryRequests.Query query, @Param("offset") long offset);
+
     @Select("SELECT * FROM ll_return_inventory_carton WHERE customer_id=#{customerId} AND overseas_warehouse_id=#{warehouseId} AND status='AVAILABLE' ORDER BY created_at DESC,id DESC LIMIT 500")
     List<ReturnInventoryCarton> findAvailable(@Param("customerId") String customerId, @Param("warehouseId") String warehouseId);
     @Select("SELECT * FROM ll_return_inventory_carton WHERE carton_mark=#{cartonMark} LIMIT 1")
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnCartonBarcode.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnCartonBarcode.java
new file mode 100644
index 000000000..7811d8d63
--- /dev/null
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnCartonBarcode.java
@@ -0,0 +1,26 @@
+package com.baiyue.lastleg.returnreceipt.service;
+
+import com.google.zxing.oned.Code128Writer;
+
+/** Inline vector bars remain printable even when browser background printing is disabled. */
+final class ReturnCartonBarcode {
+    private static final int QUIET_ZONE = 10;
+
+    private ReturnCartonBarcode() { }
+
+    static String svg(String cartonMark) {
+        boolean[] modules = new Code128Writer().encode(cartonMark);
+        int width = modules.length + QUIET_ZONE * 2;
+        StringBuilder svg = new StringBuilder("<svg xmlns=\"http://www.w3.org/2000/svg\" role=\"img\" aria-label=\"箱号条码\" viewBox=\"0 0 ")
+            .append(width).append(" 50\" preserveAspectRatio=\"none\" style=\"display:block;width:100%;height:15mm\">")
+            .append("<rect width=\"100%\" height=\"100%\" fill=\"white\"/>");
+        for (int index = 0; index < modules.length;) {
+            if (!modules[index]) { index++; continue; }
+            int start = index;
+            while (index < modules.length && modules[index]) index++;
+            svg.append("<rect x=\"").append(start + QUIET_ZONE).append("\" y=\"0\" width=\"")
+                .append(index - start).append("\" height=\"50\" fill=\"black\"/>");
+        }
+        return svg.append("</svg>").toString();
+    }
+}
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java
index 931030c4c..50babb9e9 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java
@@ -97,6 +97,19 @@ public class ReturnInventoryService {
         return new PageResult<>(records, request.page(), request.size(), total, (total + request.size() - 1) / request.size());
     }
 
+    @Transactional(readOnly = true)
+    public PageResult<ReturnInventoryResponses.CartonSummary> cartonPage(String customerId, ReturnInventoryRequests.Query request) {
+        required(customerId, "客户身份不能为空");
+        long total = cartons.merchantCount(customerId, request);
+        List<ReturnInventoryResponses.CartonSummary> records = total == 0 ? List.of() :
+            cartons.merchantPage(customerId, request, (request.page() - 1) * request.size()).stream()
+                .map(carton -> new ReturnInventoryResponses.CartonSummary(carton.getCartonMark(), carton.getOverseasWarehouseId(),
+                    carton.getSourceBatchNo(), carton.getSourceReturnNo(), carton.getStatus(),
+                    carton.getSkuTypes() == null ? 0 : carton.getSkuTypes(), value(carton.getTotalQuantity()),
+                    carton.getLength(), carton.getWidth(), carton.getHeight(), carton.getWeight(), carton.getCreatedAt())).toList();
+        return new PageResult<>(records, request.page(), request.size(), total, (total + request.size() - 1) / request.size());
+    }
+
     @Transactional(readOnly = true)
     public PageResult<ReturnInventoryResponses.SummaryItem> summaryPage(String customerId, ReturnInventoryRequests.SummaryQuery request) {
         String warehouseId = text(request.overseasWarehouseId());
@@ -241,6 +254,8 @@ public class ReturnInventoryService {
         Map<String, Long> remaining = new LinkedHashMap<>(requested);
         Map<String, Integer> emptiedBySku = new LinkedHashMap<>();
         Map<Long, Map<String, Long>> attachedByOrder = new LinkedHashMap<>();
+        LinkedHashSet<String> consumedBatchNos = new LinkedHashSet<>();
+        LinkedHashSet<String> consumedReturnNos = new LinkedHashSet<>();
         long total = 0;
         for (ReturnInventoryCarton source : sources) {
             List<ReturnInventoryCartonItem> sourceItems = cartonItems.listCarton(source.getId());
@@ -249,6 +264,8 @@ public class ReturnInventoryService {
                 String sku = item.getSkuCode().toUpperCase(java.util.Locale.ROOT);
                 long take = Math.min(value(remaining.get(sku)), value(item.getQuantity()));
                 if (take > 0) {
+                    consumedBatchNos.add(required(source.getSourceBatchNo(), "来源签收批次缺失，无法合箱"));
+                    consumedReturnNos.add(required(source.getSourceReturnNo(), "来源退货单缺失，无法合箱"));
                     remaining.put(sku, remaining.get(sku) - take); total = Math.addExact(total, take);
                     ReturnOrder owner = sourceOwners.get(source.getId());
                     if (owner != null) attachedByOrder.computeIfAbsent(owner.getId(), ignored -> new LinkedHashMap<>())
@@ -270,7 +287,7 @@ public class ReturnInventoryService {
         long targetId = IdWorker.getId();
         ReturnInventoryCarton target = new ReturnInventoryCarton();
         target.setId(targetId); target.setCustomerId(customerId); target.setOverseasWarehouseId(sources.get(0).getOverseasWarehouseId());
-        target.setCartonMark(numbers.next("RETURN_CARTON", target.getOverseasWarehouseId(), targetId)); target.setSourceBatchNo("MERGED"); target.setSourceReturnNo(String.join(",", returnNos)); target.setStatus(AVAILABLE);
+        target.setCartonMark(numbers.next("RETURN_CARTON", target.getOverseasWarehouseId(), targetId)); target.setSourceBatchNo(String.join(",", consumedBatchNos)); target.setSourceReturnNo(String.join(",", consumedReturnNos)); target.setStatus(AVAILABLE);
         target.setSkuTypes(requested.size()); target.setTotalQuantity(total); target.setLength(request.length()); target.setWidth(request.width()); target.setHeight(request.height()); target.setWeight(request.weight()); target.setCreatedAt(now); target.setUpdatedAt(now); cartons.insert(target);
         for (Map.Entry<String, Long> entry : requested.entrySet()) {
             ReturnInventoryCartonItem targetItem = new ReturnInventoryCartonItem();
@@ -279,8 +296,9 @@ public class ReturnInventoryService {
             // A SKU's carton count is the number of available physical cartons containing it:
             // remove fully emptied source cartons, then add the one merged target carton.
             long cartonDelta = 1L - emptiedBySku.getOrDefault(entry.getKey(), 0);
-            balances.adjust(IdWorker.getId(), customerId, target.getOverseasWarehouseId(), entry.getKey(), productNames.get(entry.getKey()), 0,
-                -entry.getValue(), cartonDelta);
+            if (balances.adjustCartonQuantity(customerId, target.getOverseasWarehouseId(), entry.getKey(), cartonDelta) != 1) {
+                throw new IllegalStateException("退货合箱库存箱数更新失败: " + entry.getKey());
+            }
         }
         attachMergedCarton(target, attachedByOrder, selectedOrders, productNames, now);
         operation.setResultCartonId(targetId); operation.setUpdatedAt(now); operations.updateById(operation);
@@ -351,13 +369,14 @@ public class ReturnInventoryService {
         for (ReturnInventoryResponses.CartonItem item : items) rows.append("<tr><td>").append(escape(item.skuCode())).append("</td><td>")
             .append(escape(item.productNameZh())).append("</td><td class=\"qty\">").append(item.quantity()).append("</td></tr>");
         return "<!doctype html><html><head><meta charset=\"utf-8\"><title>退货箱唛</title><style>"
-            + "@page{size:100mm 150mm;margin:5mm}body{font-family:Arial,'Microsoft YaHei',sans-serif;color:#111;margin:0}.label{border:2px solid #111;padding:5mm;min-height:136mm}.brand{font-size:16px;font-weight:700}.title{font-size:22px;font-weight:700;margin:3mm 0 5mm}.mark{font:700 18px monospace;letter-spacing:1px;word-break:break-all}.meta{font-size:11px;margin:4mm 0;border-top:1px solid #111;border-bottom:1px solid #111;padding:3mm 0}.barcode{height:11mm;margin:3mm 0;background:repeating-linear-gradient(90deg,#111 0 2px,#fff 2px 4px,#111 4px 5px,#fff 5px 8px)}table{width:100%;border-collapse:collapse;font-size:11px}th,td{border:1px solid #111;padding:2mm;text-align:left}.qty{text-align:right;font-weight:700}.total{font-size:14px;font-weight:700;text-align:right;margin-top:4mm}</style></head><body><div class=\"label\"><div class=\"brand\">BAIYUE OVERSEAS WAREHOUSE</div><div class=\"title\">RETURN CARTON LABEL / 退货箱唛</div><div class=\"mark\">"
-            + escape(carton.getCartonMark()) + "</div><div class=\"barcode\" aria-label=\"" + escape(carton.getCartonMark()) + "\"></div>"
-            + "<div class=\"meta\">仓库：" + escape(carton.getOverseasWarehouseId()) + "<br>客户：" + escape(carton.getCustomerId())
-            + "<br>箱规：" + escape(String.valueOf(carton.getLength())) + " × " + escape(String.valueOf(carton.getWidth())) + " × " + escape(String.valueOf(carton.getHeight())) + " cm / " + escape(String.valueOf(carton.getWeight())) + " kg"
+            + "@page{size:100mm 150mm;margin:5mm}body{font-family:Arial,'Microsoft YaHei',sans-serif;color:#111;margin:0}.label{box-sizing:border-box;width:90mm;border:2px solid #111;padding:3mm;min-height:138mm}.brand{font-size:12px;font-weight:700}.title{font-size:16px;font-weight:700;margin:3mm 0}.mark{font:700 16px monospace;word-break:break-all}.meta{font-size:11px;margin:3mm 0;border-top:1px solid #111;border-bottom:1px solid #111;padding:2mm 0;overflow-wrap:anywhere}.barcode{margin:3mm 0}table{width:100%;border-collapse:collapse;font-size:11px;table-layout:fixed}th,td{border:1px solid #111;padding:1mm;text-align:left;overflow-wrap:anywhere}tr{break-inside:avoid}.qty{text-align:right;font-weight:700}.total{font-size:14px;font-weight:700;text-align:right;margin-top:3mm}</style></head><body><div class=\"label\"><div class=\"brand\">BAIYUE OVERSEAS WAREHOUSE</div><div class=\"title\">RETURN CARTON LABEL / 退货箱唛</div><div class=\"mark\">"
+            + escape(carton.getCartonMark()) + "</div><div class=\"barcode\">" + ReturnCartonBarcode.svg(carton.getCartonMark()) + "</div>"
+            + "<div class=\"meta\">来源退货单：" + escape(carton.getSourceReturnNo())
+            + "<br>箱规：" + dimension(carton.getLength()) + " × " + dimension(carton.getWidth()) + " × " + dimension(carton.getHeight()) + " cm / " + dimension(carton.getWeight()) + " kg"
             + "<br>签收批次：" + escape(carton.getSourceBatchNo()) + "</div><table><thead><tr><th>SKU</th><th>品名</th><th>数量</th></tr></thead><tbody>"
             + rows + "</tbody></table><div class=\"total\">合计：" + carton.getTotalQuantity() + " 件 / " + carton.getSkuTypes() + " 种 SKU</div></div></body></html>";
     }
+    private static String dimension(BigDecimal value) { return value == null ? "—" : value.stripTrailingZeros().toPlainString(); }
     private String hash(Object request) { try { return java.util.HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256")
         .digest(String.valueOf(request).getBytes(StandardCharsets.UTF_8))); }
         catch (Exception exception) { throw new IllegalStateException("无法生成请求哈希", exception); } }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptService.java
index c793cbe1f..0f4e15ae6 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptService.java
@@ -118,12 +118,14 @@ public class ReturnReceiptService {
         tail.setId(IdWorker.getId());
         tail.setOrderNo(numbers.next("RETURN_RELABEL", returnOrder.getOverseasWarehouseId(), tail.getId()));
         tail.setCustomerId(returnOrder.getCustomerId()); tail.setOrderType("RETURN_RELABEL");
-        tail.setSourceRegion("CUSTOMER"); tail.setSourceOrderId(String.valueOf(returnOrder.getId()));
+        tail.setSourceRegion("CUSTOMER"); tail.setSourceInboundId(returnOrder.getReturnNo());
+        tail.setSourceOrderId(String.valueOf(returnOrder.getId()));
         tail.setSourceOrderNo(returnOrder.getReturnNo()); tail.setOverseasWarehouseId(returnOrder.getOverseasWarehouseId());
         tail.setCurrentStatus("PENDING_ASSIGNMENT"); tail.setSubOrderStatus(Boolean.TRUE.equals(returnOrder.getNeedRelabel()) ? "RETURN_RELABEL:PENDING_BINDING" : "RETURN_RELABEL:NOT_REQUIRED");
         tail.setRelabelStatus(Boolean.TRUE.equals(returnOrder.getNeedRelabel()) ? "PENDING_BINDING" : "NOT_REQUIRED");
         tail.setCustomerRemark(returnOrder.getRemark()); tail.setSourceEventId("RETURN_ORDER:" + returnOrder.getReturnNo());
         tail.setSourceLoadingPlanId("RETURN_RELABEL"); tail.setCreatedAt(now); tail.setUpdatedAt(now);
+        tail.setSourcePayloadHash(returnOrder.getRequestHash());
         lastlegOrders.insert(tail);
         returnOrder.setLastlegOrderId(tail.getId()); returnOrder.setLastlegOrderNo(tail.getOrderNo());
         returnOrder.setRelabelStatus(Boolean.TRUE.equals(returnOrder.getNeedRelabel()) ? "PENDING_BINDING" : "NOT_REQUIRED");
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/service/LastlegOrderService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/service/LastlegOrderService.java
index 51b2417ae..dc7b68fb7 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/service/LastlegOrderService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/service/LastlegOrderService.java
@@ -31,6 +31,8 @@ import com.baiyue.lastleg.mapper.LastlegOrderOperationLogMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderManualNodeMapper;
 import com.baiyue.lastleg.mapper.ReceivingWarehouseOperationMapper;
 import com.baiyue.lastleg.model.LastlegOrderType;
+import com.baiyue.lastleg.shipping.entity.ContainerShippingGate;
+import com.baiyue.lastleg.shipping.mapper.ContainerShippingGateMapper;
 import jakarta.annotation.Resource;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -75,6 +77,7 @@ public class LastlegOrderService {
     @Resource private InboundOrderDetainedOutboxService detainedOutbox;
     @Resource private ReceivingWarehouseOperationMapper receivingWarehouseOperations;
     @Resource private WarehouseResourceGateway warehouseResourceGateway;
+    @Resource private ContainerShippingGateMapper containerShippingGates;
 
     public PageResult<LastlegOrderSummary> page(String customerId, LastlegOrderRequests.Query query) {
         return page(customerId, query, null);
@@ -85,7 +88,9 @@ public class LastlegOrderService {
             new Page<>(query.page(), query.size()), filter(customerId, query, relabelNo).orderByDesc(LastlegOrder::getCreatedAt));
         Map<Long, List<LastlegOrderMapper.PalletMergeRelationRow>> mergeRelations = palletMergeRelations(page.getRecords());
         Map<Long, String> dispatchStatuses = dispatchStatuses(page.getRecords());
+        Map<String, String> containerNodes = containerNodes(page.getRecords());
         return new PageResult<>(page.getRecords().stream().map(order -> summary(order, mergeRelations.get(order.getId()),
+                StringUtils.hasText(order.getSourceContainerBookingId()) ? containerNodes.get(order.getSourceContainerBookingId()) : null,
                 dispatchStatuses.getOrDefault(order.getId(), "UNSCHEDULED"))).toList(),
             page.getCurrent(), page.getSize(), page.getTotal(), page.getPages());
     }
@@ -269,7 +274,7 @@ public class LastlegOrderService {
                 value.getNodeCode(), value.getNodeAt(), value.getSource()))
             .sorted(java.util.Comparator.comparingInt(value -> MANUAL_NODE_CODES.indexOf(value.nodeCode()))).toList();
         return new LastlegOrderDetailResponse(summary(order, palletMergeRelations(List.of(order)).get(order.getId()),
-            dispatchStatuses(List.of(order)).getOrDefault(order.getId(), "UNSCHEDULED")), manualNodes, cargo, history.stream()
+            containerNode(order), dispatchStatuses(List.of(order)).getOrDefault(order.getId(), "UNSCHEDULED")), manualNodes, cargo, history.stream()
             .map(value -> new LastlegOrderDetailResponse.History(value.getId(), value.getFromStatus(),
                 value.getToStatus(), value.getRemark(), value.getCreatedAt())).toList(), fees, operations.stream()
             .map(value -> new LastlegOrderDetailResponse.Operation(value.getId(), value.getOperationNode(),
@@ -488,20 +493,22 @@ public class LastlegOrderService {
 
     public void writeExportCsv(String customerId, LastlegOrderRequests.Query query, OutputStream output)
         throws IOException {
-        output.write("\uFEFFID,尾程单号,订单类型,入仓码,头程单号,货主,海外仓,转仓,转仓编码,FBA仓库,集装箱号,货柜状态,是否异常,是否暂扣,托数,箱数,体积(m3),数量,体积重量,预计到港时间,实际到港时间,预计到仓,入库单号,换标单号,换标状态,合托标记,主流程状态,子单状态,备注(仅自己),备注(客户),备注(仓库)\r\n".getBytes(StandardCharsets.UTF_8));
+        output.write("\uFEFFID,尾程单号,订单类型,入仓码,头程单号,货主,海外仓,转仓,转仓编码,FBA仓库,集装箱号,货柜节点,是否异常,是否暂扣,托数,箱数,体积(m3),数量,体积重量,预计到港时间,实际到港时间,预计到仓,入库单号,换标单号,换标状态,合托标记,主流程状态,子单状态,备注(仅自己),备注(客户),备注(仓库)\r\n".getBytes(StandardCharsets.UTF_8));
         final int batchSize = 1000;
         long page = 1;
         while (true) {
             List<LastlegOrder> orders = orderMapper.selectPage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page, batchSize),
                 filter(customerId, query).orderByDesc(LastlegOrder::getCreatedAt).orderByDesc(LastlegOrder::getId)).getRecords();
             if (orders.isEmpty()) break;
+            Map<String, String> containerNodes = containerNodes(orders);
             for (LastlegOrder order : orders) {
                 String line = String.join(",", List.of(
                 csv(order.getId()), csv(order.getOrderNo()), csv(LastlegOrderType.labelOf(order.getOrderType())),
                 csv(displayInboundCode(order)),
                 csv(order.getSourceOrderNo()), csv(order.getCustomerName()), csv(order.getOverseasWarehouseName()),
                 csv(order.getTransferWarehouseName()), csv(order.getTransferWarehouseCode()), csv(order.getFbaWarehouseCode()),
-                csv(order.getContainerNo()), csv(order.getContainerStatus()), csv(order.getAbnormal()), csv(order.getDetained()),
+                csv(order.getContainerNo()), csv(StringUtils.hasText(order.getSourceContainerBookingId())
+                    ? containerNodes.get(order.getSourceContainerBookingId()) : null), csv(order.getAbnormal()), csv(order.getDetained()),
                 csv(order.getPalletCount()), csv(order.getPackageCount()), csv(order.getVolumeCbm()), csv(order.getProductQuantity()),
                 csv(order.getVolumeWeightKg()), csv(order.getEstimatedArrivalAt()), csv(order.getActualArrivalAt()),
                 csv(order.getEstimatedWarehouseAt()), csv(order.getInboundOrderNo()), csv(order.getRelabelOrderNo()), csv(order.getRelabelStatus()),
@@ -571,7 +578,7 @@ public class LastlegOrderService {
         return result;
     }
 
-    private Map<Long, String> dispatchStatuses(List<LastlegOrder> orders) {
+        private Map<Long, String> dispatchStatuses(List<LastlegOrder> orders) {
         if (orders.isEmpty()) return Map.of();
         List<LastlegOrderMapper.DispatchStatusRow> rows = orderMapper.findDispatchStatuses(
             orders.stream().map(LastlegOrder::getId).toList());
@@ -581,13 +588,14 @@ public class LastlegOrderService {
     }
 
     private LastlegOrderSummary summary(LastlegOrder o, List<LastlegOrderMapper.PalletMergeRelationRow> relations,
-                                         String dispatchStatus) {
+                                        String containerNode, String dispatchStatus) {
         List<LastlegOrderMapper.PalletMergeRelationRow> related = relations == null ? List.of() : relations;
         return new LastlegOrderSummary(o.getId(), o.getOrderNo(), o.getOrderType(),
             LastlegOrderType.labelOf(o.getOrderType()), o.getDestinationType(), o.getSourceInboundId(),
             displayInboundCode(o), o.getLxCode(), o.getSourceOrderNo(), o.getCustomerId(), o.getCustomerName(), o.getOverseasWarehouseId(),
             o.getOverseasWarehouseCode(), o.getOverseasWarehouseName(), o.getTransferWarehouseId(), o.getTransferWarehouseCode(),
             o.getTransferWarehouseName(), o.getFbaWarehouseCode(), o.getContainerNo(),
+            containerNode,
             o.getAbnormal(), o.getDetained(), o.getHoldChargeable(), o.getHoldReason(),
             Boolean.TRUE.equals(o.getManualNodeOverride()), Boolean.TRUE.equals(o.getManualNodeOverride()) ? "MANUAL" : "CONTAINER",
             o.getVersion() == null ? 0 : o.getVersion(), o.getPalletCount(), o.getPackageCount(), o.getVolumeCbm(),
@@ -599,6 +607,25 @@ public class LastlegOrderService {
             o.getCustomerRemark(), o.getWarehouseRemark(), o.getCreatedAt(), o.getUpdatedAt());
     }
 
+    private String containerNode(LastlegOrder order) {
+        if (!StringUtils.hasText(order.getSourceContainerBookingId())) return null;
+        ContainerShippingGate gate = containerShippingGates.selectById(order.getSourceContainerBookingId());
+        return gate == null ? null : gate.getStandardNode();
+    }
+
+    private Map<String, String> containerNodes(List<LastlegOrder> orders) {
+        List<String> bookingIds = orders.stream().map(LastlegOrder::getSourceContainerBookingId)
+            .filter(StringUtils::hasText).distinct().toList();
+        if (bookingIds.isEmpty()) return Map.of();
+        Map<String, String> result = new LinkedHashMap<>();
+        containerShippingGates.selectBatchIds(bookingIds).forEach(gate -> {
+            if (StringUtils.hasText(gate.getStandardNode())) {
+                result.put(gate.getContainerBookingId(), gate.getStandardNode());
+            }
+        });
+        return result;
+    }
+
     private static String displayInboundCode(LastlegOrder order) {
         String orderType = order.getOrderType();
         return "RELABEL_APPLICATION".equals(orderType) || "LOCAL_LOOSEBOARD".equals(orderType)
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/service/LoadingCompletedConsumer.java b/lastleg-service/src/main/java/com/baiyue/lastleg/service/LoadingCompletedConsumer.java
index 832a57d57..80b5175d1 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/service/LoadingCompletedConsumer.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/service/LoadingCompletedConsumer.java
@@ -253,7 +253,7 @@ public class LoadingCompletedConsumer {
         order.setReceivingWarehouseVersion(0);
         order.setFbaWarehouseCode("FBA".equals(destinationType) ? source.destinationWarehouseCode() : null);
         order.setContainerNo(containerNo);
-        order.setContainerStatus("待转柜"); order.setAbnormal(false); order.setDetained(false);
+        order.setAbnormal(false); order.setDetained(false);
         order.setPackageCount(source.packageCount());
         order.setPalletCount("ONE_CLICK_DROPSHIP".equals(orderType)
             ? dropshipPallets.size() : Objects.requireNonNullElse(source.palletCount(), 0));
@@ -459,7 +459,10 @@ public class LoadingCompletedConsumer {
 
     private List<DropshipRequests.Pallet> pallets(FirstLegLoadingPlanCompletedV1.Order source, JsonNode rawSource) {
         if (source.pallets() != null && !source.pallets().isEmpty()) {
-            return source.pallets().stream().map(pallet -> {
+            List<DropshipRequests.Pallet> result = new ArrayList<>();
+            JsonNode rawPallets = rawSource.path("pallets");
+            for (int palletIndex = 0; palletIndex < source.pallets().size(); palletIndex++) {
+                FirstLegLoadingPlanCompletedV1.PalletSnapshot pallet = source.pallets().get(palletIndex);
                 Map<String, DropshipRequests.SkuPackages> inventorySkus = new java.util.LinkedHashMap<>();
                 for (var sku : pallet.skuPackages()) {
                     inventorySkus.merge(sku.skuCode(), new DropshipRequests.SkuPackages(sku.skuCode(),
@@ -470,8 +473,13 @@ public class LoadingCompletedConsumer {
                                 Math.addExact(left.productQuantity(), right.productQuantity()), List.copyOf(marks));
                         });
                 }
-                return new DropshipRequests.Pallet(pallet.palletNo(), List.copyOf(inventorySkus.values()));
-            }).toList();
+                JsonNode rawPallet = rawPallets.isArray() && palletIndex < rawPallets.size()
+                    ? rawPallets.get(palletIndex) : objectMapper.createObjectNode();
+                result.add(new DropshipRequests.Pallet(pallet.palletNo(), List.copyOf(inventorySkus.values()),
+                    positiveManifest(rawPallet, "manifestVersion"), positiveManifest(rawPallet, "manifestPackageCount"),
+                    positiveManifest(rawPallet, "manifestFragmentCount"), requiredManifestHash(rawPallet)));
+            }
+            return List.copyOf(result);
         }
         return legacyPallets(rawSource);
     }
@@ -484,7 +492,9 @@ public class LoadingCompletedConsumer {
                 String palletNo = pallet.path("palletNo").asText(pallet.path("sourcePalletNo").asText(null));
                 List<DropshipRequests.SkuPackages> skuRows = skuPackages(pallet);
                 if (palletNo != null && !palletNo.isBlank() && !skuRows.isEmpty()) {
-                    result.add(new DropshipRequests.Pallet(palletNo, skuRows));
+                    result.add(new DropshipRequests.Pallet(palletNo, skuRows,
+                        positiveManifest(pallet, "manifestVersion"), positiveManifest(pallet, "manifestPackageCount"),
+                        positiveManifest(pallet, "manifestFragmentCount"), requiredManifestHash(pallet)));
                 }
             }
             return result;
@@ -492,11 +502,27 @@ public class LoadingCompletedConsumer {
         String palletNo = source.path("palletNo").asText(source.path("sourcePalletNo").asText(null));
         List<DropshipRequests.SkuPackages> skuRows = skuPackages(source);
         if (palletNo != null && !palletNo.isBlank() && !skuRows.isEmpty()) {
-            result.add(new DropshipRequests.Pallet(palletNo, skuRows));
+            result.add(new DropshipRequests.Pallet(palletNo, skuRows,
+                positiveManifest(source, "manifestVersion"), positiveManifest(source, "manifestPackageCount"),
+                positiveManifest(source, "manifestFragmentCount"), requiredManifestHash(source)));
         }
         return result;
     }
 
+    private int positiveManifest(JsonNode source, String field) {
+        int value = source.path(field).asInt(0);
+        if (value <= 0) throw new IllegalArgumentException("One-click dropship pallet is missing " + field);
+        return value;
+    }
+
+    private String requiredManifestHash(JsonNode source) {
+        String value = source.path("manifestHash").asText(null);
+        if (value == null || !value.matches("(?i)[0-9a-f]{64}")) {
+            throw new IllegalArgumentException("One-click dropship pallet manifestHash is invalid");
+        }
+        return value.toLowerCase(java.util.Locale.ROOT);
+    }
+
     private List<DropshipRequests.SkuPackages> skuPackages(JsonNode source) {
         List<DropshipRequests.SkuPackages> result = new ArrayList<>();
         JsonNode nodes = source.path("skuPackages");
diff --git a/lastleg-service/src/main/resources/application.yml b/lastleg-service/src/main/resources/application.yml
index 5cf972a05..e4625e6c6 100644
--- a/lastleg-service/src/main/resources/application.yml
+++ b/lastleg-service/src/main/resources/application.yml
@@ -67,6 +67,8 @@ baiyue:
         connect-timeout: ${LASTLEG_PALLET_PHYSICAL_CONNECT_TIMEOUT:3s}
         read-timeout: ${LASTLEG_PALLET_PHYSICAL_READ_TIMEOUT:5s}
   clients:
+    print:
+      url: ${PRINT_SERVICE_URL:}
     domestic-warehouse:
       url: ${DOMESTIC_WAREHOUSE_URL:}
       cache-ttl: ${DOMESTIC_WAREHOUSE_CACHE_TTL:30m}
diff --git a/lastleg-service/src/main/resources/db/lastleg.sql b/lastleg-service/src/main/resources/db/lastleg.sql
index 9dc3c942f..afc5cc4fb 100644
--- a/lastleg-service/src/main/resources/db/lastleg.sql
+++ b/lastleg-service/src/main/resources/db/lastleg.sql
@@ -67,7 +67,6 @@ CREATE TABLE IF NOT EXISTS ll_order (
   transfer_warehouse_name VARCHAR(255) COMMENT '转入目的仓名称',
   fba_warehouse_code VARCHAR(128) COMMENT 'FBA 仓库编码',
   container_no VARCHAR(64) COMMENT '集装箱号',
-  container_status VARCHAR(32) DEFAULT '待转柜' COMMENT '货柜状态',
   abnormal TINYINT NOT NULL DEFAULT 0 COMMENT '是否异常：0否1是',
   detained TINYINT NOT NULL DEFAULT 0 COMMENT '是否暂扣：0否1是',
   hold_chargeable TINYINT NOT NULL DEFAULT 0 COMMENT '当前暂扣是否计费：0否1是',
@@ -444,7 +443,6 @@ ALTER TABLE ll_order
   MODIFY COLUMN receiving_warehouse_version INT NOT NULL DEFAULT 0 COMMENT '柜级接柜仓分配乐观锁版本',
   MODIFY COLUMN fba_warehouse_code VARCHAR(128) NULL COMMENT 'FBA 仓库编码',
   MODIFY COLUMN container_no VARCHAR(64) NULL COMMENT '集装箱号',
-  MODIFY COLUMN container_status VARCHAR(32) NULL DEFAULT '待转柜' COMMENT '货柜状态',
   MODIFY COLUMN abnormal TINYINT NOT NULL DEFAULT 0 COMMENT '是否异常：0否1是',
   MODIFY COLUMN detained TINYINT NOT NULL DEFAULT 0 COMMENT '是否暂扣：0否1是',
   MODIFY COLUMN pallet_count INT NOT NULL DEFAULT 0 COMMENT '托数',
@@ -660,8 +658,9 @@ CREATE TABLE IF NOT EXISTS ll_inbound_plan_pallet (
   capacity_cbm DECIMAL(18,4) NOT NULL DEFAULT 2.0000 COMMENT '托盘容量，固定为2立方米',
   allocated_volume_cbm DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '已分配体积（立方米）',
   sequence_no INT NOT NULL COMMENT '计划内托盘序号',
+  version INT NOT NULL DEFAULT 0 COMMENT '收货累计值乐观锁版本',
   PRIMARY KEY (id),
-  UNIQUE KEY uk_ll_inbound_pallet_no (pallet_no),
+  KEY idx_ll_inbound_pallet_no (pallet_no),
   UNIQUE KEY uk_ll_inbound_pallet_sequence (plan_id, sequence_no),
   KEY idx_ll_inbound_pallet_plan (plan_id),
   KEY idx_ll_inbound_pallet_customer_plan (customer_id, plan_id)
@@ -765,6 +764,8 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
 PREPARE inbound_schema_stmt FROM @ddl; EXECUTE inbound_schema_stmt; DEALLOCATE PREPARE inbound_schema_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_pallet' AND column_name='actual_package_count'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_pallet ADD COLUMN actual_package_count INT NOT NULL DEFAULT 0 COMMENT ''实收箱数'''));
 PREPARE inbound_schema_stmt FROM @ddl; EXECUTE inbound_schema_stmt; DEALLOCATE PREPARE inbound_schema_stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_pallet' AND column_name='version'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_pallet ADD COLUMN version INT NOT NULL DEFAULT 0 COMMENT ''收货累计值乐观锁版本'''));
+PREPARE inbound_schema_stmt FROM @ddl; EXECUTE inbound_schema_stmt; DEALLOCATE PREPARE inbound_schema_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_pallet_allocation' AND column_name='planned_package_count'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_pallet_allocation ADD COLUMN planned_package_count INT NOT NULL DEFAULT 0 COMMENT ''计划分配箱数'''));
 PREPARE inbound_schema_stmt FROM @ddl; EXECUTE inbound_schema_stmt; DEALLOCATE PREPARE inbound_schema_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_plan_pallet_allocation' AND column_name='counted_package_count'), 'SELECT 1', 'ALTER TABLE ll_inbound_plan_pallet_allocation ADD COLUMN counted_package_count INT NOT NULL DEFAULT 0 COMMENT ''清点箱数'''));
@@ -996,7 +997,7 @@ CREATE TABLE IF NOT EXISTS ll_receiving_container_session (
   source_container_booking_id VARCHAR(128) NOT NULL COMMENT '稳定来源柜预订ID', container_fact_hash VARCHAR(64) NOT NULL COMMENT '领取时整柜订单与计划事实摘要',
   container_no VARCHAR(64) NOT NULL COMMENT '集装箱号', overseas_warehouse_id BIGINT NOT NULL COMMENT '平台预分配并由操作员Token匹配的海外接柜仓ID', overseas_warehouse_code VARCHAR(128) NOT NULL COMMENT '海外接柜仓业务编码快照', overseas_warehouse_name VARCHAR(255) NOT NULL COMMENT '仓库服务校验后的海外接柜仓名称快照', operator_key VARCHAR(128) NOT NULL COMMENT '操作账号唯一标识',
   operator_name VARCHAR(255) NULL COMMENT '操作账号名称', active_operator_key VARCHAR(255) NULL COMMENT '未完成会话平台操作账号全局唯一锁键',
-  active_container_key VARCHAR(255) NULL COMMENT '未完成会话柜号全局唯一锁键', status VARCHAR(32) NOT NULL DEFAULT 'WAIT_SIGN' COMMENT '会话状态：WAIT_SIGN、SIGNED、RECEIVING、COMPLETED',
+  active_container_key VARCHAR(255) NULL COMMENT '未完成会话柜号全局唯一锁键', status VARCHAR(32) NOT NULL DEFAULT 'WAIT_SIGN' COMMENT '会话状态：WAIT_SIGN、SIGNED、RECEIVING、COMPLETED、COMPLETED_WITH_DIFFERENCE',
   sign_photos JSON NULL COMMENT '签收卸柜照片角色与文件ID列表', prepared_at DATETIME(3) NULL COMMENT '选择柜号时间',
   signed_at DATETIME(3) NULL COMMENT '签收时间', receiving_at DATETIME(3) NULL COMMENT '首次收货时间',
   completed_at DATETIME(3) NULL COMMENT '完成时间', created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
@@ -1019,6 +1020,16 @@ CREATE TABLE IF NOT EXISTS ll_receiving_sku_receipt (
   KEY idx_ll_receiving_sku_plan (customer_id,plan_id,line_id)
 ) ENGINE=InnoDB COMMENT='海外PDA柜号FBA SKU实收进度';
 
+CREATE TABLE IF NOT EXISTS ll_receiving_fba_pallet_count (
+  id BIGINT NOT NULL COMMENT 'FBA托盘现场累计箱数ID', session_id BIGINT NOT NULL COMMENT '柜号签收会话ID',
+  group_key VARCHAR(255) NOT NULL COMMENT '柜号与FBA仓组成的收货组键', pallet_code VARCHAR(128) NOT NULL COMMENT '现有FBA托盘码',
+  actual_packages INT NOT NULL COMMENT '该托现场累计实物箱数', created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  PRIMARY KEY(id), UNIQUE KEY uk_ll_receiving_fba_count(session_id,group_key,pallet_code),
+  KEY idx_ll_receiving_fba_group(session_id,group_key)
+) ENGINE=InnoDB COMMENT='海外PDA普通FBA托盘现场累计与超收标记';
+
+
 CREATE TABLE IF NOT EXISTS ll_receiving_container_operation (
   id BIGINT NOT NULL COMMENT '柜号收货操作ID', session_id BIGINT NOT NULL COMMENT '柜号签收会话ID',
   operator_key VARCHAR(128) NOT NULL COMMENT '操作账号唯一标识', action VARCHAR(32) NOT NULL COMMENT '操作动作', idempotency_key VARCHAR(255) NOT NULL COMMENT '客户端幂等键',
@@ -1734,6 +1745,10 @@ CREATE TABLE IF NOT EXISTS ll_relabel_item (
   KEY idx_ll_relabel_item_destination (customer_id,destination_warehouse_id,application_id)
 ) ENGINE=InnoDB COMMENT='换标货物冻结明细';
 
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='destination_fba_warehouse_code'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN destination_fba_warehouse_code VARCHAR(128) NULL COMMENT ''可选FBA目的仓编码（与海外操作仓分离）''')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='source_inventory_balance_id'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN source_inventory_balance_id BIGINT NULL COMMENT ''原库存余额ID（预入仓换标任务可为空）''')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='source_inventory_position_id'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN source_inventory_position_id BIGINT NULL COMMENT ''原库存库位ID（预入仓换标任务可为空）''')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name='source_inbound_order_id'), 'SELECT 1', 'ALTER TABLE ll_relabel_item ADD COLUMN source_inbound_order_id BIGINT NULL COMMENT ''原入仓单ID（预入仓换标任务可为空）''')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_item' AND column_name IN ('shipment_no','destination_fba_warehouse_code','source_inventory_balance_id','source_inventory_position_id','source_inbound_order_id') AND is_nullable='NO'), 'ALTER TABLE ll_relabel_item MODIFY COLUMN shipment_no VARCHAR(128) NULL COMMENT ''货件编号（无FBA去向时为空）'', MODIFY COLUMN destination_fba_warehouse_code VARCHAR(128) NULL COMMENT ''可选FBA目的仓编码（与海外操作仓分离）'', MODIFY COLUMN source_inventory_balance_id BIGINT NULL COMMENT ''原库存余额ID（预入仓换标任务可为空）'', MODIFY COLUMN source_inventory_position_id BIGINT NULL COMMENT ''原库存库位ID（预入仓换标任务可为空）'', MODIFY COLUMN source_inbound_order_id BIGINT NULL COMMENT ''原入仓单ID（预入仓换标任务可为空）''', 'SELECT 1'));
 PREPARE relabel_pre_inbound_stmt FROM @ddl; EXECUTE relabel_pre_inbound_stmt; DEALLOCATE PREPARE relabel_pre_inbound_stmt;
 
@@ -1844,11 +1859,14 @@ CREATE TABLE IF NOT EXISTS ll_dropship_order_profile (
   id BIGINT NOT NULL COMMENT '主键ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户租户ID', order_id BIGINT NOT NULL COMMENT '订单ID',
   warehouse_pallet_id BIGINT NULL COMMENT '仓库实物托盘ID', pallet_no VARCHAR(128) NULL COMMENT '托盘号',
   source_pallet_no VARCHAR(128) NOT NULL COMMENT '来源托盘号快照',
+  manifest_version INT NOT NULL COMMENT '整托清单版本', manifest_package_count INT NOT NULL COMMENT '整托总箱数',
+  manifest_fragment_count INT NOT NULL COMMENT '整托客户分片总数', manifest_hash CHAR(64) NOT NULL COMMENT '整托完整清单摘要',
   inventory_position_id BIGINT NULL COMMENT '库存仓位记录ID', status VARCHAR(32) NOT NULL DEFAULT 'PENDING_INBOUND' COMMENT '业务状态',
   idempotency_key VARCHAR(255) NOT NULL COMMENT '业务幂等键', version BIGINT NOT NULL DEFAULT 0 COMMENT '乐观锁版本',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
   PRIMARY KEY(id), UNIQUE KEY uk_ll_dropship_profile_order_pallet(customer_id,order_id,source_pallet_no),
-  UNIQUE KEY uk_ll_dropship_profile_key(customer_id,idempotency_key), KEY idx_ll_dropship_profile_order(customer_id,order_id)
+  UNIQUE KEY uk_ll_dropship_profile_key(customer_id,idempotency_key), KEY idx_ll_dropship_profile_order(customer_id,order_id),
+  KEY idx_ll_dropship_profile_manifest(source_pallet_no,manifest_hash)
 ) ENGINE=InnoDB COMMENT='一件代发托盘档案';
 
 CREATE TABLE IF NOT EXISTS ll_dropship_carton (
@@ -2385,10 +2403,12 @@ CREATE TABLE IF NOT EXISTS ll_destuff_pallet_cost_allocation (
 -- 客户退货预报、PDA 签收与仓储费起算批次
 CREATE TABLE IF NOT EXISTS ll_return_order (
  -- need_relabel is added below for existing deployments
- id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', return_no VARCHAR(128) NOT NULL COMMENT '退货订单号', overseas_warehouse_id VARCHAR(128) NOT NULL COMMENT '操作海外仓ID', warehouse_contact_name VARCHAR(128) NULL COMMENT '中转仓联系人快照', warehouse_contact_phone VARCHAR(64) NULL COMMENT '中转仓联系电话快照', customer_reference_no VARCHAR(128) NULL COMMENT '客户参考号', status VARCHAR(32) NOT NULL COMMENT 'PENDING_RECEIPT、PARTIALLY_RECEIVED或COMPLETED', expected_sku_types INT NOT NULL COMMENT '预报SKU种类数', expected_quantity BIGINT NOT NULL COMMENT '预报总数量', received_quantity BIGINT NOT NULL DEFAULT 0 COMMENT '累计实收总数量', remark VARCHAR(1000) NULL COMMENT '客户备注', idempotency_key VARCHAR(255) NOT NULL COMMENT '创建幂等键', request_hash CHAR(64) NOT NULL COMMENT '创建请求SHA-256', created_by VARCHAR(128) NULL COMMENT '创建操作人ID', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
+ id BIGINT NOT NULL COMMENT '退货订单ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', return_no VARCHAR(128) NOT NULL COMMENT '退货订单号', overseas_warehouse_id VARCHAR(128) NOT NULL COMMENT '操作海外仓ID', warehouse_contact_name VARCHAR(128) NULL COMMENT '中转仓联系人快照', warehouse_contact_phone VARCHAR(64) NULL COMMENT '中转仓联系电话快照', customer_reference_no VARCHAR(128) NULL COMMENT '客户参考号', lastleg_order_id BIGINT NULL COMMENT '尾程订单ID', lastleg_order_no VARCHAR(32) NULL COMMENT '尾程订单号', status VARCHAR(32) NOT NULL COMMENT 'PENDING_RECEIPT、PARTIALLY_RECEIVED或COMPLETED', expected_sku_types INT NOT NULL COMMENT '预报SKU种类数', expected_quantity BIGINT NOT NULL COMMENT '预报总数量', received_quantity BIGINT NOT NULL DEFAULT 0 COMMENT '累计实收总数量', remark VARCHAR(1000) NULL COMMENT '客户备注', idempotency_key VARCHAR(255) NOT NULL COMMENT '创建幂等键', request_hash CHAR(64) NOT NULL COMMENT '创建请求SHA-256', created_by VARCHAR(128) NULL COMMENT '创建操作人ID', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
  PRIMARY KEY(id), UNIQUE KEY uk_ll_return_order_customer_no(customer_id,return_no), UNIQUE KEY uk_ll_return_order_customer_key(customer_id,idempotency_key), KEY idx_ll_return_order_warehouse_status(overseas_warehouse_id,status,created_at), CONSTRAINT chk_ll_return_order_quantity CHECK(expected_sku_types>0 AND expected_quantity>0 AND received_quantity>=0 AND received_quantity<=expected_quantity)
 ) ENGINE=InnoDB COMMENT='客户退货订单及SKU实收汇总';
 SET @ll_return_order_need_relabel = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='need_relabel'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN need_relabel TINYINT(1) NOT NULL DEFAULT 0 COMMENT ''是否需要换标'' AFTER customer_reference_no')); PREPARE stmt FROM @ll_return_order_need_relabel; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='lastleg_order_id'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN lastleg_order_id BIGINT NULL COMMENT ''尾程订单ID'' AFTER customer_reference_no')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='lastleg_order_no'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN lastleg_order_no VARCHAR(32) NULL COMMENT ''尾程订单号'' AFTER lastleg_order_id')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='warehouse_contact_name'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN warehouse_contact_name VARCHAR(128) NULL COMMENT ''中转仓联系人快照'' AFTER overseas_warehouse_id')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='warehouse_contact_phone'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN warehouse_contact_phone VARCHAR(64) NULL COMMENT ''中转仓联系电话快照'' AFTER warehouse_contact_name')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='relabel_application_id'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN relabel_application_id BIGINT NULL COMMENT ''绑定换标申请单ID'' AFTER need_relabel')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
@@ -2462,6 +2482,7 @@ PREPARE return_inventory_carton_status_drop_stmt FROM @ddl; EXECUTE return_inven
 ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','MERGED','OUTBOUNDED'));
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='source_return_no'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN source_return_no VARCHAR(2000) NULL COMMENT ''来源退货单号'' AFTER source_batch_no'));
 PREPARE return_inventory_carton_return_no_stmt FROM @ddl; EXECUTE return_inventory_carton_return_no_stmt; DEALLOCATE PREPARE return_inventory_carton_return_no_stmt;
+ALTER TABLE ll_return_inventory_carton MODIFY COLUMN source_batch_no TEXT NULL COMMENT '实际消耗来源签收批次号，多个批次逗号分隔', MODIFY COLUMN source_return_no TEXT NULL COMMENT '实际消耗来源退货单号，多个单号逗号分隔';
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='fba_carton_mark'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN fba_carton_mark VARCHAR(255) NULL COMMENT ''FBA箱唛'' AFTER carton_mark')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='destination_warehouse_code'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN destination_warehouse_code VARCHAR(128) NULL COMMENT ''目的仓编码'' AFTER fba_carton_mark')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='destination_warehouse_name'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN destination_warehouse_name VARCHAR(255) NULL COMMENT ''目的仓名称'' AFTER destination_warehouse_code')); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
diff --git a/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml b/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
index 9e773c74c..378ee173a 100644
--- a/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
+++ b/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
@@ -96,24 +96,24 @@ paths:
   /api/pda/v1/last-leg/receiving-containers/current/cartons/resolve:
     post:
       summary: 解析当前柜箱唛
-      description: 权限 lastleg:pda:operate；FBA 从完整 cartonMark 的第一个 # 前提取固定入仓码，并精确匹配当前锁定柜唯一 FBA line；不要求逐箱 manifest，不校验 SKU 或箱序号。OVERSEAS 必须命中真实 manifest。两者均不返回 SKU，也不登记收货。
+      description: 权限 lastleg:pda:operate；一件代发扫描 DP 或任一箱码解析整托并校验跨客户完整清单；普通 FBA 扫任一箱码后按当前柜+FBA目的仓聚合所有入仓码；海外仓中转仍逐箱解析。响应不返回客户信息。
       security: [{ bearerAuth: [] }]
       requestBody: { required: true, content: { application/json: { schema: { type: object, required: [cartonMark], properties: { cartonMark: { type: string } } } } } }
       responses: { '200': { description: 箱唛与入仓码信息, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingCartonResolvedApiResponse' } } } }, '404': { description: 入仓码未命中当前柜，或 OVERSEAS 箱码未命中真实 manifest }, '409': { description: '缺少 #、空入仓码前缀、跨柜或当前柜多重命中' } }
   /api/pda/v1/last-leg/receiving-containers/current/pallets/resolve:
     post:
       summary: 解析当前柜实物托盘码
-      description: 权限 lastleg:pda:operate；托盘固定从 Warehouse Overseas 公共资源作用域解析并校验实际仓与目的仓。
+      description: 权限 lastleg:pda:operate；普通 FBA 只解析当前柜该 FBA 目的仓已经生成的“柜号-FBA仓-序号”托盘，返回版本与该托现场累计箱数。
       security: [{ bearerAuth: [] }]
       requestBody: { required: true, content: { application/json: { schema: { type: object, required: [palletCode, inboundCode], properties: { palletCode: { type: string }, inboundCode: { type: string } } } } } }
       responses: { '200': { description: 可用托盘与目的匹配结果, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingPalletResolvedApiResponse' } } } }, '409': { description: 仓库、目的仓或托盘状态不符 } }
   /api/pda/v1/last-leg/receiving-containers/current/receipts/bulk:
     post:
       summary: FBA 入仓码按箱数收货
-      description: 权限 lastleg:pda:operate；只允许 destinationType=FBA，OVERSEAS 在服务端硬拒绝；服务端按当前入仓码所属计划的 line.id ASC 和冻结 SKU 明细顺序拆分箱数并记录真实 SKU 收货；不接收 SKU、customerId、planNo、allocationId、warehouseId、locationId。
+      description: 权限 lastleg:pda:operate；只允许普通 FBA。packageCount 是该托现场累计箱数，服务端按当前柜+FBA目的仓稳定分摊到全部关联入仓码；超出计划部分只记差异，不生成可用库存。
       security: [{ bearerAuth: [] }]
       requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingBulk' } } } }
-      responses: { '200': { description: 本次与累计实收进度, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingReceiptApiResponse' } } } }, '409': { description: 海外仓批量、超收或托盘不匹配 } }
+      responses: { '200': { description: 本次与累计实收进度，超收返回 DIFFERENCE_RECORDED, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingReceiptApiResponse' } } } }, '409': { description: 非普通FBA、累计数回退、版本变化或托盘不匹配 } }
   /api/pda/v1/last-leg/receiving-containers/current/receipts/carton:
     post:
       summary: 海外仓入仓码逐箱收货
@@ -124,17 +124,17 @@ paths:
   /api/pda/v1/last-leg/receiving-containers/current/receipts/pallet:
     post:
       summary: 一件代发按完整来源托盘收货
-      description: 权限 lastleg:pda:operate；只允许 ONE_CLICK_DROPSHIP，扫描国内封托后冻结的来源托盘号，一次接收该托全部箱和 SKU 快照；不允许逐箱或拆分接收。
+      description: 权限 lastleg:pda:operate；只允许 ONE_CLICK_DROPSHIP，扫描 DP 或该托任一箱码，一次接收跨客户完整 DP；所有客户事件分片清单一致且齐全后才允许收货。
       security: [{ bearerAuth: [] }]
       requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingWholePallet' } } } }
       responses: { '200': { description: 本次与累计实收进度, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingReceiptApiResponse' } } } }, '404': { description: 来源托盘不属于当前柜 }, '409': { description: 非一件代发、来源托盘重复或已操作 } }
   /api/pda/v1/last-leg/receiving-containers/current/complete:
     post:
       summary: 完成当前柜收货并入库存
-      description: 权限 lastleg:pda:operate；仅柜内每个入仓码实收总数精确相等后完成，库存、计划、尾程状态与卸柜 Outbox 同事务落地。
+      description: 权限 lastleg:pda:operate；无差异时正常入库；allowDifference=true 时允许短少或超收现场结束，差异计划进入 PENDING_RECONCILIATION 且不生成客户可用库存。
       security: [{ bearerAuth: [] }]
-      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingAction' } } } }
-      responses: { '200': { description: COMPLETED 柜号会话, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingSessionApiResponse' } } } }, '409': { description: 数量未核平或状态冲突 } }
+      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingComplete' } } } }
+      responses: { '200': { description: COMPLETED 或 COMPLETED_WITH_DIFFERENCE 柜号会话, content: { application/json: { schema: { $ref: '#/components/schemas/ReceivingSessionApiResponse' } } } }, '409': { description: 未确认差异或状态冲突 } }
   /api/pda/v1/last-leg/inventory/resolve:
     post:
       summary: PDA按SKU、箱唛或入仓码扫码查询库存
@@ -169,7 +169,7 @@ paths:
   /api/platform/v1/last-leg/orders:
     get:
       summary: 分页查询尾程订单
-      description: 权限 platform:overseas-warehouse:last-mile-order:list；平台管理员省略 customerId 时查询全部客户。
+      description: 权限 platform:overseas-warehouse:last-mile-order:list；平台管理员省略 customerId 时查询全部客户。containerNode 来自稳定 sourceContainerBookingId 对应的柜级船节点门禁。
       security: [{ bearerAuth: [] }]
       parameters:
         - { name: page, in: query, schema: { type: integer, minimum: 1, default: 1 } }
@@ -190,7 +190,7 @@ paths:
   /api/platform/v1/last-leg/orders/{id}:
     get:
       summary: 查询尾程订单详情
-      description: 权限 platform:overseas-warehouse:last-mile-order:list；返回订单、货物、状态历史、费用明细和操作记录。
+      description: 权限 platform:overseas-warehouse:last-mile-order:list；返回订单、货物、状态历史、费用明细和操作记录。订单中的 containerNode 来自稳定 sourceContainerBookingId 对应的柜级船节点门禁。
       security: [{ bearerAuth: [] }]
       parameters:
         - { name: id, in: path, required: true, schema: { type: integer, format: int64 } }
@@ -513,6 +513,21 @@ paths:
       security: [{ bearerAuth: [] }]
       parameters: [{ name: dispatchNo, in: path, required: true, schema: { type: string } }]
       responses: { '200': { description: 取消成功或已取消 }, '404': { description: 排车单不存在 }, '409': { description: 排车已开始执行 } }
+  /api/platform/v1/last-leg/dispatches/{dispatchNo}/prints/bol:
+    get:
+      summary: 生成排车 BOL PDF
+      description: 权限 platform:overseas-warehouse:dispatch:list；服务端按目的 FBA 仓分组并分页生成固定 A4 PDF，浏览器不直接访问内部打印服务。
+      security: [{ bearerAuth: [] }]
+      parameters: [{ name: dispatchNo, in: path, required: true, schema: { type: string } }]
+      responses:
+        '200':
+          description: BOL PDF
+          headers:
+            Content-Disposition: { schema: { type: string } }
+            X-Print-Page-Count: { schema: { type: integer, minimum: 1 } }
+          content: { application/pdf: { schema: { type: string, format: binary } } }
+        '404': { description: 排车单不存在 }
+        '422': { description: 排车单没有可打印的 BOL 明细 }
   /api/platform/v1/last-leg/dispatches/candidates:
     get:
       summary: 查询智能排车候选托盘
@@ -1407,6 +1422,21 @@ paths:
         - { name: overseasWarehouseId, in: query, schema: { type: string, maxLength: 128 } }
         - { name: skuCode, in: query, schema: { type: string, maxLength: 128 } }
       responses: { '200': { description: 当前客户 SKU 汇总库存分页 } }
+  /api/merchant/v1/last-leg/return-inventory/cartons:
+    get:
+      summary: 客户退货箱号分页
+      description: 需要 merchant:overseas-warehouse:return-inventory:list。客户范围仅取登录身份且精确匹配；每个实物箱一条记录，SKU 筛选使用存在性条件，不重复箱号或放大总箱数。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: page, in: query, schema: { type: integer, minimum: 1, default: 1 } }
+        - { name: size, in: query, schema: { type: integer, minimum: 1, maximum: 200, default: 20 } }
+        - { name: overseasWarehouseId, in: query, schema: { type: string } }
+        - { name: skuCode, in: query, schema: { type: string } }
+        - { name: cartonMark, in: query, schema: { type: string } }
+        - { name: returnNo, in: query, schema: { type: string } }
+        - { name: status, in: query, schema: { type: string } }
+      responses:
+        '200': { description: 分页 records 每箱一行，包含 cartonMark、overseasWarehouseId、sourceBatchNo、sourceReturnNo、status、skuTypes、totalQuantity、length、width、height、weight、createdAt；total 为实际箱数 }
   /api/merchant/v1/last-leg/return-inventory/cartons/{cartonMark}:
     get:
       summary: 客户查询退货箱明细
@@ -1810,6 +1840,12 @@ components:
       type: object
       required: [idempotencyKey]
       properties: { idempotencyKey: { type: string, minLength: 1, maxLength: 255 } }
+    ReceivingComplete:
+      type: object
+      required: [allowDifference, idempotencyKey]
+      properties:
+        allowDifference: { type: boolean }
+        idempotencyKey: { type: string, minLength: 1, maxLength: 255 }
     ReceivingSign:
       type: object
       required: [photos, idempotencyKey]
@@ -1836,6 +1872,7 @@ components:
         inboundCode: { type: string, minLength: 1 }
         palletCode: { type: string, minLength: 1 }
         packageCount: { type: integer, minimum: 1 }
+        expectedPalletVersion: { type: integer, minimum: 0, nullable: true }
         idempotencyKey: { type: string, minLength: 1, maxLength: 255 }
     ReceivingCarton:
       type: object
@@ -1912,13 +1949,13 @@ components:
         currentAccount: { type: boolean }
     ReceivingSession:
       type: object
-      required: [containerNo, overseasWarehouseId, overseasWarehouseCode, overseasWarehouseName, status, version, photos, totalPackages, receivedPackages, pendingPackages, inbounds]
+      required: [containerNo, overseasWarehouseId, overseasWarehouseCode, overseasWarehouseName, status, version, photos, totalPackages, receivedPackages, pendingPackages, hasDifference, inbounds]
       properties:
         containerNo: { type: string }
         overseasWarehouseId: { type: string, pattern: '^\d+$', description: 平台预分配并与PDA Token匹配的海外接柜仓ID }
         overseasWarehouseCode: { type: string, description: 海外接柜仓业务编码快照 }
         overseasWarehouseName: { type: string, description: Warehouse Overseas服务校验后的共享实际海外收货仓名称快照 }
-        status: { type: string, enum: [WAIT_SIGN, SIGNED, RECEIVING, COMPLETED] }
+        status: { type: string, enum: [WAIT_SIGN, SIGNED, RECEIVING, COMPLETED, COMPLETED_WITH_DIFFERENCE] }
         operatorName: { type: string, nullable: true }
         version: { type: integer }
         photos: { type: array, maxItems: 3, items: { $ref: '#/components/schemas/ReceivingSignedSessionPhoto' } }
@@ -1929,6 +1966,7 @@ components:
         totalPackages: { type: integer }
         receivedPackages: { type: integer }
         pendingPackages: { type: integer }
+        hasDifference: { type: boolean, description: 是否存在短少或普通FBA超收差异 }
         inbounds: { type: array, items: { $ref: '#/components/schemas/ReceivingInbound' } }
     ReceivingPhoto:
       type: object
@@ -1942,12 +1980,16 @@ components:
       allOf:
         - { $ref: '#/components/schemas/ReceivingInbound' }
         - type: object
-          required: [cartonMark]
+          required: [cartonMark, operationMode, groupKey, inboundCodes]
           properties:
             cartonMark: { type: string }
+            operationMode: { type: string, enum: [DROPSHIP_PALLET, FBA_GROUP], nullable: true }
+            groupKey: { type: string, nullable: true }
+            inboundCodes: { type: array, items: { type: string } }
+            sourcePalletNo: { type: string, nullable: true }
     ReceivingPalletResolved:
       type: object
-      required: [palletCode, warehouseId, status, inboundCode, destinationType, compatible]
+      required: [palletCode, warehouseId, status, inboundCode, destinationType, compatible, version, currentReceivedPackages]
       properties:
         palletCode: { type: string }
         warehouseId: { type: integer, format: int64 }
@@ -1956,6 +1998,8 @@ components:
         inboundCode: { type: string }
         destinationType: { type: string, enum: [FBA, OVERSEAS] }
         compatible: { type: boolean }
+        version: { type: integer, minimum: 0 }
+        currentReceivedPackages: { type: integer, minimum: 0 }
     ReceivingReceipt:
       type: object
       required: [result, containerNo, inboundCode, destinationType, palletCode, acceptedPackages, receivedPackages, pendingPackages, sessionStatus, assigned, mergeAllowed, urgent]
@@ -1975,6 +2019,8 @@ components:
         mergeHint: { type: string, nullable: true }
         orderType: { type: string, nullable: true }
         wholePalletInbound: { type: boolean, description: 一件代发必须按完整来源托盘扫描收货 }
+        groupKey: { type: string, nullable: true }
+        inboundCodes: { type: array, items: { type: string } }
     ReceivingCandidateListApiResponse:
       allOf:
         - { $ref: '#/components/schemas/ReceivingApiResponseBase' }
@@ -2280,6 +2326,10 @@ components:
         partialCompletionReason: { type: string, nullable: true }
         createdAt: { type: string, format: date-time }
         items: { type: array, items: { $ref: '#/components/schemas/DispatchItem' } }
+        bolLines:
+          type: array
+          description: 仅详情接口返回的BOL打印聚合行；分页接口返回空数组，避免列表查询放大
+          items: { $ref: '#/components/schemas/DispatchBolLine' }
     DispatchItem:
       type: object
       properties:
@@ -2298,6 +2348,17 @@ components:
         packageCount: { type: integer }
         volumeCbm: { type: number }
         sourceStage: { type: string, enum: [PLAN, RECEIVED] }
+    DispatchBolLine:
+      type: object
+      properties:
+        containerNo: { type: string, nullable: true }
+        palletNo: { type: string, nullable: true }
+        fbaWarehouseCode: { type: string, nullable: true }
+        destinationWarehouseName: { type: string, nullable: true }
+        warehouseNo: { type: string, nullable: true, description: 来源入仓码/仓库单号 }
+        fbaShipmentId: { type: string, nullable: true, description: 来源冻结货件编号；多值以逗号分隔 }
+        poReferenceNo: { type: string, nullable: true, description: 来源冻结FBA跟踪/参考号；多值以逗号分隔 }
+        packageCount: { type: integer, minimum: 0 }
     RelabelStatus: { type: string, enum: [PENDING_PROCESSING, PROCESSING, CUSTOMER_CONFIRM_PENDING, READY_FOR_OUTBOUND, COMPLETED, REJECTED, CANCELLED] }
     RelabelMerchantPageResponse:
       allOf:
@@ -2774,12 +2835,15 @@ components:
         version: { type: integer }
     InboundPlanDetail:
       type: object
-      required: [id, planNo, customerId, overseasWarehouseCode, overseasWarehouseName, status, lineCount, palletCount, totalVolumeCbm, expectedPackageCount, pickedPackageCount, lines, pallets, allocations, version]
+      required: [id, planNo, customerId, overseasWarehouseCode, overseasWarehouseName, status, lineCount, palletCount, totalVolumeCbm, expectedPackageCount, pickedPackageCount, lines, pallets, allocations, version, createdAt, updatedAt]
       properties:
         id: { type: string, pattern: '^[0-9]+$' }
         planNo: { type: string }
         customerId: { type: string }
         sourceOrderId: { type: string, pattern: '^[0-9]+$', nullable: true }
+        sourceOrderNo: { type: string, nullable: true, description: 关联尾程订单业务单号；手工入库计划为空 }
+        customerName: { type: string, nullable: true, description: 货主名称；手工入库计划为空 }
+        orderType: { type: string, nullable: true, description: 关联尾程订单类型；手工入库计划为空 }
         containerNo: { type: string, nullable: true }
         overseasWarehouseCode: { type: string, description: 接柜仓编码，取自尾程订单预分配接收仓事实 }
         overseasWarehouseName: { type: string, description: 接柜仓名称，取自尾程订单预分配接收仓事实 }
@@ -2796,13 +2860,15 @@ components:
         urgent: { type: boolean }
         creationMode: { type: string, enum: [AUTO, MANUAL] }
         remark: { type: string, nullable: true }
+        createdAt: { type: string, format: date-time }
+        updatedAt: { type: string, format: date-time }
         lines: { type: array, items: { $ref: '#/components/schemas/InboundPlanLine' } }
         pallets: { type: array, items: { $ref: '#/components/schemas/InboundPlanPallet' } }
         allocations: { type: array, items: { $ref: '#/components/schemas/InboundPlanAllocation' } }
         version: { type: integer }
     ContainerInboundPlanPreview:
       type: object
-      required: [sourceContainerBookingId, snapshotVersion, snapshotHash, totalOrderCount, readyOrderCount, blockedOrderCount, pendingOrderCount, pendingPalletCount, existingPlannedPalletCount, totalSuggestedPalletCount, totalPlannedPalletCount, ready, groups]
+      required: [sourceContainerBookingId, snapshotVersion, snapshotHash, totalOrderCount, readyOrderCount, blockedOrderCount, pendingOrderCount, pendingPalletCount, sourcePalletCount, supplementPalletCount, existingPlannedPalletCount, totalSuggestedPalletCount, totalPlannedPalletCount, ready, groups]
       properties:
         sourceContainerBookingId: { type: string }
         containerNo: { type: string, nullable: true }
@@ -2815,7 +2881,9 @@ components:
         readyOrderCount: { type: integer }
         blockedOrderCount: { type: integer }
         pendingOrderCount: { type: integer, description: 本次确认将新建计划的 READY 订单数 }
-        pendingPalletCount: { type: integer, description: 本次确认将向资源服务批量预留的新托盘数 }
+        pendingPalletCount: { type: integer, description: 本次确认最终向资源服务批量预留的托盘总数，包含头程已有编码及海外补充编码 }
+        sourcePalletCount: { type: integer, description: 本次处理订单随头程装柜完成事件冻结并传入的托盘码数 }
+        supplementPalletCount: { type: integer, description: 最终托数超过头程已有托盘码数时，在海外仓连续补充的托盘码数 }
         existingPlannedPalletCount: { type: integer, description: 已有有效计划的托盘总数，不计入本次新增 }
         totalSuggestedPalletCount: { type: integer }
         totalPlannedPalletCount: { type: integer }
@@ -2823,7 +2891,7 @@ components:
         groups: { type: array, items: { $ref: '#/components/schemas/ContainerInboundPlanPreviewGroup' } }
     ContainerInboundPlanPreviewGroup:
       type: object
-      required: [destinationType, orderCount, pendingOrderCount, pendingPalletCount, existingPlannedPalletCount, suggestedPalletCount, plannedPalletCount, orders]
+      required: [destinationType, orderCount, pendingOrderCount, pendingPalletCount, sourcePalletCount, supplementPalletCount, existingPlannedPalletCount, suggestedPalletCount, plannedPalletCount, orders]
       properties:
         destinationType: { type: string, enum: [FBA, ONE_CLICK_DROPSHIP, PRIVATE_ADDRESS] }
         destinationWarehouseId: { type: string, nullable: true }
@@ -2832,13 +2900,15 @@ components:
         orderCount: { type: integer }
         pendingOrderCount: { type: integer }
         pendingPalletCount: { type: integer }
+        sourcePalletCount: { type: integer }
+        supplementPalletCount: { type: integer }
         existingPlannedPalletCount: { type: integer }
         suggestedPalletCount: { type: integer }
         plannedPalletCount: { type: integer }
         orders: { type: array, items: { $ref: '#/components/schemas/ContainerInboundPlanPreviewOrder' } }
     ContainerInboundPlanPreviewOrder:
       type: object
-      required: [customerId, orderId, businessOrderNo, orderType, destinationType, packageCount, volumeCbm, orderVersion, readiness, blockers]
+      required: [customerId, orderId, businessOrderNo, orderType, destinationType, packageCount, volumeCbm, sourcePalletCount, targetPalletCount, supplementPalletCount, orderVersion, readiness, blockers]
       properties:
         customerId: { type: string }
         customerName: { type: string, nullable: true }
@@ -2854,11 +2924,14 @@ components:
         packageCount: { type: integer }
         volumeCbm: { type: number }
         suggestedPalletCount: { type: integer, nullable: true }
+        sourcePalletCount: { type: integer, description: 头程已经冻结并传入的托盘码数 }
+        targetPalletCount: { type: integer, description: 本票最终生成的托盘总数，不少于头程已有托盘码数 }
+        supplementPalletCount: { type: integer, description: 本票需要在海外仓连续补充的托盘码数 }
         plannedPalletCount: { type: integer, nullable: true }
         existingPlanNo: { type: string, nullable: true }
         planStatus: { type: string, nullable: true }
         orderVersion: { type: integer, minimum: 0 }
-        readiness: { type: string, enum: [READY, PLANNED, BLOCKED] }
+        readiness: { type: string, enum: [READY, RESOURCE_PENDING, PLANNED, BLOCKED] }
         blockers: { type: array, items: { type: string } }
     InboundPlanLine:
       type: object
@@ -2897,6 +2970,9 @@ components:
       properties:
         lineId: { type: string, pattern: '^[0-9]+$' }
         palletId: { type: string, pattern: '^[0-9]+$' }
+        palletNo: { type: string, description: 分配实际引用的托盘码，跨计划合托时仍返回真实托盘码 }
+        palletOwnerPlanNo: { type: string, description: 托盘所属入库计划号 }
+        palletOwnedByCurrentPlan: { type: boolean, description: 托盘是否归属当前详情入库计划 }
         allocatedVolumeCbm: { type: number }
         plannedPackageCount: { type: integer }
         countedPackageCount: { type: integer }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/client/DomesticWarehouseDirectoryClientContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/client/DomesticWarehouseDirectoryClientContractTest.java
index cf96c781e..f9573422f 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/client/DomesticWarehouseDirectoryClientContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/client/DomesticWarehouseDirectoryClientContractTest.java
@@ -33,6 +33,7 @@ class DomesticWarehouseDirectoryClientContractTest {
                 "warehouseType:String", "countryCode:String", "status:String");
         assertThat(Arrays.stream(DomesticWarehouseDirectoryClient.Address.class.getRecordComponents())
             .map(value -> value.getName() + ":" + value.getType().getSimpleName()))
-            .containsExactly("stateProvince:String");
+            .containsExactly("addressType:String", "countryCode:String", "stateProvince:String", "city:String",
+                "district:String", "postalCode:String", "addressLine1:String", "addressLine2:String");
     }
 }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/controller/Phase4BrowserApiBoundaryTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/controller/Phase4BrowserApiBoundaryTest.java
index f7b89b42b..890f61a38 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/controller/Phase4BrowserApiBoundaryTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/controller/Phase4BrowserApiBoundaryTest.java
@@ -58,7 +58,7 @@ class Phase4BrowserApiBoundaryTest {
         assertTrue(Arrays.asList(condition.name()).contains("lastleg.dispatch-query-api.enabled"));
         assertFalse(condition.matchIfMissing());
         assertTrue(Arrays.stream(DispatchQueryController.class.getDeclaredMethods())
-            .filter(method -> method.isAnnotationPresent(GetMapping.class)).count() == 2);
+            .filter(method -> method.isAnnotationPresent(GetMapping.class)).count() == 3);
         assertFalse(Arrays.stream(DispatchQueryController.class.getDeclaredMethods())
             .flatMap(method -> Arrays.stream(method.getAnnotations()))
             .anyMatch(annotation -> Set.of("PostMapping", "PutMapping", "DeleteMapping")
@@ -72,6 +72,14 @@ class Phase4BrowserApiBoundaryTest {
         assertTrue(yaml.contains("enabled: ${LASTLEG_SMART_DISPATCH_API_ENABLED:true}"));
     }
 
+    @Test
+    void overseasLastlegReachesDomesticPrintThroughSharedInfrastructureNetwork() throws Exception {
+        Path composePath = Path.of("deploy/docker-compose.overseas.yml");
+        if (!Files.exists(composePath)) composePath = Path.of("..").resolve(composePath);
+        String compose = Files.readString(composePath);
+        assertTrue(compose.contains("PRINT_SERVICE_URL: ${PRINT_SERVICE_URL:-http://print:9207}"));
+    }
+
     @Test
     void smartDispatchOnlyExposesCandidatePreArrangeAndDraftLifecycleEndpoints() {
         ConditionalOnProperty condition = SmartDispatchController.class.getAnnotation(ConditionalOnProperty.class);
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/controller/DispatchQueryControllerTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/controller/DispatchQueryControllerTest.java
index cd20a2fb0..483f033f3 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/controller/DispatchQueryControllerTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/controller/DispatchQueryControllerTest.java
@@ -4,6 +4,7 @@ import com.baiyue.common.core.api.PageResult;
 import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.lastleg.dispatch.dto.DispatchRequests;
 import com.baiyue.lastleg.dispatch.service.DispatchService;
+import com.baiyue.lastleg.dispatch.service.DispatchBolPrintService;
 import com.baiyue.lastleg.security.OverseasPermissions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -25,12 +26,14 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 class DispatchQueryControllerTest {
     @Mock DispatchService service;
+    @Mock DispatchBolPrintService printService;
     private DispatchQueryController controller;
 
     @BeforeEach
     void setUp() {
         controller = new DispatchQueryController();
         ReflectionTestUtils.setField(controller, "service", service);
+        ReflectionTestUtils.setField(controller, "printService", printService);
     }
 
     @Test
@@ -57,9 +60,13 @@ class DispatchQueryControllerTest {
         PreAuthorize detail = DispatchQueryController.class
             .getMethod("detail", AuthenticatedUser.class, String.class)
             .getAnnotation(PreAuthorize.class);
+        PreAuthorize print = DispatchQueryController.class
+            .getMethod("printBol", AuthenticatedUser.class, String.class, jakarta.servlet.http.HttpServletRequest.class)
+            .getAnnotation(PreAuthorize.class);
 
         assertThat(page.value()).isEqualTo("hasAuthority('" + OverseasPermissions.DISPATCH_LIST + "')");
         assertThat(detail.value()).isEqualTo("hasAuthority('" + OverseasPermissions.DISPATCH_LIST + "')");
+        assertThat(print.value()).isEqualTo("hasAuthority('" + OverseasPermissions.DISPATCH_LIST + "')");
     }
 
     private static AuthenticatedUser platform() {
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/pda/service/DispatchPdaWorkflowServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/pda/service/DispatchPdaWorkflowServiceTest.java
index a4f3a384b..6e93c451f 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/pda/service/DispatchPdaWorkflowServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/pda/service/DispatchPdaWorkflowServiceTest.java
@@ -33,6 +33,7 @@ import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -227,7 +228,7 @@ class DispatchPdaWorkflowServiceTest {
     }
 
     @Test
-    void successfulDepartureRecordsActualDepartureTime() {
+    void successfulDeparturePersistsBusinessDepartureTime() {
         DispatchOrder order = order("100", "DSP-1", "WH-1", "READY_TO_DEPART");
         order.setVehiclePlate("CA-100");
         DispatchPdaTask task = task(11L, "100", "WH-1", "COMPLETED");
@@ -244,7 +245,6 @@ class DispatchPdaWorkflowServiceTest {
         when(items.findByDispatchOrder("100", 1L)).thenReturn(List.of(item));
         when(picks.totalItem("100", 11L, 21L)).thenReturn(6L);
         when(picks.listTask("100", 11L)).thenReturn(List.of(pick));
-
         DispatchPdaResponses.Departed result = service.depart("WH-1", "DSP-1", "7",
             new DispatchPdaRequests.Depart("depart-success", null));
 
@@ -252,6 +252,10 @@ class DispatchPdaWorkflowServiceTest {
         assertEquals("DEPARTED", order.getStatus());
         assertTrue(order.getDepartAt() != null);
         assertEquals("OUTBOUNDED", outbound.getStatus());
+        when(palletLocks.selectList(any())).thenReturn(List.of());
+        assertNotNull(order.getDepartAt());
+        assertEquals(order.getDepartAt(), order.getUpdatedAt());
+        verify(orders).updateById(order);
     }
 
     @Test
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchBolPrintServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchBolPrintServiceTest.java
new file mode 100644
index 000000000..bd39901b4
--- /dev/null
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchBolPrintServiceTest.java
@@ -0,0 +1,78 @@
+package com.baiyue.lastleg.dispatch.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.lastleg.client.DomesticWarehouseDirectoryClient;
+import com.baiyue.lastleg.client.PrintPdfClient;
+import com.baiyue.lastleg.dispatch.dto.DispatchResponse;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.util.ReflectionTestUtils;
+
+@ExtendWith(MockitoExtension.class)
+class DispatchBolPrintServiceTest {
+    @Mock private DispatchService dispatches;
+    @Mock private PrintPdfClient print;
+    @Mock private DomesticWarehouseDirectoryClient warehouses;
+    @InjectMocks private DispatchBolPrintService service;
+
+    @BeforeEach
+    void setUp() {
+        ReflectionTestUtils.setField(service, "internalToken", "internal-test-token");
+    }
+
+    @Test
+    void usesDenseFirstAndContinuationPageCapacities() {
+        assertThat(DispatchBolPrintService.pageCount(1)).isEqualTo(1);
+        assertThat(DispatchBolPrintService.pageCount(18)).isEqualTo(1);
+        assertThat(DispatchBolPrintService.pageCount(19)).isEqualTo(2);
+        assertThat(DispatchBolPrintService.pageCount(44)).isEqualTo(2);
+        assertThat(DispatchBolPrintService.pageCount(45)).isEqualTo(3);
+        assertThat(DispatchBolPrintService.pageCount(70)).isEqualTo(3);
+        assertThat(DispatchBolPrintService.pageCount(71)).isEqualTo(4);
+    }
+
+    @Test
+    void resolvesTheOperatingWarehouseAddressIntoTheBolRequest() {
+        String warehouseId = "193000000000200003";
+        DispatchResponse detail = new DispatchResponse(1L, "DS-WH-20260911-624449", "DEV-23653906",
+                null, null, "五月开发验收车队", null, null, warehouseId, "洛杉矶仓", null,
+                null, null, null, LocalDateTime.of(2026, 9, 12, 2, 40, 20), "PENDING_DEPARTURE",
+                1, 1, 1, 0, 0, 1, null, LocalDateTime.of(2026, 9, 11, 10, 0), List.of(),
+                List.of(new DispatchResponse.BolLine("TSTU3539519", "DP-260911-0027", "ABE2", "ABE2",
+                        "NYEXX2609110214", null, null, 1)));
+        var address = new DomesticWarehouseDirectoryClient.Address("OPERATING", "US", "California", "Rancho Cucamonga",
+                null, "91730", "10767 7th Street", null);
+        var warehouse = new DomesticWarehouseDirectoryClient.Warehouse(Long.parseLong(warehouseId), 0L,
+                "US-LAX", "洛杉矶仓", "OVERSEAS", "US", "ACTIVE");
+        when(dispatches.platformDetail(detail.dispatchNo())).thenReturn(detail);
+        when(warehouses.activeWarehouse(Long.parseLong(warehouseId), "internal-test-token"))
+                .thenReturn(ApiResponse.success(new DomesticWarehouseDirectoryClient.Detail(warehouse, List.of(address))));
+        when(print.generateDispatchBol(eq("internal-test-token"), eq("request-1"), any()))
+                .thenReturn(ResponseEntity.ok().contentType(MediaType.APPLICATION_PDF)
+                        .header("X-Print-Page-Count", "1").body("%PDF-".getBytes(StandardCharsets.US_ASCII)));
+
+        service.generate(detail.dispatchNo(), "request-1");
+
+        ArgumentCaptor<PrintPdfClient.Request> request = ArgumentCaptor.forClass(PrintPdfClient.Request.class);
+        verify(print).generateDispatchBol(eq("internal-test-token"), eq("request-1"), request.capture());
+        assertThat(request.getValue().documents()).singleElement().satisfies(document ->
+                assertThat(document.shipFromAddress()).isEqualTo(
+                        "10767 7th Street, Rancho Cucamonga, California 91730, US"));
+    }
+}
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchServiceTest.java
index 19ab36ab9..d8cc11a7a 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/service/DispatchServiceTest.java
@@ -10,6 +10,7 @@ import com.baiyue.lastleg.dispatch.entity.DispatchItem;
 import com.baiyue.lastleg.dispatch.entity.DispatchOrder;
 import com.baiyue.lastleg.dispatch.entity.DispatchPalletLock;
 import com.baiyue.lastleg.dispatch.mapper.DispatchCandidateMapper;
+import com.baiyue.lastleg.dispatch.mapper.DispatchBolMapper;
 import com.baiyue.lastleg.dispatch.mapper.DispatchDraftContainerMapper;
 import com.baiyue.lastleg.dispatch.mapper.DispatchDraftMapper;
 import com.baiyue.lastleg.dispatch.mapper.DispatchItemMapper;
@@ -50,6 +51,7 @@ import static org.mockito.Mockito.when;
 class DispatchServiceTest {
     @Mock DispatchOrderMapper orders;
     @Mock DispatchItemMapper items;
+    @Mock DispatchBolMapper bolLines;
     @Mock DispatchPalletLockMapper locks;
     @Mock DispatchCandidateMapper candidates;
     @Mock DispatchDraftMapper drafts;
@@ -64,6 +66,7 @@ class DispatchServiceTest {
         service = new DispatchService();
         ReflectionTestUtils.setField(service, "orders", orders);
         ReflectionTestUtils.setField(service, "items", items);
+        ReflectionTestUtils.setField(service, "bolLines", bolLines);
         ReflectionTestUtils.setField(service, "locks", locks);
         ReflectionTestUtils.setField(service, "candidates", candidates);
         ReflectionTestUtils.setField(service, "drafts", drafts);
@@ -73,6 +76,7 @@ class DispatchServiceTest {
         ReflectionTestUtils.setField(service, "outboundOrders", outboundOrders);
         ReflectionTestUtils.setField(service, "orderNoGenerator", new com.baiyue.lastleg.service.LastlegOrderNoGenerator());
         lenient().when(items.findByDispatchOrder(any(), any())).thenReturn(List.of());
+        lenient().when(bolLines.findByDispatchOrder(any(), any())).thenReturn(List.of());
         lenient().when(tailOrders.selectList(any())).thenReturn(List.of());
     }
 
@@ -349,6 +353,7 @@ class DispatchServiceTest {
         service.detail("200", "PC1");
 
         verify(items).findByDispatchOrder("200", 1L);
+        verify(bolLines).findByDispatchOrder("200", 1L);
     }
 
     @Test
@@ -366,6 +371,7 @@ class DispatchServiceTest {
         assertEquals(2, result.total());
         verify(items).findByDispatchOrder("100", 1L);
         verify(items).findByDispatchOrder("200", 2L);
+        verify(bolLines, never()).findByDispatchOrder(any(), any());
     }
 
     @Test
@@ -374,9 +380,15 @@ class DispatchServiceTest {
         dispatch.setId(1L); dispatch.setCustomerId("200"); dispatch.setDispatchNo("PC1");
         when(orders.findGlobalByDispatchNo("PC1")).thenReturn(dispatch);
 
-        service.platformDetail("PC1");
+        var expected = new DispatchResponse.BolLine("D2144", "D2144-112-1", "LBE1", "Amazon LBE1",
+            "NPHK2607030206", "FBA19HFHQCHB", "7UH3F1DW", 138);
+        when(bolLines.findByDispatchOrder("200", 1L)).thenReturn(List.of(expected));
+
+        var result = service.platformDetail("PC1");
 
         verify(items).findByDispatchOrder("200", 1L);
+        verify(bolLines).findByDispatchOrder("200", 1L);
+        assertEquals(List.of(expected), result.bolLines());
     }
 
     @Test
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/dropship/controller/DropshipOrderControllerContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/dropship/controller/DropshipOrderControllerContractTest.java
index c0ef09fab..e1600578a 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/dropship/controller/DropshipOrderControllerContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/dropship/controller/DropshipOrderControllerContractTest.java
@@ -69,6 +69,6 @@ class DropshipOrderControllerContractTest {
         return new DropshipRequests.Receive("100", 10L, 20L, "event-1",
             List.of(new DropshipRequests.Pallet("PALLET-1",
                 List.of(new DropshipRequests.SkuPackages("SKU-1", "Product", 1, 2,
-                    List.of("CARTON-1"))))));
+                    List.of("CARTON-1"))), 1, 1, 1, "0".repeat(64))));
     }
 }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/dropship/service/DropshipOrderServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/dropship/service/DropshipOrderServiceTest.java
index 28d916bfe..c196f09b4 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/dropship/service/DropshipOrderServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/dropship/service/DropshipOrderServiceTest.java
@@ -52,10 +52,10 @@ class DropshipOrderServiceTest {
             List.of(
                 new DropshipRequests.Pallet("SOURCE-P-1", List.of(
                     new DropshipRequests.SkuPackages("SKU-A", "Product A", 2, 20,
-                        List.of("MARK-1", "MARK-2")))),
+                        List.of("MARK-1", "MARK-2"))), 1, 2, 1, "0".repeat(64)),
                 new DropshipRequests.Pallet("SOURCE-P-2", List.of(
                     new DropshipRequests.SkuPackages("SKU-A", "Product A", 1, 10,
-                        List.of("MARK-3"))))));
+                        List.of("MARK-3"))), 1, 1, 1, "1".repeat(64))));
 
         assertThat(service.receive(request)).isEqualTo(3);
         verifyNoInteractions(warehouse);
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/InboundPlanSchemaContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/InboundPlanSchemaContractTest.java
index 9624107b7..0e3609ce5 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/InboundPlanSchemaContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/InboundPlanSchemaContractTest.java
@@ -21,6 +21,7 @@ class InboundPlanSchemaContractTest {
             assertTrue(schema.contains("required_package_count"));
             assertTrue(schema.contains("planned_package_count"));
             assertTrue(schema.contains("warehouse_resource_lock_id"));
+            assertTrue(schema.contains("ll_inbound_plan_pallet' and column_name='version'"));
             assertTrue(schema.contains("create table if not exists ll_inbound_pda_task"));
             assertTrue(schema.contains("create table if not exists ll_inbound_pda_operation"));
             assertTrue(schema.contains("create table if not exists ll_inbound_pallet_merge"));
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/ReceivingContainerContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/ReceivingContainerContractTest.java
index 5b0ff3ef4..9d8f1d297 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/ReceivingContainerContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/ReceivingContainerContractTest.java
@@ -38,8 +38,9 @@ class ReceivingContainerContractTest {
                 .map(RecordComponent::getName).collect(Collectors.toSet());
             assertTrue(java.util.Collections.disjoint(fields, FORBIDDEN_CALLER_SCOPE), type.getSimpleName());
         }
-        for (Class<?> type : Set.of(ReceivingContainerRequests.Action.class, ReceivingContainerRequests.Sign.class,
-            ReceivingContainerRequests.BulkReceive.class, ReceivingContainerRequests.CartonReceive.class)) {
+        for (Class<?> type : Set.of(ReceivingContainerRequests.Action.class, ReceivingContainerRequests.Complete.class,
+            ReceivingContainerRequests.Sign.class, ReceivingContainerRequests.BulkReceive.class,
+            ReceivingContainerRequests.CartonReceive.class, ReceivingContainerRequests.WholePalletReceive.class)) {
             RecordComponent key = Arrays.stream(type.getRecordComponents())
                 .filter(component -> "idempotencyKey".equals(component.getName())).findFirst().orElseThrow();
             Size size = key.getAccessor().getAnnotation(Size.class);
@@ -67,7 +68,7 @@ class ReceivingContainerContractTest {
     @Test
     void inventoryCreatingEntryTransactionsAvoidMissingDimensionGapLockDeadlocks() throws NoSuchMethodException {
         Transactional pda = ReceivingContainerService.class
-            .getMethod("complete", String.class, ReceivingContainerRequests.Action.class)
+            .getMethod("complete", String.class, ReceivingContainerRequests.Complete.class)
             .getAnnotation(Transactional.class);
         Transactional bridge = LoadingCompletedConsumer.class.getMethod("consume", EventEnvelope.class)
             .getAnnotation(Transactional.class);
@@ -103,6 +104,10 @@ class ReceivingContainerContractTest {
         assertTrue(unified.contains("alter table ll_container_shipping_gate drop column customer_id"));
         assertTrue(schema.contains("create table if not exists ll_receiving_sku_receipt"));
         assertTrue(schema.contains("unique key uk_ll_receiving_sku_pallet (customer_id,line_id,pallet_id,sku_code)"));
+        assertTrue(schema.contains("create table if not exists ll_receiving_fba_pallet_count"));
+        assertTrue(schema.contains("unique key uk_ll_receiving_fba_count(session_id,group_key,pallet_code)"));
+        assertTrue(tableBlock(schema, "ll_inbound_plan_pallet").contains("key idx_ll_inbound_pallet_no (pallet_no)"));
+        assertFalse(tableBlock(schema, "ll_inbound_plan_pallet").contains("unique key uk_ll_inbound_pallet_no"));
         String order = tableBlock(schema, "ll_order");
         assertTrue(order.contains("overseas_warehouse_id varchar(128) null"));
         assertTrue(order.contains("overseas_warehouse_code varchar(128) null"));
@@ -113,6 +118,7 @@ class ReceivingContainerContractTest {
         assertTrue(receivingSession.contains("overseas_warehouse_name varchar(255) not null"));
         assertFalse(receivingSession.contains("photo_file_ids json"));
         assertTrue(unified.contains("create table if not exists ll_receiving_sku_receipt"));
+        assertTrue(unified.contains("create table if not exists ll_receiving_fba_pallet_count"));
         assertTrue(unified.contains("column_name='sign_photos'"));
         assertTrue(schema.contains("wait_sign、signed、receiving、completed"));
         assertTrue(unified.contains("customer_id is null or l.customer_id=''"));
@@ -120,7 +126,7 @@ class ReceivingContainerContractTest {
         assertTrue(unified.contains("customer_id is null or a.customer_id=''"));
         assertTrue(unified.contains("signal sqlstate '45000'"));
         assertTrue(unified.contains("assert_receiving_global_locks_migratable"));
-        assertTrue(unified.contains("where status='completed' and (active_operator_key is not null or active_container_key is not null)"));
+        assertTrue(unified.contains("where status in ('completed','completed_with_difference') and (active_operator_key is not null or active_container_key is not null)"));
         assertTrue(unified.contains("concat('operator:',operator_key)"));
         assertTrue(unified.contains("concat('container:',upper(trim(container_no)))"));
         assertTrue(unified.contains("assert_receiving_operation_global_key_migratable"));
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/InboundPdaWorkflowServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/InboundPdaWorkflowServiceTest.java
index 35797bdd5..2e002b88a 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/InboundPdaWorkflowServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/InboundPdaWorkflowServiceTest.java
@@ -30,6 +30,7 @@ import org.springframework.mock.web.MockMultipartFile;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Set;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -596,6 +597,24 @@ class InboundPdaWorkflowServiceTest {
             any(), any(), anyLong());
     }
 
+    @Test
+    void completionLoadsSharedFbaPalletOwnedByAnotherCustomerPlan() {
+        activeTask();
+        target.setPickedPackageCount(5);
+        InboundPlanPallet sharedPallet = pallet(40L, "WH-A", 5, "1.0000", 400L);
+        sharedPallet.setPlanId(99L);
+        target.setPalletId(sharedPallet.getId());
+        when(repository.allocations(plan.getId())).thenReturn(List.of(target));
+        when(repository.lines(plan.getId())).thenReturn(List.of(targetLine));
+        when(repository.pallets(plan.getId())).thenReturn(List.of());
+        when(repository.palletsByIds(Set.of(sharedPallet.getId()))).thenReturn(List.of(sharedPallet));
+
+        service.complete("100", "LIP1");
+
+        verify(stockReceipts).stockIn(eq("100"), eq(plan), eq(task), eq(List.of(targetLine)),
+            eq(List.of(target)), eq(List.of(sharedPallet)), any());
+    }
+
     @Test
     void completedTaskReplayDoesNotRunStockInAgain() {
         task.setStatus("COMPLETED");
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerServiceBehaviorTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerServiceBehaviorTest.java
index 86a24af39..cf55e5a39 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerServiceBehaviorTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerServiceBehaviorTest.java
@@ -16,11 +16,17 @@ import com.baiyue.lastleg.inboundplan.pda.dto.ReceivingContainerRequests;
 import com.baiyue.lastleg.inboundplan.pda.dto.ReceivingPhotoRole;
 import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingContainerOperation;
 import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingContainerSession;
+import com.baiyue.lastleg.inboundplan.pda.entity.ReceivingFbaPalletCount;
 import com.baiyue.lastleg.inboundplan.pda.gateway.UnloadPhotoFileGateway;
 import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingContainerOperationMapper;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingContainerSessionMapper;
+import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingFbaPalletCountMapper;
 import com.baiyue.lastleg.inboundplan.pda.mapper.ReceivingSkuReceiptMapper;
+import com.baiyue.lastleg.dropship.mapper.DropshipCartonMapper;
+import com.baiyue.lastleg.dropship.mapper.DropshipOrderProfileMapper;
+import com.baiyue.lastleg.dropship.entity.DropshipCarton;
+import com.baiyue.lastleg.dropship.entity.DropshipOrderProfile;
 import com.baiyue.lastleg.mapper.LastlegOrderDetailMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.shipping.mapper.ContainerShippingGateMapper;
@@ -58,8 +64,11 @@ class ReceivingContainerServiceBehaviorTest {
     @Mock LastlegOrderDetailMapper orderDetails;
     @Mock ReceivingContainerSessionMapper sessions;
     @Mock ReceivingContainerOperationMapper operations;
+    @Mock ReceivingFbaPalletCountMapper fbaPalletCounts;
     @Mock ReceivingSkuReceiptMapper skuReceipts;
     @Mock ContainerShippingGateMapper shippingGates;
+    @Mock DropshipCartonMapper dropshipCartons;
+    @Mock DropshipOrderProfileMapper dropshipProfiles;
     @Mock WarehouseResourceGateway warehouse;
     @Mock UnloadPhotoFileGateway unloadPhotos;
     @Mock InboundPdaWorkflowService workflow;
@@ -77,8 +86,11 @@ class ReceivingContainerServiceBehaviorTest {
         ReflectionTestUtils.setField(service, "orderDetails", orderDetails);
         ReflectionTestUtils.setField(service, "sessions", sessions);
         ReflectionTestUtils.setField(service, "operations", operations);
+        ReflectionTestUtils.setField(service, "fbaPalletCounts", fbaPalletCounts);
         ReflectionTestUtils.setField(service, "skuReceipts", skuReceipts);
         ReflectionTestUtils.setField(service, "shippingGates", shippingGates);
+        ReflectionTestUtils.setField(service, "dropshipCartons", dropshipCartons);
+        ReflectionTestUtils.setField(service, "dropshipProfiles", dropshipProfiles);
         ReflectionTestUtils.setField(service, "warehouse", warehouse);
         ReflectionTestUtils.setField(service, "unloadPhotos", unloadPhotos);
         ReflectionTestUtils.setField(service, "workflow", workflow);
@@ -414,11 +426,10 @@ class ReceivingContainerServiceBehaviorTest {
 
         org.mockito.Mockito.reset(plans, lines, orders, sessions, operations, cartons, warehouse, pallets, workflow);
         stubCurrent("FBA", "CONT-A");
-        stubSku();
-        when(warehouse.resolveAvailablePallet("PAL-1")).thenReturn(resource(101L, "FBA-1"));
         assertThatThrownBy(() -> service.receiveBulk("7", "receiver",
             new ReceivingContainerRequests.BulkReceive("IN-1", "PAL-1", 1, "pallet-key")))
-            .isInstanceOf(ResponseStatusException.class).hasMessageContaining("409");
+            .isInstanceOfSatisfying(ResponseStatusException.class,
+                error -> assertThat(error.getStatusCode().value()).isEqualTo(404));
         verify(workflow, never()).assignResolvedPallet(any(), any(), any(), any());
     }
 
@@ -426,7 +437,7 @@ class ReceivingContainerServiceBehaviorTest {
     void overReceiptAndDuplicateCartonFailBeforeRemoteReservation() {
         stubCurrent("FBA", "CONT-A");
         stubSku();
-        when(pallets.selectList(any())).thenReturn(List.of(planPallet()));
+        stubReservedFbaPallet();
         doThrow(new ResponseStatusException(org.springframework.http.HttpStatus.CONFLICT, "over receipt"))
             .when(workflow).validateBulkResolved(any(), any(), any(), anyInt());
         assertThatThrownBy(() -> service.receiveBulk("7", "receiver",
@@ -442,6 +453,30 @@ class ReceivingContainerServiceBehaviorTest {
         verify(workflow, never()).assignResolvedPallet(any(), any(), any(), any());
     }
 
+    @Test
+    void fbaOverReceiptAllocatesOnlyPlannedBalanceAndRecordsPhysicalDifference() {
+        stubCurrent("FBA", "CONT-A");
+        stubSku();
+        stubReservedFbaPallet();
+        when(workflow.receiveBulkResolved(any(), any(), any(), any(), anyInt(), any(), any()))
+            .thenAnswer(invocation -> invocation.getArgument(4));
+        when(fbaPalletCounts.insert(any(ReceivingFbaPalletCount.class))).thenReturn(1);
+        when(fbaPalletCounts.sumActual(8L, "FBA:CONT-A:FBA-1")).thenReturn(3);
+        when(sessions.updateById(any(ReceivingContainerSession.class))).thenReturn(1);
+        when(operations.insert(any(ReceivingContainerOperation.class))).thenReturn(1);
+
+        var result = service.receiveBulk("7", "receiver",
+            new ReceivingContainerRequests.BulkReceive("IN-1", "PAL-1", 3, "over-mark-key"));
+
+        assertThat(result.result()).isEqualTo("DIFFERENCE_RECORDED");
+        assertThat(result.acceptedPackages()).isEqualTo(3);
+        verify(workflow).receiveBulkResolved(any(), any(), any(), any(),
+            org.mockito.ArgumentMatchers.eq(2), any(), any());
+        ArgumentCaptor<ReceivingFbaPalletCount> count = ArgumentCaptor.forClass(ReceivingFbaPalletCount.class);
+        verify(fbaPalletCounts).insert(count.capture());
+        assertThat(count.getValue().getActualPackages()).isEqualTo(3);
+    }
+
     @Test
     void overseasPalletUsesActualReceivingWarehouseInsteadOfBusinessDestinationId() {
         stubCurrent("OVERSEAS", "CONT-A");
@@ -464,7 +499,7 @@ class ReceivingContainerServiceBehaviorTest {
         InboundPlanPalletAllocation partial = new InboundPlanPalletAllocation();
         partial.setLineId(10L); partial.setPickedPackageCount(1);
         when(allocations.selectList(any())).thenReturn(List.of(partial));
-        assertThatThrownBy(() -> service.complete("7", new ReceivingContainerRequests.Action("complete-key")))
+        assertThatThrownBy(() -> service.complete("7", new ReceivingContainerRequests.Complete(false, "complete-key")))
             .isInstanceOf(ResponseStatusException.class).hasMessageContaining("409");
         verify(workflow, never()).completeContainer(any());
     }
@@ -480,7 +515,7 @@ class ReceivingContainerServiceBehaviorTest {
         when(allocations.selectList(any())).thenReturn(List.of(received));
         when(sessions.updateById(any(ReceivingContainerSession.class))).thenReturn(1);
 
-        var completed = service.complete("7", new ReceivingContainerRequests.Action("dropship-complete"));
+        var completed = service.complete("7", new ReceivingContainerRequests.Complete(false, "dropship-complete"));
 
         assertThat(completed.status()).isEqualTo("COMPLETED");
         verifyNoInteractions(skuReceipts);
@@ -491,11 +526,11 @@ class ReceivingContainerServiceBehaviorTest {
     void completedRequestReplaysWithoutAnActiveCustomerSession() {
         ReceivingContainerOperation operation = new ReceivingContainerOperation();
         operation.setOperatorKey("7"); operation.setAction("COMPLETE"); operation.setIdempotencyKey("complete-replay");
-        operation.setRequestHash(hash(new ReceivingContainerRequests.Action("complete-replay")));
+        operation.setRequestHash(hash(new ReceivingContainerRequests.Complete(false, "complete-replay")));
         operation.setResultJson("{\"containerNo\":\"CONT-A\",\"status\":\"COMPLETED\",\"operatorName\":\"receiver\",\"version\":1,\"photos\":[],\"totalPackages\":2,\"receivedPackages\":2,\"pendingPackages\":0,\"inbounds\":[]}");
         when(operations.find("7", "complete-replay")).thenReturn(operation);
 
-        assertThat(service.complete("7", new ReceivingContainerRequests.Action("complete-replay")).status())
+        assertThat(service.complete("7", new ReceivingContainerRequests.Complete(false, "complete-replay")).status())
             .isEqualTo("COMPLETED");
         verifyNoInteractions(sessions);
     }
@@ -504,8 +539,7 @@ class ReceivingContainerServiceBehaviorTest {
     void localFailureAfterRemoteReservationTriggersReleaseCompensation() {
         stubCurrent("FBA", "CONT-A");
         stubSku();
-        when(warehouse.resolveAvailablePallet("PAL-1")).thenReturn(resource(100L, "FBA-1"));
-        when(pallets.selectList(any())).thenReturn(List.of(planPallet()));
+        stubReservedFbaPallet();
         when(workflow.assignResolvedPallet(any(), any(), any(), any())).thenReturn(55L);
         ResponseStatusException failure = new ResponseStatusException(org.springframework.http.HttpStatus.CONFLICT, "race");
         doThrow(failure).when(workflow).receiveBulkResolved(any(), any(), any(), any(), anyInt(), any(), any());
@@ -675,9 +709,10 @@ class ReceivingContainerServiceBehaviorTest {
     }
 
     @Test
-    void bulkRejectsAggregateSkuOverReceiptBeforeWarehouseLookup() {
+    void bulkRejectsInconsistentFrozenSkuProgressBeforeAnyReceiptWrite() {
         stubCurrent("FBA", "CONT-A");
         stubSku();
+        stubReservedFbaPallet();
         com.baiyue.lastleg.inboundplan.pda.entity.ReceivingSkuReceipt received =
             new com.baiyue.lastleg.inboundplan.pda.entity.ReceivingSkuReceipt();
         received.setReceivedPackages(2);
@@ -686,7 +721,7 @@ class ReceivingContainerServiceBehaviorTest {
         assertThatThrownBy(() -> service.receiveBulk("7", "receiver",
             new ReceivingContainerRequests.BulkReceive("IN-1", "PAL-1", 1, "sku-over")))
             .isInstanceOf(ResponseStatusException.class).hasMessageContaining("409");
-        verifyNoInteractions(warehouse);
+        verify(workflow, never()).assignResolvedPallet(any(), any(), any(), any());
     }
 
     @Test
@@ -707,7 +742,7 @@ class ReceivingContainerServiceBehaviorTest {
     }
 
     @Test
-    void cartonResolutionReturnsAssignmentOptionalMergeAndUrgencyFromInboundPlan() {
+    void fbaGroupResolutionKeepsUrgencyWithoutPerPlanMergeChoices() {
         stubCurrent("FBA", "CONT-A");
         InboundPlan flagged = plan("CONT-A");
         flagged.setAssignedFlag(true);
@@ -719,9 +754,9 @@ class ReceivingContainerServiceBehaviorTest {
 
         assertThat(resolved.inboundCode()).isEqualTo("IN-1");
         assertThat(resolved.assigned()).isTrue();
-        assertThat(resolved.mergeAllowed()).isTrue();
+        assertThat(resolved.mergeAllowed()).isFalse();
         assertThat(resolved.urgent()).isTrue();
-        assertThat(resolved.mergeHint()).contains("可选择", "同目的仓", "新托盘码", "不强制");
+        assertThat(resolved.mergeHint()).isNull();
     }
 
     @Test
@@ -788,8 +823,7 @@ class ReceivingContainerServiceBehaviorTest {
         when(orders.selectById(2L)).thenReturn(secondOrder);
         when(orderDetails.selectList(any())).thenReturn(List.of(detail("SKU-A", 1), detail("SKU-B", 1)),
             List.of(detail("SKU-C", 2)));
-        when(warehouse.resolveAvailablePallet("PAL-1")).thenReturn(resource(100L, "FBA-1"));
-        when(pallets.selectList(any())).thenReturn(List.of(planPallet()));
+        stubReservedFbaPallet();
         when(workflow.receiveBulkResolved(any(), any(), any(), any(), anyInt(), any(), any()))
             .thenAnswer(invocation -> invocation.getArgument(4));
         when(sessions.updateById(any(ReceivingContainerSession.class))).thenReturn(1);
@@ -813,22 +847,27 @@ class ReceivingContainerServiceBehaviorTest {
     }
 
     @Test
-    void overseasDropshipResolvesOnlyFrozenCartonsAndNeverCreatesLabelsWhileResolving() {
+    void dropshipCartonResolvesItsCompleteDpInsteadOfAPlanOrCustomer() {
         stubCurrent("OVERSEAS", "CONT-A");
         LastlegOrder dropship = order("OVERSEAS"); dropship.setOrderType("ONE_CLICK_DROPSHIP");
         when(orders.selectById(1L)).thenReturn(dropship);
-        InboundPlanCarton frozen = carton(1L, "IN-1#2-1");
-        frozen.setCustomerId("100"); frozen.setSourceInboundDetailId("d-1"); frozen.setSkuCode("SKU-1");
-        when(cartons.selectOne(any())).thenReturn(frozen);
+        InboundPlanPallet pallet = planPallet(); pallet.setSourcePalletNo("DP-260909-0001");
+        pallet.setWarehousePalletId(30L);
+        InboundPlanPalletAllocation allocation = new InboundPlanPalletAllocation();
+        allocation.setId(30L); allocation.setPlanId(2L); allocation.setLineId(10L);
+        allocation.setPalletId(20L); allocation.setPlannedPackageCount(2); allocation.setPickedPackageCount(0);
+        when(dropshipCartons.sourcePalletsInContainer("CONT-A", "IN-1#2-1"))
+            .thenReturn(List.of("DP-260909-0001"));
+        when(pallets.selectList(any())).thenReturn(List.of(pallet));
+        when(allocations.selectList(any())).thenReturn(List.of(allocation));
+        stubCompleteManifest("DP-260909-0001", 2);
         var resolved = service.resolveCarton("7", new ReceivingContainerRequests.CartonResolve("IN-1#2-1"));
         assertThat(resolved.inboundCode()).isEqualTo("IN-1");
-        assertThat(resolved.destinationType()).isEqualTo("OVERSEAS");
+        assertThat(resolved.operationMode()).isEqualTo("DROPSHIP_PALLET");
+        assertThat(resolved.sourcePalletNo()).isEqualTo("DP-260909-0001");
+        assertThat(resolved.totalPackages()).isEqualTo(2);
         verify(cartons, never()).insert(any(InboundPlanCarton.class));
         verifyNoInteractions(warehouse);
-        when(cartons.selectOne(any())).thenReturn(null);
-        assertThatThrownBy(() -> service.resolveCarton("7", new ReceivingContainerRequests.CartonResolve("IN-1#2-9")))
-            .isInstanceOf(ResponseStatusException.class).hasMessageContaining("404");
-        verify(cartons, never()).insert(any(InboundPlanCarton.class));
     }
 
     @Test
@@ -837,7 +876,8 @@ class ReceivingContainerServiceBehaviorTest {
         LastlegOrder dropship = order("OVERSEAS"); dropship.setOrderType("ONE_CLICK_DROPSHIP");
         when(orders.selectById(1L)).thenReturn(dropship);
         InboundPlanPallet pallet = planPallet();
-        pallet.setPalletNo("PAL-PHYSICAL-1"); pallet.setSourcePalletNo("DP-260909-0001");
+        pallet.setPalletNo("DP-260909-0001"); pallet.setSourcePalletNo("DP-260909-0001");
+        pallet.setWarehousePalletId(30L);
         InboundPlanPalletAllocation pending = new InboundPlanPalletAllocation();
         pending.setId(30L); pending.setCustomerId("100"); pending.setPlanId(2L);
         pending.setLineId(10L); pending.setPalletId(20L); pending.setPlannedPackageCount(2);
@@ -847,6 +887,7 @@ class ReceivingContainerServiceBehaviorTest {
         received.setPickedPackageCount(2);
         when(pallets.selectList(any())).thenReturn(List.of(pallet));
         when(allocations.selectList(any())).thenReturn(List.of(pending), List.of(received));
+        stubCompleteManifest("DP-260909-0001", 2);
         when(operations.insert(any(ReceivingContainerOperation.class))).thenReturn(1);
         when(sessions.updateById(any(ReceivingContainerSession.class))).thenReturn(1);
 
@@ -856,7 +897,7 @@ class ReceivingContainerServiceBehaviorTest {
         assertThat(result.acceptedPackages()).isEqualTo(2);
         assertThat(result.receivedPackages()).isEqualTo(2);
         assertThat(result.pendingPackages()).isZero();
-        assertThat(result.palletCode()).isEqualTo("PAL-PHYSICAL-1");
+        assertThat(result.palletCode()).isEqualTo("DP-260909-0001");
         verify(workflow).pickWholePallet(org.mockito.ArgumentMatchers.eq("100"),
             org.mockito.ArgumentMatchers.eq("PLAN-1"), org.mockito.ArgumentMatchers.eq(30L),
             any(com.baiyue.lastleg.inboundplan.pda.dto.PdaRequests.WholePalletOperation.class));
@@ -940,6 +981,28 @@ class ReceivingContainerServiceBehaviorTest {
         return value;
     }
 
+    private InboundPlanPallet stubReservedFbaPallet() {
+        InboundPlanPallet value = planPallet();
+        value.setPalletNo("PAL-1"); value.setWarehousePalletId(30L); value.setWarehouseLocationId(40L);
+        value.setWarehouseResourceLockId(50L); value.setAssignmentStatus("RESERVED"); value.setVersion(0);
+        when(pallets.selectList(any())).thenReturn(List.of(value));
+        when(warehouse.resolveReservedPallet("PAL-1", "100", 100L, 30L, 40L, 50L))
+            .thenReturn(new WarehouseResourceGateway.WarehousePalletReference(
+                30L, "PAL-1", 100L, 40L, "OCCUPIED", "FBA-1", 0));
+        return value;
+    }
+
+    private void stubCompleteManifest(String sourcePalletNo, int packages) {
+        DropshipOrderProfile profile = new DropshipOrderProfile();
+        profile.setId(60L); profile.setCustomerId("100"); profile.setSourcePalletNo(sourcePalletNo);
+        profile.setManifestVersion(1); profile.setManifestPackageCount(packages);
+        profile.setManifestFragmentCount(1); profile.setManifestHash("manifest-hash");
+        when(dropshipProfiles.listContainerPallet("CONT-A", sourcePalletNo)).thenReturn(List.of(profile));
+        List<DropshipCarton> values = new java.util.ArrayList<>();
+        for (int index = 0; index < packages; index++) values.add(new DropshipCarton());
+        when(dropshipCartons.listProfile("100", 60L)).thenReturn(values);
+    }
+
     private static WarehouseResourceGateway.WarehousePalletReference resource(long warehouseId, String fbaCode) {
         return new WarehouseResourceGateway.WarehousePalletReference(30L, "PAL-1", warehouseId, 40L,
             "AVAILABLE", fbaCode, 0);
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinatorTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinatorTest.java
index b064e4b11..122acef17 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinatorTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinatorTest.java
@@ -87,7 +87,7 @@ class ContainerInboundPlanConversionCoordinatorTest {
         var ready = new ContainerInboundPlanPreviewResponse.Order(
             "200", "Customer 200", "12", "LM-12", "RK-2", "FIRST_LEG", "FBA",
             null, "ONT8", "Amazon ONT8", "ONT8", 10, BigDecimal.ONE, 1,
-            null, null, null, 0, "READY", List.of());
+            0, 1, 1, null, null, null, 0, "READY", List.of());
         when(plans.convertManual(request, "manual-key", "7")).thenReturn(logical);
         when(plans.sourceContainerBookingId("100", 11L)).thenReturn(BOOKING_ID);
         when(plans.previewContainer(BOOKING_ID)).thenReturn(manualPreview(List.of(resourcePendingOrder(), ready)));
@@ -272,11 +272,11 @@ class ContainerInboundPlanConversionCoordinatorTest {
         var fba = previewOrder("100", "11", "RK-FBA", "ABE3", "ABE3");
         var overseas = previewOrder("200", "12", "RK-OVERSEAS", "US-LAX-01", null);
         var preview = new ContainerInboundPlanPreviewResponse(BOOKING_ID, "MSCU6639870", "31", "US-LAX-01",
-            "Los Angeles", 7L, SNAPSHOT_HASH, 2, 2, 0, 2, 2, 0, 2, 0, true,
+            "Los Angeles", 7L, SNAPSHOT_HASH, 2, 2, 0, 2, 2, 2, 0, 0, 2, 0, true,
             List.of(new ContainerInboundPlanPreviewResponse.Group("ONE_CLICK_DROPSHIP", null, "ABE3", "Amazon ABE3",
-                    1, 1, 1, 0, 1, 0, List.of(fba)),
+                    1, 1, 1, 1, 0, 0, 1, 0, List.of(fba)),
                 new ContainerInboundPlanPreviewResponse.Group("ONE_CLICK_DROPSHIP", "31", "US-LAX-01", "Los Angeles",
-                    1, 1, 1, 0, 1, 0, List.of(overseas))));
+                    1, 1, 1, 1, 0, 0, 1, 0, List.of(overseas))));
         when(plans.previewContainer(BOOKING_ID)).thenReturn(preview);
         when(numbers.next(eq("INBOUND_PLAN"), any(String.class), any(Long.class)))
             .thenReturn("IP-FBA", "IP-OVERSEAS");
@@ -305,11 +305,11 @@ class ContainerInboundPlanConversionCoordinatorTest {
         var overseas = new ContainerInboundPlanPreviewResponse.Order(
             "200", "Customer 200", "12", "LM-12", "RK-OVERSEAS", "FIRST_LEG", "FIRST_LEG",
             "31", "US-LAX-01", "Los Angeles", null, 10, BigDecimal.ONE, 2,
-            null, null, null, 0, "READY", List.of());
+            0, 2, 2, null, null, null, 0, "READY", List.of());
         var preview = new ContainerInboundPlanPreviewResponse(BOOKING_ID, "MSCU6639870", "31", "US-LAX-01",
-            "Los Angeles", 7L, SNAPSHOT_HASH, 1, 1, 0, 2, 2, 0, 1, 0, true,
+            "Los Angeles", 7L, SNAPSHOT_HASH, 1, 1, 0, 1, 2, 0, 2, 0, 1, 0, true,
             List.of(new ContainerInboundPlanPreviewResponse.Group("FIRST_LEG", "31", "US-LAX-01", "Los Angeles",
-                1, 1, 2, 0, 2, 0, List.of(overseas))));
+                1, 1, 2, 0, 2, 0, 2, 0, List.of(overseas))));
         when(plans.previewContainer(BOOKING_ID)).thenReturn(preview);
         when(numbers.next(eq("INBOUND_PLAN"), any(String.class), any(Long.class))).thenReturn("IP-OVERSEAS");
         when(plans.sourcePalletNos("200", 12L, "FIRST_LEG")).thenReturn(List.of());
@@ -337,11 +337,11 @@ class ContainerInboundPlanConversionCoordinatorTest {
         var order = new ContainerInboundPlanPreviewResponse.Order(
             "100", "Customer 100", "11", "LM-11", "RK-FBA", "FIRST_LEG", "FBA",
             null, "ACY2", "Amazon ACY2", "ACY2", 20, new BigDecimal("5.8000"), 3,
-            null, null, null, 0, "READY", List.of());
+            2, 3, 1, null, null, null, 0, "READY", List.of());
         var preview = new ContainerInboundPlanPreviewResponse(BOOKING_ID, "MSCU6639870", "31", "US-LAX-01",
-            "Los Angeles", 7L, SNAPSHOT_HASH, 1, 1, 0, 1, 3, 0, 3, 0, true,
+            "Los Angeles", 7L, SNAPSHOT_HASH, 1, 1, 0, 1, 3, 2, 1, 0, 3, 0, true,
             List.of(new ContainerInboundPlanPreviewResponse.Group("FBA", null, "ACY2", "Amazon ACY2",
-                1, 1, 3, 0, 3, 0, List.of(order))));
+                1, 1, 3, 2, 1, 0, 3, 0, List.of(order))));
         when(plans.previewContainer(BOOKING_ID)).thenReturn(preview);
         when(numbers.next(eq("INBOUND_PLAN"), any(String.class), any(Long.class))).thenReturn("IP-ACY2");
         when(plans.sourcePalletNos("100", 11L, "FIRST_LEG")).thenReturn(List.of(
@@ -369,11 +369,11 @@ class ContainerInboundPlanConversionCoordinatorTest {
         var order = new ContainerInboundPlanPreviewResponse.Order(
             "100", "Customer 100", "11", "LM-11", "RK-FBA", "FIRST_LEG", "FBA",
             null, "ACY2", "Amazon ACY2", "ACY2", 20, new BigDecimal("5.8000"), 3,
-            3, "IP-MANUAL", "PENDING_ASSIGNMENT", 1, "RESOURCE_PENDING", List.of());
+            2, 3, 1, 3, "IP-MANUAL", "PENDING_ASSIGNMENT", 1, "RESOURCE_PENDING", List.of());
         var preview = new ContainerInboundPlanPreviewResponse(BOOKING_ID, "MSCU6639870", "31", "US-LAX-01",
-            "Los Angeles", 7L, SNAPSHOT_HASH, 1, 1, 0, 1, 3, 3, 3, 3, true,
+            "Los Angeles", 7L, SNAPSHOT_HASH, 1, 1, 0, 1, 3, 2, 1, 3, 3, 3, true,
             List.of(new ContainerInboundPlanPreviewResponse.Group("FBA", null, "ACY2", "Amazon ACY2",
-                1, 1, 3, 3, 3, 3, List.of(order))));
+                1, 1, 3, 2, 1, 3, 3, 3, List.of(order))));
         when(plans.previewContainer(BOOKING_ID)).thenReturn(preview);
         when(plans.sourcePalletNos("100", 11L, "FIRST_LEG")).thenReturn(List.of(
             "MSCU6639870-101-001", "MSCU6639870-101-002"));
@@ -404,7 +404,8 @@ class ContainerInboundPlanConversionCoordinatorTest {
             "LM-" + orderId, inboundCode, "ONE_CLICK_DROPSHIP", "ONE_CLICK_DROPSHIP",
             fbaWarehouseCode == null ? "31" : null, destinationCode,
             fbaWarehouseCode == null ? "Los Angeles" : "Amazon " + destinationCode,
-            fbaWarehouseCode, 10, BigDecimal.ONE, 1, null, null, null, 0, "READY", List.of());
+            fbaWarehouseCode, 10, BigDecimal.ONE, 1, 1, 1, 0,
+            null, null, null, 0, "READY", List.of());
     }
 
     private ManualInboundPlanRequest manualRequest() {
@@ -416,7 +417,7 @@ class ContainerInboundPlanConversionCoordinatorTest {
         return new ContainerInboundPlanPreviewResponse.Order(
             "100", "Customer 100", "11", "LM-11", "RK-1", "FIRST_LEG", "FBA",
             null, "ACY2", "Amazon ACY2", "ACY2", 10, BigDecimal.ONE, 1,
-            1, "IP-MANUAL", "PENDING_ASSIGNMENT", 1, "RESOURCE_PENDING", List.of());
+            1, 1, 0, 1, "IP-MANUAL", "PENDING_ASSIGNMENT", 1, "RESOURCE_PENDING", List.of());
     }
 
     private ContainerInboundPlanPreviewResponse manualPreview(
@@ -425,16 +426,17 @@ class ContainerInboundPlanConversionCoordinatorTest {
             || "READY".equals(order.readiness())).count();
         return new ContainerInboundPlanPreviewResponse(BOOKING_ID, "MSCU6639870", "31", "US-LAX-01",
             "Los Angeles", 7L, SNAPSHOT_HASH, orders.size(), orders.size(), 0, pending, pending,
-            0, orders.size(), 1, true,
+            pending, 0, 0, orders.size(), 1, true,
             List.of(new ContainerInboundPlanPreviewResponse.Group("FBA", null, "ACY2", "Amazon ACY2",
-                orders.size(), pending, pending, 0, orders.size(), 1, orders)));
+                orders.size(), pending, pending, pending, 0, 0, orders.size(), 1, orders)));
     }
 
     private InboundPlanResponse plan(String planNo, List<InboundPlanResponse.Pallet> pallets) {
-        return new InboundPlanResponse(21L, planNo, "100", 11L, "MSCU6639870", "US-LAX-01",
+        return new InboundPlanResponse(21L, planNo, "100", 11L, "FL-WH-1", "验收客户", "ONE_CLICK_DROPSHIP",
+            "MSCU6639870", "US-LAX-01",
             "Los Angeles", "PENDING_ASSIGNMENT", 1, 1, BigDecimal.ONE, 10, 0,
             List.of(), pallets, List.of(), 1, LocalDate.of(2026, 9, 10), "WOOD", false,
-            false, false, "MANUAL", "自动生成");
+            false, false, "MANUAL", "自动生成", null, null);
     }
 
     private ConvertContainerInboundPlanRequest request() {
@@ -474,6 +476,6 @@ class ContainerInboundPlanConversionCoordinatorTest {
 
     private ContainerInboundPlanPreviewResponse preview(long version, String hash) {
         return new ContainerInboundPlanPreviewResponse(BOOKING_ID, "MSCU6639870", "31", "US-LAX-01",
-            "Los Angeles", version, hash, 1, 1, 0, 0, 0, 1, 1, 1, true, List.of());
+            "Los Angeles", version, hash, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, true, List.of());
     }
 }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanPreviewTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanPreviewTest.java
index e308c5588..409c5f89b 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanPreviewTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanPreviewTest.java
@@ -57,6 +57,8 @@ class ContainerInboundPlanPreviewTest {
         assertFalse(result.ready());
         assertEquals(4, result.pendingOrderCount());
         assertEquals(7, result.pendingPalletCount());
+        assertEquals(7, result.sourcePalletCount());
+        assertEquals(0, result.supplementPalletCount());
         assertEquals(2, result.existingPlannedPalletCount());
         assertEquals(List.of("A-01", "B-02", "C-03", "DROPSHIP", ""), result.groups().stream()
             .map(group -> group.destinationWarehouseCode() == null ? "" : group.destinationWarehouseCode()).toList());
@@ -74,7 +76,7 @@ class ContainerInboundPlanPreviewTest {
             new InboundPlanOrderMapper.ContainerPreviewOrderRow("100", 1L, "LM-1", "FO-1", "测试客户",
                 "FIRST_LEG", "OVERSEAS", "IN-1", "PENDING_ASSIGNMENT", null, null, 0, 0,
                 BigDecimal.ZERO, null, null, null, null, null, null, null, 0, false, 1,
-                null, null, null, null)));
+                null, null, null, null, null)));
 
         var result = service.previewContainer("BOOKING-NULL");
 
@@ -118,6 +120,27 @@ class ContainerInboundPlanPreviewTest {
         assertEquals("RESOURCE_PENDING", result.groups().get(0).orders().get(0).readiness());
     }
 
+    @Test
+    void exposesHeadLegExistingSupplementAndFinalPalletCountsWithoutBlocking() {
+        when(orderMapper.containerPreviewOrders("BOOKING-SUPPLEMENT")).thenReturn(List.of(
+            new InboundPlanOrderMapper.ContainerPreviewOrderRow("100", 1L, "LM-1", "FO-1",
+                "测试客户", "FIRST_LEG", "FBA", "IN-1", "PENDING_ASSIGNMENT", null,
+                "MSCU6639870", 2, 250, new BigDecimal("5.3000"), "31", "US-LAX-01",
+                "洛杉矶仓", "ACY2", null, null, "Amazon ACY2", 0, false, 1,
+                null, null, null, null, 2)));
+
+        var result = service.previewContainer("BOOKING-SUPPLEMENT");
+        var order = result.groups().get(0).orders().get(0);
+
+        assertEquals(2, order.sourcePalletCount());
+        assertEquals(3, order.targetPalletCount());
+        assertEquals(1, order.supplementPalletCount());
+        assertEquals(2, result.sourcePalletCount());
+        assertEquals(1, result.supplementPalletCount());
+        assertEquals(3, result.pendingPalletCount());
+        assertEquals("READY", order.readiness());
+    }
+
     private InboundPlanOrderMapper.ContainerPreviewOrderRow row(
         long id, String orderNo, String orderType, String destinationType, String destinationCode, String destinationName,
         int recommendedPallets, String planNo, Integer plannedPallets, int version) {
@@ -137,6 +160,6 @@ class ContainerInboundPlanPreviewTest {
             "FBA".equals(destinationType) || destinationCode == null ? null : "WH-" + id,
             "FBA".equals(destinationType) ? null : destinationCode, destinationName,
             "FBA".equals(destinationType) || destinationCode == null ? 0 : 1, false, version, planNo,
-            planStatus, plannedPallets, materializedPallets);
+            planStatus, plannedPallets, materializedPallets, recommendedPallets);
     }
 }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/InboundPlanServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/InboundPlanServiceTest.java
index edb1de9b8..523c4e2d0 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/InboundPlanServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/service/InboundPlanServiceTest.java
@@ -84,6 +84,9 @@ class InboundPlanServiceTest {
         org.mockito.Mockito.lenient().when(orderMapper.findReceivingWarehouse(any(), any())).thenReturn(
             new InboundPlanOrderMapper.ReceivingWarehouseSnapshot(
                 "193000000000200003", "US-LAX-01", "洛杉矶仓"));
+        org.mockito.Mockito.lenient().when(orderMapper.findDetailOrder(any(), anyLong())).thenReturn(
+            new InboundPlanOrderMapper.DetailOrderSnapshot(
+                "FL-WH-TEST", "测试客户", "ONE_CLICK_DROPSHIP"));
         org.mockito.Mockito.lenient().when(warehouseGateway.requireActiveSharedWarehouse(193000000000200003L)).thenReturn(
             new WarehouseResourceGateway.WarehouseReference(
                 193000000000200003L, "US-LAX-01", "洛杉矶仓", "ACTIVE"));
@@ -324,7 +327,49 @@ class InboundPlanServiceTest {
 
         assertEquals("US-NY-01", result.overseasWarehouseCode());
         assertEquals("纽约仓", result.overseasWarehouseName());
+        assertEquals("FL-WH-TEST", result.sourceOrderNo());
+        assertEquals("测试客户", result.customerName());
+        assertEquals("ONE_CLICK_DROPSHIP", result.orderType());
         verify(orderMapper).findReceivingWarehouse("100", 1L);
+        verify(orderMapper).findDetailOrder("100", 1L);
+    }
+
+    @Test
+    void detailResolvesCrossPlanMergedPalletWithoutChangingOwnedPalletList() {
+        InboundPlan currentPlan = existingPlan("100", 1L, "IP-CURRENT");
+        InboundPlan ownerPlan = existingPlan("100", 2L, "IP-OWNER");
+        InboundPlanPallet ownedPallet = new InboundPlanPallet();
+        ownedPallet.setId(301L);
+        ownedPallet.setPlanId(currentPlan.getId());
+        ownedPallet.setPalletNo("DRYU2309389-101-005");
+        ownedPallet.setSequenceNo(1);
+        ownedPallet.setActualPackageCount(0);
+        InboundPlanPallet mergedPallet = new InboundPlanPallet();
+        mergedPallet.setId(302L);
+        mergedPallet.setPlanId(ownerPlan.getId());
+        mergedPallet.setPalletNo("DRYU2309389-101-006");
+        InboundPlanPalletAllocation allocation = new InboundPlanPalletAllocation();
+        allocation.setLineId(201L);
+        allocation.setPalletId(302L);
+        allocation.setPlannedPackageCount(150);
+        allocation.setCountedPackageCount(150);
+        allocation.setPickedPackageCount(150);
+        allocation.setVersion(0);
+
+        when(planMapper.selectOne(any())).thenReturn(currentPlan);
+        when(palletMapper.selectList(any())).thenReturn(List.of(ownedPallet));
+        when(allocationMapper.selectList(any())).thenReturn(List.of(allocation));
+        when(palletMapper.selectBatchIds(any())).thenReturn(List.of(mergedPallet));
+        when(planMapper.selectBatchIds(any())).thenReturn(List.of(ownerPlan));
+
+        var result = service.detailByPlanNo("100", "IP-CURRENT");
+
+        assertEquals(List.of("DRYU2309389-101-005"),
+            result.pallets().stream().map(pallet -> pallet.palletNo()).toList());
+        assertEquals("DRYU2309389-101-006", result.allocations().get(0).palletNo());
+        assertEquals("IP-OWNER", result.allocations().get(0).palletOwnerPlanNo());
+        assertEquals(false, result.allocations().get(0).palletOwnedByCurrentPlan());
+        assertEquals(150, result.allocations().get(0).pickedPackageCount());
     }
 
     @Test
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/inventory/command/InventoryCommandServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/inventory/command/InventoryCommandServiceTest.java
index ba5f4db32..96323994c 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/inventory/command/InventoryCommandServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/inventory/command/InventoryCommandServiceTest.java
@@ -304,7 +304,7 @@ class InventoryCommandServiceTest {
         position.setPickedPackages(5L);
         when(commands.lockPosition("100", 201L)).thenReturn(position);
         when(commands.lockBalance("100", 200L)).thenReturn(balance);
-        when(commands.palletPackages("100", 300L)).thenReturn(0L);
+        when(commands.palletPackages(300L)).thenReturn(0L);
 
         var result = service.ship("100", "7", new InventoryCommandRequests.Move(
             201L, 5, "OUT-1", "OUT-1", null, "ship-1", null));
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/procurement/service/OverseasProcurementServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/procurement/service/OverseasProcurementServiceTest.java
index 6f6f69118..dc87b1865 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/procurement/service/OverseasProcurementServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/procurement/service/OverseasProcurementServiceTest.java
@@ -177,6 +177,27 @@ class OverseasProcurementServiceTest {
         assertEquals("洛杉矶采购仓", order.getPurchaseWarehouseName());
     }
 
+    @Test
+    void unchangedHistoricalWarehouseDoesNotBlockUnrelatedEditsAfterDeactivation() {
+        OverseasProcurementOrder order = order(OverseasProcurementService.APPROVED, 100, 0);
+        order.setPurchaseWarehouseId("10");
+        order.setPurchaseWarehouseName("历史采购仓");
+        when(orders.lockNo("100", "HC1")).thenReturn(order);
+        when(orders.findNo("100", "HC1")).thenReturn(order);
+        when(histories.listOrder("100", 1L)).thenReturn(List.of());
+        ObjectMapper mapper = new ObjectMapper();
+        var request = new OverseasProcurementRequests.Update(0L, null, null, null, null,
+            null, mapper.getNodeFactory().textNode("10"), null,
+            null, null, null, null, null, mapper.getNodeFactory().textNode("更新出库信息"));
+
+        service.update("100", "HC1", "7", request);
+
+        assertEquals("10", order.getPurchaseWarehouseId());
+        assertEquals("历史采购仓", order.getPurchaseWarehouseName());
+        verify(warehouseDirectory, never()).required(10L);
+        verify(orders).updateById(order);
+    }
+
     @Test
     void customerOptionsAreDeduplicatedSnapshotsFromProcurementOrders() {
         OverseasProcurementOrder option = new OverseasProcurementOrder();
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/RelabelContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/RelabelContractTest.java
index c1611680a..08c501244 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/RelabelContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/RelabelContractTest.java
@@ -90,4 +90,12 @@ class RelabelContractTest {
             openApi.indexOf("    RelabelItem:"));
         assertFalse(relabelCreate.contains("customerId"));
     }
+
+    @Test
+    void missingDeliveryMethodIsValidatedWithoutCallingNullRejectingSetContains() throws Exception {
+        String service = Files.readString(Path.of("src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java"),
+            StandardCharsets.UTF_8);
+        assertTrue(service.contains("requiresOutbound && (!StringUtils.hasText(deliveryMethod)"
+            + " || !DELIVERY_METHODS.contains(deliveryMethod))"));
+    }
 }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnCartonBarcodeTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnCartonBarcodeTest.java
new file mode 100644
index 000000000..6671baf2b
--- /dev/null
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnCartonBarcodeTest.java
@@ -0,0 +1,36 @@
+package com.baiyue.lastleg.returnreceipt.service;
+
+import com.google.zxing.common.BitArray;
+import com.google.zxing.oned.Code128Reader;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.regex.Pattern;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ReturnCartonBarcodeTest {
+    @ParameterizedTest
+    @ValueSource(strings = {"RC-WH-20260912-480898", "RC-WH-20260912-274178", "RC-1", "RC-MERGED"})
+    void decodesTheActualRenderedSvgBarsToTheExactCartonMark(String mark) throws Exception {
+        String svg = ReturnCartonBarcode.svg(mark);
+        var viewBox = Pattern.compile("viewBox=\"0 0 (\\d+) 50\"").matcher(svg);
+        assertThat(viewBox.find()).isTrue();
+        int width = Integer.parseInt(viewBox.group(1));
+        BitArray scanline = new BitArray(width);
+        var bars = Pattern.compile("<rect x=\"(\\d+)\" y=\"0\" width=\"(\\d+)\" height=\"50\" fill=\"black\"/>").matcher(svg);
+        int firstBar = width;
+        int lastBar = 0;
+        while (bars.find()) {
+            int start = Integer.parseInt(bars.group(1));
+            int end = start + Integer.parseInt(bars.group(2));
+            firstBar = Math.min(firstBar, start);
+            lastBar = Math.max(lastBar, end);
+            scanline.setRange(start, end);
+        }
+        assertThat(firstBar).isGreaterThanOrEqualTo(10);
+        assertThat(width - lastBar).isGreaterThanOrEqualTo(10);
+        assertThat(new Code128Reader().decodeRow(0, scanline, null).getText()).isEqualTo(mark);
+        assertThat(svg).doesNotContain("background", "repeating-linear-gradient");
+    }
+}
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnCartonQueryTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnCartonQueryTest.java
new file mode 100644
index 000000000..491b1b4c7
--- /dev/null
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnCartonQueryTest.java
@@ -0,0 +1,32 @@
+package com.baiyue.lastleg.returnreceipt.service;
+
+import com.baiyue.lastleg.returnreceipt.dto.ReturnInventoryRequests;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonMapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.scripting.xmltags.XMLLanguageDriver;
+import org.apache.ibatis.session.Configuration;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ReturnCartonQueryTest {
+    @Test
+    void bothQueriesUseExactCustomerScopeAndSkuExistenceWithoutAnOuterJoin() throws Exception {
+        var query = new ReturnInventoryRequests.Query(2, 1, "42", "SKU", "RC", "AVAILABLE", "RT");
+        for (String name : new String[]{"merchantCount", "merchantPage"}) {
+            var method = java.util.Arrays.stream(ReturnInventoryCartonMapper.class.getMethods())
+                .filter(candidate -> candidate.getName().equals(name)).findFirst().orElseThrow();
+            String script = String.join(" ", method.getAnnotation(Select.class).value());
+            var source = new XMLLanguageDriver().createSqlSource(new Configuration(), script, Map.class);
+            var bound = source.getBoundSql(Map.of("customerId", "10001", "query", query, "offset", 1L));
+            String sql = bound.getSql().replaceAll("\\s+", " ");
+            assertThat(sql).contains("WHERE c.customer_id=?", "AND EXISTS(SELECT 1 FROM ll_return_inventory_carton_item");
+            assertThat(sql).doesNotContain("customer_id LIKE", " JOIN ");
+            assertThat(bound.getParameterMappings().get(0).getProperty()).isEqualTo("customerId");
+            if (name.equals("merchantPage")) assertThat(sql).contains("ORDER BY c.created_at DESC,c.id DESC LIMIT ?,?");
+            else assertThat(sql).startsWith("SELECT COUNT(*) FROM ll_return_inventory_carton");
+        }
+    }
+}
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java
new file mode 100644
index 000000000..b156f9237
--- /dev/null
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java
@@ -0,0 +1,175 @@
+package com.baiyue.lastleg.returnreceipt.service;
+
+import com.baiyue.lastleg.pda.security.PdaWarehouseIdentity;
+import com.baiyue.lastleg.returnreceipt.dto.ReturnInventoryRequests;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCarton;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCartonItem;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnOrder;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnReceipt;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryBalanceMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonItemMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryMovementMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryOperationMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryQueryMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnOrderMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnReceiptMapper;
+import com.baiyue.lastleg.service.LastlegOrderNoGenerator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class ReturnInventoryServiceTest {
+    @Mock ReturnInventoryCartonMapper cartons;
+    @Mock ReturnInventoryCartonItemMapper cartonItems;
+    @Mock ReturnInventoryBalanceMapper balances;
+    @Mock ReturnInventoryOperationMapper operations;
+    @Mock ReturnInventoryQueryMapper queries;
+    @Mock ReturnInventoryMovementMapper movements;
+    @Mock LastlegOrderNoGenerator numbers;
+    @Mock ReturnOrderMapper orders;
+    @Mock ReturnReceiptMapper receipts;
+    private ReturnInventoryService service;
+
+    @BeforeEach
+    void setUp() {
+        service = new ReturnInventoryService();
+        ReflectionTestUtils.setField(service, "cartons", cartons);
+        ReflectionTestUtils.setField(service, "cartonItems", cartonItems);
+        ReflectionTestUtils.setField(service, "balances", balances);
+        ReflectionTestUtils.setField(service, "operations", operations);
+        ReflectionTestUtils.setField(service, "queries", queries);
+        ReflectionTestUtils.setField(service, "movements", movements);
+        ReflectionTestUtils.setField(service, "numbers", numbers);
+        ReflectionTestUtils.setField(service, "orders", orders);
+        ReflectionTestUtils.setField(service, "receiptMapper", receipts);
+    }
+
+    @Test
+    void printableLabelUsesBusinessNumbersAndShowsMissingDimensionsWithoutNullOrInternalIds() {
+        ReturnInventoryCarton carton = new ReturnInventoryCarton();
+        carton.setId(31L);
+        carton.setCartonMark("RC-WH-20260912-480898");
+        carton.setCustomerId("2098676663424974850");
+        carton.setOverseasWarehouseId("193000000000200003");
+        carton.setSourceReturnNo("RT-1");
+        carton.setSourceBatchNo("RB-1,RB-2");
+        carton.setTotalQuantity(2L);
+        carton.setSkuTypes(1);
+        when(cartons.findCustomerMark(carton.getCustomerId(), carton.getCartonMark())).thenReturn(carton);
+        when(cartonItems.listCarton(31L)).thenReturn(List.of(item(41L, "SKU-A", 2L)));
+        String html = service.label(carton.getCustomerId(), carton.getCartonMark()).printableHtml();
+        assertThat(html).contains("<svg", "RT-1", "RB-1,RB-2", "—", "box-sizing:border-box");
+        assertThat(html).doesNotContain("repeating-linear-gradient", "null", carton.getCustomerId(), carton.getOverseasWarehouseId());
+    }
+
+    @Test
+    void cartonPageCountsPhysicalCartonsAndKeepsTheAuthenticatedCustomerScope() {
+        var query = new ReturnInventoryRequests.Query(2, 1, "42", "SKU", null, "AVAILABLE", "RT-1");
+        ReturnInventoryCarton carton = new ReturnInventoryCarton();
+        carton.setCartonMark("RC-SECOND");
+        carton.setSkuTypes(2);
+        carton.setTotalQuantity(5L);
+        when(cartons.merchantCount("10001", query)).thenReturn(2L);
+        when(cartons.merchantPage("10001", query, 1L)).thenReturn(List.of(carton));
+        var result = service.cartonPage("10001", query);
+        assertThat(result.total()).isEqualTo(2);
+        assertThat(result.records()).hasSize(1);
+        assertThat(result.records().get(0).skuTypes()).isEqualTo(2);
+        assertThat(result.records().get(0).totalQuantity()).isEqualTo(5);
+        verify(cartons).merchantPage("10001", query, 1L);
+    }
+
+    @Test
+    void receiptCartonKeepsTheSourceReturnNumber() {
+        ReturnOrder order = completedOrder();
+        ReturnReceipt receipt = new ReturnReceipt();
+        receipt.setId(21L);
+        receipt.setReceiptBatchNo("RB-1");
+        when(numbers.next(anyString(), anyString(), anyLong())).thenReturn("RC-1");
+
+        service.createReceiptCarton(order, receipt, null,
+            List.of(new ReturnInventoryService.ReceiptLine("SKU-A", "商品A", 2)));
+
+        ArgumentCaptor<ReturnInventoryCarton> captor = ArgumentCaptor.forClass(ReturnInventoryCarton.class);
+        verify(cartons).insert(captor.capture());
+        assertThat(captor.getValue().getSourceReturnNo()).isEqualTo("RT-1");
+    }
+
+    @Test
+    void mergeMovesItemsBetweenCartonsWithoutReducingAvailableQuantity() {
+        ReturnOrder order = completedOrder();
+        ReturnReceipt receipt = new ReturnReceipt();
+        receipt.setId(21L);
+        ReturnInventoryCarton source = new ReturnInventoryCarton();
+        source.setId(31L);
+        source.setCustomerId("10001");
+        source.setOverseasWarehouseId("42");
+        source.setCartonMark("RC-SOURCE");
+        source.setSourceBatchNo("RB-1");
+        source.setSourceReturnNo("RT-1");
+        source.setStatus(ReturnInventoryService.AVAILABLE);
+        source.setSkuTypes(2);
+        source.setTotalQuantity(4L);
+        ReturnInventoryCartonItem skuA = item(41L, "SKU-A", 2L);
+        ReturnInventoryCartonItem skuB = item(42L, "SKU-B", 2L);
+
+        when(orders.findByNos("42", List.of("RT-1"))).thenReturn(List.of(order));
+        when(receipts.listOrder(11L)).thenReturn(List.of(receipt));
+        when(cartons.findReceipt(21L)).thenReturn(source);
+        when(cartons.lockMark("RC-SOURCE")).thenReturn(source);
+        when(cartonItems.listCarton(31L)).thenReturn(List.of(skuA, skuB));
+        when(numbers.next(anyString(), anyString(), anyLong())).thenReturn("RC-MERGED");
+        when(balances.adjustCartonQuantity(anyString(), anyString(), anyString(), anyLong())).thenReturn(1);
+
+        service.merge(new PdaWarehouseIdentity("operator-1", "操作员", 42L),
+            new ReturnInventoryRequests.Merge(List.of("RT-1"), List.of(
+                new ReturnInventoryRequests.ValidItem("SKU-A", 1),
+                new ReturnInventoryRequests.ValidItem("SKU-B", 1)),
+                BigDecimal.ONE, BigDecimal.ONE, BigDecimal.ONE, BigDecimal.ONE, "merge-key"));
+
+        verify(balances).adjustCartonQuantity("10001", "42", "SKU-A", 1L);
+        verify(balances).adjustCartonQuantity("10001", "42", "SKU-B", 1L);
+        assertThat(source.getTotalQuantity()).isEqualTo(2L);
+        assertThat(source.getStatus()).isEqualTo(ReturnInventoryService.AVAILABLE);
+        ArgumentCaptor<ReturnInventoryCarton> target = ArgumentCaptor.forClass(ReturnInventoryCarton.class);
+        verify(cartons).insert(target.capture());
+        assertThat(target.getValue().getSourceBatchNo()).isEqualTo("RB-1");
+        assertThat(target.getValue().getSourceReturnNo()).isEqualTo("RT-1");
+    }
+
+    private ReturnOrder completedOrder() {
+        ReturnOrder order = new ReturnOrder();
+        order.setId(11L);
+        order.setCustomerId("10001");
+        order.setReturnNo("RT-1");
+        order.setOverseasWarehouseId("42");
+        order.setStatus("COMPLETED");
+        return order;
+    }
+
+    private ReturnInventoryCartonItem item(long id, String sku, long quantity) {
+        ReturnInventoryCartonItem item = new ReturnInventoryCartonItem();
+        item.setId(id);
+        item.setCartonId(31L);
+        item.setCustomerId("10001");
+        item.setSkuCode(sku);
+        item.setProductNameZh(sku);
+        item.setQuantity(quantity);
+        return item;
+    }
+}
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java
new file mode 100644
index 000000000..28bcf59f7
--- /dev/null
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java
@@ -0,0 +1,276 @@
+package com.baiyue.lastleg.returnreceipt.service;
+
+import com.baiyue.lastleg.mapper.LastlegOrderMapper;
+import com.baiyue.lastleg.entity.LastlegOrder;
+import com.baiyue.lastleg.pda.security.PdaWarehouseIdentity;
+import com.baiyue.lastleg.returnreceipt.dto.PdaReturnReceiptRequests;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCarton;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnOrder;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnOrderItem;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnReceipt;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnReceiptBatch;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnOrderItemMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnOrderMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnReceiptBatchMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnReceiptItemMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnReceiptMapper;
+import com.baiyue.lastleg.service.LastlegOrderNoGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class ReturnReceiptServiceTest {
+    @Mock ReturnOrderMapper orders;
+    @Mock ReturnOrderItemMapper orderItems;
+    @Mock ReturnReceiptMapper receipts;
+    @Mock ReturnReceiptItemMapper receiptItems;
+    @Mock ReturnReceiptBatchMapper batches;
+    @Mock ReturnInventoryService inventory;
+    @Mock LastlegOrderNoGenerator numbers;
+    @Mock LastlegOrderMapper lastlegOrders;
+
+    ReturnReceiptService service;
+    PdaWarehouseIdentity identity;
+
+    @BeforeEach
+    void setUp() {
+        service = new ReturnReceiptService();
+        ReflectionTestUtils.setField(service, "orders", orders);
+        ReflectionTestUtils.setField(service, "orderItems", orderItems);
+        ReflectionTestUtils.setField(service, "receipts", receipts);
+        ReflectionTestUtils.setField(service, "receiptItems", receiptItems);
+        ReflectionTestUtils.setField(service, "batches", batches);
+        ReflectionTestUtils.setField(service, "inventory", inventory);
+        ReflectionTestUtils.setField(service, "numbers", numbers);
+        ReflectionTestUtils.setField(service, "objectMapper", new ObjectMapper());
+        ReflectionTestUtils.setField(service, "lastlegOrders", lastlegOrders);
+        identity = new PdaWarehouseIdentity("operator-1", "仓管员", 10L);
+    }
+
+    @Test
+    void startReturnsOnlyRemainingSkuLinesForTheBoundWarehouse() {
+        ReturnOrder order = order("RT-1", "10", ReturnReceiptService.PARTIALLY_RECEIVED, 8, 3);
+        ReturnOrderItem remaining = item(11L, "SKU-A", 5, 2);
+        ReturnOrderItem completed = item(12L, "SKU-B", 3, 3);
+        when(orders.findActiveNo("10", "RT-1")).thenReturn(order);
+        when(orderItems.listOrder(1L)).thenReturn(List.of(remaining, completed));
+
+        var result = service.start(identity, new PdaReturnReceiptRequests.Start(" RT-1 "));
+
+        assertEquals("RT-1", result.returnNo());
+        assertEquals(ReturnReceiptService.PARTIALLY_RECEIVED, result.status());
+        assertEquals(List.of("SKU-A"), result.expectedItems().stream().map(item -> item.skuCode()).toList());
+        assertEquals(2, result.expectedItems().get(0).receivedQuantity());
+    }
+
+    @Test
+    void createForecastPersistsCompleteTailOrderSourceAndReturnsItsBusinessNumber() {
+        AtomicReference<ReturnOrder> saved = new AtomicReference<>();
+        when(orders.findKey("customer-1", "create-key")).thenReturn(null);
+        when(numbers.next(eq("RETURN"), eq("10"), anyLong())).thenReturn("RT-1");
+        when(numbers.next(eq("RETURN_RELABEL"), eq("10"), anyLong())).thenReturn("RETU-1");
+        when(orders.insert(any(ReturnOrder.class))).thenAnswer(invocation -> { saved.set(invocation.getArgument(0)); return 1; });
+        when(orders.findNo("customer-1", "RT-1")).thenAnswer(invocation -> saved.get());
+        when(orderItems.listOrder(anyLong())).thenReturn(List.of());
+
+        var result = service.create("customer-1", "merchant-1", new com.baiyue.lastleg.returnreceipt.dto.ReturnOrderRequests.Create(
+            "10", "测试仓", "0000000000", "REF-1", false, "测试", "create-key",
+            List.of(new com.baiyue.lastleg.returnreceipt.dto.ReturnOrderRequests.Item("SKU-A", "商品A", 2))));
+
+        ArgumentCaptor<LastlegOrder> tail = ArgumentCaptor.forClass(LastlegOrder.class);
+        verify(lastlegOrders).insert(tail.capture());
+        assertEquals("RT-1", tail.getValue().getSourceInboundId());
+        assertEquals("RETURN_ORDER:RT-1", tail.getValue().getSourceEventId());
+        assertEquals(saved.get().getRequestHash(), tail.getValue().getSourcePayloadHash());
+        assertEquals("RETU-1", result.order().lastlegOrderNo());
+    }
+
+    @Test
+    void skuLookupReturnsOnlyActiveCandidatesFromTheBoundWarehouse() {
+        ReturnOrder order = order("RT-1", "10", ReturnReceiptService.PENDING_RECEIPT, 5, 1);
+        ReturnOrderItem item = item(11L, "SKU-A", 5, 1);
+        when(orderItems.activeSkuCandidates("10", "SKU-A")).thenReturn(List.of(item));
+        when(orders.selectBatchIds(any())).thenReturn(List.of(order));
+
+        var result = service.skuCandidates(identity, new PdaReturnReceiptRequests.SkuLookup(" SKU-A "));
+
+        assertEquals("SKU-A", result.skuCode());
+        assertEquals(1, result.candidates().size());
+        assertEquals("RT-1", result.candidates().get(0).returnNo());
+        assertEquals(1, result.candidates().get(0).skuReceivedQuantity());
+        verify(orderItems).activeSkuCandidates("10", "SKU-A");
+    }
+
+    @Test
+    void partialReceiptCreatesOneCartonAndBillingBatchAndKeepsOrderOpen() {
+        ReturnOrder order = order("RT-1", "10", ReturnReceiptService.PENDING_RECEIPT, 5, 1);
+        ReturnOrderItem first = item(11L, "SKU-A", 3, 1);
+        ReturnOrderItem second = item(12L, "SKU-B", 2, 0);
+        stubNewReceipt(order, List.of(first, second), "RC-1");
+
+        var result = service.confirm(identity, confirm("RETURN_NO", "TRACK-1", "RC-1", "key-1",
+            List.of(new PdaReturnReceiptRequests.Item("SKU-A", 1))));
+
+        assertFalse(result.fullyMatched());
+        assertEquals(ReturnReceiptService.PARTIALLY_RECEIVED, result.orderStatus());
+        assertEquals(2, result.receivedQuantity());
+        assertEquals(2, first.getReceivedQuantity());
+        assertEquals(0, second.getReceivedQuantity());
+        assertEquals(ReturnReceiptService.PARTIALLY_RECEIVED, order.getStatus());
+        verify(inventory).createReceiptCarton(eq(order), any(ReturnReceipt.class), eq("RC-1"), any());
+        ArgumentCaptor<ReturnReceipt> savedReceipt = ArgumentCaptor.forClass(ReturnReceipt.class);
+        verify(receipts).insert(savedReceipt.capture());
+        ArgumentCaptor<ReturnReceiptBatch> savedBatch = ArgumentCaptor.forClass(ReturnReceiptBatch.class);
+        verify(batches).insert(savedBatch.capture());
+        assertEquals(order.getId(), savedBatch.getValue().getReturnOrderId());
+        assertEquals(savedReceipt.getValue().getId(), savedBatch.getValue().getReceiptId());
+        assertEquals(order.getCustomerId(), savedBatch.getValue().getCustomerId());
+        assertEquals(order.getOverseasWarehouseId(), savedBatch.getValue().getOverseasWarehouseId());
+        assertEquals(result.receiptBatchNo(), savedBatch.getValue().getBatchNo());
+        assertEquals("PENDING_PRICING", savedBatch.getValue().getStorageBillingStatus());
+        assertNotNull(savedBatch.getValue().getStorageStartedAt());
+        assertNotNull(savedBatch.getValue().getCreatedAt());
+    }
+
+    @Test
+    void finalReceiptCompletesTheOrderAndIdempotentReplayDoesNotWriteTwice() {
+        ReturnOrder order = order("RT-1", "10", ReturnReceiptService.PARTIALLY_RECEIVED, 2, 1);
+        ReturnOrderItem line = item(11L, "SKU-A", 2, 1);
+        stubNewReceipt(order, List.of(line), "RC-AUTO");
+        var request = confirm("SKU", null, null, "key-final",
+            List.of(new PdaReturnReceiptRequests.Item("SKU-A", 1)));
+
+        var first = service.confirm(identity, request);
+        ArgumentCaptor<ReturnReceipt> savedReceipt = ArgumentCaptor.forClass(ReturnReceipt.class);
+        verify(receipts).insert(savedReceipt.capture());
+        when(receipts.findKey("operator-1", "key-final")).thenReturn(savedReceipt.getValue());
+        when(orders.selectById(1L)).thenReturn(order);
+        var replay = service.confirm(identity, request);
+
+        assertTrue(first.fullyMatched());
+        assertEquals(ReturnReceiptService.COMPLETED, first.orderStatus());
+        assertEquals(first.receiptNo(), replay.receiptNo());
+        assertEquals("RC-AUTO", replay.cartonMark());
+        verify(inventory, times(1)).createReceiptCarton(any(), any(), any(), any());
+        verify(batches, times(1)).insert(any(ReturnReceiptBatch.class));
+        verify(receipts, times(1)).insert(any(ReturnReceipt.class));
+    }
+
+    @Test
+    void rejectsOverReceiptBeforeCreatingReceiptInventoryOrBatch() {
+        ReturnOrder order = order("RT-1", "10", ReturnReceiptService.PARTIALLY_RECEIVED, 2, 1);
+        ReturnOrderItem line = item(11L, "SKU-A", 2, 1);
+        when(receipts.findKey("operator-1", "key-over")).thenReturn(null);
+        when(orders.lockNo("RT-1")).thenReturn(order);
+        when(orderItems.lockOrder(1L)).thenReturn(List.of(line));
+
+        ResponseStatusException error = assertThrows(ResponseStatusException.class, () -> service.confirm(identity,
+            confirm("RETURN_NO", null, null, "key-over", List.of(new PdaReturnReceiptRequests.Item("SKU-A", 2)))));
+
+        assertEquals(409, error.getStatusCode().value());
+        verify(receipts, never()).insert(any(ReturnReceipt.class));
+        verifyNoInteractions(inventory, batches);
+    }
+
+    @Test
+    void rejectsAnotherWarehousesOrderBeforeLockingSkuOrWritingInventory() {
+        ReturnOrder order = order("RT-1", "11", ReturnReceiptService.PENDING_RECEIPT, 2, 0);
+        when(receipts.findKey("operator-1", "key-cross")).thenReturn(null);
+        when(orders.lockNo("RT-1")).thenReturn(order);
+
+        ResponseStatusException error = assertThrows(ResponseStatusException.class, () -> service.confirm(identity,
+            confirm("RETURN_NO", null, null, "key-cross", List.of(new PdaReturnReceiptRequests.Item("SKU-A", 1)))));
+
+        assertEquals(404, error.getStatusCode().value());
+        verify(orderItems, never()).lockOrder(any());
+        verifyNoInteractions(inventory, batches);
+    }
+
+    @Test
+    void rejectsReuseOfAnIdempotencyKeyForDifferentReceiptContent() {
+        ReturnOrder order = order("RT-1", "10", ReturnReceiptService.PENDING_RECEIPT, 2, 0);
+        ReturnOrderItem line = item(11L, "SKU-A", 2, 0);
+        stubNewReceipt(order, List.of(line), "RC-1");
+        var original = confirm("RETURN_NO", "TRACK-1", "RC-1", "key-1",
+            List.of(new PdaReturnReceiptRequests.Item("SKU-A", 1)));
+        service.confirm(identity, original);
+        ArgumentCaptor<ReturnReceipt> savedReceipt = ArgumentCaptor.forClass(ReturnReceipt.class);
+        verify(receipts).insert(savedReceipt.capture());
+        when(receipts.findKey("operator-1", "key-1")).thenReturn(savedReceipt.getValue());
+
+        ResponseStatusException error = assertThrows(ResponseStatusException.class, () -> service.confirm(identity,
+            confirm("RETURN_NO", "TRACK-CHANGED", "RC-1", "key-1",
+                List.of(new PdaReturnReceiptRequests.Item("SKU-A", 1)))));
+
+        assertEquals(409, error.getStatusCode().value());
+        verify(inventory, times(1)).createReceiptCarton(any(), any(), anyString(), any());
+        verify(batches, times(1)).insert(any(ReturnReceiptBatch.class));
+    }
+
+    private void stubNewReceipt(ReturnOrder order, List<ReturnOrderItem> items, String cartonMark) {
+        when(receipts.findKey(eq("operator-1"), anyString())).thenReturn(null);
+        when(orders.lockNo("RT-1")).thenReturn(order);
+        when(orderItems.lockOrder(1L)).thenReturn(items);
+        when(orderItems.listOrder(1L)).thenReturn(items);
+        when(numbers.next(eq("RETURN_RECEIPT"), eq("10"), anyLong())).thenReturn("RR-1");
+        when(numbers.next(eq("RETURN_BATCH"), eq("10"), anyLong())).thenReturn("RB-1");
+        ReturnInventoryCarton carton = new ReturnInventoryCarton();
+        carton.setCartonMark(cartonMark);
+        when(inventory.createReceiptCarton(eq(order), any(ReturnReceipt.class), any(), any())).thenReturn(carton);
+    }
+
+    private static ReturnOrder order(String returnNo, String warehouseId, String status, long expected, long received) {
+        ReturnOrder order = new ReturnOrder();
+        order.setId(1L);
+        order.setCustomerId("customer-1");
+        order.setReturnNo(returnNo);
+        order.setCustomerReferenceNo("REF-1");
+        order.setOverseasWarehouseId(warehouseId);
+        order.setStatus(status);
+        order.setExpectedQuantity(expected);
+        order.setReceivedQuantity(received);
+        return order;
+    }
+
+    private static ReturnOrderItem item(long id, String sku, long expected, long received) {
+        ReturnOrderItem item = new ReturnOrderItem();
+        item.setId(id);
+        item.setReturnOrderId(1L);
+        item.setCustomerId("customer-1");
+        item.setSkuCode(sku);
+        item.setProductNameZh("商品 " + sku);
+        item.setExpectedQuantity(expected);
+        item.setReceivedQuantity(received);
+        return item;
+    }
+
+    private static PdaReturnReceiptRequests.Confirm confirm(String startedBy, String trackingNo, String cartonMark,
+                                                             String key, List<PdaReturnReceiptRequests.Item> items) {
+        return new PdaReturnReceiptRequests.Confirm("RT-1", trackingNo, startedBy, cartonMark, items, key);
+    }
+}
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/schema/Phase5OverseasUpgradeSqlContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/schema/Phase5OverseasUpgradeSqlContractTest.java
index 7f1ac90ea..92777af25 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/schema/Phase5OverseasUpgradeSqlContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/schema/Phase5OverseasUpgradeSqlContractTest.java
@@ -32,7 +32,7 @@ class Phase5OverseasUpgradeSqlContractTest {
             assertThat(overseas.indexOf(table)).as(table + " first reference")
                 .isEqualTo(overseas.indexOf(create) + "CREATE TABLE IF NOT EXISTS ".length());
         }
-        assertThat(overseas).contains("<> 24", "五期完整业务表集合未部署");
+        assertThat(overseas).contains("<> 23", "五期完整业务表集合未部署");
     }
 
     @Test
@@ -49,8 +49,22 @@ class Phase5OverseasUpgradeSqlContractTest {
             "ALTER TABLE ll_delivery_order ADD COLUMN overseas_warehouse_name",
             "ALTER TABLE ll_delivery_order ADD COLUMN waybill_no",
             "ALTER TABLE ll_dropship_order_profile ADD COLUMN source_pallet_no",
+            "ALTER TABLE ll_dropship_order_profile ADD COLUMN manifest_version",
+            "ALTER TABLE ll_dropship_order_profile ADD COLUMN manifest_package_count",
+            "ALTER TABLE ll_dropship_order_profile ADD COLUMN manifest_fragment_count",
+            "ALTER TABLE ll_dropship_order_profile ADD COLUMN manifest_hash",
+            "ALTER TABLE ll_inbound_plan_pallet ADD COLUMN version",
+            "ADD KEY idx_ll_dropship_profile_manifest(source_pallet_no,manifest_hash)",
             "ADD UNIQUE KEY uk_ll_dropship_sku_inventory(profile_id,sku_code)",
             "MODIFY COLUMN source_pallet_no VARCHAR(128) NOT NULL");
+        int relabelCreateEnd = overseas.indexOf(") ENGINE=InnoDB COMMENT='换标货物冻结明细';");
+        int relabelModify = overseas.indexOf("MODIFY COLUMN destination_fba_warehouse_code", relabelCreateEnd);
+        for (String column : List.of("destination_fba_warehouse_code", "source_inventory_balance_id",
+            "source_inventory_position_id", "source_inbound_order_id")) {
+            assertThat(overseas.indexOf("ALTER TABLE ll_relabel_item ADD COLUMN " + column, relabelCreateEnd))
+                .as(column + " converges before grouped MODIFY")
+                .isBetween(relabelCreateEnd, relabelModify - 1);
+        }
         int start = overseas.indexOf("-- 五期正式结构必须由海外固定入口自行补齐");
         int end = overseas.indexOf("USE baiyue_lastleg;", start);
         String phase5 = overseas.substring(start, end);
@@ -69,6 +83,27 @@ class Phase5OverseasUpgradeSqlContractTest {
         }
     }
 
+    @Test
+    void overseasFixedAdminProjectionAssertionMatchesItsAuthorityArray() throws Exception {
+        String overseas = repositoryFile("deploy/sql/海外区域统一增量-MySQL8.sql");
+        int start = overseas.indexOf("SET @platform_admin_overseas_authorities = JSON_ARRAY(");
+        int end = overseas.indexOf(");", start);
+        String authorityArray = overseas.substring(start, end);
+        int authorityCount = count(authorityArray, "'platform:");
+
+        assertThat(authorityCount).isPositive();
+        assertThat(overseas).contains("JSON_LENGTH(authorities_json) <> " + authorityCount);
+    }
+
+    @Test
+    void overseasReturnOrderBackfillNormalizesLegacyColumnCollations() throws Exception {
+        String overseas = repositoryFile("deploy/sql/海外区域统一增量-MySQL8.sql");
+
+        assertThat(overseas).contains(
+            "o.source_order_id COLLATE utf8mb4_unicode_ci = CAST(r.id AS CHAR) COLLATE utf8mb4_unicode_ci",
+            "o.source_order_no COLLATE utf8mb4_unicode_ci = r.return_no COLLATE utf8mb4_unicode_ci");
+    }
+
     @Test
     void domesticFixedEntryKeepsIamPermissionsButOwnsNoLastlegBusinessSchema() throws Exception {
         String domestic = repositoryFile("deploy/sql/头程数据库统一增量-MySQL8.sql");
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/service/FbaWarehouseValidatorTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/service/FbaWarehouseValidatorTest.java
index ed50bf734..1d27139c8 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/service/FbaWarehouseValidatorTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/service/FbaWarehouseValidatorTest.java
@@ -91,7 +91,8 @@ class FbaWarehouseValidatorTest {
         return new DomesticWarehouseDirectoryClient.Detail(
             new DomesticWarehouseDirectoryClient.Warehouse(193000000000000001L, 0L, code, name,
                 type, "US", status),
-            List.of(new DomesticWarehouseDirectoryClient.Address("CA")));
+            List.of(new DomesticWarehouseDirectoryClient.Address("OPERATING", "US", "CA", "Los Angeles",
+                null, "90001", "123 Logistics Ave", null)));
     }
 
     private void assertInvalid(org.assertj.core.api.ThrowableAssert.ThrowingCallable action) {
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/service/LastlegOrderServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/service/LastlegOrderServiceTest.java
index f720cfcd9..d7e620312 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/service/LastlegOrderServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/service/LastlegOrderServiceTest.java
@@ -18,6 +18,8 @@ import com.baiyue.lastleg.mapper.LastlegOrderOperationLogMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderManualNodeMapper;
 import com.baiyue.lastleg.mapper.ReceivingWarehouseOperationMapper;
 import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
+import com.baiyue.lastleg.shipping.entity.ContainerShippingGate;
+import com.baiyue.lastleg.shipping.mapper.ContainerShippingGateMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -64,6 +66,7 @@ class LastlegOrderServiceTest {
     @Mock InboundOrderDetainedOutboxService detainedOutbox;
     @Mock ReceivingWarehouseOperationMapper receivingWarehouseOperations;
     @Mock WarehouseResourceGateway warehouseResourceGateway;
+    @Mock ContainerShippingGateMapper containerShippingGates;
     LastlegOrderService service;
 
     @BeforeEach
@@ -85,6 +88,7 @@ class LastlegOrderServiceTest {
         ReflectionTestUtils.setField(service, "detainedOutbox", detainedOutbox);
         ReflectionTestUtils.setField(service, "receivingWarehouseOperations", receivingWarehouseOperations);
         ReflectionTestUtils.setField(service, "warehouseResourceGateway", warehouseResourceGateway);
+        ReflectionTestUtils.setField(service, "containerShippingGates", containerShippingGates);
     }
 
     @Test
@@ -158,6 +162,26 @@ class LastlegOrderServiceTest {
             .noneMatch(component -> "eventId".equals(component.getName())));
     }
 
+    @Test
+    void detailReadsContainerNodeFromTheContainerShippingGate() {
+        LastlegOrder order = order(11L, "100", "PENDING_ASSIGNMENT", null);
+        order.setSourceContainerBookingId("BOOKING-1");
+        ContainerShippingGate gate = new ContainerShippingGate();
+        gate.setContainerBookingId("BOOKING-1");
+        gate.setStandardNode("PICKUP_READY");
+        when(orders.selectOne(any())).thenReturn(order);
+        when(details.selectList(any())).thenReturn(List.of());
+        when(histories.selectList(any())).thenReturn(List.of());
+        when(feeSources.listForBusiness("100", "LASTLEG_ORDER", 11L)).thenReturn(List.of());
+        when(operations.selectList(any())).thenReturn(List.of());
+        when(manualNodes.selectList(any())).thenReturn(List.of());
+        when(containerShippingGates.selectById("BOOKING-1")).thenReturn(gate);
+
+        var response = service.detail("100", 11L);
+
+        assertEquals("PICKUP_READY", response.order().containerNode());
+    }
+
     @Test
     void transferUpdatesOrderAndEveryCargoSnapshot() {
         LastlegOrder order = order(11L, "100", "PENDING_ASSIGNMENT", null);
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/service/LoadingCompletedConsumerTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/service/LoadingCompletedConsumerTest.java
index 67084600d..38aad853f 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/service/LoadingCompletedConsumerTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/service/LoadingCompletedConsumerTest.java
@@ -26,7 +26,7 @@ class LoadingCompletedConsumerTest {
   assertTrue(table.contains("customer_id")); assertFalse(table.contains("tenant_id"));
  }
  @Test void rejectsEventFromWrongRegion(){ EventEnvelope source=event(); EventEnvelope invalid=new EventEnvelope(source.eventId(),source.eventType(),source.eventVersion(),source.occurredAt(),RegionCode.OVERSEAS,RegionCode.CN,source.tenantId(),source.aggregateType(),source.aggregateId(),source.aggregateVersion(),source.handoverVersion(),source.traceId(),source.correlationId(),source.causationId(),source.payload(),source.payloadHash()); assertThrows(IllegalArgumentException.class,()->service.consume(invalid)); }
- @Test void consumesFormalDropshipPalletSnapshots(){ var sku=new FirstLegLoadingPlanCompletedV1.SkuPackageSnapshot("SKU-A","Product A",2,20,List.of("BOX-1","BOX-2")); var pallet=new FirstLegLoadingPlanCompletedV1.PalletSnapshot("PLT-1",List.of(sku)); var item=new FirstLegLoadingPlanCompletedV1.Item("d-1","SKU-A","Product A","Product A",2,20,1,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,"wh-1","ONT8","ONT8",null,null,"MARK",null,List.of()); var order=new FirstLegLoadingPlanCompletedV1.Order("in-d","root-d","ord-d","FL-D","root-od","RK-D","wh-1","ONT8","ONT8",2,20,1,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,List.of(item),"100","Customer 100","ONE_CLICK_DROPSHIP",List.of(pallet),"FBA"); var payload=new FirstLegLoadingPlanCompletedV1("plan-d","LP-D","book-d","MSCU6639870","CAB-D","92","Warehouse",List.of(order)); JsonNode node=json.valueToTree(payload); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); var event=new EventEnvelope("123e4567-e89b-12d3-a456-426614174010",EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,1,Instant.now(),RegionCode.CN,RegionCode.OVERSEAS,"100","LOADING_PLAN","plan-d",2,1L,"123e4567-e89b-12d3-a456-426614174011","FIRSTLEG_LOADING_COMPLETED:plan-d:100:1",null,node,hash); assertEquals(1,service.consume(event)); ArgumentCaptor<DropshipRequests.Receive> captor=ArgumentCaptor.forClass(DropshipRequests.Receive.class); verify(dropshipOrders).receive(captor.capture()); verify(inventory,never()).registerInTransit(anyString(),anyString(),any()); assertEquals("100",captor.getValue().customerId()); assertEquals("123e4567-e89b-12d3-a456-426614174010:DROPSHIP:in-d",captor.getValue().idempotencyKey()); assertEquals(1,captor.getValue().pallets().size()); assertEquals("PLT-1",captor.getValue().pallets().get(0).palletNo()); assertEquals(List.of("BOX-1","BOX-2"),captor.getValue().pallets().get(0).skuPackages().get(0).cartonMarks()); }
+ @Test void consumesFormalDropshipPalletSnapshots(){ var sku=new FirstLegLoadingPlanCompletedV1.SkuPackageSnapshot("SKU-A","Product A",2,20,List.of("BOX-1","BOX-2")); var pallet=new FirstLegLoadingPlanCompletedV1.PalletSnapshot("PLT-1",List.of(sku)); var item=new FirstLegLoadingPlanCompletedV1.Item("d-1","SKU-A","Product A","Product A",2,20,1,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,"wh-1","ONT8","ONT8",null,null,"MARK",null,List.of()); var order=new FirstLegLoadingPlanCompletedV1.Order("in-d","root-d","ord-d","FL-D","root-od","RK-D","wh-1","ONT8","ONT8",2,20,1,BigDecimal.ONE,BigDecimal.ONE,BigDecimal.ONE,List.of(item),"100","Customer 100","ONE_CLICK_DROPSHIP",List.of(pallet),"FBA"); var payload=new FirstLegLoadingPlanCompletedV1("plan-d","LP-D","book-d","MSCU6639870","CAB-D","92","Warehouse",List.of(order)); JsonNode node=json.valueToTree(payload); addManifest(node.path("orders").get(0).path("pallets").get(0),2); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); var event=new EventEnvelope("123e4567-e89b-12d3-a456-426614174010",EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,1,Instant.now(),RegionCode.CN,RegionCode.OVERSEAS,"100","LOADING_PLAN","plan-d",2,1L,"123e4567-e89b-12d3-a456-426614174011","FIRSTLEG_LOADING_COMPLETED:plan-d:100:1",null,node,hash); assertEquals(1,service.consume(event)); ArgumentCaptor<DropshipRequests.Receive> captor=ArgumentCaptor.forClass(DropshipRequests.Receive.class); verify(dropshipOrders).receive(captor.capture()); verify(inventory,never()).registerInTransit(anyString(),anyString(),any()); assertEquals("100",captor.getValue().customerId()); assertEquals("123e4567-e89b-12d3-a456-426614174010:DROPSHIP:in-d",captor.getValue().idempotencyKey()); assertEquals(1,captor.getValue().pallets().size()); assertEquals("PLT-1",captor.getValue().pallets().get(0).palletNo()); assertEquals(List.of("BOX-1","BOX-2"),captor.getValue().pallets().get(0).skuPackages().get(0).cartonMarks()); }
  @Test void freezesReceivingWarehouseInInitialInTransitInventory(){
   service.consume(event());
   ArgumentCaptor<InventoryCommandRequests.InTransit> captured=ArgumentCaptor.forClass(InventoryCommandRequests.InTransit.class);
@@ -160,6 +160,7 @@ class LoadingCompletedConsumerTest {
   secondSku.put("sourceInboundDetailId","d-2");
   var marks=secondSku.putArray("cartonMarks"); for(int n=6;n<=10;n++)marks.add("RK1#10-"+n);
   skus.add(secondSku);
+  addManifest(order.path("pallets").get(0),10);
   service.consume(rehash(original,node));
   var captured=ArgumentCaptor.forClass(com.baiyue.lastleg.inboundplan.entity.InboundPlanCarton.class);
   verify(cartons,times(10)).insert(captured.capture());
@@ -193,7 +194,7 @@ class LoadingCompletedConsumerTest {
   sourceOrder.put("orderType","ONE_CLICK_DROPSHIP").put("destinationType","OVERSEAS");
   var sku=json.createObjectNode().put("sourceInboundDetailId","d-1").put("skuCode","SKU-1").put("productName","产品").put("packageCount",5).put("productQuantity",50);
   var marks=sku.putArray("cartonMarks"); for(int n=1;n<=5;n++)marks.add("RK1#5-"+n);
-  var pallet=json.createObjectNode().put("palletNo","DP-260909-0143"); pallet.putArray("skuPackages").add(sku);
+  var pallet=json.createObjectNode().put("palletNo","DP-260909-0143"); pallet.putArray("skuPackages").add(sku); addManifest(pallet,5);
   sourceOrder.putArray("pallets").add(pallet);
   if(duplicateSku) ((com.fasterxml.jackson.databind.node.ArrayNode)sourceOrder.path("items")).add(sourceOrder.path("items").get(0).deepCopy());
   node.putArray("orders").add(sourceOrder);
@@ -202,5 +203,6 @@ class LoadingCompletedConsumerTest {
  }
   private EventEnvelope event(){ var item1=new FirstLegLoadingPlanCompletedV1.Item("d-1","SKU-1","产品","Product",5,50,1,new BigDecimal("10"),new BigDecimal("9"),new BigDecimal("12"),new BigDecimal("1.2"),"wh-1","ONT8","FBA ONT8","FBA-1","SHIP-1","MARK-1"); var item2=new FirstLegLoadingPlanCompletedV1.Item("d-2","SKU-2","产品2","Product2",3,30,2,new BigDecimal("8"),new BigDecimal("7"),new BigDecimal("9"),new BigDecimal("0.8"),"wh-2","LAX9","FBA LAX9","FBA-2","SHIP-2","MARK-2"); var p=new FirstLegLoadingPlanCompletedV1("plan-1","LP1","book-1","MSCU6639870","CAB1","ow-1","洛杉矶海外仓",List.of(new FirstLegLoadingPlanCompletedV1.Order("in-1","root-1","ord-1","FL1","root-o1","RK1","wh-1","ONT8","FBA ONT8",5,50,1,new BigDecimal("10"),new BigDecimal("9"),new BigDecimal("1.2"),List.of(item1),"100","Customer 100","FIRST_LEG",List.of()),new FirstLegLoadingPlanCompletedV1.Order("in-2","root-2","ord-2","FL2","root-o2","RK2","wh-2","LAX9","FBA LAX9",3,30,2,new BigDecimal("8"),new BigDecimal("7"),new BigDecimal("0.8"),List.of(item2),"100","Customer 100","FIRST_LEG",List.of()))); JsonNode node=json.valueToTree(p); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); return new EventEnvelope("123e4567-e89b-12d3-a456-426614174000",EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,1,Instant.now(),RegionCode.CN,RegionCode.OVERSEAS,"100","LOADING_PLAN","plan-1",2,1L,"123e4567-e89b-12d3-a456-426614174001","FIRSTLEG_LOADING_COMPLETED:plan-1:100:1",null,node,hash); }
  private JsonNode v2Payload(EventEnvelope source){ com.fasterxml.jackson.databind.node.ObjectNode node=source.payload().deepCopy(); node.set("sourceContainerBookingId",node.remove("containerBookingId")); return node; }
- private EventEnvelope eventForPayload(FirstLegLoadingPlanCompletedV1 payload, long version){ JsonNode node=json.valueToTree(payload); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); return new EventEnvelope("123e4567-e89b-12d3-a456-426614174099",EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,1,Instant.now(),RegionCode.CN,RegionCode.OVERSEAS,"100","LOADING_PLAN",payload.loadingPlanId(),2,version,"123e4567-e89b-12d3-a456-426614174098","FIRSTLEG_LOADING_COMPLETED:"+payload.loadingPlanId()+":100:1",null,node,hash); }
+ private EventEnvelope eventForPayload(FirstLegLoadingPlanCompletedV1 payload, long version){ JsonNode node=json.valueToTree(payload); for(JsonNode order:node.path("orders")) for(JsonNode pallet:order.path("pallets")) addManifest(pallet,order.path("packageCount").asInt()); String hash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(node)); return new EventEnvelope("123e4567-e89b-12d3-a456-426614174099",EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,1,Instant.now(),RegionCode.CN,RegionCode.OVERSEAS,"100","LOADING_PLAN",payload.loadingPlanId(),2,version,"123e4567-e89b-12d3-a456-426614174098","FIRSTLEG_LOADING_COMPLETED:"+payload.loadingPlanId()+":100:1",null,node,hash); }
+ private void addManifest(JsonNode pallet,int packageCount){ var object=(com.fasterxml.jackson.databind.node.ObjectNode)pallet; object.put("manifestVersion",1).put("manifestPackageCount",packageCount).put("manifestFragmentCount",1).put("manifestHash","a".repeat(64)); }
 }
diff --git a/order/AGENTS.md b/order/AGENTS.md
index 848bcfcee..c7699e277 100644
--- a/order/AGENTS.md
+++ b/order/AGENTS.md
@@ -36,6 +36,7 @@
 - 所有客户查询在 Repository/Mapper 显式带 `tenant_id`；状态变更保留幂等、历史、审计和并发控制。
 - `inbound_code` 是跨客户全局唯一业务码；生成模式由 `InboundCodeModeProvider` 控制，序列与唯一约束不得退化为客户内唯一。修改格式、长度或生成时机时同步检查 Order SQL、Firstleg 入库快照、箱唛箱码、前端展示和全局唯一性契约测试。
 - 下单和后续关键状态操作不得信任客户端仓库名称、类型或启用状态；公共仓库必须通过 Warehouse 内部接口按 ID 实时校验。私人地址不得伪装为公共目的仓，非私人目的地必须引用类型匹配的公共仓库；Warehouse 不可用时失败关闭，不回退到旧快照或模拟数据。
+- 客户提交订单时除 IAM 审核资格外，还必须通过 Finance 资金账户校验；实际余额小于 0 时拒绝提交并提示充值。草稿保存不触发资金门禁，Finance 不可用或响应无效时提交失败关闭。
 - Warehouse 往来单位、Firstleg 入库协作只通过客户端 DTO/内部令牌；修改契约需同步消费者。
 - 智能装柜待审核候选只返回 Order 权威 `SUBMITTED` 订单，并按服务身份、客户/仓库/渠道、入仓码、创建日期、预计到货日期和分页条件查询；Firstleg 可据此提前占位，但不得把该内部查询或申报数量当作审核、测量或可物理装柜完成的事实。
 - 中文批量模板按登录客户生成取货/私人地址、国内收货仓、目的仓和渠道下拉；仓库目录必须翻页读取全部候选，不得只取第一页。导入时重新读取并校验动态目录、客户归属和启用状态，不信任模板隐藏页；文件上限 5MB、有效数据最多 50 行，仅创建草稿，`PARTIAL` 允许单行失败、`ATOMIC` 任一行失败不得落单。
diff --git a/order/src/main/java/com/baiyue/order/client/FinanceWalletClient.java b/order/src/main/java/com/baiyue/order/client/FinanceWalletClient.java
new file mode 100644
index 000000000..5803fd9ab
--- /dev/null
+++ b/order/src/main/java/com/baiyue/order/client/FinanceWalletClient.java
@@ -0,0 +1,23 @@
+package com.baiyue.order.client;
+
+import com.baiyue.common.core.api.ApiResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@FeignClient(name = "finance-service", contextId = "orderFinanceWalletClient",
+    url = "${baiyue.clients.finance.url:}", path = "/internal/finance/v1/wallet")
+public interface FinanceWalletClient {
+    @GetMapping("/accounts/{customerId}")
+    ApiResponse<WalletAccount> account(
+        @RequestHeader("X-Internal-Service-Token") String internalToken,
+        @PathVariable("customerId") long customerId);
+
+    record WalletAccount(BigDecimal actualBalance, BigDecimal availableBalance,
+                         BigDecimal creditLimit, BigDecimal availableCredit,
+                         LocalDate creditExpiresOn, boolean creditActive) { }
+}
diff --git a/order/src/main/java/com/baiyue/order/controller/InternalOrderCargoController.java b/order/src/main/java/com/baiyue/order/controller/InternalOrderCargoController.java
index 2b1dbf0a8..a7d753780 100644
--- a/order/src/main/java/com/baiyue/order/controller/InternalOrderCargoController.java
+++ b/order/src/main/java/com/baiyue/order/controller/InternalOrderCargoController.java
@@ -10,6 +10,7 @@ import com.baiyue.order.entity.OrderCargoEntity;
 import com.baiyue.order.repository.OrderRepository;
 import com.baiyue.order.service.OrderApplicationService;
 import com.baiyue.order.service.PrintableInboundSnapshotService;
+import com.baiyue.order.service.OrderCargoPackageCounts;
 import com.baiyue.order.client.FirstlegInboundClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -84,7 +85,7 @@ public class InternalOrderCargoController {
             .map(cargo -> new CargoLabelBinding(cargo.getId(), orderId, cargo.getItemNo(),
                 cargo.getCargoName(), cargo.getSkuNo(), cargo.getPackageCount(),
                 unitsPerCarton(cargo, oneClickDropship), cargo.getLengthCm(), cargo.getWidthCm(),
-                cargo.getHeightCm(), cargo.getShipmentId()))
+                cargo.getHeightCm(), cargo.getShipmentId(), cargo.getPackingGroupNo()))
             .toList());
     }
 
@@ -109,9 +110,8 @@ public class InternalOrderCargoController {
         if (order == null) {
             throw new BizException(ResultCode.NOT_FOUND, "订单不存在或不属于当前客户");
         }
-        int packageCount = orders.findCargoInheritedByOrder(tenantId, orderId).stream()
-            .map(OrderCargoEntity::getPackageCount).filter(java.util.Objects::nonNull)
-            .mapToInt(Integer::intValue).sum();
+        int packageCount = OrderCargoPackageCounts.physical(
+            orders.findCargoInheritedByOrder(tenantId, orderId), order.getFulfillmentType());
         return ApiResponse.success(OrderApplicationService.inboundCommand(order, packageCount));
     }
 
@@ -140,8 +140,10 @@ public class InternalOrderCargoController {
         // 申报重量/体积必须属于当前订单。拆分子单未物化独立货物事实时不得复制根单整单总量。
         List<OrderCargoEntity> cargoes = orders.findCargo(tenantId, orderId);
         return ApiResponse.success(new MeasurementDeclarationSnapshot(
-            order.getReferenceId(), sum(cargoes, OrderCargoEntity::getGrossWeightKg),
-            sum(cargoes, OrderCargoEntity::getVolumeCbm),
+            order.getReferenceId(), OrderCargoPackageCounts.physicalMetric(
+                cargoes, order.getFulfillmentType(), OrderCargoEntity::getGrossWeightKg),
+            OrderCargoPackageCounts.physicalMetric(
+                cargoes, order.getFulfillmentType(), OrderCargoEntity::getVolumeCbm),
             cargoes.stream().map(OrderCargoEntity::getCargoName).filter(Objects::nonNull)
                 .map(String::trim).filter(value -> !value.isEmpty()).distinct()
                 .collect(Collectors.joining("、"))));
@@ -187,18 +189,18 @@ public class InternalOrderCargoController {
                                     String skuNo, Integer packageCount, Integer unitsPerCarton,
                                     java.math.BigDecimal lengthCm,
                                     java.math.BigDecimal widthCm, java.math.BigDecimal heightCm,
-                                    String shipmentId) {
+                                    String shipmentId, String packingGroupNo) {
         public CargoLabelBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
                                  Integer packageCount, java.math.BigDecimal lengthCm,
                                  java.math.BigDecimal widthCm, java.math.BigDecimal heightCm) {
             this(cargoId, orderId, itemNo, cargoName, null, packageCount, null,
-                lengthCm, widthCm, heightCm, null);
+                lengthCm, widthCm, heightCm, null, null);
         }
         public CargoLabelBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
                                  String skuNo, Integer packageCount, java.math.BigDecimal lengthCm,
                                  java.math.BigDecimal widthCm, java.math.BigDecimal heightCm) {
             this(cargoId, orderId, itemNo, cargoName, skuNo, packageCount, null,
-                lengthCm, widthCm, heightCm, null);
+                lengthCm, widthCm, heightCm, null, null);
         }
     }
 
diff --git a/order/src/main/java/com/baiyue/order/dto/OrderRequests.java b/order/src/main/java/com/baiyue/order/dto/OrderRequests.java
index 70ef87ce4..48fa55833 100644
--- a/order/src/main/java/com/baiyue/order/dto/OrderRequests.java
+++ b/order/src/main/java/com/baiyue/order/dto/OrderRequests.java
@@ -211,7 +211,9 @@ public final class OrderRequests {
             @Size(max = 64) String upcNo,
             @Size(max = 128) String cargoNameEn,
             @Size(max = 20) String customsHsCode,
+            @Schema(description = "Units per package / 每箱数量；提交时必填", minimum = "1")
             @Min(1) Integer unitsPerPackage,
+            @Schema(description = "Total quantity / 总数量；提交时必填且必须等于每箱数量 × 箱数", minimum = "1")
             @Min(1) Integer totalQuantity,
             @DecimalMin("0.001") BigDecimal netWeightKg,
             @DecimalMin("0.00") BigDecimal unitDeclaredValue,
@@ -226,8 +228,25 @@ public final class OrderRequests {
             @Size(max = 64) String referenceId,
             @Schema(description = "Product image file ID / 产品图片文件ID") Long productImageFileId,
             @Schema(description = "Authoritative wood-product decision frozen with this cargo line / 木制品权威判定，随货物行冻结", requiredMode = Schema.RequiredMode.REQUIRED)
-            @NotNull Boolean woodenProduct
+            @NotNull Boolean woodenProduct,
+            @Schema(description = "Client-generated same-carton key. Lines with the same value share carton count, dimensions, weight and volume / 客户端添加同箱 SKU 时生成；同组物理箱字段只汇总一次", maxLength = 32)
+            @Size(max = 32) String packingGroupNo
     ) {
+        public Cargo(String cargoName, String hsCode, String packageType, int packageCount,
+                     BigDecimal grossWeightKg, BigDecimal volumeCbm, BigDecimal lengthCm,
+                     BigDecimal widthCm, BigDecimal heightCm, BigDecimal declaredValue, String currency,
+                     boolean dangerousGoods, String cargoRemark, String skuNo, String upcNo,
+                     String cargoNameEn, String customsHsCode, Integer unitsPerPackage, Integer totalQuantity,
+                     BigDecimal netWeightKg, BigDecimal unitDeclaredValue, String material, String usage,
+                     String model, String brand, BigDecimal productLengthCm, BigDecimal productWidthCm,
+                     BigDecimal productHeightCm, String shipmentId, String referenceId,
+                     Long productImageFileId, Boolean woodenProduct) {
+            this(cargoName, hsCode, packageType, packageCount, grossWeightKg, volumeCbm, lengthCm, widthCm,
+                heightCm, declaredValue, currency, dangerousGoods, cargoRemark, skuNo, upcNo, cargoNameEn,
+                customsHsCode, unitsPerPackage, totalQuantity, netWeightKg, unitDeclaredValue, material, usage,
+                model, brand, productLengthCm, productWidthCm, productHeightCm, shipmentId, referenceId,
+                productImageFileId, woodenProduct, null);
+        }
         public Cargo(String cargoName, String hsCode, String packageType, int packageCount,
                      BigDecimal grossWeightKg, BigDecimal volumeCbm, BigDecimal lengthCm,
                      BigDecimal widthCm, BigDecimal heightCm, BigDecimal declaredValue, String currency,
@@ -240,7 +259,7 @@ public final class OrderRequests {
                 heightCm, declaredValue, currency, dangerousGoods, cargoRemark, skuNo, upcNo, cargoNameEn,
                 customsHsCode, unitsPerPackage, totalQuantity, netWeightKg, unitDeclaredValue, material, usage,
                 model, brand, productLengthCm, productWidthCm, productHeightCm, shipmentId, referenceId,
-                productImageFileId, false);
+                productImageFileId, false, null);
         }
     }
 
diff --git a/order/src/main/java/com/baiyue/order/entity/OrderCargoEntity.java b/order/src/main/java/com/baiyue/order/entity/OrderCargoEntity.java
index 61c64ea5d..cf2a10a9e 100644
--- a/order/src/main/java/com/baiyue/order/entity/OrderCargoEntity.java
+++ b/order/src/main/java/com/baiyue/order/entity/OrderCargoEntity.java
@@ -12,7 +12,7 @@ import com.baiyue.common.core.model.BaseEntity; import com.baomidou.mybatisplus.
  * 申报价值及危险品标识等货物信息。</p>
  */
 @TableName("ord_order_cargo") public class OrderCargoEntity extends BaseEntity {
- @TableId(type=IdType.ASSIGN_ID) private Long id; private Long tenantId; private Long orderId; private Integer itemNo; private String cargoName; private String hsCode; private String packageType; private Integer packageCount; private BigDecimal grossWeightKg; private BigDecimal volumeCbm; private BigDecimal lengthCm; private BigDecimal widthCm; private BigDecimal heightCm; private BigDecimal declaredValue; private String currency; private Boolean dangerousGoods; private String cargoRemark; private String skuNo; private String upcNo; private String cargoNameEn; private String customsHsCode; private Integer unitsPerPackage; private Integer totalQuantity; private BigDecimal netWeightKg; private BigDecimal unitDeclaredValue; private String material; private String productUsage; private String model; private String brand; private BigDecimal productLengthCm; private BigDecimal productWidthCm; private BigDecimal productHeightCm; private String shipmentId; private String referenceId; private Long productImageFileId; private Boolean woodenProduct;
+ @TableId(type=IdType.ASSIGN_ID) private Long id; private Long tenantId; private Long orderId; private Integer itemNo; private String cargoName; private String hsCode; private String packageType; private Integer packageCount; private BigDecimal grossWeightKg; private BigDecimal volumeCbm; private BigDecimal lengthCm; private BigDecimal widthCm; private BigDecimal heightCm; private BigDecimal declaredValue; private String currency; private Boolean dangerousGoods; private String cargoRemark; private String skuNo; private String upcNo; private String cargoNameEn; private String customsHsCode; private Integer unitsPerPackage; private Integer totalQuantity; private BigDecimal netWeightKg; private BigDecimal unitDeclaredValue; private String material; private String productUsage; private String model; private String brand; private BigDecimal productLengthCm; private BigDecimal productWidthCm; private BigDecimal productHeightCm; private String shipmentId; private String referenceId; private Long productImageFileId; private Boolean woodenProduct; private String packingGroupNo;
                  
                 
 }
diff --git a/order/src/main/java/com/baiyue/order/service/MerchantInboundOrderListService.java b/order/src/main/java/com/baiyue/order/service/MerchantInboundOrderListService.java
index 6772a5ca1..a827da1c5 100644
--- a/order/src/main/java/com/baiyue/order/service/MerchantInboundOrderListService.java
+++ b/order/src/main/java/com/baiyue/order/service/MerchantInboundOrderListService.java
@@ -84,9 +84,8 @@ public class MerchantInboundOrderListService {
         List<OrderEntity> missing, Map<Long, List<OrderCargoEntity>> cargoes) {
         try {
             List<FirstlegInboundClient.OrderApprovedInboundCommand> commands = missing.stream().map(order -> {
-                int packages = cargoes.getOrDefault(order.getId(), List.of()).stream()
-                    .map(OrderCargoEntity::getPackageCount).filter(Objects::nonNull)
-                    .mapToInt(Integer::intValue).sum();
+                int packages = OrderCargoPackageCounts.physical(
+                    cargoes.getOrDefault(order.getId(), List.of()), order.getFulfillmentType());
                 return OrderApplicationService.inboundCommand(order, packages);
             }).toList();
             var response = firstleg.prepareBatch(internalToken, commands);
@@ -105,13 +104,15 @@ public class MerchantInboundOrderListService {
         OrderPartyEntity consignee,
         OrderStatusHistoryEntity latestHistory,
         FirstlegInboundClient.InboundReference inbound) {
-        int packageCount = cargoes.stream().map(OrderCargoEntity::getPackageCount)
-            .filter(Objects::nonNull).mapToInt(Integer::intValue).sum();
+        int packageCount = OrderCargoPackageCounts.physical(cargoes, order.getFulfillmentType());
         int totalQuantity = cargoes.stream().map(OrderCargoEntity::getTotalQuantity)
             .filter(Objects::nonNull).mapToInt(Integer::intValue).sum();
-        BigDecimal grossWeight = sum(cargoes, OrderCargoEntity::getGrossWeightKg);
-        BigDecimal netWeight = sum(cargoes, OrderCargoEntity::getNetWeightKg);
-        BigDecimal volume = sum(cargoes, OrderCargoEntity::getVolumeCbm);
+        BigDecimal grossWeight = OrderCargoPackageCounts.physicalMetric(
+            cargoes, order.getFulfillmentType(), OrderCargoEntity::getGrossWeightKg);
+        BigDecimal netWeight = OrderCargoPackageCounts.physicalMetric(
+            cargoes, order.getFulfillmentType(), OrderCargoEntity::getNetWeightKg);
+        BigDecimal volume = OrderCargoPackageCounts.physicalMetric(
+            cargoes, order.getFulfillmentType(), OrderCargoEntity::getVolumeCbm);
         BigDecimal declaredAmount = sum(cargoes, OrderCargoEntity::getDeclaredValue);
 
         List<MerchantInboundOrderRow.CargoColumn> cargoColumns = cargoes.stream()
diff --git a/order/src/main/java/com/baiyue/order/service/OrderApplicationService.java b/order/src/main/java/com/baiyue/order/service/OrderApplicationService.java
index de11b6b0b..8f2a76c8b 100644
--- a/order/src/main/java/com/baiyue/order/service/OrderApplicationService.java
+++ b/order/src/main/java/com/baiyue/order/service/OrderApplicationService.java
@@ -31,9 +31,13 @@ import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.time.*;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.time.format.DateTimeFormatter;
 
@@ -81,6 +85,7 @@ public class OrderApplicationService {
                                      OrderRequests.SaveRequest request) {
         AddressSnapshots addressSnapshots = resolveCustomerAddresses(tenantId, request);
         validateWoodInspection(request);
+        validateRequestCargoQuantities(request.cargoes(), false);
         productImageGuard.requireOwned(tenantId, request.cargoes());
         var snapshots = masterDataGuard.validate(tenantId, request);
         requirePricingChannel(tenantId, request.receivingWarehouseId(), request.channelCode(),
@@ -122,6 +127,7 @@ public class OrderApplicationService {
         validateWoodInspection(request);
         OrderEntity order = require(tenantId, id);
         if (allowSubmitted) validateCompleteRequest(request);
+        else validateRequestCargoQuantities(request.cargoes(), false);
         productImageGuard.requireOwned(tenantId, request.cargoes());
         var snapshots = masterDataGuard.validate(tenantId, request);
         OrderStatus before = order.getStatus();
@@ -296,7 +302,8 @@ public class OrderApplicationService {
         }
         var cargoes = repository.findCargo(tenantId, order.getId());
         if (cargoes == null || cargoes.isEmpty()) throw new BizException("At least one cargo line is required");
-        for (var cargo : cargoes) {
+        for (int cargoIndex = 0; cargoIndex < cargoes.size(); cargoIndex++) {
+            var cargo = cargoes.get(cargoIndex);
             if (!StringUtils.hasText(cargo.getCargoName()) || !StringUtils.hasText(cargo.getPackageType())
                     || cargo.getPackageCount() == null || cargo.getPackageCount() < 1
                     || cargo.getGrossWeightKg() == null || cargo.getGrossWeightKg().signum() <= 0
@@ -304,6 +311,7 @@ public class OrderApplicationService {
                 throw new BizException(ResultCode.VALIDATION_FAILED,
                     "提交订单前必须完善货物品名、包装类型、箱数、毛重和体积");
             }
+            validatePersistedCargoQuantity(cargo, cargoIndex, true);
             if (Boolean.TRUE.equals(cargo.getWoodenProduct()) && !Boolean.TRUE.equals(order.getCustomsInspection())) {
                 throw new BizException(ResultCode.VALIDATION_FAILED, "木制品必须选择商检");
             }
@@ -343,6 +351,7 @@ public class OrderApplicationService {
             throw new BizException(ResultCode.VALIDATION_FAILED, "私人目的仓必须选择客户地址");
         }
         validateWoodInspection(request);
+        validateRequestCargoQuantities(request.cargoes(), true);
         for (var cargo : request.cargoes()) {
             if (!StringUtils.hasText(cargo.cargoName()) || !StringUtils.hasText(cargo.packageType())
                     || cargo.packageCount() < 1 || cargo.grossWeightKg() == null
@@ -352,6 +361,7 @@ public class OrderApplicationService {
                     "提交订单前必须完善货物品名、包装类型、箱数、毛重和体积");
             }
         }
+        validateMixedCartons(request);
         if ("FBA".equals(request.destinationType())) {
             if (!StringUtils.hasText(request.amazonWarehouseCode()) || !StringUtils.hasText(request.shipmentId())
                     || !StringUtils.hasText(request.referenceId())) {
@@ -368,6 +378,36 @@ public class OrderApplicationService {
         }
     }
 
+    private void validateRequestCargoQuantities(List<OrderRequests.Cargo> cargoes, boolean required) {
+        for (int index = 0; index < cargoes.size(); index++) {
+            OrderRequests.Cargo cargo = cargoes.get(index);
+            Integer unitsPerPackage = cargo.unitsPerPackage();
+            Integer totalQuantity = cargo.totalQuantity();
+            if (unitsPerPackage == null && totalQuantity == null && !required) continue;
+            validateCargoQuantity(unitsPerPackage, cargo.packageCount(), totalQuantity, index, required);
+        }
+    }
+
+    private void validatePersistedCargoQuantity(OrderCargoEntity cargo, int index, boolean required) {
+        validateCargoQuantity(cargo.getUnitsPerPackage(), cargo.getPackageCount(), cargo.getTotalQuantity(), index, required);
+    }
+
+    private void validateCargoQuantity(Integer unitsPerPackage, Integer packageCount, Integer totalQuantity,
+                                       int index, boolean required) {
+        if (unitsPerPackage == null || packageCount == null || totalQuantity == null) {
+            if (required || unitsPerPackage != null || totalQuantity != null) {
+                throw new BizException(ResultCode.VALIDATION_FAILED,
+                    "第 " + (index + 1) + " 条货物必须填写每箱数量、箱数和总数量");
+            }
+            return;
+        }
+        long expected = (long) unitsPerPackage * packageCount;
+        if (totalQuantity.longValue() != expected) {
+            throw new BizException(ResultCode.VALIDATION_FAILED,
+                "第 " + (index + 1) + " 条货物总数量应等于每箱数量 × 箱数（" + expected + "）");
+        }
+    }
+
     private boolean hasParty(List<OrderPartyEntity> parties, String partyType) {
         return parties != null && parties.stream()
             .anyMatch(party -> party != null && partyType.equals(party.getPartyType()));
@@ -601,6 +641,7 @@ public class OrderApplicationService {
             item.setReferenceId(cargo.referenceId());
             item.setProductImageFileId(cargo.productImageFileId());
             item.setWoodenProduct(cargo.woodenProduct());
+            item.setPackingGroupNo(normalize(cargo.packingGroupNo()));
             item.setCreatedBy(userId); item.setUpdatedBy(userId); repository.insertCargo(item);
         }
         if (addresses.sender() != null) saveParty(tenantId, userId, orderId, "SENDER", addresses.sender());
@@ -706,8 +747,7 @@ public class OrderApplicationService {
             order.getFulfillmentType() == null ? "STANDARD" : order.getFulfillmentType(), order.getLxCode());
     }
     private void prepareDraftInbound(OrderEntity order, OrderRequests.SaveRequest request) {
-        int packageCount = request.cargoes().stream().map(OrderRequests.Cargo::packageCount)
-            .filter(java.util.Objects::nonNull).mapToInt(Integer::intValue).sum();
+        int packageCount = physicalPackageCountFromRequests(request.cargoes(), request.fulfillmentType());
         prepareSubmittedInbound(order, packageCount);
     }
 
@@ -716,11 +756,7 @@ public class OrderApplicationService {
      * 订单审核仍由 Order 独立控制，Firstleg 不得据此推进测量审核或后续履约。
      */
     private void prepareSubmittedInbound(OrderEntity order) {
-        long total = repository.findCargo(order.getTenantId(), order.getId()).stream()
-            .map(OrderCargoEntity::getPackageCount)
-            .filter(java.util.Objects::nonNull)
-            .mapToLong(Integer::longValue)
-            .sum();
+        long total = physicalPackageCountFromEntities(repository.findCargo(order.getTenantId(), order.getId()), order.getFulfillmentType());
         prepareSubmittedInbound(order, total > 0 && total <= 1_000_000 ? (int) total : null);
     }
 
@@ -745,16 +781,56 @@ public class OrderApplicationService {
         }
     }
     private int totalPackageCount(OrderEntity order) {
-        long total = repository.findCargo(order.getTenantId(), order.getId()).stream()
-            .map(com.baiyue.order.entity.OrderCargoEntity::getPackageCount)
-            .filter(java.util.Objects::nonNull)
-            .mapToLong(Integer::longValue)
-            .sum();
+        long total = physicalPackageCountFromEntities(repository.findCargo(order.getTenantId(), order.getId()), order.getFulfillmentType());
         if (total < 1 || total > 1_000_000) {
             throw new BizException("订单货物总箱数必须为1至1000000箱");
         }
         return (int) total;
     }
+    private void validateMixedCartons(OrderRequests.SaveRequest request) {
+        if (!"ONE_CLICK_DROPSHIP".equals(request.fulfillmentType())) return;
+        Map<String, OrderRequests.Cargo> firstByGroup = new LinkedHashMap<>();
+        for (OrderRequests.Cargo cargo : request.cargoes()) {
+            String group = normalize(cargo.packingGroupNo());
+            if (group == null) continue;
+            OrderRequests.Cargo first = firstByGroup.putIfAbsent(group, cargo);
+            if (first != null && (first.packageCount() != cargo.packageCount()
+                || !Objects.equals(first.packageType(), cargo.packageType())
+                || !sameDecimal(first.lengthCm(), cargo.lengthCm())
+                || !sameDecimal(first.widthCm(), cargo.widthCm())
+                || !sameDecimal(first.heightCm(), cargo.heightCm())
+                || !sameDecimal(first.grossWeightKg(), cargo.grossWeightKg())
+                || !sameDecimal(first.netWeightKg(), cargo.netWeightKg())
+                || !sameDecimal(first.volumeCbm(), cargo.volumeCbm()))) {
+                throw new BizException(ResultCode.VALIDATION_FAILED,
+                    "同箱 SKU 的箱数、包装类型、箱规、重量和体积必须一致");
+            }
+        }
+    }
+    private static int physicalPackageCountFromRequests(List<OrderRequests.Cargo> cargoes, String fulfillmentType) {
+        Set<String> countedGroups = new HashSet<>();
+        return cargoes.stream().filter(Objects::nonNull).mapToInt(cargo -> {
+            String group = normalize(cargo.packingGroupNo());
+            if (!"ONE_CLICK_DROPSHIP".equals(fulfillmentType) || group == null) return cargo.packageCount();
+            return countedGroups.add(group) ? cargo.packageCount() : 0;
+        }).sum();
+    }
+    private static int physicalPackageCountFromEntities(List<OrderCargoEntity> cargoes, String fulfillmentType) {
+        Set<String> countedGroups = new HashSet<>();
+        return cargoes.stream().filter(Objects::nonNull).mapToInt(cargo -> {
+            String group = normalize(cargo.getPackingGroupNo());
+            if (!"ONE_CLICK_DROPSHIP".equals(fulfillmentType) || group == null) {
+                return cargo.getPackageCount() == null ? 0 : cargo.getPackageCount();
+            }
+            return countedGroups.add(group) && cargo.getPackageCount() != null ? cargo.getPackageCount() : 0;
+        }).sum();
+    }
+    private static boolean sameDecimal(java.math.BigDecimal left, java.math.BigDecimal right) {
+        return left == null ? right == null : right != null && left.compareTo(right) == 0;
+    }
+    private static String normalize(String value) {
+        return StringUtils.hasText(value) ? value.trim() : null;
+    }
     private String nextNo(long orderId) {
         return "FL" + orderId;
     }
diff --git a/order/src/main/java/com/baiyue/order/service/OrderCargoPackageCounts.java b/order/src/main/java/com/baiyue/order/service/OrderCargoPackageCounts.java
new file mode 100644
index 000000000..df1403a16
--- /dev/null
+++ b/order/src/main/java/com/baiyue/order/service/OrderCargoPackageCounts.java
@@ -0,0 +1,37 @@
+package com.baiyue.order.service;
+
+import com.baiyue.order.entity.OrderCargoEntity;
+import org.springframework.util.StringUtils;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.math.BigDecimal;
+import java.util.function.Function;
+
+/** Calculates physical cartons without double-counting SKU lines in a mixed-carton group. */
+public final class OrderCargoPackageCounts {
+    private OrderCargoPackageCounts() {}
+
+    public static int physical(List<OrderCargoEntity> cargoes, String fulfillmentType) {
+        Set<String> countedGroups = new HashSet<>();
+        return cargoes.stream().filter(Objects::nonNull).mapToInt(cargo -> {
+            int count = cargo.getPackageCount() == null ? 0 : cargo.getPackageCount();
+            String group = StringUtils.hasText(cargo.getPackingGroupNo()) ? cargo.getPackingGroupNo().trim() : null;
+            if (!"ONE_CLICK_DROPSHIP".equals(fulfillmentType) || group == null) return count;
+            return countedGroups.add(group) ? count : 0;
+        }).sum();
+    }
+
+    /** Sums a physical-carton metric once per same-carton group. */
+    public static BigDecimal physicalMetric(List<OrderCargoEntity> cargoes, String fulfillmentType,
+                                            Function<OrderCargoEntity, BigDecimal> getter) {
+        Set<String> countedGroups = new HashSet<>();
+        List<BigDecimal> values = cargoes.stream().filter(Objects::nonNull).filter(cargo -> {
+            String group = StringUtils.hasText(cargo.getPackingGroupNo()) ? cargo.getPackingGroupNo().trim() : null;
+            return !"ONE_CLICK_DROPSHIP".equals(fulfillmentType) || group == null || countedGroups.add(group);
+        }).map(getter).filter(Objects::nonNull).toList();
+        return values.isEmpty() ? null : values.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
+}
diff --git a/order/src/main/java/com/baiyue/order/service/OrderEligibilityGuard.java b/order/src/main/java/com/baiyue/order/service/OrderEligibilityGuard.java
index 5673a42d5..7c26b148a 100644
--- a/order/src/main/java/com/baiyue/order/service/OrderEligibilityGuard.java
+++ b/order/src/main/java/com/baiyue/order/service/OrderEligibilityGuard.java
@@ -3,14 +3,18 @@ package com.baiyue.order.service;
 import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.order.client.TenantEligibilityClient;
+import com.baiyue.order.client.FinanceWalletClient;
 import feign.FeignException;
 import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+
 @Service
 public class OrderEligibilityGuard {
     @Resource private TenantEligibilityClient client;
+    @Resource private FinanceWalletClient financeWalletClient;
     @Value("${baiyue.security.internal-service-token}") private String internalToken;
 
     public void requireApproved(long tenantId) {
@@ -32,6 +36,7 @@ public class OrderEligibilityGuard {
                 throw new BizException(ResultCode.FORBIDDEN,
                         response.data().reason() == null ? "Enterprise review approval is required" : response.data().reason());
             }
+            requireNonNegativeActualBalance(tenantId);
         } catch (FeignException exception) {
             throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "IAM eligibility service is unavailable");
         } catch (BizException exception) {
@@ -41,4 +46,23 @@ public class OrderEligibilityGuard {
             throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "IAM 下单资格响应无效");
         }
     }
+
+    private void requireNonNegativeActualBalance(long tenantId) {
+        try {
+            var response = financeWalletClient.account(internalToken, tenantId);
+            if (response == null || !response.successful() || response.data() == null
+                || response.data().actualBalance() == null) {
+                throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "Unable to verify customer account balance");
+            }
+            if (response.data().actualBalance().compareTo(BigDecimal.ZERO) < 0) {
+                throw new BizException(ResultCode.FORBIDDEN, "账户实际余额为负，请充值后再下单");
+            }
+        } catch (FeignException exception) {
+            throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "Finance account service is unavailable");
+        } catch (BizException exception) {
+            throw exception;
+        } catch (RuntimeException exception) {
+            throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "Finance account response is invalid");
+        }
+    }
 }
diff --git a/order/src/main/java/com/baiyue/order/service/OrderInboundOutboxPublisher.java b/order/src/main/java/com/baiyue/order/service/OrderInboundOutboxPublisher.java
index 67caa0a69..37cd57cbf 100644
--- a/order/src/main/java/com/baiyue/order/service/OrderInboundOutboxPublisher.java
+++ b/order/src/main/java/com/baiyue/order/service/OrderInboundOutboxPublisher.java
@@ -141,12 +141,9 @@ public class OrderInboundOutboxPublisher {
     }
 
     private int totalPackageCount(com.baiyue.order.entity.OrderEntity order) {
-        long total = repository.findCargo(order.getTenantId(), order.getId()).stream()
-            .map(com.baiyue.order.entity.OrderCargoEntity::getPackageCount)
-            .filter(java.util.Objects::nonNull)
-            .mapToLong(Integer::longValue)
-            .sum();
-        return total > 0 && total <= 1_000_000 ? (int) total : 0;
+        int total = OrderCargoPackageCounts.physical(
+            repository.findCargo(order.getTenantId(), order.getId()), order.getFulfillmentType());
+        return total > 0 && total <= 1_000_000 ? total : 0;
     }
 
     private void failPermanently(OutboxEventEntity event, String reason) {
diff --git a/order/src/main/java/com/baiyue/order/service/PrintableInboundSnapshotService.java b/order/src/main/java/com/baiyue/order/service/PrintableInboundSnapshotService.java
index a789cf392..aedad4660 100644
--- a/order/src/main/java/com/baiyue/order/service/PrintableInboundSnapshotService.java
+++ b/order/src/main/java/com/baiyue/order/service/PrintableInboundSnapshotService.java
@@ -48,9 +48,8 @@ public class PrintableInboundSnapshotService {
                 }
             }
         }
-        int packageCount = orders.findCargoInheritedByOrder(tenantId, orderId).stream()
-            .map(OrderCargoEntity::getPackageCount).filter(java.util.Objects::nonNull)
-            .mapToInt(Integer::intValue).sum();
+        int packageCount = OrderCargoPackageCounts.physical(
+            orders.findCargoInheritedByOrder(tenantId, orderId), order.getFulfillmentType());
         return OrderApplicationService.inboundCommand(order, packageCount);
     }
 
diff --git a/order/src/main/java/com/baiyue/order/service/UnifiedOrderQueryService.java b/order/src/main/java/com/baiyue/order/service/UnifiedOrderQueryService.java
index 599cdb311..4aa72693c 100644
--- a/order/src/main/java/com/baiyue/order/service/UnifiedOrderQueryService.java
+++ b/order/src/main/java/com/baiyue/order/service/UnifiedOrderQueryService.java
@@ -67,7 +67,7 @@ public class UnifiedOrderQueryService {
         List<Long> orderIds = selected.stream().map(OrderEntity::getId).toList();
         Map<Long, FirstlegUnifiedOrderClient.Summary> inboundByOrder = summaries(null, orderIds);
         Map<Long, String> latestNotes = latestNotes(null, orderIds);
-        Map<Long, CargoSummary> cargoSummaries = cargoSummaries(null, orderIds);
+        Map<Long, CargoSummary> cargoSummaries = cargoSummaries(null, selected);
         Map<Long, Integer> childCounts = childCounts(selected);
         return selected.stream().map(order -> row(order, inboundByOrder.get(order.getId()),
             latestNotes.get(order.getId()), childCounts, cargoSummaries.get(order.getId()), null)).toList();
@@ -90,8 +90,7 @@ public class UnifiedOrderQueryService {
             ? optionalSummaries(tenantId, sourceOrderIds)
             : summaries(tenantId, sourceOrderIds);
         Map<Long, String> latestNotes = latestNotes(tenantId, source.records().stream().map(OrderEntity::getId).toList());
-        Map<Long, CargoSummary> cargoSummaries = cargoSummaries(tenantId,
-            source.records().stream().map(OrderEntity::getId).toList());
+        Map<Long, CargoSummary> cargoSummaries = cargoSummaries(tenantId, source.records());
         Map<Long, Integer> childCounts = childCounts(source.records());
         Map<Long, UnifiedOrderResponse.CoLoadGroupSummary> coLoadByOrder = coLoadGroups(
             source.records().stream().map(OrderEntity::getId).toList(), includeCoLoadGroups);
@@ -130,7 +129,7 @@ public class UnifiedOrderQueryService {
                 .findFirst()
                 .orElse(null));
         UnifiedOrderResponse.Row summary = row(order, inbound == null ? null : inbound.summary(), latestNote,
-            childCounts(List.of(order)), CargoSummary.from(orderDetail.cargoes()), creatorName,
+            childCounts(List.of(order)), CargoSummary.from(orderDetail.cargoes(), order.getFulfillmentType()), creatorName,
             coLoadGroups(List.of(orderId), includeCoLoadGroups).get(orderId));
         List<UnifiedOrderResponse.TimelineEvent> timeline = new ArrayList<>();
         orderDetail.statusHistory().forEach(item -> timeline.add(new UnifiedOrderResponse.TimelineEvent(
@@ -168,7 +167,7 @@ public class UnifiedOrderQueryService {
         Map<Long, OrderEntity> orderById = orders.findByIds(tenantId, orderIds).stream()
             .collect(Collectors.toMap(OrderEntity::getId, Function.identity(), (left, right) -> left));
         Map<Long, String> latestNotes = latestNotes(tenantId, orderIds);
-        Map<Long, CargoSummary> cargoSummaries = cargoSummaries(tenantId, orderIds);
+        Map<Long, CargoSummary> cargoSummaries = cargoSummaries(tenantId, List.copyOf(orderById.values()));
         Map<Long, Integer> childCounts = childCounts(List.copyOf(orderById.values()));
         Map<Long, UnifiedOrderResponse.CoLoadGroupSummary> coLoadByOrder = coLoadGroups(
             orderIds, includeCoLoadGroups);
@@ -239,11 +238,15 @@ public class UnifiedOrderQueryService {
             OrderInternalNoteEntity::getOrderId, OrderInternalNoteEntity::getContent, (latest, ignored) -> latest));
     }
 
-    private Map<Long, CargoSummary> cargoSummaries(Long tenantId, List<Long> orderIds) {
-        if (orderIds.isEmpty()) return Map.of();
+    private Map<Long, CargoSummary> cargoSummaries(Long tenantId, List<OrderEntity> pageOrders) {
+        if (pageOrders.isEmpty()) return Map.of();
+        List<Long> orderIds = pageOrders.stream().map(OrderEntity::getId).toList();
+        Map<Long, String> fulfillmentTypes = new HashMap<>();
+        pageOrders.forEach(order -> fulfillmentTypes.put(order.getId(), order.getFulfillmentType()));
         return orders.findCargoByOrderIds(tenantId, orderIds).stream()
-            .collect(Collectors.groupingBy(OrderCargoEntity::getOrderId,
-                Collectors.collectingAndThen(Collectors.toList(), CargoSummary::from)));
+            .collect(Collectors.groupingBy(OrderCargoEntity::getOrderId)).entrySet().stream()
+            .collect(Collectors.toMap(Map.Entry::getKey,
+                entry -> CargoSummary.from(entry.getValue(), fulfillmentTypes.get(entry.getKey()))));
     }
 
     private Map<Long, Integer> childCounts(List<OrderEntity> pageOrders) {
@@ -492,7 +495,7 @@ public class UnifiedOrderQueryService {
     private record CargoSummary(List<String> skuNos, List<String> shipmentIds, List<String> referenceIds,
                                 Integer totalQuantity, Integer totalPackageCount, BigDecimal grossWeightKg,
                                 BigDecimal netWeightKg, BigDecimal volumeCbm) {
-        private static CargoSummary from(List<OrderCargoEntity> cargoes) {
+        private static CargoSummary from(List<OrderCargoEntity> cargoes, String fulfillmentType) {
             List<String> skuNos = cargoes.stream().map(OrderCargoEntity::getSkuNo)
                 .filter(Objects::nonNull).map(String::trim).filter(value -> !value.isEmpty()).distinct().toList();
             List<String> shipmentIds = cargoes.stream().map(OrderCargoEntity::getShipmentId)
@@ -501,13 +504,16 @@ public class UnifiedOrderQueryService {
                 .filter(StringUtils::hasText).map(String::trim).distinct().toList();
             int totalQuantity = cargoes.stream().map(OrderCargoEntity::getTotalQuantity)
                 .filter(Objects::nonNull).mapToInt(Integer::intValue).sum();
-            List<Integer> packageCounts = cargoes.stream().map(OrderCargoEntity::getPackageCount)
-                .filter(Objects::nonNull).toList();
-            Integer totalPackageCount = packageCounts.isEmpty() ? null
-                : Math.toIntExact(packageCounts.stream().mapToLong(Integer::longValue).sum());
-            BigDecimal grossWeightKg = sum(cargoes, OrderCargoEntity::getGrossWeightKg);
-            BigDecimal netWeightKg = sum(cargoes, OrderCargoEntity::getNetWeightKg);
-            BigDecimal volumeCbm = sum(cargoes, OrderCargoEntity::getVolumeCbm);
+            boolean hasPackageCount = cargoes.stream().anyMatch(cargo -> cargo.getPackageCount() != null);
+            Integer totalPackageCount = hasPackageCount
+                ? OrderCargoPackageCounts.physical(cargoes, fulfillmentType)
+                : null;
+            BigDecimal grossWeightKg = OrderCargoPackageCounts.physicalMetric(
+                cargoes, fulfillmentType, OrderCargoEntity::getGrossWeightKg);
+            BigDecimal netWeightKg = OrderCargoPackageCounts.physicalMetric(
+                cargoes, fulfillmentType, OrderCargoEntity::getNetWeightKg);
+            BigDecimal volumeCbm = OrderCargoPackageCounts.physicalMetric(
+                cargoes, fulfillmentType, OrderCargoEntity::getVolumeCbm);
             return new CargoSummary(skuNos, shipmentIds, referenceIds, totalQuantity, totalPackageCount,
                 grossWeightKg, netWeightKg, volumeCbm);
         }
@@ -517,6 +523,7 @@ public class UnifiedOrderQueryService {
             List<BigDecimal> values = cargoes.stream().map(value).filter(Objects::nonNull).toList();
             return values.isEmpty() ? null : values.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
         }
+
     }
     private String inboundMainStatus(String status) {
         if (status == null) return null;
diff --git a/order/src/main/resources/db/order.sql b/order/src/main/resources/db/order.sql
index d4574aaeb..7c3d24e80 100644
--- a/order/src/main/resources/db/order.sql
+++ b/order/src/main/resources/db/order.sql
@@ -304,6 +304,7 @@ CREATE TABLE IF NOT EXISTS ord_order_cargo (
   reference_id VARCHAR(64) NULL COMMENT '货物级 Amazon Reference ID',
   product_image_file_id BIGINT UNSIGNED NULL COMMENT '文件中心产品图片逻辑ID',
   wooden_product TINYINT(1) NOT NULL DEFAULT 0 COMMENT '木制品权威判定快照；1时订单必须商检',
+  packing_group_no VARCHAR(32) NULL COMMENT '混箱组合号；同组货物行共享同一批物理箱',
   created_by BIGINT UNSIGNED NOT NULL COMMENT '创建人ID',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   updated_by BIGINT UNSIGNED NOT NULL COMMENT '最后修改人ID',
diff --git a/order/src/main/resources/db/phase1-order-extension.sql b/order/src/main/resources/db/phase1-order-extension.sql
index 00dd9e56b..d6957530c 100644
--- a/order/src/main/resources/db/phase1-order-extension.sql
+++ b/order/src/main/resources/db/phase1-order-extension.sql
@@ -60,6 +60,7 @@ CALL phase1_add_column('ord_order_cargo', 'product_height_cm', "DECIMAL(12,2) NU
 CALL phase1_add_column('ord_order_cargo', 'shipment_id', "VARCHAR(64) NULL COMMENT '本货物明细对应的Amazon Shipment ID'");
 CALL phase1_add_column('ord_order_cargo', 'reference_id', "VARCHAR(64) NULL COMMENT '本货物明细对应的Amazon Reference ID'");
 CALL phase1_add_column('ord_order_cargo', 'product_image_file_id', "BIGINT UNSIGNED NULL COMMENT 'File服务中的产品图片逻辑文件ID'");
+CALL phase1_add_column('ord_order_cargo', 'packing_group_no', "VARCHAR(32) NULL COMMENT '混箱组合号；同组货物行共享同一批物理箱'");
 
 -- 货物级字段上线前，FBA 编号只保存在主单；回填后提交校验可统一按每条货物执行。
 UPDATE ord_order_cargo cargo
diff --git a/order/src/main/resources/openapi/order-v1.yaml b/order/src/main/resources/openapi/order-v1.yaml
index 787828a1c..ad2f90bfa 100644
--- a/order/src/main/resources/openapi/order-v1.yaml
+++ b/order/src/main/resources/openapi/order-v1.yaml
@@ -477,6 +477,7 @@ paths:
   /api/merchant/v1/orders/first-leg/{id}/submit:
     post:
       summary: 提交订单
+      description: 每条货物的每箱数量、箱数和总数量均必填，且总数量必须等于每箱数量 × 箱数。
       parameters:
         - $ref: '#/components/parameters/OrderId'
         - $ref: '#/components/parameters/IdempotencyKey'
@@ -581,6 +582,7 @@ paths:
   /api/platform/v1/orders/first-leg/{id}/submit:
     post:
       summary: 平台代客提交指定订单
+      description: 每条货物的每箱数量、箱数和总数量均必填，且总数量必须等于每箱数量 × 箱数。
       parameters:
         - $ref: '#/components/parameters/OrderId'
         - $ref: '#/components/parameters/TenantId'
@@ -1258,11 +1260,12 @@ components:
         lengthCm: {type: number, minimum: 0, description: 箱规长（厘米）}
         widthCm: {type: number, minimum: 0, description: 箱规宽（厘米）}
         heightCm: {type: number, minimum: 0, description: 箱规高（厘米）}
-        unitsPerPackage: {type: integer, minimum: 1, description: 每箱数量}
+        unitsPerPackage: {type: integer, minimum: 1, description: 每箱数量；提交时必填}
         packageCount: {type: integer, minimum: 1, description: 箱数}
+        packingGroupNo: {type: string, maxLength: 32, description: 一件代发同箱关联键，由客户端在添加同箱 SKU 时生成；同组货物行共享物理箱，箱数、包装类型、箱规、重量和体积必须一致且汇总时只计算一次}
         grossWeightKg: {type: number, exclusiveMinimum: true, minimum: 0, description: 总毛重}
         volumeCbm: {type: number, exclusiveMinimum: true, minimum: 0, description: 总体积}
-        totalQuantity: {type: integer, minimum: 1, description: 总数量}
+        totalQuantity: {type: integer, minimum: 1, description: 总数量；提交时必填且必须等于每箱数量 × 箱数}
         netWeightKg: {type: number, exclusiveMinimum: true, minimum: 0, description: 总净重}
         unitDeclaredValue: {type: number, minimum: 0, description: 清关申报单价（USD）}
         declaredValue: {type: number, minimum: 0, description: 清关申报金额（USD）}
@@ -1282,7 +1285,7 @@ components:
         woodenProduct: {type: boolean, description: 木制品权威判定快照；为 true 时订单 customsInspection 必须为 true}
       description: >-
         原型货物明细字段。FBA 货物的 skuNo、upcNo、shipmentId、referenceId 由服务端按每条货物校验；
-        productImageFileId 必须属于当前登录客户。
+        productImageFileId 必须属于当前登录客户。一件代发中，相同 packingGroupNo 的多条 SKU 行属于同一批物理箱，物理箱数只计算一次。
     FirstLegOrderSummary:
       type: object
       properties:
diff --git a/order/src/test/java/com/baiyue/order/controller/MerchantBatchDraftOpenApiContractTest.java b/order/src/test/java/com/baiyue/order/controller/MerchantBatchDraftOpenApiContractTest.java
index e685ef60d..0b7954d81 100644
--- a/order/src/test/java/com/baiyue/order/controller/MerchantBatchDraftOpenApiContractTest.java
+++ b/order/src/test/java/com/baiyue/order/controller/MerchantBatchDraftOpenApiContractTest.java
@@ -52,6 +52,8 @@ class MerchantBatchDraftOpenApiContractTest {
         assertThat(openapi)
             .contains("/api/merchant/v1/orders/first-leg:")
             .contains("/api/merchant/v1/orders/first-leg/{id}/submit:")
+            .contains("总数量必须等于每箱数量 × 箱数")
+            .contains("总数量；提交时必填且必须等于每箱数量 × 箱数")
             .contains("$ref: '#/components/schemas/FirstLegOrderDraft'");
     }
 }
diff --git a/order/src/test/java/com/baiyue/order/service/OrderApplicationServiceStateTest.java b/order/src/test/java/com/baiyue/order/service/OrderApplicationServiceStateTest.java
index 98f67b1e7..bf6ea159b 100644
--- a/order/src/test/java/com/baiyue/order/service/OrderApplicationServiceStateTest.java
+++ b/order/src/test/java/com/baiyue/order/service/OrderApplicationServiceStateTest.java
@@ -103,6 +103,21 @@ class OrderApplicationServiceStateTest {
                 && "自动化联调测试，请勿实际出货".equals(saved.getCargoRemark())));
     }
 
+    @Test
+    void creatingDraftRejectsMismatchedCargoTotalQuantity() {
+        OrderRepository repository = mock(OrderRepository.class);
+        OrderRequests.SaveRequest request = requestWithCargoQuantities(5, 24, 119);
+
+        assertThatThrownBy(() -> service(repository, mock(OrderEligibilityGuard.class), mock(OrderMasterDataGuard.class))
+            .createDraft(10001L, 2L, request, "mismatched-quantity-on-create"))
+            .isInstanceOf(BizException.class)
+            .hasMessage("第 1 条货物总数量应等于每箱数量 × 箱数（120）")
+            .extracting(exception -> ((BizException) exception).getResultCode())
+            .isEqualTo(ResultCode.VALIDATION_FAILED);
+
+        verify(repository, never()).insertOrder(any());
+    }
+
     @Test
     void creatingDraftValidatesCurrentPriceBookChannelBeforePersistence() {
         OrderRepository repository = mock(OrderRepository.class);
@@ -194,6 +209,22 @@ class OrderApplicationServiceStateTest {
         ordered.verify(repository).saveOrder(10001L, order);
     }
 
+    @Test
+    void updatingDraftRejectsMismatchedCargoTotalQuantity() {
+        OrderRepository repository = mock(OrderRepository.class);
+        OrderEntity order = persistedOrder(OrderStatus.DRAFT);
+        when(repository.findOwned(10001L, 1L)).thenReturn(order);
+
+        assertThatThrownBy(() -> service(repository, mock(OrderEligibilityGuard.class), mock(OrderMasterDataGuard.class))
+            .updateDraft(10001L, 2L, 1L, requestWithCargoQuantities(5, 24, 119)))
+            .isInstanceOf(BizException.class)
+            .hasMessage("第 1 条货物总数量应等于每箱数量 × 箱数（120）")
+            .extracting(exception -> ((BizException) exception).getResultCode())
+            .isEqualTo(ResultCode.VALIDATION_FAILED);
+
+        verify(repository, never()).saveOrder(anyLong(), any());
+    }
+
     @Test
     void platformCanEditSubmittedOrderWithoutRollingBackReviewStatus() {
         OrderRepository repository = mock(OrderRepository.class);
@@ -584,6 +615,8 @@ class OrderApplicationServiceStateTest {
         cargo.setPackageCount(1);
         cargo.setGrossWeightKg(BigDecimal.ONE);
         cargo.setVolumeCbm(BigDecimal.ONE);
+        cargo.setUnitsPerPackage(1);
+        cargo.setTotalQuantity(1);
         when(repository.findOwned(20002L, 1L)).thenReturn(order);
         when(repository.findCargo(20002L, 1L)).thenReturn(List.of(cargo));
         when(repository.findParties(20002L, 1L)).thenReturn(List.of());
@@ -617,6 +650,27 @@ class OrderApplicationServiceStateTest {
         verify(repository, never()).saveOrder(anyLong(), any());
     }
 
+    @Test
+    void submittingDraftRejectsPersistedMismatchedCargoTotalQuantity() {
+        OrderRepository repository = mock(OrderRepository.class);
+        OrderEntity order = persistedDraft("SELF_EXPRESS", "OVERSEAS");
+        OrderCargoEntity cargo = completeCargo();
+        cargo.setPackageCount(5);
+        cargo.setUnitsPerPackage(24);
+        cargo.setTotalQuantity(119);
+        when(repository.findOwned(20002L, 1L)).thenReturn(order);
+        when(repository.findCargo(20002L, 1L)).thenReturn(List.of(cargo));
+
+        assertThatThrownBy(() -> service(repository, mock(OrderEligibilityGuard.class), mock(OrderMasterDataGuard.class))
+            .transit(20002L, 2L, "u", 1L, OrderStatus.SUBMITTED, null))
+            .isInstanceOf(BizException.class)
+            .hasMessage("第 1 条货物总数量应等于每箱数量 × 箱数（120）")
+            .extracting(exception -> ((BizException) exception).getResultCode())
+            .isEqualTo(ResultCode.VALIDATION_FAILED);
+
+        verify(repository, never()).saveOrder(anyLong(), any());
+    }
+
     @Test
     void updatingAnotherCustomersOrderStopsBeforePersistence() {
         OrderRepository repository = mock(OrderRepository.class);
@@ -672,7 +726,7 @@ class OrderApplicationServiceStateTest {
         var cargo = new OrderRequests.Cargo(
             "货物", null, "CARTON", 1, BigDecimal.ONE, BigDecimal.ONE,
             null, null, null, null, null, false, null, null, null, null,
-            null, null, null, null, null, null, null, null, null,
+            null, 1, 1, null, null, null, null, null, null,
             null, null, null, null, null, null);
         return new OrderRequests.SaveRequest(
             7L, "客户", "SEA", null, "US", null, "目的仓", null, null,
@@ -699,7 +753,7 @@ class OrderApplicationServiceStateTest {
         var cargo = new OrderRequests.Cargo(
             "货物", null, "CARTON", 1, BigDecimal.ONE, BigDecimal.ONE,
             null, null, null, null, null, false, null, null, null, null,
-            null, null, null, null, null, null, null, null, null,
+            null, 1, 1, null, null, null, null, null, null,
             null, null, null, null, null, null);
         return new OrderRequests.SaveRequest(
             customerId, "当前企业", "SEA", null, "US", null, "目的仓", null, null,
@@ -722,6 +776,25 @@ class OrderApplicationServiceStateTest {
             amazonWarehouseCode, shipmentId, referenceId);
     }
 
+    private OrderRequests.SaveRequest requestWithCargoQuantities(int packageCount, Integer unitsPerPackage,
+                                                                  Integer totalQuantity) {
+        OrderRequests.SaveRequest source = request();
+        var cargo = new OrderRequests.Cargo(
+            "货物", null, "CARTON", packageCount, BigDecimal.ONE, BigDecimal.ONE,
+            null, null, null, null, null, false, null, null, null, null,
+            null, unitsPerPackage, totalQuantity, null, null, null, null, null, null,
+            null, null, null, null, null, null);
+        return new OrderRequests.SaveRequest(
+            source.customerId(), source.customerName(), source.transportMode(), source.tradeTerm(),
+            source.destinationCountryCode(), source.destinationWarehouseId(), source.destinationWarehouseName(),
+            source.expectedShipDate(), source.customerRemark(), source.sender(), source.receiver(), List.of(cargo),
+            source.pickupMethod(), source.requestedPickupAt(), source.receivingWarehouseId(),
+            source.receivingWarehouseName(), source.channelCode(), source.channelName(), source.carrierId(),
+            source.carrierName(), source.taxMode(), source.pricingTaxMode(), source.containerMode(),
+            source.customsInspection(), source.destinationType(), source.amazonWarehouseCode(), source.shipmentId(),
+            source.referenceId());
+    }
+
     private OrderMasterDataGuard.Snapshots snapshots() {
         return snapshots(null);
     }
@@ -758,6 +831,8 @@ class OrderApplicationServiceStateTest {
         cargo.setPackageCount(1);
         cargo.setGrossWeightKg(BigDecimal.ONE);
         cargo.setVolumeCbm(BigDecimal.ONE);
+        cargo.setUnitsPerPackage(1);
+        cargo.setTotalQuantity(1);
         return cargo;
     }
 
diff --git a/order/src/test/java/com/baiyue/order/service/OrderCargoPackageCountsTest.java b/order/src/test/java/com/baiyue/order/service/OrderCargoPackageCountsTest.java
new file mode 100644
index 000000000..4226fca70
--- /dev/null
+++ b/order/src/test/java/com/baiyue/order/service/OrderCargoPackageCountsTest.java
@@ -0,0 +1,40 @@
+package com.baiyue.order.service;
+
+import com.baiyue.order.entity.OrderCargoEntity;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.math.BigDecimal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class OrderCargoPackageCountsTest {
+    @Test
+    void sameMixedCartonGroupCountsPhysicalCartonsOnce() {
+        OrderCargoEntity skuA = cargo(10, "A");
+        OrderCargoEntity skuB = cargo(10, "A");
+        OrderCargoEntity separate = cargo(4, null);
+
+        assertThat(OrderCargoPackageCounts.physical(
+            List.of(skuA, skuB, separate), "ONE_CLICK_DROPSHIP")).isEqualTo(14);
+        assertThat(OrderCargoPackageCounts.physical(
+            List.of(skuA, skuB, separate), "STANDARD")).isEqualTo(24);
+
+        skuA.setGrossWeightKg(new BigDecimal("12.5"));
+        skuB.setGrossWeightKg(new BigDecimal("12.5"));
+        separate.setGrossWeightKg(new BigDecimal("3.0"));
+        assertThat(OrderCargoPackageCounts.physicalMetric(
+            List.of(skuA, skuB, separate), "ONE_CLICK_DROPSHIP", OrderCargoEntity::getGrossWeightKg))
+            .isEqualByComparingTo("15.5");
+        assertThat(OrderCargoPackageCounts.physicalMetric(
+            List.of(skuA, skuB, separate), "STANDARD", OrderCargoEntity::getGrossWeightKg))
+            .isEqualByComparingTo("28.0");
+    }
+
+    private OrderCargoEntity cargo(int count, String group) {
+        OrderCargoEntity value = new OrderCargoEntity();
+        value.setPackageCount(count);
+        value.setPackingGroupNo(group);
+        return value;
+    }
+}
diff --git a/order/src/test/java/com/baiyue/order/service/OrderEligibilityGuardTest.java b/order/src/test/java/com/baiyue/order/service/OrderEligibilityGuardTest.java
index cc346b148..f2d1d55be 100644
--- a/order/src/test/java/com/baiyue/order/service/OrderEligibilityGuardTest.java
+++ b/order/src/test/java/com/baiyue/order/service/OrderEligibilityGuardTest.java
@@ -3,11 +3,15 @@ package com.baiyue.order.service;
 import com.baiyue.common.core.api.ApiResponse;
 import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
+import com.baiyue.order.client.FinanceWalletClient;
 import com.baiyue.order.client.TenantEligibilityClient;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -48,4 +52,46 @@ class OrderEligibilityGuardTest {
             .extracting(exception -> ((BizException) exception).getResultCode())
             .isEqualTo(ResultCode.SERVICE_UNAVAILABLE);
     }
+
+    @Test
+    void negativeActualBalanceBlocksNewOrderSubmission() {
+        TenantEligibilityClient client = approvedClient();
+        FinanceWalletClient finance = mock(FinanceWalletClient.class);
+        when(finance.account("internal-token", 10001L)).thenReturn(ApiResponse.success(
+            new FinanceWalletClient.WalletAccount(new BigDecimal("-0.01"), new BigDecimal("99.99"),
+                new BigDecimal("100.00"), new BigDecimal("99.99"), LocalDate.now().plusDays(7), true)));
+        OrderEligibilityGuard guard = guard(client, finance);
+
+        assertThatThrownBy(() -> guard.requireApproved(10001L))
+            .isInstanceOf(BizException.class)
+            .hasMessage("账户实际余额为负，请充值后再下单")
+            .extracting(exception -> ((BizException) exception).getResultCode())
+            .isEqualTo(ResultCode.FORBIDDEN);
+    }
+
+    @Test
+    void zeroActualBalanceAllowsOrderWhileCreditIsActive() {
+        TenantEligibilityClient client = approvedClient();
+        FinanceWalletClient finance = mock(FinanceWalletClient.class);
+        when(finance.account("internal-token", 10001L)).thenReturn(ApiResponse.success(
+            new FinanceWalletClient.WalletAccount(BigDecimal.ZERO, new BigDecimal("100.00"),
+                new BigDecimal("100.00"), new BigDecimal("100.00"), LocalDate.now().plusDays(7), true)));
+
+        guard(client, finance).requireApproved(10001L);
+    }
+
+    private static TenantEligibilityClient approvedClient() {
+        TenantEligibilityClient client = mock(TenantEligibilityClient.class);
+        when(client.check("internal-token", 10001L)).thenReturn(ApiResponse.success(
+            new TenantEligibilityClient.EligibilityResponse(true, "ACTIVE", null)));
+        return client;
+    }
+
+    private static OrderEligibilityGuard guard(TenantEligibilityClient client, FinanceWalletClient finance) {
+        OrderEligibilityGuard guard = new OrderEligibilityGuard();
+        ReflectionTestUtils.setField(guard, "client", client);
+        ReflectionTestUtils.setField(guard, "financeWalletClient", finance);
+        ReflectionTestUtils.setField(guard, "internalToken", "internal-token");
+        return guard;
+    }
 }
diff --git a/order/src/test/java/com/baiyue/order/service/UnifiedOrderQueryServiceTest.java b/order/src/test/java/com/baiyue/order/service/UnifiedOrderQueryServiceTest.java
index 7f90979c8..f502162aa 100644
--- a/order/src/test/java/com/baiyue/order/service/UnifiedOrderQueryServiceTest.java
+++ b/order/src/test/java/com/baiyue/order/service/UnifiedOrderQueryServiceTest.java
@@ -131,6 +131,28 @@ class UnifiedOrderQueryServiceTest {
         verify(orders).findCargoByOrderIds(10001L, List.of(77L));
     }
 
+    @Test
+    void dropshipMixedSkuRowsCountSharedCartonVolumeOnlyOnce() {
+        UnifiedOrderQuery query = query(null);
+        OrderEntity order = order(OrderStatus.APPROVED);
+        order.setFulfillmentType("ONE_CLICK_DROPSHIP");
+        OrderCargoEntity first = new OrderCargoEntity();
+        first.setOrderId(77L); first.setPackageCount(10); first.setPackingGroupNo("PG-1");
+        first.setVolumeCbm(new BigDecimal("0.375"));
+        OrderCargoEntity second = new OrderCargoEntity();
+        second.setOrderId(77L); second.setPackageCount(10); second.setPackingGroupNo("PG-1");
+        second.setVolumeCbm(new BigDecimal("0.375"));
+        when(orders.unifiedPage(eq(10001L), eq(query), any()))
+            .thenReturn(new PageResult<>(List.of(order), 1, 20, 1, 1));
+        when(firstleg.summaries(eq("internal-token"), any())).thenReturn(ApiResponse.success(List.of()));
+        when(orders.findCargoByOrderIds(10001L, List.of(77L))).thenReturn(List.of(first, second));
+
+        assertThat(service.page(10001L, query).records()).singleElement().satisfies(row -> {
+            assertThat(row.totalPackageCount()).isEqualTo(10);
+            assertThat(row.expectedVolumeCbm()).isEqualByComparingTo("0.375");
+        });
+    }
+
     @Test
     void listAggregatesShipmentAndReferenceIdsFromAllCargoLines() {
         UnifiedOrderQuery query = query(null);
diff --git a/print/AGENTS.md b/print/AGENTS.md
index 85608b755..7f87e386e 100644
--- a/print/AGENTS.md
+++ b/print/AGENTS.md
@@ -4,7 +4,7 @@
 
 - 本模块是无数据库的无状态 PDF 渲染服务；调用方传入完整 `labels[]` 或 `documents[]`，模块在内存中生成一次性多页 PDF 并同步返回。
 - 不保存模板、任务、历史或文件，不连接数据库、File 服务或打印机，不反查或修正业务数据。
-- 当前支持 `INBOUND_MARK_V1`（`100mm x 100mm`）、`SEA_FREIGHT_SHIPPING_INSTRUCTION_A4_V1` 和 `BILL_OF_LADING_CONFIRMATION_A4_V1`（均为 `210mm x 297mm`）；新尺寸或布局必须使用新模板编码，不得静默改变既有 V1。
+- 当前支持 `INBOUND_MARK_V1`（`100mm x 100mm`）、`DROPSHIP_PALLET_A4_V1`、`SEA_FREIGHT_SHIPPING_INSTRUCTION_A4_V1` 和 `BILL_OF_LADING_CONFIRMATION_A4_V1`（后三者均为 `210mm x 297mm`）；一件代发托盘模板每托固定一页，展示托盘 Code 128 一维码、最多两行入仓码和最多 34 行完整 SKU 归托信息，不展示作业状态。新尺寸或布局必须使用新模板编码，不得静默改变既有 V1。
 
 ## 快速索引
 
@@ -13,11 +13,11 @@
 | 调用方接入指南 | `README.md` |
 | 应用入口 | `src/main/java/com/baiyue/print/PrintServiceApplication.java` |
 | 健康状态 API | `controller/PrintHealthController.java`（`/api/platform/v1/print/status`） |
-| 内部 PDF API | `controller/InternalPdfController.java`（`/internal/print/v1/pdfs/inbound-marks`、`/internal/print/v1/pdfs/freight-a4-documents`） |
+| 内部 PDF API | `controller/InternalPdfController.java`（`/internal/print/v1/pdfs/inbound-marks`、`/internal/print/v1/pdfs/dropship-pallet-a4-documents`、`/internal/print/v1/pdfs/freight-a4-documents`） |
 | 内部令牌校验 | `controller/InternalServiceTokenGuard.java` |
-| 请求与响应模型 | `dto/InboundMarkPdfDtos.java`、`dto/FreightA4PdfDtos.java` |
-| 固定模板与渲染 | `renderer/InboundMarkV1Renderer.java`、`renderer/FreightA4Renderer.java`、`renderer/PdfQrRenderer.java`、`renderer/PdfUnits.java` |
-| 请求校验与资源保护 | `controller/PrintRequestSizeFilter.java`、`service/InboundMarkPdfService.java`、`service/FreightA4PdfService.java`、`service/PdfGenerationLimiter.java` |
+| 请求与响应模型 | `dto/InboundMarkPdfDtos.java`、`dto/DropshipPalletA4PdfDtos.java`、`dto/FreightA4PdfDtos.java`、`dto/DispatchBolPdfDtos.java` |
+| 固定模板与渲染 | `renderer/InboundMarkV1Renderer.java`、`renderer/DropshipPalletA4Renderer.java`、`renderer/FreightA4Renderer.java`、`renderer/DispatchBolRenderer.java`、`renderer/PdfQrRenderer.java`、`renderer/PdfUnits.java` |
+| 请求校验与资源保护 | `controller/PrintRequestSizeFilter.java`、`service/InboundMarkPdfService.java`、`service/FreightA4PdfService.java`、`service/DispatchBolPdfService.java`、`service/PdfGenerationLimiter.java` |
 | PDF 参数配置 | `config/PrintPdfProperties.java` |
 | 接口契约 | `src/main/resources/openapi/print-internal-v1.yaml` |
 | 字体及授权 | `src/main/resources/fonts/NotoSansSC-Bold.ttf`、`src/main/resources/fonts/OFL.txt` |
@@ -32,4 +32,4 @@
 - 成功响应为 `application/pdf`，业务校验、鉴权和生成失败响应为 `application/json`；Controller 不得固定声明只产生 PDF，具体契约以 OpenAPI 为准。
 - 不得重新引入已删除的 `src/main/resources/db/print.sql`，也不得引入数据源、MyBatis、MySQL、本地临时文件或异步任务队列；失败时整次请求失败，不返回部分 PDF。
 - 中文字体必须从 classpath 加载并嵌入 PDF，不得依赖宿主机或容器系统字体；更新字体时同步归档授权文件。
-- 修改后至少从父目录运行 `mvn -pl print -am test`；渲染变更同时核对页面尺寸、页数、页序、二维码反向解码和字体嵌入。
+- 修改后至少从父目录运行 `mvn -pl print -am test`；渲染变更同时核对页面尺寸、页数、页序、二维码或一维码反向解码和字体嵌入。
diff --git a/print/README.md b/print/README.md
index 3fec0f4a3..4f45ee9af 100644
--- a/print/README.md
+++ b/print/README.md
@@ -8,7 +8,9 @@
 
 - 服务发现名：`print-service`。
 - 内部地址：`POST /internal/print/v1/pdfs/inbound-marks`。
+- 一件代发 A4 托盘信息单：`POST /internal/print/v1/pdfs/dropship-pallet-a4-documents`；模板固定为 `DROPSHIP_PALLET_A4_V1`，每托一页 A4，包含托盘 Code 128 一维码、最多两行入仓码、总箱数和最多 34 行 SKU/商品名称/箱数/实点数量，不展示作业状态。
 - A4 海运单据内部地址：`POST /internal/print/v1/pdfs/freight-a4-documents`。
+- 海外仓排车 BOL 内部地址：`POST /internal/print/v1/pdfs/dispatch-bol-documents`；模板固定为 `DISPATCH_BILL_OF_LADING_A4_V2`，每个 document 对应一张 A4、包含 1-26 行明细。调用方首张按 18 行、续页按 26 行稳定分页；同页连续相同柜号和托盘号由 Print 纵向合并显示。
 - 本地直连：`http://127.0.0.1:9207`。
 - 请求必须携带 `X-Internal-Service-Token`，值使用各服务已有的 `baiyue.security.internal-service-token` 配置。
 - 不把该接口加入 Gateway，也不允许 Admin 浏览器直接携带内部令牌访问 Print。
@@ -262,7 +264,7 @@ spring:
 
 1. `GET /actuator/health` 返回 `UP`。
 2. 使用正确内部令牌提交 1 页，响应为 `application/pdf`。
-3. 检查入仓标签页面为严格 `100mm x 100mm`，A4 单据页面为严格 `210mm x 297mm`，`X-Print-Page-Count` 与数组长度一致。
+3. 检查入仓标签页面为严格 `100mm x 100mm`，一件代发托盘信息单及其他 A4 单据为严格 `210mm x 297mm`，`X-Print-Page-Count` 与数组长度一致。
 4. 提交多页并检查页序与数组顺序一致。
 5. 分别验证错误令牌、非法尺寸、空数组、超过 2000 页和超过 2 MiB 请求体。
 6. Admin 下载链路不得在浏览器请求或日志中出现 `X-Internal-Service-Token`。
diff --git a/print/src/main/java/com/baiyue/print/controller/InternalPdfController.java b/print/src/main/java/com/baiyue/print/controller/InternalPdfController.java
index 1aff9298d..48261eaa9 100644
--- a/print/src/main/java/com/baiyue/print/controller/InternalPdfController.java
+++ b/print/src/main/java/com/baiyue/print/controller/InternalPdfController.java
@@ -4,8 +4,12 @@ import jakarta.annotation.Resource;
 
 import com.baiyue.common.web.CorrelationContext;
 import com.baiyue.print.dto.FreightA4PdfDtos;
+import com.baiyue.print.dto.DispatchBolPdfDtos;
+import com.baiyue.print.dto.DropshipPalletA4PdfDtos;
 import com.baiyue.print.dto.InboundMarkPdfDtos;
 import com.baiyue.print.service.FreightA4PdfService;
+import com.baiyue.print.service.DispatchBolPdfService;
+import com.baiyue.print.service.DropshipPalletA4PdfService;
 import com.baiyue.print.service.InboundMarkPdfService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
@@ -30,6 +34,8 @@ public class InternalPdfController {
 
     @Resource private InboundMarkPdfService pdfService;
     @Resource private FreightA4PdfService freightA4PdfService;
+    @Resource private DispatchBolPdfService dispatchBolPdfService;
+    @Resource private DropshipPalletA4PdfService dropshipPalletA4PdfService;
     @Resource private InternalServiceTokenGuard tokenGuard;
 
     @PostMapping(value = "/inbound-marks", consumes = MediaType.APPLICATION_JSON_VALUE)
@@ -85,4 +91,31 @@ public class InternalPdfController {
 
         return response.body(content);
     }
+
+    @PostMapping(value = "/dispatch-bol-documents", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<byte[]> generateDispatchBolDocuments(
+            @RequestHeader(value = INTERNAL_TOKEN_HEADER, required = false) String internalToken,
+            @Valid @RequestBody DispatchBolPdfDtos.Request request) {
+        tokenGuard.verify(internalToken);
+        DispatchBolPdfService.GeneratedPdf pdf = dispatchBolPdfService.generate(request);
+        byte[] content = pdf.content();
+        return ResponseEntity.ok().cacheControl(CacheControl.noStore()).header(HttpHeaders.PRAGMA, "no-cache")
+                .header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment().filename(pdf.fileName(), StandardCharsets.UTF_8).build().toString())
+                .header("X-Content-Type-Options", "nosniff").header(PAGE_COUNT_HEADER, Integer.toString(pdf.pageCount()))
+                .contentType(MediaType.APPLICATION_PDF).contentLength(content.length).body(content);
+    }
+
+    @PostMapping(value = "/dropship-pallet-a4-documents", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<byte[]> generateDropshipPalletA4Documents(
+            @RequestHeader(value = INTERNAL_TOKEN_HEADER, required = false) String internalToken,
+            @Valid @RequestBody DropshipPalletA4PdfDtos.Request request) {
+        tokenGuard.verify(internalToken);
+        DropshipPalletA4PdfService.GeneratedPdf pdf = dropshipPalletA4PdfService.generate(request);
+        byte[] content = pdf.content();
+        return ResponseEntity.ok().cacheControl(CacheControl.noStore()).header(HttpHeaders.PRAGMA, "no-cache")
+                .header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment().filename(pdf.fileName(), StandardCharsets.UTF_8).build().toString())
+                .header("X-Content-Type-Options", "nosniff").header(PAGE_COUNT_HEADER, Integer.toString(pdf.pageCount()))
+                .contentType(MediaType.APPLICATION_PDF).contentLength(content.length).body(content);
+    }
+
 }
diff --git a/print/src/main/java/com/baiyue/print/dto/DispatchBolPdfDtos.java b/print/src/main/java/com/baiyue/print/dto/DispatchBolPdfDtos.java
new file mode 100644
index 000000000..1a8dcf26b
--- /dev/null
+++ b/print/src/main/java/com/baiyue/print/dto/DispatchBolPdfDtos.java
@@ -0,0 +1,24 @@
+package com.baiyue.print.dto;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/** A4 vehicle-dispatch bill of lading request contract. */
+public final class DispatchBolPdfDtos {
+    public static final String TEMPLATE = "DISPATCH_BILL_OF_LADING_A4_V2";
+
+    private DispatchBolPdfDtos() {}
+
+    public record Request(String templateCode, PageSpec pageSpec, String downloadFileName,
+                          List<Document> documents) {}
+    public record PageSpec(BigDecimal widthMm, BigDecimal heightMm) {}
+    public record Document(String shipFromName, String shipFromAddress, String carrierName,
+                           String isaNumber, String appointmentTime, String trailerNumber,
+                           String sealNumber, String fbaWarehouseCode, String shipToName,
+                           String shipToAddress, String dispatchNo, String fbaShipmentIds,
+                           String poReferenceNos, int totalPackages, int pageNumber, int pageCount,
+                           List<CargoRow> cargoRows) {}
+    public record CargoRow(String containerNo, String palletNo, String fbaWarehouseCode,
+                           String warehouseNo, String fbaShipmentId, String poReferenceNo,
+                           int packageCount) {}
+}
diff --git a/print/src/main/java/com/baiyue/print/dto/DropshipPalletA4PdfDtos.java b/print/src/main/java/com/baiyue/print/dto/DropshipPalletA4PdfDtos.java
new file mode 100644
index 000000000..627e8ed85
--- /dev/null
+++ b/print/src/main/java/com/baiyue/print/dto/DropshipPalletA4PdfDtos.java
@@ -0,0 +1,23 @@
+package com.baiyue.print.dto;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/** 一件代发托盘 A4 信息单的内部渲染契约。 */
+public final class DropshipPalletA4PdfDtos {
+    public static final String TEMPLATE = "DROPSHIP_PALLET_A4_V1";
+
+    private DropshipPalletA4PdfDtos() {}
+
+    public record Request(String templateCode, PageSpec pageSpec, String downloadFileName,
+                          List<Document> documents) {}
+
+    public record PageSpec(BigDecimal widthMm, BigDecimal heightMm) {}
+
+    public record Document(String palletNo, String inboundCodes, int cartonCount,
+                           int skuCount, BigDecimal weightKg, BigDecimal volumeCbm,
+                           String barcodeContent, List<SkuRow> skuRows) {}
+
+    public record SkuRow(String inboundCode, String skuCode, String cargoName,
+                         int cartonCount, int skuQuantity) {}
+}
diff --git a/print/src/main/java/com/baiyue/print/renderer/DispatchBolRenderer.java b/print/src/main/java/com/baiyue/print/renderer/DispatchBolRenderer.java
new file mode 100644
index 000000000..6067b1a4b
--- /dev/null
+++ b/print/src/main/java/com/baiyue/print/renderer/DispatchBolRenderer.java
@@ -0,0 +1,157 @@
+package com.baiyue.print.renderer;
+
+import com.baiyue.print.dto.DispatchBolPdfDtos;
+import java.awt.Color;
+import java.io.IOException;
+import java.util.List;
+import java.util.function.Function;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DispatchBolRenderer {
+    private static final float[] COLS = {8, 23, 39, 62, 89, 123, 160, 190, 202};
+    private static final String[][] HEADERS = {
+            {""}, {"Container", "#"}, {"Pallet", "#"}, {"FBA", "Warehouse #"},
+            {"Warehouse No #"}, {"FBA Shipment ID"}, {"PO / Reference #"}, {"CTNS"}
+    };
+    private static final double FIRST_TABLE_TOP = 82;
+    private static final double CONTINUATION_TABLE_TOP = 10;
+    private static final double HEADER_HEIGHT = 10;
+    private static final double ROW_HEIGHT = 7.2;
+
+    public void renderPage(PDDocument document, PDFont font, DispatchBolPdfDtos.Document data) throws IOException {
+        PDPage page = new PDPage(PDRectangle.A4);
+        document.addPage(page);
+        PdfUnits units = new PdfUnits(297);
+        try (PDPageContentStream stream = new PDPageContentStream(document, page)) {
+            stream.setLineWidth(PdfUnits.mmToPt(.3));
+            double tableTop;
+            if (data.pageNumber() == 1) {
+                title(stream, units, font);
+                block(stream, units, font, data, 8, 202, 21, FIRST_TABLE_TOP);
+                tableTop = FIRST_TABLE_TOP;
+            } else {
+                tableTop = CONTINUATION_TABLE_TOP;
+            }
+            double tableBottom = table(stream, units, font, data, tableTop);
+            if (data.pageNumber() == data.pageCount()) {
+                summaryAndSignatures(stream, units, font, data, tableBottom);
+            }
+            if (data.pageCount() > 1) {
+                right(stream, units, font, data.pageNumber() + " / " + data.pageCount(), 6.5f, 202, 290);
+            }
+        }
+    }
+
+    private void title(PDPageContentStream s, PdfUnits u, PDFont f) throws IOException {
+        fill(s, u, Color.BLACK, 8, 8, 202, 21);
+        s.setNonStrokingColor(Color.WHITE);
+        centered(s, u, f, "BILL OF LADING", 15, 105, 17);
+        s.setNonStrokingColor(Color.BLACK);
+    }
+
+    private void block(PDPageContentStream s, PdfUnits u, PDFont f, DispatchBolPdfDtos.Document d,
+                       double left, double right, double top, double bottom) throws IOException {
+        line(s,u,left,top,right,top); line(s,u,left,bottom,right,bottom); line(s,u,left,top,left,bottom); line(s,u,right,top,right,bottom);
+        line(s,u,105,top,105,bottom); line(s,u,left,50,right,50);
+        blackHeader(s,u,f,"SHIP FROM",left,top,105,27); blackHeader(s,u,f,"CARRIER",105,top,right,27);
+        blackHeader(s,u,f,"SHIP TO",left,50,105,56); blackHeader(s,u,f,"REFERENCE",105,50,right,56);
+        text(s,u,f,d.shipFromName(),9.5f,left+2,33);
+        wrappedText(s,u,f,"Address: " + d.shipFromAddress(),7.2f,left+2,40,91,2,4.5);
+        text(s,u,f,"Carrier Name: " + d.carrierName(),7.5f,107,32); text(s,u,f,"ISA #: " + d.isaNumber(),7.5f,107,36.5);
+        text(s,u,f,"Appointment time: " + d.appointmentTime(),7.5f,107,41); text(s,u,f,"Trailer #: " + d.trailerNumber(),7.5f,107,45.5);
+        text(s,u,f,"Seal #: " + d.sealNumber(),7.5f,107,49);
+        text(s,u,f,"Amazon FBA Warehouse",7.5f,left+2,61); text(s,u,f,"FC Code: " + d.fbaWarehouseCode(),7.5f,left+2,66);
+        text(s,u,f,"Name: " + d.shipToName(),7.5f,left+2,71); text(s,u,f,"Address: " + d.shipToAddress(),7.5f,left+2,76);
+        text(s,u,f,"BOL / Dispatch #: " + d.dispatchNo(),7.5f,107,61); text(s,u,f,"FBA Shipment ID: " + d.fbaShipmentIds(),7.5f,107,68);
+        text(s,u,f,"PO / Reference #: " + d.poReferenceNos(),7.5f,107,75);
+    }
+
+    private double table(PDPageContentStream s, PdfUnits u, PDFont f, DispatchBolPdfDtos.Document d, double top) throws IOException {
+        List<DispatchBolPdfDtos.CargoRow> rows = d.cargoRows();
+        double headerBottom = top + HEADER_HEIGHT;
+        double bottom = headerBottom + rows.size() * ROW_HEIGHT;
+        for (float x : COLS) line(s,u,x,top,x,bottom);
+        line(s,u,COLS[0],top,COLS[COLS.length-1],top);
+        line(s,u,COLS[0],headerBottom,COLS[COLS.length-1],headerBottom);
+        for (int i = 0; i < HEADERS.length; i++) centeredLines(s,u,f,HEADERS[i],5.2f,COLS[i],COLS[i+1],top+4.2);
+
+        for (int boundary = 1; boundary <= rows.size(); boundary++) {
+            double y = headerBottom + boundary * ROW_HEIGHT;
+            line(s,u,COLS[0],y,COLS[1],y);
+            boolean last = boundary == rows.size();
+            if (last || !same(rows.get(boundary - 1).containerNo(), rows.get(boundary).containerNo())) line(s,u,COLS[1],y,COLS[2],y);
+            if (last || !same(rows.get(boundary - 1).palletNo(), rows.get(boundary).palletNo())) line(s,u,COLS[2],y,COLS[3],y);
+            line(s,u,COLS[3],y,COLS[COLS.length-1],y);
+        }
+
+        drawMergedColumn(s,u,f,rows,DispatchBolPdfDtos.CargoRow::containerNo,1,headerBottom);
+        drawMergedColumn(s,u,f,rows,DispatchBolPdfDtos.CargoRow::palletNo,2,headerBottom);
+        for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
+            DispatchBolPdfDtos.CargoRow row = rows.get(rowIndex);
+            String[] values = {row.fbaWarehouseCode(), row.warehouseNo(), row.fbaShipmentId(), row.poReferenceNo(), Integer.toString(row.packageCount())};
+            double baseline = headerBottom + rowIndex * ROW_HEIGHT + 4.7;
+            for (int column = 0; column < values.length; column++) {
+                centeredCell(s,u,f,values[column],5.25f,COLS[column+3]+.5,COLS[column+4]-.5,baseline);
+            }
+        }
+        return bottom;
+    }
+
+    private void drawMergedColumn(PDPageContentStream s, PdfUnits u, PDFont f, List<DispatchBolPdfDtos.CargoRow> rows,
+                                  Function<DispatchBolPdfDtos.CargoRow, String> value, int column, double headerBottom) throws IOException {
+        int start = 0;
+        while (start < rows.size()) {
+            int end = start + 1;
+            while (end < rows.size() && same(value.apply(rows.get(start)), value.apply(rows.get(end)))) end++;
+            double baseline = headerBottom + ((start + end) * ROW_HEIGHT / 2) + 1.8;
+            centeredCell(s,u,f,value.apply(rows.get(start)),5.25f,COLS[column]+.5,COLS[column+1]-.5,baseline);
+            start = end;
+        }
+    }
+
+    private void summaryAndSignatures(PDPageContentStream s, PdfUnits u, PDFont f, DispatchBolPdfDtos.Document d, double tableBottom) throws IOException {
+        double summaryY = Math.max(tableBottom + 14, 236);
+        line(s,u,12,summaryY+4,198,summaryY+4);
+        text(s,u,f,"总箱数 / Total CTNS:",8,12,summaryY);
+        right(s,u,f,Integer.toString(d.totalPackages()),12,198,summaryY);
+        double signatureY = Math.max(summaryY + 30, 266);
+        signature(s,u,f,24,signatureY,"Driver signature");
+        signature(s,u,f,93,signatureY,"Warehouse signature");
+        signature(s,u,f,160,signatureY,"Date");
+    }
+
+    private boolean same(String left, String right) { return left != null && left.equals(right); }
+    private void blackHeader(PDPageContentStream s,PdfUnits u,PDFont f,String label,double x1,double y1,double x2,double y2)throws IOException{
+        fill(s,u,Color.BLACK,x1,y1,x2,y2); s.setNonStrokingColor(Color.WHITE); text(s,u,f,label,6.2f,x1+2,y2-1.7); s.setNonStrokingColor(Color.BLACK);
+    }
+    private void fill(PDPageContentStream s,PdfUnits u,Color color,double x1,double y1,double x2,double y2)throws IOException{s.setNonStrokingColor(color);s.addRect(PdfUnits.mmToPt(x1),u.topDownMmToPdfY(y2),PdfUnits.mmToPt(x2-x1),PdfUnits.mmToPt(y2-y1));s.fill();}
+    private void signature(PDPageContentStream s,PdfUnits u,PDFont f,double x,double y,String label)throws IOException{line(s,u,x,y,x+52,y);centeredCell(s,u,f,label,6.2f,x,x+52,y+8);}
+    private void centered(PDPageContentStream s,PdfUnits u,PDFont f,String value,float size,double centerX,double y)throws IOException{float w=f.getStringWidth(value)/1000*size;text(s,u,f,value,size,centerX-w/PdfUnits.mmToPt(1)/2,y);}
+    private void wrappedText(PDPageContentStream s,PdfUnits u,PDFont f,String value,float size,double x,double y,double width,int maxLines,double lineHeight)throws IOException{
+        String remaining=value==null?"—":value.strip();
+        for(int lineIndex=0;lineIndex<maxLines&&!remaining.isEmpty();lineIndex++){
+            String line=fitLine(f,remaining,size,PdfUnits.mmToPt(width));
+            boolean truncated=line.length()<remaining.length();
+            if(lineIndex==maxLines-1&&truncated)line=fit(f,remaining,size,PdfUnits.mmToPt(width));
+            text(s,u,f,line,size,x,y+lineIndex*lineHeight);
+            remaining=truncated?remaining.substring(line.length()).strip():"";
+        }
+    }
+    private String fitLine(PDFont f,String value,float size,float max)throws IOException{
+        if(f.getStringWidth(value)/1000*size<=max)return value;
+        int end=value.length();while(end>0&&f.getStringWidth(value.substring(0,end))/1000*size>max)end--;
+        int space=value.lastIndexOf(' ',end);return value.substring(0,space>0?space:end).stripTrailing();
+    }
+    private void centeredLines(PDPageContentStream s,PdfUnits u,PDFont f,String[] values,float size,double x1,double x2,double y)throws IOException{for(int i=0;i<values.length;i++)centeredCell(s,u,f,values[i],size,x1+.3,x2-.3,y+i*3.5);}
+    private void centeredCell(PDPageContentStream s,PdfUnits u,PDFont f,String value,float size,double x1,double x2,double y)throws IOException{String fit=fit(f,value,size,PdfUnits.mmToPt(x2-x1));float w=f.getStringWidth(fit)/1000*size;text(s,u,f,fit,size,x1+(x2-x1-w/PdfUnits.mmToPt(1))/2,y);}
+    private void right(PDPageContentStream s,PdfUnits u,PDFont f,String value,float size,double x,double y)throws IOException{float w=f.getStringWidth(value)/1000*size;text(s,u,f,value,size,x-w/PdfUnits.mmToPt(1),y);}
+    private String fit(PDFont f,String v,float size,float max)throws IOException{String value=v==null?"—":v;if(f.getStringWidth(value)/1000*size<=max)return value;String ell="…";int end=value.length();while(end>0&&f.getStringWidth(value.substring(0,end)+ell)/1000*size>max)end--;return end==0?ell:value.substring(0,end)+ell;}
+    private void text(PDPageContentStream s,PdfUnits u,PDFont f,String value,float size,double x,double y)throws IOException{s.beginText();s.setFont(f,size);s.newLineAtOffset(PdfUnits.mmToPt(x),u.topDownMmToPdfY(y));s.showText(value==null?"—":value);s.endText();}
+    private void line(PDPageContentStream s,PdfUnits u,double x1,double y1,double x2,double y2)throws IOException{s.moveTo(PdfUnits.mmToPt(x1),u.topDownMmToPdfY(y1));s.lineTo(PdfUnits.mmToPt(x2),u.topDownMmToPdfY(y2));s.stroke();}
+}
diff --git a/print/src/main/java/com/baiyue/print/renderer/DropshipPalletA4Renderer.java b/print/src/main/java/com/baiyue/print/renderer/DropshipPalletA4Renderer.java
new file mode 100644
index 000000000..5cd8c08f4
--- /dev/null
+++ b/print/src/main/java/com/baiyue/print/renderer/DropshipPalletA4Renderer.java
@@ -0,0 +1,167 @@
+package com.baiyue.print.renderer;
+
+import com.baiyue.print.dto.DropshipPalletA4PdfDtos;
+import com.google.zxing.common.BitMatrix;
+import jakarta.annotation.Resource;
+import java.awt.Color;
+import java.io.IOException;
+import java.util.List;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.springframework.stereotype.Component;
+
+/** 每个托盘一页 A4，Code 128 托盘码与完整 SKU 归托信息同页展示。 */
+@Component
+public class DropshipPalletA4Renderer {
+    private static final float[] COLS = {8, 18, 57, 98, 161, 181, 202};
+    private static final String[] HEADERS = {"序号", "入仓码", "SKU", "商品名称", "箱数", "实点数量"};
+    private static final double TABLE_TOP = 105;
+    private static final double HEADER_HEIGHT = 8;
+    private static final double REGULAR_ROW_HEIGHT = 7;
+    private static final double DENSE_ROW_HEIGHT = 5.2;
+    private static final float BARCODE_WIDTH_PT = PdfUnits.mmToPt(158);
+    private static final float BARCODE_HEIGHT_PT = PdfUnits.mmToPt(22);
+    @Resource private PdfBarcodeRenderer barcodeRenderer;
+
+    public void renderPage(PDDocument pdf, PDFont font, DropshipPalletA4PdfDtos.Document data,
+                           BitMatrix barcodeMatrix) throws IOException {
+        PDPage page = new PDPage(PDRectangle.A4);
+        pdf.addPage(page);
+        PdfUnits units = new PdfUnits(297);
+        try (PDPageContentStream stream = new PDPageContentStream(pdf, page)) {
+            stream.setNonStrokingColor(Color.BLACK);
+            stream.setLineWidth(PdfUnits.mmToPt(.3));
+            centered(stream, units, font, "一件代发托盘信息单", 15, 105, 13);
+            centered(stream, units, font, data.palletNo(), 22, 105, 25);
+            barcode(stream, units, barcodeMatrix);
+            fill(stream, units, new Color(245, 247, 250), 8, 58, 202, 94);
+            inboundCodes(stream, units, font, data.inboundCodes());
+            line(stream, units, 8, 78, 202, 78);
+            metric(stream, units, font, "总箱数", Integer.toString(data.cartonCount()), 8, 56.5);
+            metric(stream, units, font, "SKU 数", Integer.toString(data.skuCount()), 56.5, 105);
+            metric(stream, units, font, "重量", decimal(data.weightKg()) + " kg", 105, 153.5);
+            metric(stream, units, font, "体积", decimal(data.volumeCbm()) + " m³", 153.5, 202);
+            line(stream, units, 56.5, 78, 56.5, 94);
+            line(stream, units, 105, 78, 105, 94);
+            line(stream, units, 153.5, 78, 153.5, 94);
+            line(stream, units, 8, 99, 202, 99);
+            text(stream, units, font, "SKU 明细", 11, 8, 104);
+            table(stream, units, font, data.skuRows());
+        }
+    }
+
+    private void barcode(PDPageContentStream stream, PdfUnits units, BitMatrix matrix) throws IOException {
+        float left = PdfUnits.mmToPt(26);
+        float bottom = units.topDownMmToPdfY(54);
+        barcodeRenderer.draw(stream, matrix, left, bottom, BARCODE_WIDTH_PT, BARCODE_HEIGHT_PT);
+    }
+
+    private void table(PDPageContentStream stream, PdfUnits units, PDFont font,
+                       List<DropshipPalletA4PdfDtos.SkuRow> rows) throws IOException {
+        int visibleRows = Math.max(1, rows.size());
+        double rowHeight = rows.size() > 24 ? DENSE_ROW_HEIGHT : REGULAR_ROW_HEIGHT;
+        float rowFontSize = rows.size() > 24 ? 5.3f : 6.4f;
+        double headerBottom = TABLE_TOP + HEADER_HEIGHT;
+        double bottom = headerBottom + visibleRows * rowHeight;
+        fill(stream, units, new Color(235, 239, 245), COLS[0], TABLE_TOP, COLS[COLS.length - 1], headerBottom);
+        for (float x : COLS) line(stream, units, x, TABLE_TOP, x, bottom);
+        for (int boundary = 0; boundary <= visibleRows; boundary++) {
+            line(stream, units, COLS[0], headerBottom + boundary * rowHeight,
+                    COLS[COLS.length - 1], headerBottom + boundary * rowHeight);
+        }
+        line(stream, units, COLS[0], TABLE_TOP, COLS[COLS.length - 1], TABLE_TOP);
+        for (int column = 0; column < HEADERS.length; column++) {
+            centeredCell(stream, units, font, HEADERS[column], 7.2f,
+                    COLS[column] + .5, COLS[column + 1] - .5, TABLE_TOP + 5.5);
+        }
+        if (rows.isEmpty()) {
+            centeredCell(stream, units, font, "暂无已归托 SKU", 7.2f, COLS[0], COLS[COLS.length - 1], headerBottom + 4.8);
+            return;
+        }
+        for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
+            DropshipPalletA4PdfDtos.SkuRow row = rows.get(rowIndex);
+            String[] values = {Integer.toString(rowIndex + 1), row.inboundCode(), row.skuCode(), row.cargoName(),
+                    Integer.toString(row.cartonCount()), Integer.toString(row.skuQuantity())};
+            double baseline = headerBottom + rowIndex * rowHeight + rowHeight * .7;
+            for (int column = 0; column < values.length; column++) {
+                centeredCell(stream, units, font, values[column], rowFontSize,
+                        COLS[column] + .7, COLS[column + 1] - .7, baseline);
+            }
+        }
+    }
+
+    private String decimal(java.math.BigDecimal value) {
+        return value == null ? "0" : value.stripTrailingZeros().toPlainString();
+    }
+    private void inboundCodes(PDPageContentStream s, PdfUnits u, PDFont f, String value) throws IOException {
+        text(s, u, f, "入仓码：", 8, 14, 66);
+        List<String> lines = wrap(f, value, 8, PdfUnits.mmToPt(163), 2);
+        for (int index = 0; index < lines.size(); index++) {
+            text(s, u, f, lines.get(index), 8, 33, 66 + index * 6);
+        }
+    }
+    private void metric(PDPageContentStream s, PdfUnits u, PDFont f, String label, String value,
+                        double x1, double x2) throws IOException {
+        centeredCell(s, u, f, label, 7.2f, x1 + 1, x2 - 1, 84);
+        centeredCell(s, u, f, value, 10.5f, x1 + 1, x2 - 1, 91);
+    }
+    private void centered(PDPageContentStream s, PdfUnits u, PDFont f, String value, float size,
+                          double centerX, double y) throws IOException {
+        float width = f.getStringWidth(value) / 1000 * size;
+        text(s, u, f, value, size, centerX - width / PdfUnits.mmToPt(1) / 2, y);
+    }
+    private void centeredCell(PDPageContentStream s, PdfUnits u, PDFont f, String value, float size,
+                              double x1, double x2, double y) throws IOException {
+        String fitted = fit(f, value, size, PdfUnits.mmToPt(x2 - x1));
+        float width = f.getStringWidth(fitted) / 1000 * size;
+        text(s, u, f, fitted, size, x1 + (x2 - x1 - width / PdfUnits.mmToPt(1)) / 2, y);
+    }
+    private String fit(PDFont font, String raw, float size, float maxWidth) throws IOException {
+        String value = raw == null || raw.isBlank() ? "—" : raw;
+        if (font.getStringWidth(value) / 1000 * size <= maxWidth) return value;
+        String ellipsis = "…";
+        int end = value.length();
+        while (end > 0 && font.getStringWidth(value.substring(0, end) + ellipsis) / 1000 * size > maxWidth) end--;
+        return end == 0 ? ellipsis : value.substring(0, end) + ellipsis;
+    }
+    private List<String> wrap(PDFont font, String raw, float size, float maxWidth,
+                              int maxLines) throws IOException {
+        String remaining = raw == null || raw.isBlank() ? "—" : raw;
+        List<String> lines = new java.util.ArrayList<>();
+        while (!remaining.isEmpty() && lines.size() < maxLines) {
+            if (font.getStringWidth(remaining) / 1000 * size <= maxWidth) {
+                lines.add(remaining);
+                break;
+            }
+            int split = remaining.length();
+            while (split > 0 && font.getStringWidth(remaining.substring(0, split)) / 1000 * size > maxWidth) split--;
+            int delimiter = remaining.lastIndexOf('/', split - 1);
+            if (delimiter > 0) split = delimiter + 1;
+            String line = remaining.substring(0, Math.max(1, split));
+            remaining = remaining.substring(Math.max(1, split));
+            if (lines.size() == maxLines - 1 && !remaining.isEmpty()) line = fit(font, line + remaining, size, maxWidth);
+            lines.add(line);
+        }
+        return lines;
+    }
+    private void fill(PDPageContentStream s, PdfUnits u, Color color, double x1, double y1,
+                      double x2, double y2) throws IOException {
+        s.setNonStrokingColor(color);
+        s.addRect(PdfUnits.mmToPt(x1), u.topDownMmToPdfY(y2), PdfUnits.mmToPt(x2 - x1), PdfUnits.mmToPt(y2 - y1));
+        s.fill();
+        s.setNonStrokingColor(Color.BLACK);
+    }
+    private void text(PDPageContentStream s, PdfUnits u, PDFont f, String value, float size,
+                      double x, double y) throws IOException {
+        s.beginText(); s.setFont(f, size); s.newLineAtOffset(PdfUnits.mmToPt(x), u.topDownMmToPdfY(y));
+        s.showText(value == null ? "—" : value); s.endText();
+    }
+    private void line(PDPageContentStream s, PdfUnits u, double x1, double y1, double x2,
+                      double y2) throws IOException {
+        s.moveTo(PdfUnits.mmToPt(x1), u.topDownMmToPdfY(y1));
+        s.lineTo(PdfUnits.mmToPt(x2), u.topDownMmToPdfY(y2)); s.stroke();
+    }
+}
diff --git a/print/src/main/java/com/baiyue/print/renderer/PdfBarcodeRenderer.java b/print/src/main/java/com/baiyue/print/renderer/PdfBarcodeRenderer.java
new file mode 100644
index 000000000..86470581e
--- /dev/null
+++ b/print/src/main/java/com/baiyue/print/renderer/PdfBarcodeRenderer.java
@@ -0,0 +1,36 @@
+package com.baiyue.print.renderer;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.oned.Code128Writer;
+import java.io.IOException;
+import java.util.Map;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.springframework.stereotype.Component;
+
+/** 将 Code 128 一维码以矢量矩形绘制到 PDF，避免打印缩放造成模糊。 */
+@Component
+public class PdfBarcodeRenderer {
+    private static final int QUIET_ZONE_MODULES = 10;
+
+    public BitMatrix encode(String content) {
+        try {
+            return new Code128Writer().encode(content, BarcodeFormat.CODE_128, 1, 1,
+                    Map.of(EncodeHintType.MARGIN, QUIET_ZONE_MODULES));
+        } catch (IllegalArgumentException exception) {
+            throw new IllegalArgumentException("barcodeContent cannot be encoded", exception);
+        }
+    }
+
+    public void draw(PDPageContentStream stream, BitMatrix matrix, float leftPt,
+                     float bottomPt, float widthPt, float heightPt) throws IOException {
+        float moduleWidth = widthPt / matrix.getWidth();
+        for (int x = 0; x < matrix.getWidth(); x++) {
+            if (matrix.get(x, 0)) {
+                stream.addRect(leftPt + x * moduleWidth, bottomPt, moduleWidth + .02f, heightPt);
+            }
+        }
+        stream.fill();
+    }
+}
diff --git a/print/src/main/java/com/baiyue/print/service/DispatchBolPdfService.java b/print/src/main/java/com/baiyue/print/service/DispatchBolPdfService.java
new file mode 100644
index 000000000..213c1a826
--- /dev/null
+++ b/print/src/main/java/com/baiyue/print/service/DispatchBolPdfService.java
@@ -0,0 +1,94 @@
+package com.baiyue.print.service;
+
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.print.config.PrintPdfProperties;
+import com.baiyue.print.dto.DispatchBolPdfDtos;
+import com.baiyue.print.renderer.DispatchBolRenderer;
+import jakarta.annotation.Resource;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.text.Normalizer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.font.PDType0Font;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DispatchBolPdfService {
+    private static final BigDecimal A4_WIDTH = new BigDecimal("210");
+    private static final BigDecimal A4_HEIGHT = new BigDecimal("297");
+    private static final Set<Character> FORBIDDEN_FILE_CHARS = Set.of('/', '\\', ':', '*', '?', '"', '<', '>', '|');
+    private static final int MAX_FIRST_PAGE_ROWS = 18;
+    private static final int MAX_CONTINUATION_PAGE_ROWS = 26;
+
+    @Resource private PrintPdfProperties properties;
+    @Resource private PdfGenerationLimiter limiter;
+    @Resource private DispatchBolRenderer renderer;
+
+    public GeneratedPdf generate(DispatchBolPdfDtos.Request request) {
+        DispatchBolPdfDtos.Request normalized = normalize(request);
+        try (PdfGenerationLimiter.Permit ignored = limiter.acquire();
+             PDDocument pdf = new PDDocument(); InputStream fontStream = openFont();
+             ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+            PDType0Font font = PDType0Font.load(pdf, fontStream, true);
+            for (DispatchBolPdfDtos.Document document : normalized.documents()) renderer.renderPage(pdf, font, document);
+            pdf.save(output);
+            byte[] content = output.toByteArray();
+            if (content.length > properties.getMaxOutputBytes()) invalid("生成的 PDF 超过输出大小上限");
+            return new GeneratedPdf(content, normalized.downloadFileName(), normalized.documents().size());
+        } catch (IOException exception) {
+            throw new BizException(ResultCode.INTERNAL_ERROR, "PDF 生成失败");
+        }
+    }
+
+    private InputStream openFont() throws IOException {
+        return new ClassPathResource(properties.getFontResource()).getInputStream();
+    }
+
+    private DispatchBolPdfDtos.Request normalize(DispatchBolPdfDtos.Request request) {
+        if (request == null || !DispatchBolPdfDtos.TEMPLATE.equals(line(request.templateCode()))) invalid("templateCode is not supported");
+        if (request.pageSpec() == null || request.pageSpec().widthMm() == null || request.pageSpec().heightMm() == null
+                || request.pageSpec().widthMm().compareTo(A4_WIDTH) != 0 || request.pageSpec().heightMm().compareTo(A4_HEIGHT) != 0) invalid("pageSpec must be A4");
+        String fileName = line(request.downloadFileName());
+        if (fileName.isBlank() || !fileName.toLowerCase(java.util.Locale.ROOT).endsWith(".pdf") || fileName.length() > 120
+                || fileName.chars().anyMatch(c -> FORBIDDEN_FILE_CHARS.contains((char) c))) invalid("downloadFileName is invalid");
+        if (request.documents() == null || request.documents().isEmpty() || request.documents().size() > properties.getMaxPages()) invalid("documents count is invalid");
+        List<DispatchBolPdfDtos.Document> documents = new ArrayList<>();
+        for (int i = 0; i < request.documents().size(); i++) documents.add(normalizeDocument(request.documents().get(i), i));
+        return new DispatchBolPdfDtos.Request(DispatchBolPdfDtos.TEMPLATE, request.pageSpec(), fileName, List.copyOf(documents));
+    }
+
+    private DispatchBolPdfDtos.Document normalizeDocument(DispatchBolPdfDtos.Document value, int index) {
+        int maxRows = value != null && value.pageNumber() == 1 ? MAX_FIRST_PAGE_ROWS : MAX_CONTINUATION_PAGE_ROWS;
+        if (value == null || value.cargoRows() == null || value.cargoRows().isEmpty() || value.cargoRows().size() > maxRows) {
+            invalid("documents[" + index + "].cargoRows exceeds the page layout capacity");
+        }
+        if (value.totalPackages() < 0 || value.pageNumber() < 1 || value.pageCount() < value.pageNumber()) invalid("documents[" + index + "] page metadata is invalid");
+        List<DispatchBolPdfDtos.CargoRow> rows = new ArrayList<>();
+        for (DispatchBolPdfDtos.CargoRow row : value.cargoRows()) {
+            if (row == null || row.packageCount() < 0) invalid("cargo row is invalid");
+            rows.add(new DispatchBolPdfDtos.CargoRow(text(row.containerNo()), text(row.palletNo()), text(row.fbaWarehouseCode()),
+                    text(row.warehouseNo()), text(row.fbaShipmentId()), text(row.poReferenceNo()), row.packageCount()));
+        }
+        return new DispatchBolPdfDtos.Document(text(value.shipFromName()), text(value.shipFromAddress()), text(value.carrierName()),
+                text(value.isaNumber()), text(value.appointmentTime()), text(value.trailerNumber()), text(value.sealNumber()),
+                text(value.fbaWarehouseCode()), text(value.shipToName()), text(value.shipToAddress()), text(value.dispatchNo()),
+                text(value.fbaShipmentIds()), text(value.poReferenceNos()), value.totalPackages(), value.pageNumber(), value.pageCount(), List.copyOf(rows));
+    }
+
+    private String text(String value) {
+        String normalized = line(value);
+        if (normalized.codePointCount(0, normalized.length()) > 300 || normalized.codePoints().anyMatch(c -> Character.isISOControl(c))) invalid("document text is invalid");
+        return normalized.isBlank() ? "—" : normalized;
+    }
+    private String line(String value) { return value == null ? "" : Normalizer.normalize(value, Normalizer.Form.NFC).strip(); }
+    private void invalid(String message) { throw new BizException(ResultCode.VALIDATION_FAILED, message); }
+
+    public record GeneratedPdf(byte[] content, String fileName, int pageCount) {}
+}
diff --git a/print/src/main/java/com/baiyue/print/service/DropshipPalletA4PdfService.java b/print/src/main/java/com/baiyue/print/service/DropshipPalletA4PdfService.java
new file mode 100644
index 000000000..b95a7d278
--- /dev/null
+++ b/print/src/main/java/com/baiyue/print/service/DropshipPalletA4PdfService.java
@@ -0,0 +1,100 @@
+package com.baiyue.print.service;
+
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.print.config.PrintPdfProperties;
+import com.baiyue.print.dto.DropshipPalletA4PdfDtos;
+import com.baiyue.print.renderer.DropshipPalletA4Renderer;
+import com.baiyue.print.renderer.PdfBarcodeRenderer;
+import com.google.zxing.common.BitMatrix;
+import jakarta.annotation.Resource;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.text.Normalizer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.font.PDType0Font;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DropshipPalletA4PdfService {
+    private static final BigDecimal A4_WIDTH = new BigDecimal("210");
+    private static final BigDecimal A4_HEIGHT = new BigDecimal("297");
+    private static final int MAX_SKU_ROWS = 34;
+    private static final Set<Character> FORBIDDEN_FILE_CHARS = Set.of('/', '\\', ':', '*', '?', '"', '<', '>', '|');
+
+    @Resource private PrintPdfProperties properties;
+    @Resource private PdfGenerationLimiter limiter;
+    @Resource private DropshipPalletA4Renderer renderer;
+    @Resource private PdfBarcodeRenderer barcodeRenderer;
+
+    public GeneratedPdf generate(DropshipPalletA4PdfDtos.Request request) {
+        DropshipPalletA4PdfDtos.Request normalized = normalize(request);
+        try (PdfGenerationLimiter.Permit ignored = limiter.acquire(); PDDocument pdf = new PDDocument();
+             InputStream fontStream = new ClassPathResource(properties.getFontResource()).getInputStream();
+             ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+            PDType0Font font = PDType0Font.load(pdf, fontStream, true);
+            for (DropshipPalletA4PdfDtos.Document document : normalized.documents()) {
+                BitMatrix barcode = barcodeRenderer.encode(document.barcodeContent());
+                renderer.renderPage(pdf, font, document, barcode);
+            }
+            pdf.save(output);
+            byte[] content = output.toByteArray();
+            if (content.length > properties.getMaxOutputBytes()) invalid("生成的 PDF 超过输出大小上限");
+            return new GeneratedPdf(content, normalized.downloadFileName(), normalized.documents().size());
+        } catch (IOException exception) {
+            throw new BizException(ResultCode.INTERNAL_ERROR, "PDF 生成失败");
+        }
+    }
+
+    private DropshipPalletA4PdfDtos.Request normalize(DropshipPalletA4PdfDtos.Request request) {
+        if (request == null || !DropshipPalletA4PdfDtos.TEMPLATE.equals(line(request.templateCode()))) invalid("templateCode is not supported");
+        if (request.pageSpec() == null || request.pageSpec().widthMm() == null || request.pageSpec().heightMm() == null
+                || request.pageSpec().widthMm().compareTo(A4_WIDTH) != 0 || request.pageSpec().heightMm().compareTo(A4_HEIGHT) != 0) invalid("pageSpec must be A4");
+        String fileName = line(request.downloadFileName());
+        if (fileName.isBlank() || !fileName.toLowerCase(java.util.Locale.ROOT).endsWith(".pdf") || fileName.length() > 120
+                || fileName.chars().anyMatch(value -> FORBIDDEN_FILE_CHARS.contains((char) value))) invalid("downloadFileName is invalid");
+        if (request.documents() == null || request.documents().isEmpty() || request.documents().size() > properties.getMaxPages()) invalid("documents count is invalid");
+        List<DropshipPalletA4PdfDtos.Document> documents = new ArrayList<>();
+        for (int index = 0; index < request.documents().size(); index++) documents.add(normalizeDocument(request.documents().get(index), index));
+        return new DropshipPalletA4PdfDtos.Request(DropshipPalletA4PdfDtos.TEMPLATE, request.pageSpec(), fileName, List.copyOf(documents));
+    }
+
+    private DropshipPalletA4PdfDtos.Document normalizeDocument(DropshipPalletA4PdfDtos.Document value, int index) {
+        if (value == null) invalid("documents[" + index + "] is required");
+        if (value.cartonCount() < 0 || value.skuCount() < 0 || negative(value.weightKg()) || negative(value.volumeCbm())) invalid("documents[" + index + "] totals are invalid");
+        if (value.skuRows() == null || value.skuRows().size() > MAX_SKU_ROWS) invalid("documents[" + index + "].skuRows exceeds the one-page A4 capacity");
+        List<DropshipPalletA4PdfDtos.SkuRow> rows = new ArrayList<>();
+        for (DropshipPalletA4PdfDtos.SkuRow row : value.skuRows()) {
+            if (row == null || row.cartonCount() < 0 || row.skuQuantity() < 0) invalid("SKU row is invalid");
+            rows.add(new DropshipPalletA4PdfDtos.SkuRow(text(row.inboundCode(), 80), text(row.skuCode(), 128),
+                    text(row.cargoName(), 200), row.cartonCount(), row.skuQuantity()));
+        }
+        return new DropshipPalletA4PdfDtos.Document(text(value.palletNo(), 80), text(value.inboundCodes(), 300),
+                value.cartonCount(), value.skuCount(), decimal(value.weightKg()), decimal(value.volumeCbm()),
+                barcode(value.barcodeContent()), List.copyOf(rows));
+    }
+
+    private BigDecimal decimal(BigDecimal value) { return value == null ? BigDecimal.ZERO : value; }
+    private boolean negative(BigDecimal value) { return value != null && value.signum() < 0; }
+    private String barcode(String value) {
+        String normalized = text(value, 80);
+        if (normalized.codePoints().anyMatch(codePoint -> codePoint < 0x20 || codePoint > 0x7e)) invalid("barcodeContent must contain printable ASCII only");
+        return normalized;
+    }
+    private String text(String value, int maxCodePoints) {
+        String normalized = line(value);
+        if (normalized.isBlank() || normalized.codePointCount(0, normalized.length()) > maxCodePoints
+                || normalized.codePoints().anyMatch(Character::isISOControl)) invalid("document text is invalid");
+        return normalized;
+    }
+    private String line(String value) { return value == null ? "" : Normalizer.normalize(value, Normalizer.Form.NFC).strip(); }
+    private void invalid(String message) { throw new BizException(ResultCode.VALIDATION_FAILED, message); }
+
+    public record GeneratedPdf(byte[] content, String fileName, int pageCount) {}
+}
diff --git a/print/src/main/resources/openapi/print-internal-v1.yaml b/print/src/main/resources/openapi/print-internal-v1.yaml
index 8ea325df9..d71e12cd5 100644
--- a/print/src/main/resources/openapi/print-internal-v1.yaml
+++ b/print/src/main/resources/openapi/print-internal-v1.yaml
@@ -100,6 +100,45 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/ApiError'
+  /internal/print/v1/pdfs/dispatch-bol-documents:
+    post:
+      summary: Generate vehicle-dispatch BOL documents as fixed A4 PDF pages
+      operationId: generateDispatchBolPdf
+      security: [{ internalServiceToken: [] }]
+      parameters: [{ $ref: '#/components/parameters/RequestId' }]
+      requestBody:
+        required: true
+        content: { application/json: { schema: { $ref: '#/components/schemas/DispatchBolPdfRequest' } } }
+      responses:
+        '200':
+          description: PDF generation succeeded, or a business error was returned as ApiResponse JSON.
+          headers:
+            Content-Disposition: { schema: { type: string } }
+            X-Print-Page-Count: { schema: { type: integer, minimum: 1, maximum: 2000 } }
+          content:
+            application/pdf: { schema: { type: string, format: binary } }
+            application/json: { schema: { $ref: '#/components/schemas/ApiError' } }
+  /internal/print/v1/pdfs/dropship-pallet-a4-documents:
+    post:
+      summary: Generate one A4 information sheet per dropship pallet
+      operationId: generateDropshipPalletA4Pdf
+      security: [{ internalServiceToken: [] }]
+      parameters: [{ $ref: '#/components/parameters/RequestId' }]
+      requestBody:
+        required: true
+        content: { application/json: { schema: { $ref: '#/components/schemas/DropshipPalletA4PdfRequest' } } }
+      responses:
+        '200':
+          description: PDF generation succeeded, or a business error was returned as ApiResponse JSON.
+          headers:
+            Content-Disposition: { schema: { type: string } }
+            X-Print-Page-Count: { schema: { type: integer, minimum: 1, maximum: 2000 } }
+          content:
+            application/pdf: { schema: { type: string, format: binary } }
+            application/json: { schema: { $ref: '#/components/schemas/ApiError' } }
+        '413':
+          description: Request body exceeds the configured limit.
+          content: { application/json: { schema: { $ref: '#/components/schemas/ApiError' } } }
 components:
   securitySchemes:
     internalServiceToken:
@@ -186,6 +225,98 @@ components:
           description: One document item renders one A4 page in request order.
           items:
             $ref: '#/components/schemas/FreightA4Document'
+    DispatchBolPdfRequest:
+      type: object
+      required: [templateCode, pageSpec, downloadFileName, documents]
+      properties:
+        templateCode: { type: string, enum: [DISPATCH_BILL_OF_LADING_A4_V2] }
+        pageSpec: { $ref: '#/components/schemas/FreightA4PageSpec' }
+        downloadFileName: { type: string, maxLength: 120 }
+        documents:
+          type: array
+          minItems: 1
+          maxItems: 2000
+          description: One item renders one A4 page; the caller groups and chunks BOL rows in stable order.
+          items: { $ref: '#/components/schemas/DispatchBolDocument' }
+    DispatchBolDocument:
+      type: object
+      required: [shipFromName, carrierName, fbaWarehouseCode, shipToName, dispatchNo, totalPackages, pageNumber, pageCount, cargoRows]
+      properties:
+        shipFromName: { type: string }
+        shipFromAddress: { type: string }
+        carrierName: { type: string }
+        isaNumber: { type: string }
+        appointmentTime: { type: string }
+        trailerNumber: { type: string }
+        sealNumber: { type: string }
+        fbaWarehouseCode: { type: string }
+        shipToName: { type: string }
+        shipToAddress: { type: string }
+        dispatchNo: { type: string }
+        fbaShipmentIds: { type: string }
+        poReferenceNos: { type: string }
+        totalPackages: { type: integer, minimum: 0 }
+        pageNumber: { type: integer, minimum: 1 }
+        pageCount: { type: integer, minimum: 1 }
+        cargoRows:
+          type: array
+          minItems: 1
+          maxItems: 26
+          description: First page accepts at most 18 rows; continuation pages accept at most 26 rows.
+          items: { $ref: '#/components/schemas/DispatchBolCargoRow' }
+    DispatchBolCargoRow:
+      type: object
+      required: [containerNo, palletNo, fbaWarehouseCode, warehouseNo, fbaShipmentId, poReferenceNo, packageCount]
+      properties:
+        containerNo: { type: string }
+        palletNo: { type: string }
+        fbaWarehouseCode: { type: string }
+        warehouseNo: { type: string }
+        fbaShipmentId: { type: string }
+        poReferenceNo: { type: string }
+        packageCount: { type: integer, minimum: 0 }
+    DropshipPalletA4PdfRequest:
+      type: object
+      required: [templateCode, pageSpec, downloadFileName, documents]
+      properties:
+        templateCode: { type: string, enum: [DROPSHIP_PALLET_A4_V1] }
+        pageSpec: { $ref: '#/components/schemas/FreightA4PageSpec' }
+        downloadFileName: { type: string, maxLength: 120 }
+        documents:
+          type: array
+          minItems: 1
+          maxItems: 2000
+          description: One pallet renders as exactly one A4 page in request order.
+          items: { $ref: '#/components/schemas/DropshipPalletA4Document' }
+    DropshipPalletA4Document:
+      type: object
+      required: [palletNo, inboundCodes, cartonCount, skuCount, weightKg, volumeCbm, barcodeContent, skuRows]
+      properties:
+        palletNo: { type: string, maxLength: 80 }
+        inboundCodes: { type: string, maxLength: 300 }
+        cartonCount: { type: integer, minimum: 0 }
+        skuCount: { type: integer, minimum: 0 }
+        weightKg: { type: number, minimum: 0 }
+        volumeCbm: { type: number, minimum: 0 }
+        barcodeContent:
+          type: string
+          maxLength: 80
+          pattern: '^[\\x20-\\x7E]+$'
+          description: Code 128 一维码内容，当前固定为稳定托盘码
+        skuRows:
+          type: array
+          minItems: 0
+          maxItems: 34
+          items: { $ref: '#/components/schemas/DropshipPalletSkuRow' }
+    DropshipPalletSkuRow:
+      type: object
+      required: [inboundCode, skuCode, cargoName, cartonCount, skuQuantity]
+      properties:
+        inboundCode: { type: string, maxLength: 80 }
+        skuCode: { type: string, maxLength: 128 }
+        cargoName: { type: string, maxLength: 200 }
+        cartonCount: { type: integer, minimum: 0 }
+        skuQuantity: { type: integer, minimum: 0 }
     FreightA4PageSpec:
       type: object
       required: [widthMm, heightMm]
diff --git a/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java b/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java
index f0d45499e..798c269f4 100644
--- a/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java
+++ b/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java
@@ -4,8 +4,11 @@ import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.common.web.GlobalExceptionHandler;
 import com.baiyue.print.dto.FreightA4PdfDtos;
+import com.baiyue.print.dto.DropshipPalletA4PdfDtos;
 import com.baiyue.print.dto.InboundMarkPdfDtos;
 import com.baiyue.print.service.FreightA4PdfService;
+import com.baiyue.print.service.DispatchBolPdfService;
+import com.baiyue.print.service.DropshipPalletA4PdfService;
 import com.baiyue.print.service.InboundMarkPdfService;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.BeforeEach;
@@ -42,6 +45,10 @@ class InternalPdfControllerTest {
     private InboundMarkPdfService service;
     @MockBean
     private FreightA4PdfService freightA4PdfService;
+    @MockBean
+    private DispatchBolPdfService dispatchBolPdfService;
+    @MockBean
+    private DropshipPalletA4PdfService dropshipPalletA4PdfService;
     @Resource
     private InternalPdfController controller;
     private MockMvc mockMvc;
@@ -166,6 +173,27 @@ class InternalPdfControllerTest {
         verify(freightA4PdfService).generate(any(FreightA4PdfDtos.Request.class));
     }
 
+    @Test
+    void returnsDropshipPalletA4PdfWithDownloadHeaders() throws Exception {
+        byte[] pdf = "%PDF-pallet-a4".getBytes(StandardCharsets.US_ASCII);
+        when(dropshipPalletA4PdfService.generate(any())).thenReturn(
+                new DropshipPalletA4PdfService.GeneratedPdf(pdf, "DP-260911-0034-A4托盘信息单.pdf", 1));
+
+        mockMvc.perform(post("/internal/print/v1/pdfs/dropship-pallet-a4-documents")
+                        .header(InternalPdfController.INTERNAL_TOKEN_HEADER, TOKEN)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_PDF, MediaType.APPLICATION_JSON)
+                        .content(validDropshipPalletA4RequestJson()))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_PDF))
+                .andExpect(content().bytes(pdf))
+                .andExpect(header().string("X-Print-Page-Count", "1"))
+                .andExpect(header().string("Content-Disposition",
+                        org.hamcrest.Matchers.containsString("filename*=")));
+
+        verify(dropshipPalletA4PdfService).generate(any(DropshipPalletA4PdfDtos.Request.class));
+    }
+
     @Test
     void endpointDoesNotPinProducedMediaTypeToPdf() throws Exception {
         PostMapping mapping = InternalPdfController.class
@@ -182,11 +210,13 @@ class InternalPdfControllerTest {
         assertThat(contract)
                 .contains("/internal/print/v1/pdfs/inbound-marks:")
                 .contains("/internal/print/v1/pdfs/freight-a4-documents:")
+                .contains("/internal/print/v1/pdfs/dropship-pallet-a4-documents:")
                 .contains("application/pdf:")
                 .contains("application/json:")
                 .contains("name: X-Internal-Service-Token")
                 .contains("SEA_FREIGHT_SHIPPING_INSTRUCTION_A4_V1:")
                 .contains("BILL_OF_LADING_CONFIRMATION_A4_V1:")
+                .contains("DROPSHIP_PALLET_A4_V1")
                 .contains("additionalProperties: false")
                 .contains("minItems: 1")
                 .contains("required: [marksAndNos, quantity, packaging, descriptionOfGoods, grossWeight, measurement]")
@@ -235,4 +265,30 @@ class InternalPdfControllerTest {
                 """;
     }
 
+    private String validDropshipPalletA4RequestJson() {
+        return """
+                {
+                  "templateCode": "DROPSHIP_PALLET_A4_V1",
+                  "pageSpec": {"widthMm": 210, "heightMm": 297},
+                  "downloadFileName": "DP-260911-0034-A4托盘信息单.pdf",
+                  "documents": [{
+                    "palletNo": "DP-260911-0034",
+                    "inboundCodes": "NYEXX2609110249",
+                    "cartonCount": 3,
+                    "skuCount": 1,
+                    "weightKg": 90,
+                    "volumeCbm": 0.534,
+                    "barcodeContent": "DP-260911-0034",
+                    "skuRows": [{
+                      "inboundCode": "NYEXX2609110249",
+                      "skuCode": "SKU-001",
+                      "cargoName": "蓝牙音箱",
+                      "cartonCount": 3,
+                      "skuQuantity": 90
+                    }]
+                  }]
+                }
+                """;
+    }
+
 }
diff --git a/print/src/test/java/com/baiyue/print/renderer/PdfBarcodeRendererTest.java b/print/src/test/java/com/baiyue/print/renderer/PdfBarcodeRendererTest.java
new file mode 100644
index 000000000..dfce28def
--- /dev/null
+++ b/print/src/test/java/com/baiyue/print/renderer/PdfBarcodeRendererTest.java
@@ -0,0 +1,22 @@
+package com.baiyue.print.renderer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.zxing.common.BitMatrix;
+import org.junit.jupiter.api.Test;
+
+class PdfBarcodeRendererTest {
+    @Test
+    void encodesCode128DeterministicallyWithQuietZone() {
+        PdfBarcodeRenderer renderer = new PdfBarcodeRenderer();
+
+        BitMatrix first = renderer.encode("DP-260911-0034");
+        BitMatrix second = renderer.encode("DP-260911-0034");
+
+        assertThat(first).isEqualTo(second);
+        assertThat(first.getHeight()).isEqualTo(1);
+        assertThat(first.getWidth()).isGreaterThan(100);
+        assertThat(first.getEnclosingRectangle()).isNotNull();
+        assertThat(first.getEnclosingRectangle()[0]).isGreaterThanOrEqualTo(5);
+    }
+}
diff --git a/print/src/test/java/com/baiyue/print/service/DispatchBolPdfServiceGenerationTest.java b/print/src/test/java/com/baiyue/print/service/DispatchBolPdfServiceGenerationTest.java
new file mode 100644
index 000000000..7e8aaf050
--- /dev/null
+++ b/print/src/test/java/com/baiyue/print/service/DispatchBolPdfServiceGenerationTest.java
@@ -0,0 +1,85 @@
+package com.baiyue.print.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.baiyue.print.config.PrintPdfProperties;
+import com.baiyue.print.dto.DispatchBolPdfDtos;
+import com.baiyue.print.renderer.DispatchBolRenderer;
+import com.baiyue.print.renderer.PdfUnits;
+import jakarta.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+@SpringJUnitConfig(classes = {DispatchBolPdfService.class, PrintPdfProperties.class,
+        PdfGenerationLimiter.class, DispatchBolRenderer.class})
+class DispatchBolPdfServiceGenerationTest {
+    @Resource private DispatchBolPdfService service;
+
+    @Test
+    void generatesStableA4BolWithEmbeddedChineseFontAndBlackHeaders() throws Exception {
+        DispatchBolPdfDtos.Document page = new DispatchBolPdfDtos.Document(
+                "洛杉矶仓", "—", "五月开发验收车队", "ISA-446646", "2026-09-11 18:39:37",
+                "DEV-83222028", "—", "ABE4", "ABE4", "—", "DS-WH-20260911-692865",
+                "FBA-SHIP-1", "PO-1", 4, 1, 1,
+                List.of(new DispatchBolPdfDtos.CargoRow("TSTU2186171", "TSTU2186171-126-001", "ABE4",
+                        "NYEXX2609110181", "FBA-SHIP-1", "PO-1", 4)));
+        var generated = service.generate(new DispatchBolPdfDtos.Request(DispatchBolPdfDtos.TEMPLATE,
+                new DispatchBolPdfDtos.PageSpec(new BigDecimal("210"), new BigDecimal("297")),
+                "DS-WH-20260911-692865-BOL.pdf", List.of(page)));
+
+        assertThat(generated.content()).startsWith("%PDF-".getBytes(java.nio.charset.StandardCharsets.US_ASCII));
+        try (PDDocument pdf = Loader.loadPDF(generated.content())) {
+            assertThat(pdf.getNumberOfPages()).isEqualTo(1);
+            assertThat(pdf.getPage(0).getMediaBox().getWidth()).isCloseTo(PdfUnits.mmToPt(210), org.assertj.core.data.Offset.offset(.002f));
+            assertThat(pdf.getPage(0).getMediaBox().getHeight()).isCloseTo(PdfUnits.mmToPt(297), org.assertj.core.data.Offset.offset(.002f));
+            assertThat(new PDFTextStripper().getText(pdf)).contains("BILL OF LADING", "洛杉矶仓", "DS-WH-20260911-692865", "TSTU2186171", "Total CTNS:", "4");
+        }
+    }
+
+    @Test
+    void rendersDenseContinuationPageAndPrintsTotalOnlyOnLastPage() throws Exception {
+        List<DispatchBolPdfDtos.CargoRow> firstRows = rows(1, 18);
+        List<DispatchBolPdfDtos.CargoRow> continuationRows = rows(19, 44);
+        DispatchBolPdfDtos.Document first = page(1, 2, firstRows);
+        DispatchBolPdfDtos.Document second = page(2, 2, continuationRows);
+
+        var generated = service.generate(new DispatchBolPdfDtos.Request(DispatchBolPdfDtos.TEMPLATE,
+                new DispatchBolPdfDtos.PageSpec(new BigDecimal("210"), new BigDecimal("297")),
+                "dense-bol.pdf", List.of(first, second)));
+
+        try (PDDocument pdf = Loader.loadPDF(generated.content())) {
+            assertThat(pdf.getNumberOfPages()).isEqualTo(2);
+            PDFTextStripper stripper = new PDFTextStripper();
+            stripper.setStartPage(1);
+            stripper.setEndPage(1);
+            String firstText = stripper.getText(pdf);
+            stripper.setStartPage(2);
+            stripper.setEndPage(2);
+            String secondText = stripper.getText(pdf);
+            assertThat(firstText).contains("BILL OF LADING", "PALLET-01", "1 / 2").doesNotContain("Total CTNS:");
+            assertThat(secondText).contains("PALLET-44", "Total CTNS:", "44", "2 / 2").doesNotContain("SHIP FROM");
+        }
+    }
+
+    private DispatchBolPdfDtos.Document page(int pageNumber, int pageCount, List<DispatchBolPdfDtos.CargoRow> rows) {
+        return new DispatchBolPdfDtos.Document("NOBLE LOGISTICS INC", "10767 7th Street", "ECHO", "14068390973 F",
+                "09/14/2026 08:00 EDT", "—", "—", "IND9", "IND9", "—", "DS-WH-20260911-692865",
+                "FBA19TEST", "PO-TEST", 44, pageNumber, pageCount, rows);
+    }
+
+    private List<DispatchBolPdfDtos.CargoRow> rows(int start, int end) {
+        List<DispatchBolPdfDtos.CargoRow> rows = new ArrayList<>();
+        for (int index = start; index <= end; index++) {
+            String pallet = index <= 4 ? "PALLET-01" : "PALLET-" + String.format("%02d", index);
+            rows.add(new DispatchBolPdfDtos.CargoRow("D2250", pallet, "CLT2转IND9", "HDHK2608" + String.format("%06d", index),
+                    "FBA19TEST" + index + "-" + index + "件", "PO" + index, 1));
+        }
+        return rows;
+    }
+}
diff --git a/print/src/test/java/com/baiyue/print/service/DropshipPalletA4PdfServiceGenerationTest.java b/print/src/test/java/com/baiyue/print/service/DropshipPalletA4PdfServiceGenerationTest.java
new file mode 100644
index 000000000..3b7076e93
--- /dev/null
+++ b/print/src/test/java/com/baiyue/print/service/DropshipPalletA4PdfServiceGenerationTest.java
@@ -0,0 +1,93 @@
+package com.baiyue.print.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.print.config.PrintPdfProperties;
+import com.baiyue.print.dto.DropshipPalletA4PdfDtos;
+import com.baiyue.print.renderer.DropshipPalletA4Renderer;
+import com.baiyue.print.renderer.PdfBarcodeRenderer;
+import com.baiyue.print.renderer.PdfUnits;
+import jakarta.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+@SpringJUnitConfig(classes = {DropshipPalletA4PdfService.class, PrintPdfProperties.class,
+        PdfGenerationLimiter.class, DropshipPalletA4Renderer.class, PdfBarcodeRenderer.class})
+class DropshipPalletA4PdfServiceGenerationTest {
+    @Resource private DropshipPalletA4PdfService service;
+
+    @Test
+    void generatesOneA4PageWithPalletBarcodeAndSkuDetails() throws Exception {
+        DropshipPalletA4PdfDtos.Document document = new DropshipPalletA4PdfDtos.Document(
+                "DP-260911-0034", "NYEXX2609110249", 3, 2,
+                new BigDecimal("90"), new BigDecimal("0.534"), "DP-260911-0034",
+                List.of(
+                        new DropshipPalletA4PdfDtos.SkuRow("NYEXX2609110249", "SKU-001", "蓝牙音箱", 2, 40),
+                        new DropshipPalletA4PdfDtos.SkuRow("NYEXX2609110249", "SKU-002", "充电线", 1, 50)));
+        var generated = service.generate(new DropshipPalletA4PdfDtos.Request(
+                DropshipPalletA4PdfDtos.TEMPLATE,
+                new DropshipPalletA4PdfDtos.PageSpec(new BigDecimal("210"), new BigDecimal("297")),
+                "DP-260911-0034-A4托盘信息单.pdf", List.of(document)));
+        assertThat(generated.pageCount()).isEqualTo(1);
+        assertThat(generated.content()).startsWith("%PDF-".getBytes(java.nio.charset.StandardCharsets.US_ASCII));
+        try (PDDocument pdf = Loader.loadPDF(generated.content())) {
+            assertThat(pdf.getNumberOfPages()).isEqualTo(1);
+            assertThat(pdf.getPage(0).getMediaBox().getWidth()).isCloseTo(PdfUnits.mmToPt(210), org.assertj.core.data.Offset.offset(.002f));
+            assertThat(pdf.getPage(0).getMediaBox().getHeight()).isCloseTo(PdfUnits.mmToPt(297), org.assertj.core.data.Offset.offset(.002f));
+            assertThat(new PDFTextStripper().getText(pdf))
+                    .contains("DP-260911-0034", "NYEXX2609110249", "SKU 明细", "SKU-001", "SKU-002", "40", "50")
+                    .containsOnlyOnce("DP-260911-0034")
+                    .doesNotContain("状态", "待封托", "已封托");
+        }
+    }
+
+    @Test
+    void keepsTenInboundCodesAndThirtyTwoSkuRowsOnOneA4Page() throws Exception {
+        List<String> inboundCodes = new ArrayList<>();
+        for (int index = 1; index <= 10; index++) inboundCodes.add("NYEXX260911" + String.format("%04d", 240 + index));
+        List<DropshipPalletA4PdfDtos.SkuRow> rows = new ArrayList<>();
+        for (int index = 1; index <= 32; index++) {
+            rows.add(new DropshipPalletA4PdfDtos.SkuRow(inboundCodes.get((index - 1) % inboundCodes.size()),
+                    "SKU-" + String.format("%03d", index), "测试商品" + index, 2, index * 5));
+        }
+        DropshipPalletA4PdfDtos.Document document = new DropshipPalletA4PdfDtos.Document(
+                "DP-260911-0034", String.join("/", inboundCodes), 64, 32,
+                new BigDecimal("860.5"), new BigDecimal("6.728"), "DP-260911-0034", rows);
+        var generated = service.generate(new DropshipPalletA4PdfDtos.Request(
+                DropshipPalletA4PdfDtos.TEMPLATE,
+                new DropshipPalletA4PdfDtos.PageSpec(new BigDecimal("210"), new BigDecimal("297")),
+                "DP-260911-0034-高密度预览.pdf", List.of(document)));
+        try (PDDocument pdf = Loader.loadPDF(generated.content())) {
+            assertThat(pdf.getNumberOfPages()).isEqualTo(1);
+            assertThat(new PDFTextStripper().getText(pdf))
+                    .contains("NYEXX2609110241", "NYEXX2609110250", "SKU-001", "SKU-032")
+                    .containsOnlyOnce("DP-260911-0034");
+        }
+    }
+
+    @Test
+    void rejectsSkuRowsThatCannotFitOnOneA4Page() {
+        List<DropshipPalletA4PdfDtos.SkuRow> rows = new ArrayList<>();
+        for (int index = 0; index < 35; index++) {
+            rows.add(new DropshipPalletA4PdfDtos.SkuRow("INBOUND", "SKU-" + index, "商品", 1, 1));
+        }
+        DropshipPalletA4PdfDtos.Document document = new DropshipPalletA4PdfDtos.Document(
+                "DP-260911-0034", "INBOUND", 35, 35,
+                BigDecimal.ZERO, BigDecimal.ZERO, "DP-260911-0034", rows);
+
+        assertThatThrownBy(() -> service.generate(new DropshipPalletA4PdfDtos.Request(
+                DropshipPalletA4PdfDtos.TEMPLATE,
+                new DropshipPalletA4PdfDtos.PageSpec(new BigDecimal("210"), new BigDecimal("297")),
+                "pallet.pdf", List.of(document))))
+                .isInstanceOf(BizException.class)
+                .hasMessageContaining("one-page A4 capacity");
+    }
+}
diff --git a/scripts/AGENTS.md b/scripts/AGENTS.md
index 5d8b39022..e2db4bc29 100644
--- a/scripts/AGENTS.md
+++ b/scripts/AGENTS.md
@@ -20,7 +20,7 @@
 | 入仓测量与整票库位块专项 | `admin-test-env-modules/inbound-measurement.mjs`、`admin-test-env-modules/README.md` | 仍从 Admin 总入口按 `orders,inbound-measurement` 依赖链执行；开启 `--verify-pallet-location-guide true` 后逐张确认回查块扩容只能追加，既有槽身份不得漂移，并验证删除图片后空槽保留与替代图片复用；会写目标环境，必须有对应环境授权 |
 | Finance 扩展 HTTP 模块 | `admin-test-env-modules/firstleg-container-fee-allocation.mjs`、`finance-direct-paid-isolation.mjs`、`phase4-overseas-finance-cross-region.mjs` | 分别验证柜费跨客户分摊、海外仓服务直接已付隔离、五类海外费用跨区入池；必须由 Admin 总入口按已登记依赖运行，使用本轮资源且禁止借历史数据，真实 HTTP 仍须当前轮授权 |
 | 订舱与拖车服务中心链路 | `admin-test-env-modules/service-center-flow.mjs` | 复用本轮 `RELEASED` 订舱，创建订舱级拖车并验证附件、完整状态链、历史和稳定关联；由 Admin 总入口按依赖运行，会写目标环境 |
-| 尾程单控制与目的港码头拖车 | `admin-test-env-modules/phase4-tail-order-controls.mjs`、`admin-test-env-modules/phase5-terminal-drayage.mjs`、`admin-test-env-modules/phase4-carrier-nodes.mjs` | PDA 前覆盖整柜接柜仓变更与恢复、单/批目的仓变更、单/批合托标记、CSV 导出、订单费用、单票暂扣/解除、八个人工节点和逐票人工计划；接柜仓仅复用公共主档且恢复原值。PDA 卸柜后经正式码头拖车接口完成选车队、预约、提柜、还柜，船节点模块只读核对最终回写，不直接伪造最后两个节点 |
+| 尾程单控制与目的港码头拖车 | `admin-test-env-modules/phase4-tail-order-controls.mjs`、`admin-test-env-modules/phase5-terminal-drayage.mjs`、`admin-test-env-modules/phase4-carrier-nodes.mjs` | PDA 前覆盖整柜接柜仓变更与恢复、单/批目的仓变更、单/批合托标记、CSV 导出、订单费用、单票暂扣/解除、八个人工节点和逐票人工计划；接柜仓仅复用公共主档且恢复原值。货柜达到 `PICKUP_READY` 后先经正式码头拖车接口完成选车队、预约和提柜，PDA 卸柜后再还柜；船节点模块只读核对最终回写，不直接伪造最后两个节点。人工船节点的 `observedAt` 使用运行机本地墙钟时间，避免无时区 `LocalDateTime` 被 UTC 偏移倒序 |
 | 定向 HTTP/诊断 | 以 `README.md` 的“仓库级入口清单”为准 | 必须明确是只读诊断还是会补证据、创建资源或推进状态，不能用诊断成功冒充全量通过 |
 | 本地质量与静态合同 | `backend-full-regression.ps1`、`frontend-full-regression.ps1`（含国内 PDA Node 全量测试）、`mapper-scan-contract.mjs`、`script-documentation-contract.test.mjs` 等 | 默认不访问开发或测试环境；数据库非 dry-run、Nacos 发布等有写入能力的入口必须按 README 单独识别 |
 | 部署与基础设施 | `../deploy/scripts/`、`../deploy/rocketmq/` | 靠近部署组件管理，不移动到根脚本目录；部署、初始化数据库或发布配置必须获得当前轮明确授权 |
diff --git a/scripts/admin-test-env-acceptance.mjs b/scripts/admin-test-env-acceptance.mjs
index a92d0ef0b..ff17e07cf 100644
--- a/scripts/admin-test-env-acceptance.mjs
+++ b/scripts/admin-test-env-acceptance.mjs
@@ -5,7 +5,7 @@ import { dirname, resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import process from 'node:process'
 
-const CONFIGURED_MODULES = ['merchant-qualification-fixture', 'customers', 'overseas-storage-fees', 'system', 'notifications', 'master-data', 'suppliers', 'domestic-container', 'orders', 'inbound-hold', 'fee-items', 'pricing', 'downloads', 'inbound-weight-ocr', 'inbound-measurement', 'inbound-fees', 'phase3-container-loading', 'phase3-container-overview', 'phase3-loading', 'phase3-loading-model-bridge', 'phase3-pda-convergence', 'phase3-evidence-gate', 'supplemental', 'supplemental-boundaries', 'ocean-bookings', 'truck-appointments', 'service-center-flow', 'phase3-loading-finalize', 'phase3-container-documents', 'phase3-customs', 'phase3-container-customs', 'phase3-port-schedules', 'phase3-carrier-schedule-queries', 'phase3-outbound-dispatch', 'phase3-outbound-aggregate', 'phase3-dispatch-gate', 'phase3-waiting-for-loading', 'phase3-warehouse-rbac', 'phase3-order-splitting', 'manual-state-matrix', 'phase4-overseas-warehouse', 'phase4-carrier-pickup-ready', 'phase4-tail-order-controls', 'phase4-overseas-pda', 'phase4-overseas-pda-operations', 'phase4-overseas-inbound-operations', 'phase4-overseas-client-services', 'phase4-overseas-dispatch', 'phase5-overseas-fulfillment', 'phase5-terminal-drayage', 'phase4-cross-region-events', 'phase4-overseas-business', 'phase4-overseas-master-data', 'phase4-carrier-nodes', 'finance-full-fixtures', 'finance-reconciliation-full', 'finance-settlement-full', 'finance-direct-paid-isolation', 'finance-downloads', 'firstleg-container-fee-allocation', 'phase4-overseas-finance-cross-region', 'phase4-overseas-wallet-and-pallet-cost', 'customer-operating-statistics']
+const CONFIGURED_MODULES = ['merchant-qualification-fixture', 'customers', 'overseas-storage-fees', 'system', 'notifications', 'master-data', 'suppliers', 'domestic-container', 'orders', 'inbound-hold', 'fee-items', 'pricing', 'downloads', 'inbound-weight-ocr', 'inbound-measurement', 'inbound-fees', 'phase3-container-loading', 'phase3-container-overview', 'phase3-loading', 'phase3-loading-model-bridge', 'phase3-pda-convergence', 'phase3-evidence-gate', 'supplemental', 'supplemental-boundaries', 'ocean-bookings', 'truck-appointments', 'service-center-flow', 'phase3-loading-finalize', 'phase3-container-documents', 'phase3-customs', 'phase3-container-customs', 'phase3-port-schedules', 'phase3-carrier-schedule-queries', 'phase3-outbound-dispatch', 'phase3-outbound-aggregate', 'phase3-dispatch-gate', 'phase3-waiting-for-loading', 'phase3-warehouse-rbac', 'phase3-order-splitting', 'manual-state-matrix', 'phase4-overseas-warehouse', 'phase4-carrier-pickup-ready', 'phase4-tail-order-controls', 'phase4-overseas-pda', 'phase4-overseas-pda-operations', 'phase4-overseas-return-receipt', 'phase4-overseas-inbound-operations', 'phase4-overseas-client-services', 'phase4-overseas-dispatch', 'phase5-overseas-fulfillment', 'phase5-terminal-drayage', 'phase4-cross-region-events', 'phase4-overseas-business', 'phase4-overseas-master-data', 'phase4-carrier-nodes', 'finance-full-fixtures', 'finance-reconciliation-full', 'finance-settlement-full', 'finance-direct-paid-isolation', 'finance-downloads', 'firstleg-container-fee-allocation', 'phase4-overseas-finance-cross-region', 'phase4-overseas-wallet-and-pallet-cost', 'customer-operating-statistics']
 const OPTIONAL_MODULES = ['manual-order-splitting-fixture', 'manual-order-splitting-verify',
   'manual-preload-push-fixture', 'manual-preload-push-verify',
   'manual-pda-ready-fixture', 'manual-pda-ready-verify',
@@ -75,6 +75,7 @@ const MODULE_DEPENDENCIES = new Map([
   ['phase4-tail-order-controls', ['phase4-carrier-pickup-ready']],
   ['phase4-overseas-pda', ['phase4-tail-order-controls']],
   ['phase4-overseas-pda-operations', ['phase4-overseas-pda']],
+  ['phase4-overseas-return-receipt', ['merchant-qualification-fixture']],
   ['phase4-overseas-inbound-operations', ['phase4-overseas-pda-operations']],
   ['phase4-overseas-client-services', ['phase4-overseas-pda-operations']],
   ['phase4-overseas-dispatch', ['phase4-overseas-pda-operations']],
@@ -294,6 +295,7 @@ function usage() {
   --wait-split-package-count <n> 单票指定总箱数，1-1000；省略时使用既有轮换
   --wait-split-sequence <n> 单票全局序号，正整数，默认1
   --wait-split-random-value <n> 单票随机选择值，正整数，默认使用全局序号
+  --prepare-dropship-manual-count <true> 一件代发停在PDA清点前，不领取、不清点、不归托
   --verify-pallet-location-guide <true> 验证整票库位块、图片槽绑定与删除后 RESERVED_EMPTY
   --route-mode <mode> 线路选择：fixed 或 random，默认fixed
   --manual-split-fixture-report <path> 人工分柜准备报告路径，仅只读核验模块使用
@@ -333,6 +335,7 @@ export function parseArguments(argv) {
   const merchantPassword = values.get('merchant-password') || process.env.MERCHANT_TEST_PASSWORD || ''
   const requiresMarkerOwnedMerchantFixture = [
     'phase4-overseas-business',
+    'phase4-overseas-return-receipt',
     'phase4-overseas-client-services',
     'phase5-overseas-fulfillment',
     'phase4-overseas-finance-cross-region',
@@ -362,6 +365,7 @@ export function parseArguments(argv) {
     waitSplitPackageCount: Number(values.get('wait-split-package-count') || 0),
     waitSplitSequence: Number(values.get('wait-split-sequence') || 1),
     waitSplitRandomValue: Number(values.get('wait-split-random-value') || values.get('wait-split-sequence') || 1),
+    prepareDropshipManualCount: values.get('prepare-dropship-manual-count') === 'true',
     verifyPalletLocationGuide: values.has('verify-pallet-location-guide'),
     routeMode: values.get('route-mode') || 'fixed',
     quiet: values.get('quiet') === 'true',
@@ -421,6 +425,10 @@ export function validateExecutionOptions(options) {
       && (!options.originWarehouseName || !options.channelName || !options.channelCode)) {
     throw new Error('randomized订单档案必须同时固定起运仓、渠道名称和渠道编码')
   }
+  if (options.prepareDropshipManualCount
+      && (!options.modules.includes('orders') || !options.modules.includes('inbound-measurement'))) {
+    throw new Error('prepare-dropship-manual-count要求同时执行orders和inbound-measurement模块')
+  }
   if (options.waitSplitCount > 1) {
     const fixtureModules = new Set(['merchant-qualification-fixture', 'orders', 'inbound-measurement',
       'manual-order-splitting-fixture', 'coload-groups', 'firstleg-container-fee-allocation'])
@@ -531,6 +539,7 @@ export class AcceptanceRun {
     this.modules = []
     this.scenarios = []
     this.createdResources = {}
+    this.phase4ProducerAttempts = new Map()
     this.deploymentBlockers = []
     this.coverageGaps = []
     this.context = {}
@@ -767,10 +776,12 @@ export class AcceptanceRun {
   captureWaitSplitFixture(sequence) {
     const order = this.createdResources.orders || {}
     const measurement = this.createdResources.inboundMeasurement || {}
+    const expectedProcessStatus = this.options.prepareDropshipManualCount ? 'WAIT_PALLETIZE' : 'WAIT_SPLIT'
     const ready = Boolean(order.orderId && measurement.inboundId
       && String(order.tenantId) === String(measurement.tenantId)
-      && measurement.processStatus === 'WAIT_SPLIT' && measurement.finalStatus === 'APPROVED')
-    this.assert('wait-split-fixtures', `固定客户第 ${sequence} 单停在待分柜`, null, ready,
+      && measurement.processStatus === expectedProcessStatus && measurement.finalStatus === 'APPROVED')
+    this.assert('wait-split-fixtures', this.options.prepareDropshipManualCount
+      ? `固定客户第 ${sequence} 单停在PDA清点前` : `固定客户第 ${sequence} 单停在待分柜`, null, ready,
       `tenantId=${measurement.tenantId || 'missing'}, orderId=${order.orderId || 'missing'}, inboundId=${measurement.inboundId || 'missing'}, processStatus=${measurement.processStatus || 'missing'}, reviewStatus=${measurement.finalStatus || 'missing'}`,
       { scenario: 'fixed-customer-wait-split', deploymentBlocker: true })
     if (!ready) return false
@@ -780,7 +791,8 @@ export class AcceptanceRun {
       orderNo: order.orderNo || null, inboundId: String(measurement.inboundId),
       inboundCode: order.inboundCode || null, processStatus: measurement.processStatus,
       reviewStatus: measurement.finalStatus, skuCount: order.skuLines?.length || null,
-      totalPackageCount: (order.skuLines || []).reduce((sum, item) => sum + Number(item.packageCount || 0), 0),
+      totalPackageCount: measurement.actualPackageCount
+        || (order.skuLines || []).reduce((sum, item) => sum + Number(item.packageCount || 0), 0),
       palletCount: measurement.palletCount || null,
       actualGrossWeightKg: measurement.actualGrossWeightKg || null,
       actualNetWeightKg: measurement.actualNetWeightKg || null,
@@ -1317,7 +1329,7 @@ export class AcceptanceRun {
     const createdKeys = ['orders', 'ocrInbound', 'testInbound', 'inboundMeasurement']
     const contextKeys = ['inboundWeightOcr', 'ocrInbound', 'testInbound', 'createdInbound',
       'phase3LoadingRequireSharedOverflow', 'phase3LoadingIncrementalPackageCount',
-      'phase3LoadingIncrementalDetailCount', 'orderProfile', 'measurementPalletOverride']
+      'phase3LoadingIncrementalDetailCount', 'orderProfile']
     const createdSnapshot = new Map(createdKeys.map((key) => [key, {
       present: Object.hasOwn(this.createdResources, key), value: this.createdResources[key],
     }]))
@@ -1362,9 +1374,6 @@ export class AcceptanceRun {
       : { forced: false, disabled: [] }
     this.context.phase3LoadingRequireSharedOverflow = requireSharedOverflow
     try {
-      if (requireSharedOverflow) {
-        this.context.measurementPalletOverride = await this.createPhase3FreshMeasurementPallet(warehouseId)
-      }
       const measurement = await import(new URL('./admin-test-env-modules/inbound-measurement.mjs', import.meta.url))
       await this.executeModule('inbound-measurement-phase3-loading-fixture', () => measurement.run(this))
     } finally {
@@ -1397,7 +1406,6 @@ export class AcceptanceRun {
     const incrementalMarker = `${originalMarker}-LOAD${suffix}-INC`
     this.marker = incrementalMarker
     this.context.phase3LoadingRequireSharedOverflow = false
-    delete this.context.measurementPalletOverride
     this.context.phase3LoadingIncrementalPackageCount = 2
     this.context.phase3LoadingIncrementalDetailCount = 4
     // orders.mjs derives the actual SKU/package shape from waitSplitVariant.  Override that
@@ -1470,7 +1478,9 @@ export class AcceptanceRun {
 
   async runPhase4ProducerVariant(label, destinationType, fulfillmentType = 'STANDARD', pickupRequired = false) {
     const matrixMarker = this.marker
-    const variantMarker = `${matrixMarker}-P4-${label}`
+    const attempt = (this.phase4ProducerAttempts.get(label) || 0) + 1
+    this.phase4ProducerAttempts.set(label, attempt)
+    const variantMarker = `${matrixMarker}-P4-${label}${attempt === 1 ? '' : `-R${attempt}`}`
     const contextKeys = ['orderDestinationType', 'orderFulfillmentType', 'phase4ProducerMatrixMarker']
     const createdKeys = [
       'phase3Loading', 'phase3LoadingCompletedProducer', 'phase3ContainerDocuments', 'orchestrationFixtures', 'oceanBooking',
@@ -1575,7 +1585,7 @@ export class AcceptanceRun {
     const hasStandardFbaProducer = () => (this.createdResources.phase4InboundProducerFixtures?.containers || [])
       .some((item) => item?.destinationType === 'FBA'
         && item?.fulfillmentType !== 'ONE_CLICK_DROPSHIP'
-        && String(item?.resourceKey || '').includes('-P4-FBA-STANDARD:'))
+        && /-P4-FBA-STANDARD(?:-R\d+)?:/.test(String(item?.resourceKey || '')))
     if (!hasStandardFbaProducer()) {
       await this.runPhase4ProducerVariant('FBA-STANDARD', 'FBA', 'STANDARD', true)
     }
@@ -1583,7 +1593,7 @@ export class AcceptanceRun {
       await this.runPhase4ProducerVariant('OVERSEAS-PRIMARY', 'OVERSEAS', 'ONE_CLICK_DROPSHIP', true)
     }
     const hasSecondaryProducer = () => (this.createdResources.phase4InboundProducerFixtures?.containers || [])
-      .some((item) => String(item?.resourceKey || '').includes('-P4-SECONDARY:'))
+      .some((item) => /-P4-SECONDARY(?:-R\d+)?:/.test(String(item?.resourceKey || '')))
     if (!hasSecondaryProducer()) {
       await this.runPhase4ProducerVariant('SECONDARY', 'FBA', 'STANDARD', false)
     }
@@ -1592,10 +1602,10 @@ export class AcceptanceRun {
     const dropshipReady = containers.find((item) => item?.fulfillmentType === 'ONE_CLICK_DROPSHIP')
     const standardFbaReady = containers.find((item) => item?.destinationType === 'FBA'
       && item?.fulfillmentType !== 'ONE_CLICK_DROPSHIP'
-      && String(item?.resourceKey || '').includes('-P4-FBA-STANDARD:'))
+      && /-P4-FBA-STANDARD(?:-R\d+)?:/.test(String(item?.resourceKey || '')))
     const overseasReady = containers.find((item) => item?.destinationType === 'OVERSEAS')
     const awaitingVariants = containers.filter((item) => ['SECONDARY']
-      .some((label) => String(item?.resourceKey || '').includes(`-P4-${label}:`)))
+      .some((label) => new RegExp(`-P4-${label}(?:-R\\d+)?:`).test(String(item?.resourceKey || ''))))
     const shippingMatrixReady = dropshipReady?.shippingReady === true
       && Boolean(dropshipReady?.carrierScheduleQueryId)
       && standardFbaReady?.shippingReady === true && Boolean(standardFbaReady?.carrierScheduleQueryId)
@@ -1609,37 +1619,6 @@ export class AcceptanceRun {
       { scenario: 'phase3-phase4-producer-fixture', deploymentBlocker: true })
   }
 
-  async createPhase3FreshMeasurementPallet(warehouseId) {
-    const module = 'phase3-loading-fixture'
-    const options = { scenario: 'phase3-loading-a0-fixture', deploymentBlocker: true }
-    const payload = {
-      warehouseId, palletType: 'STANDARD', capacityCbm: 1.5, weightKg: 25,
-      color: 'ORANGE', remark: `${this.marker}-inventory-snapshot-a0`,
-    }
-    const createResponse = await this.request('POST', '/api/platform/v1/pallets?tenantId=0', payload)
-    const palletId = String(this.apiSuccess(module, '创建本轮库存快照专用称重托盘', createResponse,
-      `warehouseId=${warehouseId}`, options) || '')
-    if (!palletId) return null
-
-    const detailResponse = await this.request('GET',
-      `/api/platform/v1/pallets/${encodeURIComponent(palletId)}?tenantId=0&warehouseId=${encodeURIComponent(warehouseId)}`)
-    const pallet = this.apiSuccess(module, '回读本轮库存快照专用称重托盘', detailResponse,
-      `palletId=${palletId}`, options)
-    const valid = String(pallet?.id || '') === palletId
-      && String(pallet?.warehouseId || '') === String(warehouseId)
-      && Boolean(String(pallet?.palletCode || '').trim())
-    this.assert(module, '本轮专用称重托盘尚未复用历史占用身份', detailResponse, valid,
-      `palletId=${palletId}, palletCode=${pallet?.palletCode || 'missing'}`, options)
-    if (!valid) return null
-
-    const fixture = {
-      id: palletId, code: String(pallet.palletCode), warehouseId: String(warehouseId),
-      marker: this.marker, retainedReason: '测量审核后成为正式库存占用，保留为开发验收证据',
-    }
-    this.createdResources.phase3LoadingFreshMeasurementPallet = fixture
-    return fixture
-  }
-
   async listAvailableLocationsForA0(warehouseId, module, options) {
     const locations = []
     const seen = new Set()
diff --git a/scripts/admin-test-env-modules/README.md b/scripts/admin-test-env-modules/README.md
index 11d777acc..48f054289 100644
--- a/scripts/admin-test-env-modules/README.md
+++ b/scripts/admin-test-env-modules/README.md
@@ -39,7 +39,7 @@ export async function run(context) {
 
 货柜查询使用 `/api/platform/v1/containers/domestic` 列表和 `/domestic/{id}` 详情，响应为 `WorkbenchItem`（`container`、`workbenchStage`、`statusSummary`、`allowedActions`），不接受旧扁平实体。默认 `phase3-container-loading` 同时验证页面的 ACTIVE、状态、关键字组合查询及详情结构；`container-detail-route-contract.test.mjs` 离线核对 Admin、Controller 和人工分段/同柜脚本读路径，并反证旧 DTO。定向真实 HTTP 使用总入口 `--modules phase3-container-loading`，仍自动展开本轮前置并创建测试资源；不借历史柜。
 
-一件代发的 `inbound-measurement` 前置通过 PDA 正式 `pallets/create-and-bind` 创建系统 DP 码并绑定待清点箱，不再按测试 marker 拼托盘号；默认一件代发后续链复用该前置。验证清点前及绑定后无待绑箱请求均拒绝且无空托、系统发码同操作重放保持托盘/计数不变、封托完成后原操作可重放；离线场景反向注入重复发码和空托，保证回归确实识别这两类故障。
+一件代发的 `inbound-measurement` 前置在测量草稿录入预计托数；审核通过时系统一次性预生成全部 DP 托盘码，允许空托先打印。PDA 既支持先清点箱再扫预生成托盘码批量归托，也支持先扫托盘后逐箱直接归托；预计托数不得超过实测箱数。验收逐托封托并确认全部箱数已绑定、全部预生成托盘已封托后任务才完成，默认一件代发后续链复用该前置。人工验收造数可传 `--prepare-dropship-manual-count true`，脚本会停在任务未领取、箱未清点、托盘未绑定的状态。
 
 该前置保存成功解析且清点的原始 `boxCode`，随装柜完成生产 fixture 传入默认 `phase4-overseas-pda`。默认矩阵同时创建 FBA 和 OVERSEAS 两种一件代发，必须先将全部原箱码经海外 `current/cartons/resolve` 精确解析到同一入仓码及冻结目的类型，再进入实收及库存验证；OVERSEAS 逐箱实收，A0404、错误箱码/归属或数量缺失均阻断，不扩展推算箱号或排除失败候选。现行 V2 托盘 SKU 分组必须携带 `sourceInboundDetailId`，离线合同同时锁定两个生产分支来源明细和上述真实 HTTP 调用链。
 
@@ -91,7 +91,8 @@ export async function run(context) {
 | Finance 扩展隔离与跨区费用 | `firstleg-container-fee-allocation.mjs`（柜次跨客户分摊）、`finance-direct-paid-isolation.mjs`（海外仓服务直接已付）、`phase4-overseas-finance-cross-region.mjs`（五类海外费用跨区进入 Finance） | 对应同名 `*-contract.test.mjs`；跨区事件持久化链在本轮获授权时另以只读数据库证据核对 |
 | 客户钱包与拆柜打托费自动闭环 | `phase4-overseas-wallet-and-pallet-cost.mjs`（授信初始化、平台充值、采购凭证/费用冻结结算、换标冻结结算/释放、Client 余额账本、国内/海外托盘汇总、按体积分摊及跨区金额守恒） | `phase4-overseas-wallet-and-pallet-cost-contract.test.mjs`；默认全量已启用，定向入口自动展开已审核客户与海外 PDA 实收链 |
 | 海外仓 HTTP 生命周期 | `phase4-overseas-warehouse.mjs` | `phase4-overseas-warehouse-contract.test.mjs` |
-| 海外 PDA 柜号收货与库内操作 HTTP 生命周期 | `phase4-overseas-pda.mjs`（按柜完成签收和实收，成功后仅以内存上下文交接操作员会话和已完成库存事实）、`phase4-overseas-pda-operations.mjs`（紧随收货执行盘点、整托移库、托盘拆装换绑和换标复核；finally 停用双操作员并清空临时 Token；任何真实 fixture 缺失均 fail-closed） | `phase4-overseas-pda-contract.test.mjs`、`phase4-overseas-pda-operations-contract.test.mjs` |
+| 海外 PDA 柜号收货与库内操作 HTTP 生命周期 | `phase4-overseas-pda.mjs`（按柜完成签收和实收，成功后仅以内存上下文交接操作员会话和已完成库存事实）、`phase4-overseas-pda-operations.mjs`（紧随收货执行盘点、公共位核对、托盘拆装换绑和换标复核；只复用本轮入仓计划已有空托盘及公共位，不新增托盘或库位；finally 停用双操作员并清空临时 Token；任何真实 fixture 缺失均 fail-closed） | `phase4-overseas-pda-contract.test.mjs`、`phase4-overseas-pda-operations-contract.test.mjs` |
+| 海外 PDA 退货入库、计费批次与退货合箱 | `phase4-overseas-return-receipt.mjs`（自包含创建本轮客户退货预报和绑定仓临时 PDA 操作员；覆盖退货单号/SKU 查询、正常空结果、分批签收、核平、超收、幂等、退货箱/SKU 库存、每次成功签收唯一仓储计费批次及合箱；finally 停用操作员） | `phase4-overseas-return-receipt-contract.test.mjs`；`ReturnReceiptServiceTest` 精确核对计费批次客户、仓库、签收单、起算时间和 `PENDING_PRICING` 初态 |
 | 尾程单公网控制与人工计划 | `phase4-tail-order-controls.mjs`（PDA 收货前对本轮柜执行整柜接柜仓变更/恢复与幂等冲突、单/批 FBA 目的仓变更、单/批合托标记并取消、CSV 导出、订单费用回查、单票暂扣/解除、八个人工节点和逐票人工计划） | `phase4-tail-order-controls-contract.test.mjs`；只复用现有公共接柜仓/FBA 主档，不新增仓库、托盘或库位；为目标柜全部入仓码创建 `MANUAL` 计划后交给 PDA 继续消费，不借历史订单 |
 | 海外入仓扩展、客户服务与排车 | `phase4-overseas-inbound-operations.mjs`、`phase4-overseas-client-services.mjs`、`phase4-overseas-dispatch.mjs` | 对应同名 `*-contract.test.mjs`；只消费本轮前置资源，缺失时 fail-closed |
 | 海外仓业务跨区事件与安全门禁 | `phase4-cross-region-events.mjs`（双 Token Audience 互斥、canonical 权限 403、国内装柜完成到 Lastleg 建单、海外柜完成到 Firstleg 回写、轮询重试/幂等/诊断证据；缺本轮 marker 前置时阻断） | `phase4-cross-region-events-contract.test.mjs` |
@@ -100,17 +101,17 @@ export async function run(context) {
 | 人工状态矩阵 | `manual-state-matrix.mjs` | `manual-state-matrix-contract.test.mjs`；验证装柜完成、报关和订舱相关状态组合 |
 | 海外业务 HTTP 生命周期 | `phase4-overseas-business.mjs` | `phase4-overseas-business-contract.test.mjs` |
 | 海外主数据 HTTP 生命周期 | `phase4-overseas-master-data.mjs` | `phase4-overseas-master-data-contract.test.mjs` |
-| 目的港码头拖车与船节点终态 | `phase5-terminal-drayage.mjs`（PDA 卸柜后复用 `ACTIVE + TRUCKING` 主数据，覆盖选车队、预约提柜、实际提柜、实际还柜及四命令幂等/历史）、`phase4-carrier-nodes.mjs`（PDA 前补录至 `PICKUP_READY`；拖车完成后只读核验 `PICKED_UP/EMPTY_RETURNED` 和停止语义） | `phase5-terminal-drayage-contract.test.mjs`、`phase4-carrier-nodes-contract.test.mjs`；不再由船节点脚本直接伪造提柜和还柜 |
+| 目的港码头拖车与船节点终态 | `phase5-terminal-drayage.mjs`（PDA 卸柜前复用 `ACTIVE + TRUCKING` 主数据完成选车队、预约和实际提柜，卸柜后完成实际还柜，并覆盖四命令幂等/历史）、`phase4-carrier-nodes.mjs`（PDA 前补录至 `PICKUP_READY`；拖车完成后只读核验 `PICKED_UP/EMPTY_RETURNED` 和停止语义） | `phase5-terminal-drayage-contract.test.mjs`、`phase4-carrier-nodes-contract.test.mjs`；不再由船节点脚本直接伪造提柜和还柜 |
 | 海外排车、出库、派送、异常与回访 HTTP 生命周期 | `phase5-overseas-fulfillment.mjs`（复用本轮海外仓已收货托盘和预排单，正式创建临时 PDA 操作员并在 `finally` 停用；覆盖排车编辑、转出库/派送、PDA 全量拣货/发车、派送完成、客户回访、人工异常及派送退回） | `phase5-overseas-fulfillment-contract.test.mjs` |
 | 初始化基线（仅离线） | — | `initialization-baseline-contract.test.mjs` |
 
 表中的 `*-fixture.mjs` 是被业务模块复用的测试数据前置，不是新增的独立全量入口。执行 HTTP 时仍从 `../admin-test-env-acceptance.mjs` 进入；`*contract.test.mjs` 只做离线脚本结构和数据归属回归。
 
-海外仓业务 HTTP 验收使用国内登录响应同时签发的短时海外 Token。总入口通过 `--gateway` 访问国内 Gateway，通过 `--overseas-gateway` 访问海外 Gateway。海外仓、海外业务和海外主数据模块只对带本轮 marker 的资源执行已确认的新增、编辑、状态与导出，并在结束前按契约停用；PDA 收货模块使用本轮临时 OVERSEAS_WAREHOUSE_PDA_OPERATOR 海外 Token，只调用 `/api/pda/v1/last-leg/receiving-containers/**` 柜号收货入口，不接受 `customerId`、`planNo` 或分配 ID。收货成功后由相邻的 `phase4-overseas-pda-operations` 消费仅存在于进程内存、不会进入 JSON 报告的 Token 与库存事实，执行盘点、整托移库、托盘操作和换标；新模块无论成功失败都在 finally 停用两个 picker 并清空临时凭据。两模块均不调用出库、退货出库、派送或内部接口；任何真实柜、箱唛、托盘、库存或换标前置缺失都必须形成 deployment blocker，不能按空场景通过；船节点禁止手工创建任务。
+海外仓业务 HTTP 验收使用国内登录响应同时签发的短时海外 Token。总入口通过 `--gateway` 访问国内 Gateway，通过 `--overseas-gateway` 访问海外 Gateway。海外仓、海外业务和海外主数据模块只对带本轮 marker 的资源执行已确认的新增、编辑、状态与导出，并在结束前按契约停用；PDA 收货模块使用本轮临时 OVERSEAS_WAREHOUSE_PDA_OPERATOR 海外 Token，只调用 `/api/pda/v1/last-leg/receiving-containers/**` 柜号收货入口，不接受 `customerId`、`planNo` 或分配 ID。收货成功后由相邻的 `phase4-overseas-pda-operations` 消费仅存在于进程内存、不会进入 JSON 报告的 Token 与库存事实，执行盘点、公共位核对、托盘操作和换标；库内操作只复用收货计划产生的已有空托盘及当前仓 `VIRTUAL + ACTIVE` 公共位，不调用托盘或库位新增接口。新模块无论成功失败都在 finally 停用两个 picker 并清空临时凭据。两模块均不调用出库、退货出库、派送或内部接口；任何真实柜、箱唛、托盘、库存或换标前置缺失都必须形成 deployment blocker，不能按空场景通过；船节点禁止手工创建任务。
 
 节点全链定向入口为 `--modules phase4-overseas-pda`。依赖展开固定先为本轮 `LOADED` 柜次完成国内 `CUSTOMS_DECLARATION` 与 PDA 装柜证据，再确认国内出仓；离仓后才维护 `DESTINATION_CLEARANCE`、`DELIVERY_ORDER` 两类目的港文件，PU 使用柜级数字码而不是文件，随后核对自动创建的 `OUTBOUND_CONFIRM` 船节点任务、人工补录至实际 `PICKUP_READY`，最后验证海外 PDA 候选可见。资料模块只写本轮 marker 柜次，覆盖上传/完成重放、同键异载荷 `A0409`、冲突后零漂移和聚合回读；任一 fixture 或 Trace 缺失均为 deployment blocker。
 
-尾程单公网控制与目的港码头拖车定向入口为 `--modules phase4-carrier-nodes`。依赖会在海外 PDA 前插入 `phase4-tail-order-controls`，先对本轮柜验证接柜仓变更/恢复、目的仓变更、合托标记、CSV 导出、订单费用、暂扣阻断、解除和八个人工节点，再通过柜级预览与确认自动生成逐票计划和实体托盘；PDA 必须消费这些计划托盘，不得临时另建脱离计划的托盘。卸柜完成后再运行 `phase5-terminal-drayage`，只复用公共 `ACTIVE + TRUCKING` 供应商，依次推进选车队、预约、提柜和还柜。最后的船节点模块仅回读两次业务动作同步生成的 `PICKED_UP/EMPTY_RETURNED`，不得直接补录这两个节点。
+尾程单公网控制与目的港码头拖车定向入口为 `--modules phase4-carrier-nodes`。依赖会在海外 PDA 前插入 `phase4-tail-order-controls`，先对本轮柜验证接柜仓变更/恢复、目的仓变更、合托标记、CSV 导出、订单费用、暂扣阻断、解除和八个人工节点，再通过柜级预览与确认自动生成逐票计划和实体托盘；PDA 必须消费这些计划托盘，不得临时另建脱离计划的托盘。货柜到达 `PICKUP_READY` 后先复用公共 `ACTIVE + TRUCKING` 供应商完成选车队、预约和实际提柜；PDA 卸柜完成后，有界等待跨区卸柜事件回写国内聚合为 `UNLOADED`，再确认实际还柜。最后的船节点模块仅回读两次业务动作同步生成的 `PICKED_UP/EMPTY_RETURNED`，不得直接补录这两个节点。
 
 ```powershell
 node --env-file="$env:USERPROFILE\.codex\chongchong-global-test-acceptance.env" scripts/admin-test-env-acceptance.mjs --modules phase4-carrier-nodes
@@ -140,7 +141,7 @@ node --env-file="$env:USERPROFILE\.codex\chongchong-global-dev-acceptance.env" s
 
 其中，无号 push 只冻结装柜计划、建立 bridge 并使预装可见，不得创建 PDA task；订舱放舱也不创建真实货柜或 allocation。港口取得真实柜号后，四字段 link 直接补全原模拟柜并创建 allocation，原 `containerBookingId/cabinetNo/loadingPlan/items` 不变；未关联、订舱未 `RELEASED` 或整份计划未确认时，PDA 查询必须返回业务码 `A0404`。唯一确认入口为 `POST /api/platform/v1/first-leg/loading-plans/{loadingPlanId}/confirm`，请求体只含当前计划 `expectedVersion` 并携带 `Idempotency-Key`；成功必须返回 `confirmationStatus=CONFIRMED`、`readiness.readyForPda=true` 和唯一 `readiness.pdaTaskId`。验收脚本禁止调用旧入库单级 `/preload/confirming`、`/preload/confirm`。
 
-计划在 `EDITING/LOADING` 可通过正式 assignments/PATCH/DELETE 端点增量；计划、任务和明细版本必须递增，PDA 四元身份不变，旧 `inventorySnapshotToken` 必须返回 `A0409 库存已变化，请刷新后重试`。完整国内货柜履约装柜 fixture 通过平台托盘 API 创建本轮专用称重托盘，再交给通用测量模块；当普通位不足时由 Warehouse 自然分配到 A0，随后仅使用公开 A0 换绑接口制造库存版本变化，不直连数据库或调用内部 Warehouse 接口。主国内货柜履约链强制完成该专项，海外仓业务生产矩阵的附加柜只负责跨区生产，不重复要求 A0；附加柜若自然落入 A0 仍执行同一验证。批量待分柜入口仍只复用 `TP-001`/`YW-TP-002`，不创建托盘。已拣项不可删或减量，未拣项可删；增量会把全拣的 `AWAITING_REVIEW` 撤回为 `IN_PROGRESS`，刷新 task detail 与 inventory 后续拣才可再次等待最终确认。最终唯一完成入口仍为 `POST /api/platform/v1/first-leg/pda-loading/tasks/{taskId}/complete`：保留同柜 `RELEASED` 订舱、bridge 与五类 ACTIVE 证据门禁；拖车状态和数量不是前置门禁。主事务提交后，零条有效拖车直接跳过，恰有一条时在独立事务尝试推进 `COMPLETED`，多条或并发冲突只记录拖车同步失败，不回滚已完成的 task/plan/inbound。PDA 结算可能先递增来源入库单版本或创建实装分片，完成动作必须在结算后重新锁定实际完成行并使用当前版本；HTTP finalizer 会回查 full/partial 履约分片，失败时保存 `requestId/traceId` 并断言 task/plan/inbound/operation 零漂移。后续模块必须复用 `phase3Loading` 发布的本轮 `taskId + inboundId + loadingPlanId + containerBookingId`，不得回退历史资源。
+计划在 `EDITING/LOADING` 可通过正式 assignments/PATCH/DELETE 端点增量；计划、任务和明细版本必须递增，PDA 四元身份不变，旧 `inventorySnapshotToken` 必须返回 `A0409 库存已变化，请刷新后重试`。完整国内货柜履约装柜 fixture 与批量待分柜入口都只随机复用初始化的 `TP-001`/`YW-TP-002`，任一缺失即报告部署阻断，不调用托盘新增接口；当普通位不足时由 Warehouse 自然分配到 A0，随后仅使用公开 A0 换绑接口制造库存版本变化，不直连数据库、创建库位或调用内部 Warehouse 接口。模拟柜的 `channelGroupCode` 统一由 `smart-loading-channel-group.mjs` 根据订单渠道映射。主国内货柜履约链强制完成该专项，海外仓业务生产矩阵的附加柜只负责跨区生产，不重复要求 A0；附加柜若自然落入 A0 仍执行同一验证。已拣项不可删或减量，未拣项可删；增量会把全拣的 `AWAITING_REVIEW` 撤回为 `IN_PROGRESS`，刷新 task detail 与 inventory 后续拣才可再次等待最终确认。最终唯一完成入口仍为 `POST /api/platform/v1/first-leg/pda-loading/tasks/{taskId}/complete`：保留同柜 `RELEASED` 订舱、bridge 与五类 ACTIVE 证据门禁；拖车状态和数量不是前置门禁。主事务提交后，零条有效拖车直接跳过，恰有一条时在独立事务尝试推进 `COMPLETED`，多条或并发冲突只记录拖车同步失败，不回滚已完成的 task/plan/inbound。PDA 结算可能先递增来源入库单版本或创建实装分片，完成动作必须在结算后重新锁定实际完成行并使用当前版本；HTTP finalizer 会回查 full/partial 履约分片，失败时保存 `requestId/traceId` 并断言 task/plan/inbound/operation 零漂移。后续模块必须复用 `phase3Loading` 发布的本轮 `taskId + inboundId + loadingPlanId + containerBookingId`，不得回退历史资源。
 
 动态增量还会读取计划明细中的服务端 `totalPackageCount/remainingPackageCount`，断言
 `remaining = total - assigned`；随后尝试把箱数调整为权威总数加一，必须得到 `A0400`，并回查
diff --git a/scripts/admin-test-env-modules/coload-groups-contract.test.mjs b/scripts/admin-test-env-modules/coload-groups-contract.test.mjs
index 5a03ba02c..ee667f20e 100644
--- a/scripts/admin-test-env-modules/coload-groups-contract.test.mjs
+++ b/scripts/admin-test-env-modules/coload-groups-contract.test.mjs
@@ -43,4 +43,6 @@ test('同柜不可拆组HTTP验收锁定公开接口与防绕过矩阵', async (
   assert.doesNotMatch(source, /跨仓库渠道或目的仓港创建整组被拒绝/)
   assert.doesNotMatch(source, /已有父子拆分订单创建同柜组被拒绝/)
   assert.doesNotMatch(source, /push-preload/)
+  assert.match(source, /import \{ channelGroup \} from '\.\/smart-loading-channel-group\.mjs'/)
+  assert.equal((source.match(/channelGroupCode:\s*channelGroup\(/g) || []).length, 6)
 })
diff --git a/scripts/admin-test-env-modules/coload-groups.mjs b/scripts/admin-test-env-modules/coload-groups.mjs
index b183a2032..e8ef138b2 100644
--- a/scripts/admin-test-env-modules/coload-groups.mjs
+++ b/scripts/admin-test-env-modules/coload-groups.mjs
@@ -1,6 +1,7 @@
 const MODULE = 'coload-groups'
 const OPTIONS = { scenario: 'indivisible-coload-group', deploymentBlocker: true }
 const CONTAINERS = '/api/platform/v1/containers'
+import { channelGroup } from './smart-loading-channel-group.mjs'
 const SMART = '/api/platform/v1/first-leg/smart-loading'
 const FIRST_LEG = '/api/platform/v1/first-leg'
 const PDA = '/api/platform/v1/first-leg/pda-loading'
@@ -10,19 +11,6 @@ import { ensureMatsonCarrierPartner } from './carrier-partner-fixture.mjs'
 import { iso6346ContainerNumber } from './iso6346-container-number.mjs'
 
 function id(value) { return value == null ? '' : String(value) }
-function channelGroup(channelCode) {
-  const value = String(channelCode || '').toUpperCase()
-  if (value.startsWith('EXX_')) return 'EXX'
-  if (value.startsWith('MATSON_CLX_')) return 'MATSON_CLX'
-  if (value.startsWith('MATSON_MAX_')) return 'MATSON_MAX'
-  if (value.startsWith('HEDE_')) return 'HEDE'
-  if (value.startsWith('OA_LA_') || value === 'OA_PARCEL') return 'OA_LA'
-  if (value.startsWith('OA_CHICAGO_')) return 'OA_CHICAGO'
-  if (value.startsWith('OA_HOUSTON_')) return 'OA_HOUSTON'
-  if (value.startsWith('OA_SAVANNAH_')) return 'OA_SAVANNAH'
-  if (value === 'OA_NEW_YORK_TRUCK') return value
-  throw new Error(`unsupported smart-loading channel group: ${channelCode}`)
-}
 function code(response) { return id(response?.body?.code) || 'missing' }
 function evidence(response, extra = '') {
   return `HTTP=${response?.http ?? 'missing'}, code=${code(response)}, requestId=${response?.requestId || 'missing'}, traceId=${response?.traceId || 'missing'}${extra ? `, ${extra}` : ''}`
@@ -105,7 +93,7 @@ async function createSecondGroup(context, third, fourth) {
 
 async function createAssignedPushedPlan(context, fixture, groupId, suffix) {
   const simulationResponse = await context.request('POST', CONTAINERS, {
-    channelCode: fixture.channelCode, warehouseId: fixture.warehouseId, containerType: '40HC',
+    channelGroupCode: channelGroup(fixture.channelCode), warehouseId: fixture.warehouseId, containerType: '40HC',
     capacityCbm: 76, maxWeightKg: 28000,
   })
   const simulation = context.apiSuccess(MODULE, `${suffix} 创建组装柜模拟柜`, simulationResponse,
@@ -131,7 +119,7 @@ async function createAssignedPushedPlan(context, fixture, groupId, suffix) {
 
 async function createNormalPushedPlan(context, fixture, suffix) {
   const simulationResponse = await context.request('POST', CONTAINERS, {
-    channelCode: fixture.channelCode, warehouseId: fixture.warehouseId, containerType: '40HC',
+    channelGroupCode: channelGroup(fixture.channelCode), warehouseId: fixture.warehouseId, containerType: '40HC',
     capacityCbm: 76, maxWeightKg: 28000,
   })
   const simulation = context.apiSuccess(MODULE, `${suffix} 创建普通单模拟柜`, simulationResponse,
@@ -522,7 +510,7 @@ export async function run(context) {
     `status=${queried.data?.status || 'missing'}, members=${summaryInboundCodes(queried.data).join('|')}`, OPTIONS)
 
   const simulationResponse = await context.request('POST', '/api/platform/v1/containers', {
-    channelCode: first.channelCode, warehouseId: first.warehouseId, containerType: '20GP',
+    channelGroupCode: channelGroup(first.channelCode), warehouseId: first.warehouseId, containerType: '20GP',
     capacityCbm: 33, maxWeightKg: 28000,
   })
   const simulation = context.apiSuccess(MODULE, '创建容量拒绝专用20GP模拟柜', simulationResponse,
@@ -613,7 +601,7 @@ export async function run(context) {
     `targetGroupId=${groupId}, assignedMembers=${capacityGroupItems.map((item) => id(item?.inboundId)).join('|') || 'none'}, before=${planSignature(beforeRecommend)}, after=${planSignature(capacityRecommendation)}`, OPTIONS)
 
   const recommendSimulationResponse = await context.request('POST', '/api/platform/v1/containers', {
-    channelCode: first.channelCode, warehouseId: first.warehouseId, containerType: '40HC',
+    channelGroupCode: channelGroup(first.channelCode), warehouseId: first.warehouseId, containerType: '40HC',
     capacityCbm: 76, maxWeightKg: 28000,
   })
   const recommendSimulation = context.apiSuccess(MODULE, '创建智能推荐整组成功专用40HC模拟柜',
@@ -659,7 +647,7 @@ export async function run(context) {
   }
 
   const workingSimulationResponse = await context.request('POST', '/api/platform/v1/containers', {
-    channelCode: first.channelCode, warehouseId: first.warehouseId, containerType: '40HC',
+    channelGroupCode: channelGroup(first.channelCode), warehouseId: first.warehouseId, containerType: '40HC',
     capacityCbm: 76, maxWeightKg: 28000,
   })
   const workingSimulation = context.apiSuccess(MODULE, '创建PDA主链40HC模拟柜', workingSimulationResponse,
@@ -978,7 +966,7 @@ export async function run(context) {
     const uiGroup = context.apiSuccess(MODULE, '为Admin页面保留ACTIVE未分配跨目的仓组', uiGroupResponse,
       evidence(uiGroupResponse), OPTIONS)
     const uiSimulationResponse = await context.request('POST', CONTAINERS, {
-      channelCode: fifth.channelCode, warehouseId: fifth.warehouseId, containerType: '40HC',
+      channelGroupCode: channelGroup(fifth.channelCode), warehouseId: fifth.warehouseId, containerType: '40HC',
       capacityCbm: 76, maxWeightKg: 28000,
     })
     const uiSimulation = context.apiSuccess(MODULE, '为Admin页面保留可编辑智能装柜柜次', uiSimulationResponse,
diff --git a/scripts/admin-test-env-modules/finance-reconciliation-full-contract.test.mjs b/scripts/admin-test-env-modules/finance-reconciliation-full-contract.test.mjs
index 5d887de7a..39ec26bb0 100644
--- a/scripts/admin-test-env-modules/finance-reconciliation-full-contract.test.mjs
+++ b/scripts/admin-test-env-modules/finance-reconciliation-full-contract.test.mjs
@@ -98,7 +98,7 @@ function fakeContext(withFixture = true, permissions = financePermissions, denyF
         return ok({ accessToken: 'client-token' })
       }
       if (method === 'GET' && requestPath === '/api/platform/finance/v1/accounts?page=1&pageSize=20&customerId=11') {
-        return ok({ records: [{ customerId: '11', customerCode: 'TEN11', customerName: 'Fixture Account',
+        return ok({ records: [{ customerId: '11', customerCode: '00011', customerName: 'Fixture Account',
           contactName: 'Fixture Contact', contactPhone: '13800000000', outstandingReceivable: 100,
           pendingBilling: 20, receivedInPeriod: 30, outstandingPayable: 40, status: 'ACTIVE',
           lastChangedAt: '2026-08-10T09:00:00' }] })
diff --git a/scripts/admin-test-env-modules/firstleg-container-fee-allocation-contract.test.mjs b/scripts/admin-test-env-modules/firstleg-container-fee-allocation-contract.test.mjs
index 01473bc7d..9ca244e90 100644
--- a/scripts/admin-test-env-modules/firstleg-container-fee-allocation-contract.test.mjs
+++ b/scripts/admin-test-env-modules/firstleg-container-fee-allocation-contract.test.mjs
@@ -18,6 +18,7 @@ test('candidate plans only come from resources created by the current acceptance
     financeFullFixtures: { feeSources: [{ loadingPlanId: '104' }] },
   }), ['101', '102', '103', '104'])
   assert.doesNotMatch(source, /pageSize=\d+.*smart-loading|containers\?page|历史柜/)
+  assert.match(source, /channelGroupCode:\s*channelGroup\(first\.channelCode\)/)
 })
 
 test('allocation builder selects one real order per distinct customer and preserves exact cents', () => {
diff --git a/scripts/admin-test-env-modules/firstleg-container-fee-allocation.mjs b/scripts/admin-test-env-modules/firstleg-container-fee-allocation.mjs
index 86f22ab80..0343a9ff2 100644
--- a/scripts/admin-test-env-modules/firstleg-container-fee-allocation.mjs
+++ b/scripts/admin-test-env-modules/firstleg-container-fee-allocation.mjs
@@ -2,6 +2,7 @@ const MODULE = 'firstleg-container-fee-allocation'
 const OPTIONS = { scenario: 'firstleg-container-fee-allocation-http', deploymentBlocker: true }
 
 import { run as createMerchant } from './merchant-qualification-fixture.mjs'
+import { channelGroup } from './smart-loading-channel-group.mjs'
 
 function id(value) { return value == null ? '' : String(value) }
 function rows(value) { return Array.isArray(value) ? value : Array.isArray(value?.records) ? value.records : [] }
@@ -140,7 +141,7 @@ async function provisionCrossCustomerPlan(context) {
       || id(first.receivingWarehouseId) !== id(second.receivingWarehouseId)
       || first.channelCode !== second.channelCode) return null
     const containerResponse = await context.request('POST', '/api/platform/v1/containers', {
-      channelCode: first.channelCode, warehouseId: id(first.receivingWarehouseId),
+      channelGroupCode: channelGroup(first.channelCode), warehouseId: id(first.receivingWarehouseId),
       containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000,
     })
     const container = context.apiSuccess(MODULE, '创建跨客户费用分摊专用模拟柜', containerResponse,
diff --git a/scripts/admin-test-env-modules/inbound-fees-contract.test.mjs b/scripts/admin-test-env-modules/inbound-fees-contract.test.mjs
index 251f83da1..044718c60 100644
--- a/scripts/admin-test-env-modules/inbound-fees-contract.test.mjs
+++ b/scripts/admin-test-env-modules/inbound-fees-contract.test.mjs
@@ -48,8 +48,8 @@ test('customer confirms chargeable quantity and manual unit price in one locked
   const source = await readFile(moduleFile, 'utf8')
   assert.match(source, /const orderId = id\(fixture\?\.orderId\)/)
   assert.match(source, /context\.context\?\.merchantQualificationFixture/)
-  assert.match(source, /merchantFixture\?\.username/)
-  assert.match(source, /merchantFixture\?\.password/)
+  assert.match(source, /merchantFixture\?\.username \|\| MERCHANT_USERNAME/)
+  assert.match(source, /merchantFixture\?\.password \|\| MERCHANT_PASSWORD/)
   assert.doesNotMatch(source, /const orderId = id\(context\.createdResources\.orders\?\.orderId\)/)
   assert.match(source, /Client 读取已推送计费量、对客单价和费用合计/)
   assert.match(source, /Client 一次确认计费量、对客单价和费用/)
diff --git a/scripts/admin-test-env-modules/inbound-fees.mjs b/scripts/admin-test-env-modules/inbound-fees.mjs
index 3a4e8adfd..3ed2dfb03 100644
--- a/scripts/admin-test-env-modules/inbound-fees.mjs
+++ b/scripts/admin-test-env-modules/inbound-fees.mjs
@@ -1,5 +1,7 @@
 const MODULE = 'inbound-fees'
 const OPTIONS = { scenario: 'inbound-fee-lifecycle', deploymentBlocker: true }
+const MERCHANT_USERNAME = process.env.MERCHANT_TEST_USERNAME || ''
+const MERCHANT_PASSWORD = process.env.MERCHANT_TEST_PASSWORD || ''
 
 function id(value) { return value === null || value === undefined ? '' : String(value) }
 function success(response) { return response?.http === 200 && String(response?.body?.code) === '200' }
@@ -134,7 +136,8 @@ export async function run(context) {
   const orderId = id(fixture?.orderId)
   const merchantFixture = context.context?.merchantQualificationFixture
   const merchantLoginResponse = await context.request('POST', '/api/auth/login', {
-    loginId: merchantFixture?.username, password: merchantFixture?.password,
+    loginId: merchantFixture?.username || MERCHANT_USERNAME,
+    password: merchantFixture?.password || MERCHANT_PASSWORD,
   }, '')
   const merchantLogin = context.apiSuccess(MODULE, 'Client 登录并准备确认计费量和费用', merchantLoginResponse,
     `orderId=${orderId || 'missing'}`, OPTIONS)
diff --git a/scripts/admin-test-env-modules/inbound-measurement.mjs b/scripts/admin-test-env-modules/inbound-measurement.mjs
index 1326096c1..55c430736 100644
--- a/scripts/admin-test-env-modules/inbound-measurement.mjs
+++ b/scripts/admin-test-env-modules/inbound-measurement.mjs
@@ -30,13 +30,6 @@ function validPdf(response) {
 
 async function reusablePallets(context, warehouseId) {
   const cacheKey = asId(warehouseId)
-  const override = context.context?.measurementPalletOverride
-  if (asId(override?.warehouseId) === cacheKey && asId(override?.id)
-      && String(override?.code || '').trim()) {
-    context.assert(MODULE, '使用编排层提供的本轮专用称重托盘', null, true,
-      `warehouseId=${warehouseId}, palletId=${asId(override.id)}`, OPTIONS)
-    return [{ id: asId(override.id), code: String(override.code) }]
-  }
   const allowAnyExistingPallet = context.context?.allowAnyExistingPallet === true
   const scopedCacheKey = `${cacheKey}:${allowAnyExistingPallet ? 'any' : 'fixed'}`
   if (reusablePalletsByWarehouse.has(scopedCacheKey)) return reusablePalletsByWarehouse.get(scopedCacheKey)
@@ -64,29 +57,11 @@ async function reusablePallets(context, warehouseId) {
     const exact = (page?.records || []).find((item) => asId(item?.warehouseId) === cacheKey
       && String(item?.palletCode || '') === palletCode && asId(item?.id))
     context.assert(MODULE, `查询原有称重托盘 ${palletCode}`, response, true,
-      `warehouseId=${warehouseId}, matched=${exact?.palletCode || 'missing'}, fallback=${exact ? 'not-needed' : 'create-marker-owned'}`, OPTIONS)
+      `warehouseId=${warehouseId}, matched=${exact?.palletCode || 'missing'}, fallback=disabled`, OPTIONS)
     if (!exact) {
-      // A newly selected development warehouse may not have the historical fixture pallets.
-      // Create one marker-owned pallet through the public platform API rather than coupling
-      // measurement acceptance to another warehouse's seed data.
-      const createResponse = await context.request('POST', '/api/platform/v1/pallets?tenantId=0', {
-        warehouseId, palletType: 'STANDARD', capacityCbm: 1.5, weightKg: 25,
-        color: 'ORANGE', remark: `${context.marker}-measurement-fixture`,
-      })
-      const createdId = asId(context.apiSuccess(MODULE, '创建本轮称重托盘', createResponse,
-        `warehouseId=${warehouseId}`, OPTIONS))
-      if (!createdId) return null
-      const detailResponse = await context.request('GET',
-        `/api/platform/v1/pallets/${encodeURIComponent(createdId)}?tenantId=0&warehouseId=${encodeURIComponent(warehouseId)}`)
-      const created = context.apiSuccess(MODULE, '回读本轮称重托盘', detailResponse,
-        `warehouseId=${warehouseId}, palletId=${createdId}`, OPTIONS)
-      const valid = asId(created?.id) === createdId && asId(created?.warehouseId) === cacheKey
-        && String(created?.palletCode || '').trim()
-      context.assert(MODULE, '新建称重托盘归属当前仓库且编码完整', detailResponse, valid,
-        `warehouseId=${warehouseId}, palletId=${createdId}, palletCode=${created?.palletCode || 'missing'}`, OPTIONS)
-      if (!valid) return null
-      pallets.push({ id: createdId, code: String(created.palletCode) })
-      break
+      context.assert(MODULE, '固定称重托盘主数据完整', response, false,
+        `warehouseId=${warehouseId}, missing=${palletCode}`, OPTIONS)
+      return null
     }
     pallets.push({ id: asId(exact.id), code: palletCode })
   }
@@ -115,7 +90,7 @@ async function waitForCompletedMeasurement(context, measurementPath, expectedSta
 
 export async function completeDropshipPalletization(context, { inboundId, inboundCode, warehouseId, measurement }) {
   const pendingResponse = await context.request('GET',
-    `/api/platform/v1/first-leg/pda-dropship/tasks/pending?keyword=${encodeURIComponent(inboundCode)}`)
+    `/api/platform/v1/first-leg/pda-dropship/tasks/pending?warehouseId=${warehouseId}&keyword=${encodeURIComponent(inboundCode)}`)
   const pending = context.apiSuccess(MODULE, '查询一件代发待合托任务', pendingResponse,
     `inboundId=${inboundId}`, OPTIONS)
   const task = (pending || []).find((item) => asId(item?.inboundId) === inboundId
@@ -135,31 +110,17 @@ export async function completeDropshipPalletization(context, { inboundId, inboun
     `taskStatus=${claimed?.taskStatus ?? 'missing'}`, OPTIONS)
 
   const totalCartons = Number(measurement?.actualPackageCount)
-  const createPath = `/api/platform/v1/first-leg/pda-dropship/tasks/${taskId}/pallets/create-and-bind`
+  const expectedPalletCount = Number(measurement?.expectedPalletCount)
   const taskPath = `/api/platform/v1/first-leg/pda-dropship/tasks/${taskId}?warehouseId=${warehouseId}`
-  const createPayload = { warehouseId, operationId: `${context.marker}-dropship-create-bind`.slice(0, 128) }
-  let palletNo = ''
+  const generatedPallets = Array.isArray(claimed?.pallets) ? claimed.pallets : []
+  context.assert(MODULE, '审核通过时已按预计托数预生成全部DP托盘码', claimResponse,
+    generatedPallets.length === expectedPalletCount && generatedPallets.every((item) =>
+      item?.status === 'OPEN' && Number(item?.cartonCount) === 0 && /^DP-\d{6}-\d{4}$/.test(item?.palletNo || '')),
+    `expected=${expectedPalletCount}, generated=${generatedPallets.length}`, OPTIONS)
+  if (!generatedPallets.length) return null
+
   let countedCartons = 0
   const sealedCartonMarks = []
-  let pallet = null
-
-  const palletSnapshot = (value) => JSON.stringify({
-    counted: value?.countedCartons, bound: value?.boundCartons, unbound: value?.unboundCartons,
-    pallets: value?.pallets?.map((item) => ({ id: asId(item.palletId), no: item.palletNo,
-      count: item.cartonCount, status: item.status, version: item.version })),
-  })
-  async function rejectEmptyCreation(before, suffix) {
-    const response = await context.request('POST', createPath,
-      { ...createPayload, operationId: `${context.marker}-dropship-empty-${suffix}`.slice(0, 128) })
-    context.assert(MODULE, `无待绑箱创建托盘被拒绝-${suffix}`, response,
-      response.http === 200 && String(response.body?.code) === 'A0409',
-      `HTTP=${response.http}, code=${response.body?.code || 'missing'}`, OPTIONS)
-    const afterResponse = await context.request('GET', taskPath)
-    const after = context.apiSuccess(MODULE, `拒绝创建后回查任务-${suffix}`, afterResponse, '', OPTIONS)
-    context.assert(MODULE, `拒绝创建没有空托或计数漂移-${suffix}`, afterResponse,
-      palletSnapshot(after) === palletSnapshot(before), `pallets=${after?.pallets?.length ?? 'missing'}`, OPTIONS)
-  }
-  await rejectEmptyCreation(claimed, 'before-count')
 
   for (let index = 0; index < totalCartons; index += 1) {
     const boxCode = `${inboundCode}#${totalCartons}-${index + 1}`
@@ -167,18 +128,25 @@ export async function completeDropshipPalletization(context, { inboundId, inboun
       `/api/platform/v1/first-leg/pda-dropship/tasks/${taskId}/cartons/resolve?warehouseId=${warehouseId}&boxCode=${encodeURIComponent(boxCode)}`)
     const resolved = context.apiSuccess(MODULE, `解析第${index + 1}箱的冻结箱唛`, resolveResponse,
       `boxCode=${boxCode}`, OPTIONS)
-    context.assert(MODULE, `第${index + 1}箱允许清点且每箱SKU数完整`, resolveResponse,
-      resolved?.canCount === true && Number(resolved?.expectedSkuQuantity) > 0,
-      `canCount=${resolved?.canCount ?? 'missing'}, expectedSkuQuantity=${resolved?.expectedSkuQuantity ?? 'missing'}`, OPTIONS)
-    if (resolved?.canCount !== true || Number(resolved?.expectedSkuQuantity) < 1) continue
+    const resolvedSkuLines = Array.isArray(resolved?.skuLines) ? resolved.skuLines : []
+    context.assert(MODULE, `第${index + 1}箱允许清点且每箱SKU明细完整`, resolveResponse,
+      resolved?.canCount === true && resolvedSkuLines.length > 0
+        && resolvedSkuLines.every((line) => asId(line?.inboundDetailId) && line?.skuCode
+          && Number(line?.expectedQuantity) > 0),
+      `canCount=${resolved?.canCount ?? 'missing'}, skuLines=${resolvedSkuLines.length}`, OPTIONS)
+    if (resolved?.canCount !== true || resolvedSkuLines.length < 1) continue
 
     const countPayload = {
       warehouseId,
       boxCode,
-      actualSkuQuantity: Number(resolved.expectedSkuQuantity),
-      discrepancyAction: 'MATCH',
-      discrepancyRemark: null,
-      palletNo: index === 0 ? null : palletNo,
+      skuLines: resolvedSkuLines.map((line) => ({
+        inboundDetailId: asId(line.inboundDetailId),
+        skuCode: line.skuCode,
+        actualQuantity: Number(line.expectedQuantity),
+        discrepancyAction: 'MATCH',
+        discrepancyRemark: null,
+      })),
+      palletNo: index === 0 ? null : generatedPallets[Math.min(index, generatedPallets.length - 1)].palletNo,
       operationId: `${context.marker}-dropship-count-${index + 1}`.slice(0, 128),
     }
     const countResponse = await context.request('POST',
@@ -187,10 +155,11 @@ export async function completeDropshipPalletization(context, { inboundId, inboun
       `boxCode=${boxCode}`, OPTIONS)
     context.assert(MODULE, `第${index + 1}箱清点结果与冻结箱唛一致`, countResponse,
       counted?.carton?.boxCode === resolved?.boxCode
-        && Number(counted?.carton?.expectedSkuQuantity) === Number(resolved?.expectedSkuQuantity)
-        && Number(counted?.carton?.actualSkuQuantity) === Number(resolved?.expectedSkuQuantity)
-        && counted?.carton?.discrepancyStatus === 'MATCH',
-      `cartonId=${asId(counted?.carton?.cartonId) || 'missing'}, discrepancy=${counted?.carton?.discrepancyStatus ?? 'missing'}`, OPTIONS)
+        && Array.isArray(counted?.carton?.skuLines)
+        && counted.carton.skuLines.length === resolvedSkuLines.length
+        && counted.carton.skuLines.every((line) => Number(line?.actualQuantity) === Number(line?.expectedQuantity)
+          && line?.discrepancyStatus === 'MATCH'),
+      `cartonId=${asId(counted?.carton?.cartonId) || 'missing'}, skuLines=${counted?.carton?.skuLines?.length ?? 'missing'}`, OPTIONS)
     if (counted?.carton?.boxCode === resolved?.boxCode) {
       countedCartons += 1
       sealedCartonMarks.push(resolved.boxCode)
@@ -209,55 +178,57 @@ export async function completeDropshipPalletization(context, { inboundId, inboun
           && Number(replayed?.unboundCartons) === Number(counted?.unboundCartons),
         `counted=${replayed?.countedCartons ?? 'missing'}, unbound=${replayed?.unboundCartons ?? 'missing'}`, OPTIONS)
 
-      const bindResponse = await context.request('POST', createPath, createPayload)
-      const bound = context.apiSuccess(MODULE, '系统发码创建托盘并绑定全部待组托箱', bindResponse,
+      const firstPallet = generatedPallets[0]
+      const bindPayload = { warehouseId, palletNo: firstPallet.palletNo,
+        operationId: `${context.marker}-dropship-bind-first`.slice(0, 128) }
+      const bindResponse = await context.request('POST',
+        `/api/platform/v1/first-leg/pda-dropship/tasks/${taskId}/pallets/bind-pending`, bindPayload)
+      const bound = context.apiSuccess(MODULE, '后扫预生成托盘码并绑定全部待组托箱', bindResponse,
         `taskId=${taskId}`, OPTIONS)
-      pallet = bound?.pallets?.find((item) => Number(item.cartonCount) === 1) || null
-      palletNo = pallet?.palletNo || ''
+      const pallet = bound?.pallets?.find((item) => asId(item.palletId) === asId(firstPallet.palletId)) || null
       context.assert(MODULE, '待组托箱绑定到OPEN托盘且不再游离', bindResponse,
         Number(bound?.unboundCartons) === 0 && Number(pallet?.cartonCount) === 1
-          && pallet?.status === 'OPEN' && /^DP-\d{6}-\d{4}$/.test(palletNo)
-          && bound?.pallets?.length === 1,
+          && pallet?.status === 'OPEN' && pallet?.palletNo === firstPallet.palletNo
+          && bound?.pallets?.length === expectedPalletCount,
         `unbound=${bound?.unboundCartons ?? 'missing'}, palletStatus=${pallet?.status ?? 'missing'}`, OPTIONS)
-      const createReplayResponse = await context.request('POST', createPath, createPayload)
-      const createReplay = context.apiSuccess(MODULE, '系统发码同operationId重放', createReplayResponse, '', OPTIONS)
-      context.assert(MODULE, '系统发码重放不新增托盘且业务码和计数稳定', createReplayResponse,
-        palletSnapshot(createReplay) === palletSnapshot(bound), `palletNo=${palletNo}`, OPTIONS)
-      await rejectEmptyCreation(bound, 'after-bind')
     } else {
-      pallet = counted?.pallet || pallet
+      const expectedPallet = generatedPallets[Math.min(index, generatedPallets.length - 1)]
       context.assert(MODULE, `第${index + 1}箱直接进入当前OPEN托盘`, countResponse,
-        counted?.pallet?.palletNo === palletNo && counted?.pallet?.status === 'OPEN',
+        counted?.pallet?.palletNo === expectedPallet.palletNo && counted?.pallet?.status === 'OPEN',
         `palletNo=${counted?.pallet?.palletNo ?? 'missing'}, status=${counted?.pallet?.status ?? 'missing'}`, OPTIONS)
     }
   }
-  context.assert(MODULE, '一件代发工作托盘覆盖测量冻结的全部箱数', null,
-    totalCartons > 0 && countedCartons === totalCartons && Number(pallet?.cartonCount) === totalCartons,
-    `counted=${countedCartons}, palletCartons=${pallet?.cartonCount ?? 'missing'}, expected=${totalCartons || 'missing'}`, OPTIONS)
+  const countedTaskResponse = await context.request('GET', taskPath)
+  let sealed = context.apiSuccess(MODULE, '清点完成后回查预生成托盘分配', countedTaskResponse, '', OPTIONS)
+  context.assert(MODULE, '预生成托盘覆盖测量冻结的全部箱数', countedTaskResponse,
+    totalCartons > 0 && countedCartons === totalCartons
+      && Number(sealed?.boundCartons) === totalCartons
+      && sealed?.pallets?.length === expectedPalletCount
+      && sealed?.pallets?.every((item) => Number(item?.cartonCount) > 0),
+    `counted=${countedCartons}, bound=${sealed?.boundCartons ?? 'missing'}, expected=${totalCartons || 'missing'}`, OPTIONS)
 
-  const palletId = asId(pallet?.palletId)
-  if (!palletId) return null
-
-  const sealResponse = await context.request('POST',
-    `/api/platform/v1/first-leg/pda-dropship/tasks/${taskId}/pallets/${palletId}/seal`, {
-      warehouseId, expectedVersion: Number(pallet?.version),
-      operationId: `${context.marker}-dropship-seal`.slice(0, 128),
-    })
-  const sealed = context.apiSuccess(MODULE, '封托并完成一件代发合托任务', sealResponse,
-    `taskId=${taskId}, palletId=${palletId}`, OPTIONS)
-  context.assert(MODULE, '全部箱数封托后入仓单允许进入WAIT_SPLIT', sealResponse,
+  let lastSealResponse = countedTaskResponse
+  for (let index = 0; index < (sealed?.pallets || []).length; index += 1) {
+    const pallet = sealed.pallets.find((item) => item.status === 'OPEN')
+    if (!pallet) break
+    const sealResponse = await context.request('POST',
+      `/api/platform/v1/first-leg/pda-dropship/tasks/${taskId}/pallets/${asId(pallet.palletId)}/seal`, {
+        warehouseId, expectedVersion: Number(pallet.version),
+        operationId: `${context.marker}-dropship-seal-${index + 1}`.slice(0, 128),
+      })
+    lastSealResponse = sealResponse
+    sealed = context.apiSuccess(MODULE, `封托第${index + 1}个预生成托盘`, sealResponse,
+      `taskId=${taskId}, palletNo=${pallet.palletNo}`, OPTIONS)
+  }
+  context.assert(MODULE, '全部箱数封托后入仓单允许进入WAIT_SPLIT', lastSealResponse,
     sealed?.taskStatus === 'COMPLETED'
       && Number(sealed?.countedCartons) === Number(sealed?.totalCartons)
       && Number(sealed?.boundCartons) === Number(sealed?.totalCartons)
       && Number(sealed?.unboundCartons) === 0
       && sealed?.pallets?.every((item) => item?.status === 'SEALED'),
     `taskStatus=${sealed?.taskStatus ?? 'missing'}, counted=${sealed?.countedCartons ?? 'missing'}, bound=${sealed?.boundCartons ?? 'missing'}`, OPTIONS)
-  const sealedReplayResponse = await context.request('POST', createPath, createPayload)
-  const sealedReplay = context.apiSuccess(MODULE, '封托完成后系统发码原操作仍可重放', sealedReplayResponse, '', OPTIONS)
-  context.assert(MODULE, '完成后重放不重开任务或新建空托', sealedReplayResponse,
-    sealedReplay?.taskStatus === 'COMPLETED' && palletSnapshot(sealedReplay) === palletSnapshot(sealed),
-    `taskStatus=${sealedReplay?.taskStatus || 'missing'}, palletNo=${palletNo}`, OPTIONS)
-  return { ...sealed, sealedCartonMarks, sealedSourcePalletNos: [palletNo] }
+  return { ...sealed, sealedCartonMarks,
+    sealedSourcePalletNos: (sealed?.pallets || []).map((item) => item.palletNo).filter(Boolean) }
 }
 
 async function provisionWarehouseResources(context, { inboundId, tenantId, warehouseId, palletCount }) {
@@ -813,8 +784,10 @@ export async function run(context) {
       measured = context.apiSuccess(MODULE, '回查增量 fixture 动态测量明细', measuredResponse, '', OPTIONS)
       measuredItem = measured?.items?.find((item) => asId(item.id) === asId(firstScan.itemId))
       const detailIds = new Set((measured?.items || []).map((item) => asId(item?.inboundDetailId)).filter(Boolean))
-      context.assert(MODULE, '增量 fixture 形成动态真实独立货物测量明细', measuredResponse,
-        detailIds.size >= incrementalDetailCount
+      const mixedDropship = context.createdResources?.orders?.fulfillmentType === 'ONE_CLICK_DROPSHIP'
+      context.assert(MODULE, mixedDropship
+        ? '混箱一件代发复用物理箱测量明细' : '增量 fixture 形成动态真实独立货物测量明细', measuredResponse,
+        mixedDropship ? detailIds.size === 1 : detailIds.size >= incrementalDetailCount
           && measured.items.filter((item) => detailIds.has(asId(item?.inboundDetailId))).length >= incrementalDetailCount,
         `measurementItems=${measured?.items?.length ?? 'missing'}, distinctInboundDetails=${detailIds.size}`, OPTIONS)
     }
@@ -871,9 +844,13 @@ export async function run(context) {
         ? 'ADD' : measuredItem.coefficientMode ?? null,
       remark: context.marker,
     }]
+  const palletCount = Math.max(1, Math.min(originalPackageCount,
+    Number(context.context?.waitSplitVariant?.palletCount || 1)))
   const draftPayload = {
     measurementId: measured.measurementId, version: Number(measured.version),
     actualGoodsName: `墨家测量验收-${context.marker.slice(-12)}`,
+    expectedPalletCount: context.createdResources?.orders?.fulfillmentType === 'ONE_CLICK_DROPSHIP'
+      ? palletCount : null,
     items: draftItems,
   }
   const draftResponse = await context.request('PUT',
@@ -889,7 +866,6 @@ export async function run(context) {
     return
   }
 
-  const palletCount = Math.max(1, Number(context.context?.waitSplitVariant?.palletCount || 1))
   const warehouseResourcesReady = await provisionWarehouseResources(context, {
     inboundId, tenantId, warehouseId: asId(summary?.warehouseId), palletCount,
   })
@@ -1069,21 +1045,40 @@ export async function run(context) {
   let sealedCartonMarks = []
   let sealedSourcePalletNos = []
   if (dropship && finalMeasurement?.processStatus === 'WAIT_PALLETIZE') {
-    const sealed = await completeDropshipPalletization(context, {
-      inboundId, inboundCode, warehouseId: asId(summary?.warehouseId), measurement: finalMeasurement,
-    })
-    sealedCartonMarks = sealed?.taskStatus === 'COMPLETED' ? sealed.sealedCartonMarks : []
-    sealedSourcePalletNos = sealed?.taskStatus === 'COMPLETED'
-      ? (sealed.sealedSourcePalletNos || []).filter(Boolean) : []
-    completed = await waitForCompletedMeasurement(context, measurementPath, ['WAIT_SPLIT'], 10)
-    finalResponse = completed.response
-    finalMeasurement = context.apiSuccess(MODULE, '合托后回查一件代发入仓单', finalResponse,
-      `pollAttempts=${completed.attempts}`, OPTIONS)
-    context.assert(MODULE, '一件代发合托完成后进入智能分柜门禁', finalResponse,
-      finalMeasurement?.processStatus === 'WAIT_SPLIT'
-        && finalMeasurement?.measureReviewStatus === 'APPROVED'
-        && finalMeasurement?.measurementStatus === 'APPROVED',
-      `processStatus=${finalMeasurement?.processStatus ?? 'missing'}`, OPTIONS)
+    if (context.options?.prepareDropshipManualCount) {
+      const warehouseId = asId(summary?.warehouseId)
+      const pendingResponse = await context.request('GET',
+        `/api/platform/v1/first-leg/pda-dropship/tasks/pending?warehouseId=${warehouseId}&keyword=${encodeURIComponent(inboundCode)}`)
+      const pending = context.apiSuccess(MODULE, '准备PDA人工清点任务', pendingResponse,
+        `inboundId=${inboundId}`, OPTIONS)
+      const task = (pending || []).find((item) => asId(item?.inboundId) === inboundId)
+      context.assert(MODULE, '任务停在未领取、未清点、未归托状态', pendingResponse,
+        Boolean(asId(task?.taskId)) && task?.taskStatus === 'PENDING'
+          && Number(task?.countedCartons) === 0 && Number(task?.boundCartons) === 0
+          && Number(task?.totalCartons) === Number(finalMeasurement?.actualPackageCount),
+        `taskId=${asId(task?.taskId) || 'missing'}, status=${task?.taskStatus ?? 'missing'}, counted=${task?.countedCartons ?? 'missing'}`, OPTIONS)
+      context.createdResources.dropshipManualCount = {
+        taskId: asId(task?.taskId), inboundId, inboundCode, warehouseId,
+        warehouseName: task?.warehouseName || null, totalCartons: Number(task?.totalCartons || 0),
+        taskStatus: task?.taskStatus || null,
+      }
+    } else {
+      const sealed = await completeDropshipPalletization(context, {
+        inboundId, inboundCode, warehouseId: asId(summary?.warehouseId), measurement: finalMeasurement,
+      })
+      sealedCartonMarks = sealed?.taskStatus === 'COMPLETED' ? sealed.sealedCartonMarks : []
+      sealedSourcePalletNos = sealed?.taskStatus === 'COMPLETED'
+        ? (sealed.sealedSourcePalletNos || []).filter(Boolean) : []
+      completed = await waitForCompletedMeasurement(context, measurementPath, ['WAIT_SPLIT'], 10)
+      finalResponse = completed.response
+      finalMeasurement = context.apiSuccess(MODULE, '合托后回查一件代发入仓单', finalResponse,
+        `pollAttempts=${completed.attempts}`, OPTIONS)
+      context.assert(MODULE, '一件代发合托完成后进入智能分柜门禁', finalResponse,
+        finalMeasurement?.processStatus === 'WAIT_SPLIT'
+          && finalMeasurement?.measureReviewStatus === 'APPROVED'
+          && finalMeasurement?.measurementStatus === 'APPROVED',
+        `processStatus=${finalMeasurement?.processStatus ?? 'missing'}`, OPTIONS)
+    }
   }
 
   const approvedScanResponse = await multipartRequest(context, scanPath, {
@@ -1103,6 +1098,7 @@ export async function run(context) {
     boxCode, finalStatus: finalMeasurement?.measurementStatus || null,
     processStatus: finalMeasurement?.processStatus || null,
     palletCount: weightEvidence.count, actualGrossWeightKg: weightEvidence.grossWeightKg,
+    actualPackageCount: Number(finalMeasurement?.actualPackageCount || 0),
     destinationType: context.createdResources?.orders?.destinationType || null,
     destinationWarehouseId: context.createdResources?.orders?.destinationWarehouseId || null,
     destinationWarehouseCode: context.createdResources?.orders?.destinationWarehouseCode || null,
diff --git a/scripts/admin-test-env-modules/initialization-baseline-contract.test.mjs b/scripts/admin-test-env-modules/initialization-baseline-contract.test.mjs
index dd3633d11..b0efc204c 100644
--- a/scripts/admin-test-env-modules/initialization-baseline-contract.test.mjs
+++ b/scripts/admin-test-env-modules/initialization-baseline-contract.test.mjs
@@ -43,7 +43,7 @@ test('统一初始化 SQL 提供人工验收所需公共仓储主数据', () =>
   assert.match(sql, /193000000000400004,0,193000000000200004,'RECEIVING','海外收货',1,'16:00:00',[\s\S]*?'纽约仓海外接柜入仓收货能力'/)
   assert.match(sql, /固定平台作业仓收货能力写入校验失败/)
 
-  const palletSeed = sql.match(/INSERT INTO wh_pallet \([\s\S]*?remark = VALUES\(remark\);/)?.[0]
+  const palletSeed = sql.match(/INSERT INTO wh_pallet \([\s\S]*?deleted = 0;/)?.[0]
   assert.ok(palletSeed, 'missing pallet initialization seed')
   assert.doesNotMatch(palletSeed, /\bstatus\b|'AVAILABLE'/)
 })
@@ -67,6 +67,19 @@ test('国内统一初始化在注释门禁前创建订单申报快照表', () =>
   }
 })
 
+test('国内统一增量在 Firstleg 补列前重建已由 Warehouse 段删除的过程', () => {
+  const warehouseDrop = sql.indexOf('DROP PROCEDURE IF EXISTS add_column_if_missing;',
+    sql.indexOf('CALL assert_platform_public_resource_scope();'))
+  const firstlegCall = sql.indexOf("CALL add_column_if_missing('fl_price_book_version', 'voided_by'")
+  const firstlegCreate = sql.lastIndexOf('CREATE PROCEDURE add_column_if_missing(', firstlegCall)
+  const firstlegDrop = sql.indexOf('DROP PROCEDURE IF EXISTS add_column_if_missing;', firstlegCall)
+
+  assert.ok(warehouseDrop >= 0, 'Warehouse migration must clean up its helper procedure')
+  assert.ok(firstlegCreate > warehouseDrop, 'Firstleg must recreate the helper after the Warehouse cleanup')
+  assert.ok(firstlegCreate < firstlegCall, 'Firstleg helper must exist before the price-version ALTER calls')
+  assert.ok(firstlegDrop > firstlegCall, 'Firstleg must clean up the helper after its ALTER calls')
+})
+
 test('海外统一初始化内联空库基线且不依赖模块 SQL', () => {
   assert.match(overseasSql, /BEGIN INLINE EMPTY-DATABASE BASELINE: LASTLEG/)
   assert.match(overseasSql, /BEGIN INLINE EMPTY-DATABASE BASELINE: OVERSEAS WAREHOUSE/)
diff --git a/scripts/admin-test-env-modules/it-test-wait-split-bulk-contract.test.mjs b/scripts/admin-test-env-modules/it-test-wait-split-bulk-contract.test.mjs
index efd755ca0..6048ff9c7 100644
--- a/scripts/admin-test-env-modules/it-test-wait-split-bulk-contract.test.mjs
+++ b/scripts/admin-test-env-modules/it-test-wait-split-bulk-contract.test.mjs
@@ -28,14 +28,14 @@ test('随机线路只固定义乌仓并从客户真实可计价候选选择', ()
   assert.doesNotMatch(runner, /channel-name|channel-code/)
 })
 
-test('称重优先复用固定托盘并允许为无基线仓创建本轮托盘', () => {
+test('称重只随机复用固定托盘且不创建新托盘', () => {
   assert.match(measurement, /REUSABLE_PALLET_CODES = Object\.freeze\(\['TP-001', 'YW-TP-002'\]\)/)
   assert.match(measurement, /context\.request\('GET',[\s\S]*\/api\/platform\/v1\/pallets\?page=1&size=20/)
   assert.match(measurement, /randomlyReusePalletIds\(candidates, palletCount/)
   assert.match(measurement, /随机复用原有称重托盘/)
-  assert.match(measurement, /context\.request\('POST', '\/api\/platform\/v1\/pallets\?tenantId=0'/)
-  assert.match(measurement, /创建本轮称重托盘/)
-  assert.match(measurement, /measurement-fixture/)
+  assert.match(measurement, /固定称重托盘主数据完整/)
+  assert.doesNotMatch(measurement, /context\.request\('POST', '\/api\/platform\/v1\/pallets/)
+  assert.doesNotMatch(acceptance, /createPhase3FreshMeasurementPallet/)
 })
 
 test('称重脚本不新增库位且容量不足由仓库服务复用 A0 公共位', () => {
diff --git a/scripts/admin-test-env-modules/manual-state-loading-pda-contract.test.mjs b/scripts/admin-test-env-modules/manual-state-loading-pda-contract.test.mjs
index 788d65410..314b60a0d 100644
--- a/scripts/admin-test-env-modules/manual-state-loading-pda-contract.test.mjs
+++ b/scripts/admin-test-env-modules/manual-state-loading-pda-contract.test.mjs
@@ -17,6 +17,7 @@ test('retains all clickable container, loading-list and PDA workflow states thro
   assert.match(source, /\.\/orders\.mjs/)
   assert.match(source, /\.\/inbound-measurement\.mjs/)
   assert.match(source, /context\.request\('POST', CONTAINERS/)
+  assert.match(source, /channelGroupCode:\s*channelGroup\(summary\.channelCode\)/)
   assert.match(source, /summary\?\.processStatus === 'WAIT_SPLIT'/)
   const pushIndex = source.indexOf('`${SMART}/plans/${plan.id}`')
   const transportIndex = source.indexOf('ocean-booking-link')
diff --git a/scripts/admin-test-env-modules/manual-state-loading-pda.mjs b/scripts/admin-test-env-modules/manual-state-loading-pda.mjs
index 199582d2f..d13797cd0 100644
--- a/scripts/admin-test-env-modules/manual-state-loading-pda.mjs
+++ b/scripts/admin-test-env-modules/manual-state-loading-pda.mjs
@@ -9,6 +9,7 @@ const PRELOAD_STATUSES = ['EDITING', 'LOADING']
 const PDA_STATUSES = ['UNASSIGNED', 'IN_PROGRESS', 'AWAITING_REVIEW', 'COMPLETED']
 
 import { resolveOceanBookingAgent } from './ocean-booking-fixture.mjs'
+import { channelGroup } from './smart-loading-channel-group.mjs'
 
 function id(value) { return value == null ? '' : String(value) }
 function records(value) { return Array.isArray(value?.records) ? value.records : [] }
@@ -127,7 +128,7 @@ async function createConfirmedContainer(context, source, label) {
       maxWeightKg: 28000 }],
   }
   const simulationResponse = await context.request('POST', CONTAINERS, {
-    channelCode: summary.channelCode, warehouseId: source.warehouseId, containerType: '40HC',
+    channelGroupCode: channelGroup(summary.channelCode), warehouseId: source.warehouseId, containerType: '40HC',
     capacityCbm: 76, maxWeightKg: 28000,
   })
   const simulation = context.apiSuccess(MODULE, `${label} 新增内部模拟柜`, simulationResponse, '', OPTIONS)
diff --git a/scripts/admin-test-env-modules/merchant-qualification-fixture-contract.test.mjs b/scripts/admin-test-env-modules/merchant-qualification-fixture-contract.test.mjs
index b4d30a2b0..2b29d2014 100644
--- a/scripts/admin-test-env-modules/merchant-qualification-fixture-contract.test.mjs
+++ b/scripts/admin-test-env-modules/merchant-qualification-fixture-contract.test.mjs
@@ -15,6 +15,8 @@ test('默认全量验收先准备已审核商户再运行订单链路', () => {
 
 test('商户夹具通过正式 File 和 IAM 审核流程建立下单资格', () => {
   assert.match(fixture, /files\/qualifications\/\$\{encodeURIComponent\(tenantId\)\}\/required-package/)
+  assert.match(fixture, /required-package\?unifiedSocialCreditCode=\$\{encodeURIComponent\(unifiedSocialCreditCode\)\}/)
+  assert.doesNotMatch(fixture, /packageForm\.append\('unifiedSocialCreditCode'/)
   assert.match(fixture, /iam\/tenants\/\$\{encodeURIComponent\(tenantId\)\}\/submit-review/)
   assert.match(fixture, /iam\/tenants\/\$\{encodeURIComponent\(tenantId\)\}\/dimension-initialization/)
   assert.match(fixture, /status === 'READY'/)
diff --git a/scripts/admin-test-env-modules/merchant-qualification-fixture.mjs b/scripts/admin-test-env-modules/merchant-qualification-fixture.mjs
index 168dac189..a2a5e94fd 100644
--- a/scripts/admin-test-env-modules/merchant-qualification-fixture.mjs
+++ b/scripts/admin-test-env-modules/merchant-qualification-fixture.mjs
@@ -62,9 +62,10 @@ export async function run(context) {
   const packageForm = new FormData()
   packageForm.append('businessLicense', new Blob([QUALIFICATION_IMAGE], { type: 'image/png' }), `business-${suffix}.png`)
   packageForm.append('legalPersonId', new Blob([QUALIFICATION_IMAGE], { type: 'image/png' }), `legal-person-${suffix}.png`)
-  packageForm.append('unifiedSocialCreditCode', `91440300${suffix}`)
+  const unifiedSocialCreditCode = `91440300${suffix}`
   const packageResponse = await context.requestWithBody('POST',
-    `/api/platform/v1/files/qualifications/${encodeURIComponent(tenantId)}/required-package`, packageForm)
+    `/api/platform/v1/files/qualifications/${encodeURIComponent(tenantId)}/required-package?unifiedSocialCreditCode=${encodeURIComponent(unifiedSocialCreditCode)}`,
+    packageForm)
   context.apiSuccess(MODULE, '通过 File 上传真实必填资质包', packageResponse,
     `tenantId=${tenantId}`, { deploymentBlocker: true })
 
diff --git a/scripts/admin-test-env-modules/ocean-booking-channel-contract.test.mjs b/scripts/admin-test-env-modules/ocean-booking-channel-contract.test.mjs
index a85575731..35be99334 100644
--- a/scripts/admin-test-env-modules/ocean-booking-channel-contract.test.mjs
+++ b/scripts/admin-test-env-modules/ocean-booking-channel-contract.test.mjs
@@ -37,12 +37,15 @@ test('backend OpenAPI freezes a platform channel query scoped by originWarehouse
     'BLOCKED_CONTRACT: platform logistics-channel query by originWarehouseId is not frozen in OpenAPI')
 })
 
-test('released requirement association locks the selected channel onto the simulation', () => {
+test('released requirement association locks the selected channel group onto the simulation', () => {
   const fixture = source(new URL('./phase3-container-loading.mjs', import.meta.url))
   assert.match(fixture, /ocean-booking-link/)
   assert.match(fixture, /订舱放舱为 RELEASED 且不预生成真实货柜/)
   assert.match(fixture, /oceanBookingId: bookingId, requirementId: id\(requirement\.id\), containerNo: realContainerNo/)
-  assert.match(fixture, /containerDetail\?\.channelCode === channelCode/)
+  assert.match(fixture, /simulation\?\.channelGroupCode === channelGroup\(channelCode\)/)
+  assert.match(fixture, /simulation\?\.channelCode == null/)
+  assert.match(fixture, /containerDetail\?\.channelGroupCode === channelGroup\(channelCode\)/)
+  assert.match(fixture, /containerDetail\?\.channelCode == null/)
   assert.match(fixture, /selectPlatformChannelIsolationPair/)
   assert.doesNotMatch(fixture, /\$\{channelCode\}-OTHER|foreignChannelCode/)
 })
diff --git a/scripts/admin-test-env-modules/orders-pricing-fixture-contract.test.mjs b/scripts/admin-test-env-modules/orders-pricing-fixture-contract.test.mjs
index 1cdcc0f66..5198741cb 100644
--- a/scripts/admin-test-env-modules/orders-pricing-fixture-contract.test.mjs
+++ b/scripts/admin-test-env-modules/orders-pricing-fixture-contract.test.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
 import test from 'node:test'
 
-import { findPricedOrderRoute, findPricedOrderRouteAcrossOrigins } from './orders.mjs'
+import { eligibleOrderDestinations, findPricedOrderRoute, findPricedOrderRouteAcrossOrigins } from './orders.mjs'
 
 const source = readFileSync(new URL('orders.mjs', import.meta.url), 'utf8')
 
@@ -18,6 +18,16 @@ test('orders fixture verifies the complete pricing tuple before selecting an FBA
   assert.match(source, /warehouse\?\.status === 'ACTIVE'/)
 })
 
+test('FBA order fixture excludes warehouses without the internal code required by pallet labels', () => {
+  const warehouses = [
+    { id: 'abe3', warehouseCode: 'ABE3', status: 'ACTIVE', internalCode: null },
+    { id: 'abe4', warehouseCode: 'ABE4', status: 'ACTIVE', internalCode: '126' },
+    { id: 'abe8', warehouseCode: 'ABE8', status: 'INACTIVE', internalCode: '39' },
+  ]
+  assert.deepEqual(eligibleOrderDestinations(warehouses, 'FBA').map((item) => item.warehouseCode), ['ABE4'])
+  assert.deepEqual(eligibleOrderDestinations(warehouses, 'OVERSEAS').map((item) => item.warehouseCode), ['ABE3', 'ABE4'])
+})
+
 test('pricing selection skips an ACTIVE domestic warehouse with an empty channel catalog', async () => {
   const channelCalls = []
   const result = await findPricedOrderRouteAcrossOrigins({
diff --git a/scripts/admin-test-env-modules/orders.mjs b/scripts/admin-test-env-modules/orders.mjs
index b64056891..8850c800c 100644
--- a/scripts/admin-test-env-modules/orders.mjs
+++ b/scripts/admin-test-env-modules/orders.mjs
@@ -55,6 +55,12 @@ export function requestedOrderDestinationType(context) {
   const value = String(context?.context?.orderDestinationType || 'FBA').trim().toUpperCase()
   return ['FBA', 'OVERSEAS', 'PRIVATE'].includes(value) ? value : 'FBA'
 }
+export function eligibleOrderDestinations(values, destinationType) {
+  const active = (Array.isArray(values) ? values : []).filter((warehouse) => warehouse?.status === 'ACTIVE')
+  return destinationType === 'FBA'
+    ? active.filter((warehouse) => String(warehouse?.internalCode || '').trim() !== '')
+    : active
+}
 export function approvedInboundReady(orderDetail, taskResponse, tenantId, orderId) {
   const summary = orderDetail?.summary
   const task = success(taskResponse) ? taskResponse.body?.data : null
@@ -251,13 +257,13 @@ async function loadMasterData(context, merchantToken) {
       records(destinationPage).length > 0, `count=${records(destinationPage).length}`)
   }
   const receivings = records(domesticPage).filter((warehouse) => warehouse?.status === 'ACTIVE')
-  let destinations = records(destinationPage).filter((warehouse) => warehouse?.status === 'ACTIVE')
+  let destinations = eligibleOrderDestinations(records(destinationPage), destinationType)
   if (Number(destinationPage?.total) > destinations.length) {
     const nextResponse = await request(context, 'GET',
       `/api/merchant/v1/warehouses?page=2&size=200&status=ACTIVE&warehouseType=${encodeURIComponent(destinationType)}`,
       undefined, merchantToken)
     const nextPage = context.apiSuccess(MODULE, `Client 查询 ${destinationType} 目的仓第二页`, nextResponse)
-    destinations = [...destinations, ...records(nextPage).filter((warehouse) => warehouse?.status === 'ACTIVE')]
+    destinations = [...destinations, ...eligibleOrderDestinations(records(nextPage), destinationType)]
   }
   if (receivings.length === 0 || (destinationType !== 'PRIVATE' && destinations.length === 0)) {
     throw new Error('缺少创建测试订单所需的收货仓或目的仓')
@@ -396,6 +402,11 @@ function buildPayload(context, profile, master, productImageFileId, customerAddr
     ? context.context.waitSplitVariant.packageCounts : []
   const selectedBoxes = BOXES.slice(0, skuCount)
   const orderProfile = context.context?.orderProfile || {}
+  const dropship = String(context.context?.orderFulfillmentType || 'STANDARD').trim().toUpperCase()
+    === 'ONE_CLICK_DROPSHIP'
+  const mixedPackageCount = Math.max(1,
+    Number(context.context?.waitSplitVariant?.totalPackageCount || packageCountPerSku))
+  const mixedPackingGroupNo = `MIX-${context.marker}`.slice(0, 32)
   const isPrivate = master.destinationType === 'PRIVATE'
   const pickupMethod = orderProfile.pickupMethod || 'SELF_EXPRESS'
   const receiver = isPrivate ? {
@@ -405,7 +416,7 @@ function buildPayload(context, profile, master, productImageFileId, customerAddr
     addressLine: `${context.marker} 88 Randomized Test Ave`, postalCode: '11354',
   } : null
   return {
-    fulfillmentType: String(context.context?.orderFulfillmentType || 'STANDARD').trim().toUpperCase(),
+    fulfillmentType: dropship ? 'ONE_CLICK_DROPSHIP' : 'STANDARD',
     customerId: profile.id,
     customerName: companyName,
     transportMode: 'SEA', tradeTerm: 'FOB',
@@ -433,17 +444,19 @@ function buildPayload(context, profile, master, productImageFileId, customerAddr
     },
     receiver,
     cargoes: selectedBoxes.map((box, index) => {
-      const volumeCbm = box.lengthCm * box.widthCm * box.heightCm / 1_000_000
       const unitsPerPackage = 10 + index
-      const packageCount = Number(packageCounts[index] || packageCountPerSku)
+      const packageCount = dropship ? mixedPackageCount : Number(packageCounts[index] || packageCountPerSku)
+      const carton = dropship ? selectedBoxes[0] : box
+      const cartonVolumeCbm = carton.lengthCm * carton.widthCm * carton.heightCm / 1_000_000
       return {
         skuNo: `SKU-${box.boxType}-${context.marker}`.slice(0, 64),
         cargoName: `${box.boxType} 测试产品`, cargoNameEn: `${box.boxType} test product`,
         hsCode: '8518210000', customsHsCode: '8518210000', packageType: 'CARTON',
-        lengthCm: box.lengthCm, widthCm: box.widthCm, heightCm: box.heightCm,
-        unitsPerPackage, packageCount, grossWeightKg: (10 + index) * packageCount,
-        volumeCbm: volumeCbm * packageCount, totalQuantity: unitsPerPackage * packageCount,
-        netWeightKg: (9 + index) * packageCount,
+        packingGroupNo: dropship ? mixedPackingGroupNo : null,
+        lengthCm: carton.lengthCm, widthCm: carton.widthCm, heightCm: carton.heightCm,
+        unitsPerPackage, packageCount, grossWeightKg: (dropship ? 10 : 10 + index) * packageCount,
+        volumeCbm: cartonVolumeCbm * packageCount, totalQuantity: unitsPerPackage * packageCount,
+        netWeightKg: (dropship ? 9 : 9 + index) * packageCount,
         unitDeclaredValue: 8.5, declaredValue: unitsPerPackage * packageCount * 8.5, currency: 'USD',
         material: '塑料 / Plastic', usage: '接口验收 / API acceptance',
         model: `MODEL-${box.boxType}`, brand: 'TEST-NO-LOGO',
diff --git a/scripts/admin-test-env-modules/phase3-container-loading.mjs b/scripts/admin-test-env-modules/phase3-container-loading.mjs
index 5b1fe75b8..174eb2f69 100644
--- a/scripts/admin-test-env-modules/phase3-container-loading.mjs
+++ b/scripts/admin-test-env-modules/phase3-container-loading.mjs
@@ -3,6 +3,7 @@ import { diffPushPreloadStability, projectPushPreloadStability } from './push-pr
 import { containerFieldGaps, loadingListFieldGaps, preloadFieldGaps } from './fulfillment-list-field-contract.mjs'
 import { ensureMatsonCarrierPartner } from './carrier-partner-fixture.mjs'
 import { iso6346ContainerNumber } from './iso6346-container-number.mjs'
+import { channelGroup } from './smart-loading-channel-group.mjs'
 
 const MODULE = 'phase3-container-loading'
 const OPTIONS = { scenario: 'phase3-container-smart-loading-pda', deploymentBlocker: true }
@@ -208,7 +209,7 @@ export async function run(context) {
   context.assert(MODULE, '订舱渠道与仓库快照完整', inboundResponse, Boolean(channelCode && channelName && warehouseName),
     `channelCode=${channelCode || 'missing'}, warehouseId=${warehouseId}, warehouseName=${warehouseName || 'missing'}`, OPTIONS)
   const simulationResponse = await request(context, 'POST', CONTAINERS, {
-    channelCode, warehouseId, containerType: primaryRequirement.containerType,
+    channelGroupCode: channelGroup(channelCode), warehouseId, containerType: primaryRequirement.containerType,
     capacityCbm: primaryRequirement.capacityCbm, maxWeightKg: primaryRequirement.maxWeightKg,
   })
   const simulation = context.apiSuccess(MODULE, '新增内部模拟柜', simulationResponse,
@@ -216,7 +217,8 @@ export async function run(context) {
   const containerId = id(simulation?.id)
   context.assert(MODULE, '模拟柜由服务端生成稳定身份且不伪造真实柜号或订舱', simulationResponse,
     Boolean(containerId) && Boolean(simulation?.cabinetNo) && simulation?.containerNo == null
-      && simulation?.oceanBookingId == null && simulation?.channelCode === channelCode
+      && simulation?.oceanBookingId == null && simulation?.channelGroupCode === channelGroup(channelCode)
+      && simulation?.channelCode == null
       && id(simulation?.warehouseId) === warehouseId,
     `containerBookingId=${containerId || 'missing'}, cabinetNo=${simulation?.cabinetNo || 'missing'}, oceanBookingId=${id(simulation?.oceanBookingId) || 'null'}`, OPTIONS)
   if (!containerId) return
@@ -240,7 +242,8 @@ export async function run(context) {
   } else {
     const foreignChannel = channelIsolation.pair.foreign
     const foreignContainerResponse = await request(context, 'POST', CONTAINERS, {
-      channelCode: foreignChannel.channelCode, warehouseId, containerType: primaryRequirement.containerType,
+      channelGroupCode: channelGroup(foreignChannel.channelCode), warehouseId,
+      containerType: primaryRequirement.containerType,
       capacityCbm: primaryRequirement.capacityCbm, maxWeightKg: primaryRequirement.maxWeightKg,
     })
     const foreignContainer = context.apiSuccess(MODULE, '新增真实异渠道模拟柜', foreignContainerResponse, '', OPTIONS)
@@ -288,9 +291,10 @@ export async function run(context) {
   context.assert(MODULE, '货柜详情保留候选货物路线约束', containerDetailResponse,
     (!containerDetail?.destinationWarehouseCode || !candidate.destinationWarehouseCode
       || containerDetail.destinationWarehouseCode === candidate.destinationWarehouseCode)
-      && containerDetail?.channelCode === channelCode
+      && containerDetail?.channelGroupCode === channelGroup(channelCode)
+      && containerDetail?.channelCode == null
       && ['EDITING', 'WAIT_LOADING'].includes(containerDetail?.planStatus),
-    `planStatus=${containerDetail?.planStatus || 'missing'}, channel=${containerDetail?.channelCode || 'missing'}`, OPTIONS)
+    `planStatus=${containerDetail?.planStatus || 'missing'}, channelGroup=${containerDetail?.channelGroupCode || 'missing'}`, OPTIONS)
 
   const containerNo = id(containerDetail?.containerNo || containerDetail?.cabinetNo)
   const planResponse = await request(context, 'GET', `${SMART}/plans/by-booking/${encodeURIComponent(containerId)}`)
@@ -517,7 +521,7 @@ export async function run(context) {
     `containerBookingId=${id(mergedContainer?.containerBookingId) || 'missing'}, requirementId=${id(mergedContainer?.requirementId) || 'missing'}, allocationId=${id(mergedContainer?.allocationId) || 'missing'}`, OPTIONS)
 
   const duplicateSimulationResponse = await request(context, 'POST', CONTAINERS, {
-    channelCode, warehouseId, containerType: primaryRequirement.containerType,
+    channelGroupCode: channelGroup(channelCode), warehouseId, containerType: primaryRequirement.containerType,
     capacityCbm: primaryRequirement.capacityCbm, maxWeightKg: primaryRequirement.maxWeightKg,
   })
   const duplicateSimulation = context.apiSuccess(MODULE, '新增重复容量占用负向模拟柜', duplicateSimulationResponse, '', OPTIONS)
diff --git a/scripts/admin-test-env-modules/phase3-loading.mjs b/scripts/admin-test-env-modules/phase3-loading.mjs
index 47d0eca4a..5c804fa85 100644
--- a/scripts/admin-test-env-modules/phase3-loading.mjs
+++ b/scripts/admin-test-env-modules/phase3-loading.mjs
@@ -1,6 +1,7 @@
 import { diffPushPreloadStability, projectPushPreloadStability } from './push-preload-stability.mjs'
 import { isPureStatusNoop, visibleLoadingHistories } from './loading-history-noop.mjs'
 import { ensureMatsonCarrierPartner } from './carrier-partner-fixture.mjs'
+import { channelGroup } from './smart-loading-channel-group.mjs'
 import { createHash } from 'node:crypto'
 
 const MODULE = 'phase3-loading'
@@ -135,20 +136,6 @@ function inventorySignature(snapshot) {
   })))
 }
 
-function channelGroup(channelCode) {
-  const value = String(channelCode || '').toUpperCase()
-  if (value.startsWith('EXX_')) return 'EXX'
-  if (value.startsWith('MATSON_CLX_')) return 'MATSON_CLX'
-  if (value.startsWith('MATSON_MAX_')) return 'MATSON_MAX'
-  if (value.startsWith('HEDE_')) return 'HEDE'
-  if (value.startsWith('OA_LA_') || value === 'OA_PARCEL') return 'OA_LA'
-  if (value.startsWith('OA_CHICAGO_')) return 'OA_CHICAGO'
-  if (value.startsWith('OA_HOUSTON_')) return 'OA_HOUSTON'
-  if (value.startsWith('OA_SAVANNAH_')) return 'OA_SAVANNAH'
-  if (value === 'OA_NEW_YORK_TRUCK') return value
-  throw new Error(`unsupported smart-loading channel group: ${channelCode}`)
-}
-
 function operationsSignature(operations) {
   return JSON.stringify((operations || []).map((operation) => ({
     id: id(operation?.id), operationId: operation?.operationId || null,
@@ -226,7 +213,7 @@ export async function run(context) {
       maxWeightKg: 28000 }],
   }
   const simulationResponse = await request(context, 'POST', '/api/platform/v1/containers', {
-    channelCode: initial?.summary?.channelCode, warehouseId, containerType: '40HC',
+    channelGroupCode: channelGroup(initial?.summary?.channelCode), warehouseId, containerType: '40HC',
     capacityCbm: 76, maxWeightKg: 28000,
   })
   const simulation = context.apiSuccess(MODULE, '新增三期内部模拟柜', simulationResponse, '', OPTIONS)
diff --git a/scripts/admin-test-env-modules/phase3-order-splitting-contract.test.mjs b/scripts/admin-test-env-modules/phase3-order-splitting-contract.test.mjs
index 14dc2b700..41ee5ace2 100644
--- a/scripts/admin-test-env-modules/phase3-order-splitting-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase3-order-splitting-contract.test.mjs
@@ -106,6 +106,14 @@ test('booking freezes the source customer channel and warehouse scope', () => {
   assert.match(source, /containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000/)
 })
 
+test('split chain starts from the partial inbound and derives quantities from the real tree', () => {
+  assert.match(source, /fixture\?\.incrementalInboundId \|\| fixture\?\.inboundId/)
+  assert.match(source, /const originalPackageCount = Number\(firstTree\?\.originalPackageCount\)/)
+  assert.match(source, /while \(activeRemainders\(tree\)\.length > 0\)/)
+  assert.match(source, /sourcePackageCount = Number\(source\?\.packageCount\)/)
+  assert.doesNotMatch(source, /snapshotMatches\(firstTree, 4, 1, 3, 1\)/)
+})
+
 test('booking fixture never invents supplier names without formal IDs', () => {
   assert.match(source, /oceanBookingDraft/)
   assert.doesNotMatch(source, /SPLIT-SHIPPING|SPLIT-AGENT/)
diff --git a/scripts/admin-test-env-modules/phase3-order-splitting.mjs b/scripts/admin-test-env-modules/phase3-order-splitting.mjs
index b57902ad2..a7a624b68 100644
--- a/scripts/admin-test-env-modules/phase3-order-splitting.mjs
+++ b/scripts/admin-test-env-modules/phase3-order-splitting.mjs
@@ -10,6 +10,7 @@ const PDA = '/api/platform/v1/first-leg/pda-loading'
 import { oceanBookingDraft } from './ocean-booking-fixture.mjs'
 import { iso6346ContainerNumber } from './iso6346-container-number.mjs'
 import { ensureInitialCalculated } from './inbound-fees.mjs'
+import { channelGroup } from './smart-loading-channel-group.mjs'
 
 function id(value) { return value == null ? '' : String(value) }
 function codeOf(response) { return response?.body?.code == null ? 'missing' : String(response.body.code) }
@@ -186,7 +187,8 @@ async function loadOneFragment(context, state) {
   const carrier = await ensureMatsonCarrierPartner(context, MODULE, OPTIONS)
   if (!carrier?.id) return null
   const simulationResponse = await request(context, 'POST', CONTAINERS, {
-    channelCode: state.channelCode, warehouseId, containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000,
+    channelGroupCode: channelGroup(state.channelCode), warehouseId,
+    containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000,
   })
   const simulation = context.apiSuccess(MODULE, `为 ${sourceOrderNo} 新增内部模拟柜`, simulationResponse, '', OPTIONS)
   const containerId = id(simulation?.id)
@@ -237,9 +239,9 @@ async function loadOneFragment(context, state) {
   const candidate = Array.isArray(candidates)
     ? candidates.find((row) => id(row.orderId) === sourceOrderId && id(row.accountId) === tenantId)
     : null
-  context.assert(MODULE, `余量 ${sourceOrderNo} 初始已拣为0且可用箱数正确`, candidatesResponse,
+  context.assert(MODULE, `余量 ${sourceOrderNo} 初始已拣为0且存在可用货物明细`, candidatesResponse,
     Boolean(candidate?.inboundId) && Boolean(candidate?.inboundDetailId)
-      && Number(candidate?.availablePackageCount) === sourcePackageCount,
+      && Number(candidate?.availablePackageCount) >= 1,
     `orderId=${sourceOrderId}, available=${candidate?.availablePackageCount ?? 'missing'}`, OPTIONS)
   if (!candidate?.inboundId || !candidate?.inboundDetailId) return null
 
@@ -484,7 +486,7 @@ async function loadOneFragment(context, state) {
 export async function run(context) {
   const fixture = context.createdResources?.phase3Loading || context.createdResources?.phase3ContainerLoading
   const tenantId = id(fixture?.tenantId)
-  const inboundId = id(fixture?.inboundId)
+  const inboundId = id(fixture?.incrementalInboundId || fixture?.inboundId)
   const warehouseId = id(fixture?.warehouseId)
   const containerBookingId = id(fixture?.containerBookingId)
   if (!tenantId || !inboundId || !warehouseId || !containerBookingId || fixture?.marker !== context.marker) {
@@ -511,8 +513,20 @@ export async function run(context) {
   const firstTreeResponse = await context.request('GET', treePath(orderId, tenantId))
   const firstTree = context.apiSuccess(MODULE, '查询首次拆分后的根履约树', firstTreeResponse,
     `orderId=${orderId}, tenantId=${tenantId}`, OPTIONS)
+  const originalPackageCount = Number(firstTree?.originalPackageCount)
+  const initialLoadedPackageCount = Number(firstTree?.cumulativeLoadedPackageCount)
+  const initialRemainingPackageCount = Number(firstTree?.currentRemainderPackageCount)
+  const initialActive = activeRemainders(firstTree)
+  const initialActiveSequence = Number(initialActive[0]?.splitSequence)
   context.assert(MODULE, '新批次由来源单承接已装且只创建一个余量子单', firstTreeResponse,
-    treeShape(firstTree, orderId) && snapshotMatches(firstTree, 4, 1, 3, 1)
+    treeShape(firstTree, orderId)
+      && Number.isInteger(originalPackageCount) && originalPackageCount > 1
+      && Number.isInteger(initialLoadedPackageCount) && initialLoadedPackageCount > 0
+      && Number.isInteger(initialRemainingPackageCount) && initialRemainingPackageCount > 0
+      && originalPackageCount === initialLoadedPackageCount + initialRemainingPackageCount
+      && initialActive.length === 1 && Number.isInteger(initialActiveSequence)
+      && snapshotMatches(firstTree, originalPackageCount, initialLoadedPackageCount,
+        initialRemainingPackageCount, initialActiveSequence)
       && firstTree.children.filter((row) => row.splitRole === 'LOADED').length === 1
       && firstTree.children.filter((row) => row.splitRole === 'REMAINDER').length === 1,
     `original=${firstTree?.originalPackageCount ?? 'missing'}, loaded=${firstTree?.cumulativeLoadedPackageCount ?? 'missing'}, remaining=${firstTree?.currentRemainderPackageCount ?? 'missing'}`, OPTIONS)
@@ -521,7 +535,8 @@ export async function run(context) {
   const firstLoaded = firstTree.children.find((row) => row.splitRole === 'LOADED')
   context.assert(MODULE, '新拆分未生成 LOADED 子单且完成目标保持来源单', firstTreeResponse,
     id(firstLoaded?.orderId) === orderId && id(firstLoaded?.sourceOrderId) === orderId
-      && firstLoaded?.orderNo === firstTree.parentOrderNo && Number(firstLoaded?.packageCount) === 1,
+      && firstLoaded?.orderNo === firstTree.parentOrderNo
+      && Number(firstLoaded?.packageCount) === initialLoadedPackageCount,
     `loadedOrderId=${id(firstLoaded?.orderId) || 'missing'}, sourceOrderId=${id(firstLoaded?.sourceOrderId) || 'missing'}`, OPTIONS)
 
   const merchantLogin = await context.request('POST', '/api/auth/login', {
@@ -534,7 +549,9 @@ export async function run(context) {
       `/api/merchant/v1/orders/${encodeURIComponent(orderId)}/fulfillment-tree`, undefined, merchantToken)
     const merchantTree = context.apiSuccess(MODULE, '客户查询本客户根履约树', merchantTreeResponse, '', OPTIONS)
     context.assert(MODULE, '客户履约树与平台数量聚合一致', merchantTreeResponse,
-      treeShape(merchantTree, orderId) && snapshotMatches(merchantTree, 4, 1, 3, 1),
+      treeShape(merchantTree, orderId)
+        && snapshotMatches(merchantTree, originalPackageCount, initialLoadedPackageCount,
+          initialRemainingPackageCount, initialActiveSequence),
       `children=${merchantTree?.children?.length ?? 'missing'}`, OPTIONS)
 
     const forbidden = await request(context, 'GET', treePath(orderId, tenantId), undefined, {}, merchantToken)
@@ -569,41 +586,54 @@ export async function run(context) {
     cleanupNote: '公开 API 不允许删除订单/柜次/PDA审计记录；只有全部分片完成且无活动余量时标记业务清理完成。',
   }
   let tree = firstTree
-  for (const step of [
-    { sourcePackageCount: 3, expectedLoaded: 2, expectedRemaining: 2, sourceSuffix: 1, activeSuffix: 2 },
-    { sourcePackageCount: 2, expectedLoaded: 3, expectedRemaining: 1, sourceSuffix: 2, activeSuffix: 3 },
-    { sourcePackageCount: 1, expectedLoaded: 4, expectedRemaining: 0, sourceSuffix: 3, activeSuffix: null },
-  ]) {
+  let completedFragments = 0
+  while (activeRemainders(tree).length > 0) {
     const active = activeRemainders(tree)
     const source = active[0]
-    context.assert(MODULE, `链式拆分来源固定为根编号 -${step.sourceSuffix}`, null,
-      active.length === 1 && source?.orderNo === `${tree.parentOrderNo}-${step.sourceSuffix}`,
+    const sourceSuffix = Number(source?.splitSequence)
+    const sourcePackageCount = Number(source?.packageCount)
+    const beforeLoaded = Number(tree.cumulativeLoadedPackageCount)
+    const beforeRemaining = Number(tree.currentRemainderPackageCount)
+    context.assert(MODULE, `链式拆分来源固定为根编号 -${sourceSuffix}`, null,
+      active.length === 1 && Number.isInteger(sourceSuffix) && sourceSuffix > 0
+        && source?.orderNo === `${tree.parentOrderNo}-${sourceSuffix}`
+        && Number.isInteger(sourcePackageCount) && sourcePackageCount === beforeRemaining,
       `active=${active.map((row) => row.orderNo).join(',') || 'none'}`, OPTIONS)
     if (!source) return
 
     const result = await loadOneFragment(context, {
       tenantId, rootOrderId: orderId, sourceOrderId: id(source.orderId), sourceOrderNo: source.orderNo,
       customerName, channelCode, channelName, warehouseId, warehouseName,
-      sourcePackageCount: step.sourcePackageCount, sequence: step.sourceSuffix,
+      sourcePackageCount, sequence: sourceSuffix,
     })
     if (!result?.tree) return
     tree = result.tree
+    completedFragments += 1
+    const expectedLoaded = beforeLoaded + 1
+    const expectedRemaining = beforeRemaining - 1
+    const activeSuffix = expectedRemaining > 0 ? sourceSuffix + 1 : null
     Object.assign(context.createdResources.phase3OrderSplitting, {
       activeRemainderCount: activeRemainders(tree).length,
       finalLoadedPackageCount: Number(tree.cumulativeLoadedPackageCount),
       finalRemainingPackageCount: Number(tree.currentRemainderPackageCount),
     })
-    context.assert(MODULE, `完成第 ${step.sourceSuffix + 1} 个分片后根数量守恒`, result.treeResponse,
+    context.assert(MODULE, `完成余量分片 -${sourceSuffix} 后根数量守恒`, result.treeResponse,
       treeShape(tree, orderId)
-        && snapshotMatches(tree, 4, step.expectedLoaded, step.expectedRemaining, step.activeSuffix),
+        && snapshotMatches(tree, originalPackageCount, expectedLoaded, expectedRemaining, activeSuffix),
       `original=${tree.originalPackageCount}, loaded=${tree.cumulativeLoadedPackageCount}, remaining=${tree.currentRemainderPackageCount}`, OPTIONS)
+    if (completedFragments > originalPackageCount) {
+      context.addStep(MODULE, '余量链在原始箱数边界内收敛', null, false,
+        `original=${originalPackageCount}, fragments=${completedFragments}`, OPTIONS)
+      return
+    }
   }
 
   const remainderCodes = tree.children.filter((row) => row.splitRole === 'REMAINDER').map((row) => row.orderNo)
+  const expectedRemainderCodes = Array.from({ length: completedFragments }, (_, index) =>
+    `${tree.parentOrderNo}-${initialActiveSequence + index}`)
   context.assert(MODULE, '余量子单始终按根编号全局递增且禁止嵌套编号', null,
-    JSON.stringify(remainderCodes) === JSON.stringify([
-      `${tree.parentOrderNo}-1`, `${tree.parentOrderNo}-2`, `${tree.parentOrderNo}-3`,
-    ]) && remainderCodes.every((code) => !/-[0-9]+-[0-9]+$/.test(code)),
+    JSON.stringify(remainderCodes) === JSON.stringify(expectedRemainderCodes)
+      && remainderCodes.every((code) => !/-[0-9]+-[0-9]+$/.test(code)),
     `codes=${remainderCodes.join(',')}`, OPTIONS)
   context.assert(MODULE, '最后一次全量装完不再生成子单且根整体完成', null,
     activeRemainders(tree).length === 0 && Number(tree.currentRemainderPackageCount) === 0
diff --git a/scripts/admin-test-env-modules/phase3-pda-convergence.mjs b/scripts/admin-test-env-modules/phase3-pda-convergence.mjs
index 2c42f2d0d..63970322b 100644
--- a/scripts/admin-test-env-modules/phase3-pda-convergence.mjs
+++ b/scripts/admin-test-env-modules/phase3-pda-convergence.mjs
@@ -53,7 +53,7 @@ export async function run(context) {
     `${taskPath}?warehouseId=${encodeURIComponent(warehouseId)}`)
   const taskDetail = context.apiSuccess(MODULE, '按稳定 taskId 读取 PDA 任务详情', taskDetailResponse, '', OPTIONS)
   const pendingResponse = await request(context, 'GET',
-    `/api/platform/v1/first-leg/pda-loading/tasks/pending?keyword=${encodeURIComponent(containerNo)}`)
+    `/api/platform/v1/first-leg/pda-loading/tasks/pending?warehouseId=${encodeURIComponent(warehouseId)}&keyword=${encodeURIComponent(containerNo)}`)
   const pendingTasks = context.apiSuccess(MODULE, '读取当前操作员 PDA pending 列表', pendingResponse, '', OPTIONS)
   const pendingTask = Array.isArray(pendingTasks)
     ? pendingTasks.find((item) => id(item?.taskId) === taskId)
diff --git a/scripts/admin-test-env-modules/phase3-producer-chain-contract.test.mjs b/scripts/admin-test-env-modules/phase3-producer-chain-contract.test.mjs
index a08fa5af1..0c2b126a5 100644
--- a/scripts/admin-test-env-modules/phase3-producer-chain-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase3-producer-chain-contract.test.mjs
@@ -434,7 +434,9 @@ test('container loading permits manual cross-channel allocation and keeps stable
     '换柜号后按稳定计划身份回查 PDA 任务',
     '换柜号不改变任务计划柜次柜次号和库存快照身份',
   ])
-  assert.match(value, /containerDetail\?\.channelCode === channelCode/)
+  assert.match(value, /simulation\?\.channelGroupCode === channelGroup\(channelCode\)/)
+  assert.match(value, /simulation\?\.channelCode == null/)
+  assert.match(value, /containerDetail\?\.channelGroupCode === channelGroup\(channelCode\)/)
   assert.match(value, /id\(replacedTask\?\.cabinetNo\) === stableIdentity\.cabinetNo/)
   assert.match(value, /afterReplacementSnapshot\?\.snapshotToken === beforeReplacementSnapshot\?\.snapshotToken/)
   assert.match(value, /pdaIdentityStable: true/)
diff --git a/scripts/admin-test-env-modules/phase4-carrier-nodes-contract.test.mjs b/scripts/admin-test-env-modules/phase4-carrier-nodes-contract.test.mjs
index a4a33b8a2..31e660c3f 100644
--- a/scripts/admin-test-env-modules/phase4-carrier-nodes-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase4-carrier-nodes-contract.test.mjs
@@ -71,6 +71,8 @@ test('canonical states, ten ordered nodes, exception codes and complete payload
 test('actual node timestamps advance from the frozen outbound-confirm fact instead of the runner timezone', () => {
   assert.match(source, /Date\.parse\(`\$\{frozenLatestActual\}Z`\)/)
   assert.match(source, /frozenLatestActualMs\) \? Date\.now\(\) : frozenLatestActualMs/)
+  assert.equal((source.match(/observedAt: localWallIso\(new Date\(\)\)/g) || []).length, 3)
+  assert.match(source, /const observedAt = localWallIso\(new Date\(\)\)/)
 })
 
 test('module exposes no scheduler, attempt, internal or arbitrary stop endpoint', () => {
@@ -185,7 +187,7 @@ function markerOwnedContext() {
       if (body.actualAt != null
           && NODE_SEQUENCES[body.standardNode] <= NODE_SEQUENCES[task.latestActualNode]) {
         return conflict(`req-monotonic-${key}`,
-          `人工实际节点必须严格晚于当前最新实际节点：${task.latestActualNode}`)
+          '实际船节点必须按业务顺序向后推进')
       }
       const providerEventId = `manual-${String(nextId)}`
       nodes.push({
diff --git a/scripts/admin-test-env-modules/phase4-carrier-nodes.mjs b/scripts/admin-test-env-modules/phase4-carrier-nodes.mjs
index 21a1e2586..38766ede4 100644
--- a/scripts/admin-test-env-modules/phase4-carrier-nodes.mjs
+++ b/scripts/admin-test-env-modules/phase4-carrier-nodes.mjs
@@ -34,10 +34,15 @@ function codeOf(response) { return response?.body?.code == null ? 'missing' : St
 function rejected(response) { return response?.http === 200 && ['A0409', '409'].includes(codeOf(response)) }
 function monotonicRejected(response) {
   return rejected(response)
-    && String(response?.body?.message || '').includes('人工实际节点必须严格晚于当前最新实际节点')
+    && String(response?.body?.message || '').includes('实际船节点必须按业务顺序向后推进')
     && Boolean(response?.requestId) && Boolean(response?.traceId)
 }
 function localIso(value) { return value.toISOString().slice(0, 19) }
+function localWallIso(value) {
+  const pad = (part) => String(part).padStart(2, '0')
+  return `${value.getFullYear()}-${pad(value.getMonth() + 1)}-${pad(value.getDate())}`
+    + `T${pad(value.getHours())}:${pad(value.getMinutes())}:${pad(value.getSeconds())}`
+}
 
 export function markerOwnedCarrierQuery(context) {
   const resource = context?.createdResources?.phase3CarrierScheduleQuery
@@ -167,7 +172,7 @@ export async function runUntilPickupReady(context) {
     ownershipMatches, `registered=${queryId}, actual=${id(initialTask?.id) || 'missing'}`, OPTIONS)
   if (!ownershipMatches) return
 
-  const observedAt = localIso(new Date())
+  const observedAt = localWallIso(new Date())
   const estimatedAt = localIso(new Date(Date.now() + 30 * 24 * 60 * 60_000))
   const estimatedBody = manualNodePayload({ expectedVersion: Number(initialTask.version),
     standardNode: 'ARRIVED_DESTINATION_PORT', observedAt, estimatedAt, marker: context.marker })
@@ -226,7 +231,7 @@ export async function runUntilPickupReady(context) {
 
   const sameNodeSnapshot = actualProgressSnapshot(detail)
   const sameNodeBody = manualNodePayload({ expectedVersion: version,
-    standardNode: detail.query.query.latestActualNode, observedAt: localIso(new Date()),
+    standardNode: detail.query.query.latestActualNode, observedAt: localWallIso(new Date()),
     actualAt: localIso(new Date(baseActual)), marker: context.marker, index: frozenLatestNodeIndex + 1 })
   const sameNodeResponse = await context.request('POST', `${BASE}/${queryId}/manual-nodes`, sameNodeBody,
     context.token, { 'Idempotency-Key': `${context.marker}-carrier-same-actual`.slice(0, 128) })
@@ -250,7 +255,7 @@ export async function runUntilPickupReady(context) {
     const standardNode = STANDARD_NODES[index]
     const actualAt = localIso(new Date(baseActual + index * 60_000))
     const body = manualNodePayload({ expectedVersion: version, standardNode,
-      observedAt: localIso(new Date()), actualAt, marker: context.marker, index: index + 1 })
+      observedAt: localWallIso(new Date()), actualAt, marker: context.marker, index: index + 1 })
     const key = `${context.marker}-carrier-actual-${String(index + 1).padStart(2, '0')}`.slice(0, 128)
     const response = await context.request('POST', `${BASE}/${queryId}/manual-nodes`, body,
       context.token, { 'Idempotency-Key': key })
@@ -275,7 +280,7 @@ export async function runUntilPickupReady(context) {
       const progressedSnapshot = actualProgressSnapshot(detail)
       const earlierNode = STANDARD_NODES[index - 1]
       const earlierBody = manualNodePayload({ expectedVersion: version, standardNode: earlierNode,
-        observedAt: localIso(new Date()), actualAt: localIso(new Date(baseActual + (index + 1) * 60_000)),
+        observedAt: localWallIso(new Date()), actualAt: localIso(new Date(baseActual + (index + 1) * 60_000)),
         marker: context.marker, index })
       const earlierResponse = await context.request('POST', `${BASE}/${queryId}/manual-nodes`, earlierBody,
         context.token, { 'Idempotency-Key': `${context.marker}-carrier-earlier-actual`.slice(0, 128) })
diff --git a/scripts/admin-test-env-modules/phase4-overseas-client-services-contract.test.mjs b/scripts/admin-test-env-modules/phase4-overseas-client-services-contract.test.mjs
index ceb1b0e98..ab2b8a5ba 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-client-services-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-client-services-contract.test.mjs
@@ -30,6 +30,7 @@ test('module never borrows historical order or inventory candidates', () => {
 })
 
 test('relabel transfer and discard cover create replay conflict list detail and legal initial states', () => {
+  assert.match(source, /deliveryMethod: 'TRUCK', printShippingLabel: false/)
   assert.match(source, /chargeAmount: 0\.01/)
   assert.match(source, /cartonMark:/)
   assert.match(source, /fbaCartonMark:/)
diff --git a/scripts/admin-test-env-modules/phase4-overseas-client-services.mjs b/scripts/admin-test-env-modules/phase4-overseas-client-services.mjs
index 564cb9a0c..278a686a6 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-client-services.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-client-services.mjs
@@ -108,6 +108,7 @@ async function verifyRelabel(context, token, order) {
     operationWarehouseId: order.row.overseasWarehouseId,
     labelDeadline: future(7), contactName: '客户贴标验收联系人', contactPhone: '13800000006',
     chargeAmount: 0.01,
+    deliveryMethod: 'TRUCK', printShippingLabel: false,
     remark: context.marker, idempotencyKey: `${context.marker}-CLIENT-RELABEL`.slice(0, 255),
     items: [{
       sourceInventoryBalanceId: id(source.inventoryBalanceId),
diff --git a/scripts/admin-test-env-modules/phase4-overseas-pda-contract.test.mjs b/scripts/admin-test-env-modules/phase4-overseas-pda-contract.test.mjs
index 35543db25..556e3d9d5 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-pda-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-pda-contract.test.mjs
@@ -107,10 +107,12 @@ test('PDA module covers the container-number receiving contract and excludes out
   assert.match(source, /安全投影已收敛/)
   assert.match(source, /projectionReady = success\(projectionResponse\) \|\| notFound\(projectionResponse\)/)
   assert.match(source, /setTimeout\(resolve, 500\)/)
-  assert.match(source, /超收被拒绝/)
+  assert.match(source, /重复累计不产生超收/)
   assert.match(source, /重复箱新键被拒绝/)
   assert.match(source, /key\(context, `fba-bulk-\$\{index\}`\)/)
-  assert.match(source, /packageCount = Number\(inbound\.pendingPackages \|\| 0\)/)
+  assert.match(source, /inbounds\.reduce\(\(total, inbound\) => total \+ Number\(inbound\.totalPackages \|\| 0\), 0\)/)
+  assert.match(source, /resolvedInboundCodes\.includes\(scannedInboundCode\)/)
+  assert.match(source, /duplicate\.data\?\.result === 'ALREADY_RECEIVED'/)
   assert.match(source, /if \(packageCount <= 0\) return true/)
   assert.match(source, /key\(context, `overseas-carton-\$\{index\}`\)/)
   assert.match(source, /模式硬拒绝/)
diff --git a/scripts/admin-test-env-modules/phase4-overseas-pda-operations-contract.test.mjs b/scripts/admin-test-env-modules/phase4-overseas-pda-operations-contract.test.mjs
index 508c27f63..0149e0305 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-pda-operations-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-pda-operations-contract.test.mjs
@@ -5,7 +5,7 @@ import test from 'node:test'
 import { fileURLToPath } from 'node:url'
 
 import { normalizeModuleOrder } from '../admin-test-env-acceptance.mjs'
-import { auxiliaryPalletFbaWarehouseCode, run } from './phase4-overseas-pda-operations.mjs'
+import { run } from './phase4-overseas-pda-operations.mjs'
 
 const here = path.dirname(fileURLToPath(import.meta.url))
 const source = fs.readFileSync(path.join(here, 'phase4-overseas-pda-operations.mjs'), 'utf8')
@@ -29,6 +29,8 @@ test('receiving hands off only transient credentials and completed warehouse fac
   assert.match(receivingSource, /context\.context\.phase4OverseasPdaOperations = \{/)
   assert.match(receivingSource, /completedFixtures: \[\]/)
   assert.match(receivingSource, /merchantToken,/)
+  assert.match(receivingSource, /const refreshedMerchantToken = await loginMerchantForNegativeProbe\(context\)/)
+  assert.match(receivingSource, /phase4OverseasPdaOperations\.merchantToken = refreshedMerchantToken/)
   assert.match(receivingSource, /if \(!handoffReady\) \{[\s\S]*await cleanup\(\)/)
   assert.doesNotMatch(receivingSource, /createdResources\.phase4OverseasPdaOperations/)
   assert.doesNotMatch(receivingSource, /primary: primary \? \{[^}]*password/)
@@ -66,16 +68,25 @@ test('P2 to P5 cover all frozen endpoints, replays and conflict boundaries witho
   assert.match(source, /traceId=/)
 })
 
-test('auxiliary pallets use the authoritative inbound FBA code and never the business destination fallback', () => {
-  assert.equal(auxiliaryPalletFbaWarehouseCode('FBA', ' ABE3 '), 'ABE3')
-  assert.equal(auxiliaryPalletFbaWarehouseCode('OVERSEAS', 'ABE3'), null)
-  assert.equal(auxiliaryPalletFbaWarehouseCode('FBA', ''), null)
+test('PDA operations reuse received plan pallets and the public location without creating resources', () => {
   assert.match(receivingSource,
-    /destinationType: inbound\.destinationType,[\s\S]*fbaWarehouseCode: inbound\.destinationType === 'FBA' \? inbound\.fbaWarehouseCode : null/)
-  assert.match(source, /fbaWarehouseCode,\s*\n\s*remark:/)
-  assert.match(source, /createLocation\(context, fixture\.overseasWarehouseId, `\$\{suffix\}-PALLET`\)/)
-  assert.match(source, /locationId: location\.locationId/)
-  assert.doesNotMatch(source, /createEmptyPallet\([^\n]*main\.destinationWarehouseCode/)
+    /auxiliaryPallets: generatedContainerPallets\.filter/)
+  assert.match(source, /resolvePublicLocation/)
+  assert.match(source, /resolveReusableAuxiliaryPallet/)
+  assert.match(source, /locationType === 'VIRTUAL'/)
+  assert.match(source, /P3托盘已在公共库位不重复移库/)
+  assert.doesNotMatch(source, /warehouse-admin[^'`]*\/locations`,\s*\{/)
+  assert.doesNotMatch(source, /warehouse-admin[^'`]*\/pallets`,\s*\{/)
+  assert.doesNotMatch(source, /createLocation|createEmptyPallet/)
+})
+
+test('P5 follows warehouse review, customer confirmation and fulfillment completion in order', () => {
+  assert.match(source, /applicationStatus === 'CUSTOMER_CONFIRM_PENDING'/)
+  assert.match(source, /const merchantRelabelBase = '\/api\/merchant\/v1\/last-leg\/relabel-applications'/)
+  assert.match(source, /`\$\{merchantRelabelBase\}\/\$\{encodeURIComponent\(relabelNo\)\}\/confirm-completion`/)
+  assert.match(source, /status === 'READY_FOR_OUTBOUND'/)
+  assert.match(source, /status: 'COMPLETED'/)
+  assert.match(source, /walletStatus === 'SETTLED'/)
 })
 
 test('fixture failure still disables both picker accounts and removes all transient tokens', async () => {
diff --git a/scripts/admin-test-env-modules/phase4-overseas-pda.mjs b/scripts/admin-test-env-modules/phase4-overseas-pda.mjs
index e0ec1df74..b6268b4af 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-pda.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-pda.mjs
@@ -1,3 +1,5 @@
+import { prepareTerminalDrayage } from './phase5-terminal-drayage.mjs'
+
 const MODULE = 'phase4-overseas-pda'
 const SCENARIO = 'phase4-overseas-pda-container-receiving'
 const OPTIONS = { scenario: SCENARIO, deploymentBlocker: true }
@@ -91,8 +93,10 @@ async function captureCompletedOrder(context, containerNo, expectedCustomerId) {
 
 async function loginMerchantForNegativeProbe(context) {
   const fixture = context.context?.merchantQualificationFixture
-  if (!fixture?.username || !fixture?.password) return null
-  const response = await context.request('POST', '/api/auth/login', { loginId: fixture.username, password: fixture.password }, '')
+  const username = fixture?.username || context.options?.merchantUsername
+  const password = fixture?.password || context.options?.merchantPassword
+  if (!username || !password) return null
+  const response = await context.request('POST', '/api/auth/login', { loginId: username, password }, '')
   const data = success(response) ? response.body?.data : null
   context.addStep(MODULE, '本轮客户登录取得海外令牌用于PDA越权反证', response,
     success(response) && nonBlank(data?.overseasAccessToken),
@@ -204,31 +208,38 @@ async function resolveGeneratedPallet(context, inbound) {
 async function verifyWarehouseQueries(context, token, inboundCode, pallet, destinationType) {
   const inventory = await pda(context, token, 'POST', '完成入库后按入仓码现场查询库存',
     '/api/pda/v1/last-leg/inventory/resolve', { code: inboundCode })
+  const inventoryItems = Array.isArray(inventory.data?.items) ? inventory.data.items : []
   context.assert(MODULE, '现场库存查询只返回Token绑定仓且包含库存位置', inventory.response,
     success(inventory.response) && inventory.data?.queryCode === inboundCode
-      && Array.isArray(inventory.data?.items) && inventory.data.items.length > 0
-      && inventory.data.items.every((item) => id(item?.palletId) === pallet.palletId
-        && id(item?.locationId) === pallet.locationId && Number(item?.availablePackages) > 0),
+      && inventoryItems.length > 0
+      && inventoryItems.every((item) => longId(id(item?.palletId))
+        && longId(id(item?.locationId)) && nonBlank(item?.palletCode)
+        && nonBlank(item?.locationCode) && Number(item?.availablePackages) > 0),
     `items=${inventory.data?.items?.length ?? 'missing'}; ${trace(inventory.response)}`, OPTIONS)
-  const inventoryItems = Array.isArray(inventory.data?.items) ? inventory.data.items : []
   context.assert(MODULE, `${destinationType}实收形成服务端SKU库存账`, inventory.response,
     success(inventory.response) && inventoryItems.length > 0
       && inventoryItems.every((item) => nonBlank(item?.skuCode) && Number(item?.availablePackages) > 0),
     `skuCodes=${[...new Set(inventoryItems.map((item) => item?.skuCode).filter(nonBlank))].join('|') || 'missing'}, availablePackages=${inventoryItems.reduce((total, item) => total + Number(item?.availablePackages || 0), 0)}; ${trace(inventory.response)}`, OPTIONS)
 
+  const occupied = [...inventoryItems].sort((left, right) =>
+    Number(right?.availablePackages || 0) - Number(left?.availablePackages || 0))[0]
+  const actualPalletCode = occupied?.palletCode || pallet.palletCode
+  const actualPalletId = id(occupied?.palletId || pallet.palletId)
+  const actualLocationCode = occupied?.locationCode || pallet.locationCode
+  const actualLocationId = id(occupied?.locationId || pallet.locationId)
   const location = await pda(context, token, 'POST', '完成入库后扫码查询库位',
-    '/api/pda/v1/last-leg/locations/resolve', { code: pallet.locationCode })
+    '/api/pda/v1/last-leg/locations/resolve', { code: actualLocationCode })
   context.assert(MODULE, '库位查询返回当前仓真实占用汇总', location.response,
-    success(location.response) && id(location.data?.locationId) === pallet.locationId
-      && location.data?.locationCode === pallet.locationCode
+    success(location.response) && id(location.data?.locationId) === actualLocationId
+      && location.data?.locationCode === actualLocationCode
       && Number(location.data?.occupiedPackages) > 0 && Number(location.data?.inventoryPositionCount) > 0,
     `locationId=${id(location.data?.locationId) || 'missing'}; ${trace(location.response)}`, OPTIONS)
 
   const resolvedPallet = await pda(context, token, 'POST', '完成入库后扫码查询托盘内容',
-    '/api/pda/v1/last-leg/pallets/resolve', { code: pallet.palletCode })
+    '/api/pda/v1/last-leg/pallets/resolve', { code: actualPalletCode })
   context.assert(MODULE, '托盘查询返回当前位置与库存明细', resolvedPallet.response,
-    success(resolvedPallet.response) && id(resolvedPallet.data?.palletId) === pallet.palletId
-      && id(resolvedPallet.data?.locationId) === pallet.locationId
+    success(resolvedPallet.response) && id(resolvedPallet.data?.palletId) === actualPalletId
+      && id(resolvedPallet.data?.locationId) === actualLocationId
       && Array.isArray(resolvedPallet.data?.inventory) && resolvedPallet.data.inventory.length > 0
       && Number(resolvedPallet.data?.occupiedPackages) > 0,
     `palletId=${id(resolvedPallet.data?.palletId) || 'missing'}; ${trace(resolvedPallet.response)}`, OPTIONS)
@@ -242,7 +253,8 @@ async function verifyWarehouseQueries(context, token, inboundCode, pallet, desti
       && Number(history.data?.page) === 1 && Number(history.data?.size) === 50,
     `records=${historyRows.length}; ${trace(history.response)}`, OPTIONS)
   return success(inventory.response) && success(location.response) && success(resolvedPallet.response)
-    ? { inboundCode, pallet: resolvedPallet.data, location: location.data, inventory: inventory.data?.items || [] }
+    ? { inboundCode, pallet: resolvedPallet.data, location: location.data,
+      inventory: inventoryItems.filter((item) => id(item?.palletId) === actualPalletId) }
     : null
 }
 
@@ -465,12 +477,17 @@ export async function resolveCartonFixtures(context, token, inbounds, producerCa
       continue
     }
     const resolved = response.body?.data
-    const matches = inbounds.filter((item) => item.inboundCode === resolved?.inboundCode)
+    const delimiter = cartonMark.indexOf('#')
+    const scannedInboundCode = delimiter > 0 ? cartonMark.slice(0, delimiter).trim() : ''
+    const resolvedInboundCodes = Array.isArray(resolved?.inboundCodes)
+      ? resolved.inboundCodes.map(id) : [id(resolved?.inboundCode)].filter(nonBlank)
+    const matches = inbounds.filter((item) => item.inboundCode === scannedInboundCode)
     const destinations = new Set(matches.map((item) => item?.destinationType).filter(nonBlank))
     const unique = success(response) && nonBlank(resolved?.inboundCode) && !Array.isArray(resolved?.inboundCode)
       && matches.length === 1 && destinations.size === 1
       && ['FBA', 'OVERSEAS'].includes(resolved?.destinationType)
       && destinations.has(resolved?.destinationType)
+      && resolvedInboundCodes.includes(scannedInboundCode)
       && (!strictDropship || (resolved?.cartonMark === cartonMark
         && resolved?.inboundCode === dropshipProducer.inboundCode && resolved?.destinationType === dropshipProducer.destinationType))
     context.addStep(MODULE, `统一解析${resolved?.destinationType || 'UNKNOWN'}箱码${index + 1}并返回唯一入仓码`, response,
@@ -521,29 +538,33 @@ async function probeCartonResolveNegatives(context, token, current) {
   }
 }
 
-async function receiveFba(context, token, inbound, pallet, cartonFixtures, index) {
-  const resolvedCartons = cartonFixtures.filter((item) => item.inbound.inboundCode === inbound.inboundCode
+async function receiveFba(context, token, inbounds, pallet, cartonFixtures, index) {
+  const inboundCodes = new Set(inbounds.map((item) => item.inboundCode))
+  const resolvedCartons = cartonFixtures.filter((item) => inboundCodes.has(item.inbound.inboundCode)
     && item.resolved.destinationType === 'FBA')
-  if (!resolvedCartons.length) {
-    blockerGap(context, `FBA入仓码${inbound.inboundCode}箱码解析`, '没有冻结箱码以200/code 200唯一解析到当前FBA入仓码')
+  if (resolvedCartons.length !== inbounds.length) {
+    blockerGap(context, `FBA组${[...inboundCodes].join('|')}箱码解析`, '没有为FBA组内每个入仓码完成唯一解析')
     return false
   }
-  const packageCount = Number(inbound.pendingPackages || 0)
+  const packageCount = inbounds.reduce((total, inbound) => total + Number(inbound.totalPackages || 0), 0)
   if (packageCount <= 0) return true
-  const body = { inboundCode: inbound.inboundCode, palletCode: pallet.palletCode,
+  const body = { inboundCode: inbounds[0].inboundCode, palletCode: pallet.palletCode,
     packageCount, idempotencyKey: key(context, `fba-bulk-${index}`) }
-  const first = await pda(context, token, 'POST', `FBA入仓码${inbound.inboundCode}按箱数实收`,
+  const first = await pda(context, token, 'POST', `FBA组${[...inboundCodes].join('|')}按累计箱数实收`,
     '/api/pda/v1/last-leg/receiving-containers/current/receipts/bulk', body)
   if (!success(first.response)) return false
-  const replay = await pda(context, token, 'POST', `FBA入仓码${inbound.inboundCode}同键同载荷重放`,
+  const replay = await pda(context, token, 'POST', `FBA组${[...inboundCodes].join('|')}同键同载荷重放`,
     '/api/pda/v1/last-leg/receiving-containers/current/receipts/bulk', body)
-  context.assert(MODULE, `FBA入仓码${inbound.inboundCode}幂等结果一致`, replay.response,
+  context.assert(MODULE, `FBA组${[...inboundCodes].join('|')}幂等结果一致`, replay.response,
     success(replay.response) && JSON.stringify(replay.data) === JSON.stringify(first.data), trace(replay.response), OPTIONS)
-  await expected(context, token, 'POST', `FBA入仓码${inbound.inboundCode}同键异载荷冲突`,
+  await expected(context, token, 'POST', `FBA组${[...inboundCodes].join('|')}同键异载荷冲突`,
     '/api/pda/v1/last-leg/receiving-containers/current/receipts/bulk', { ...body, packageCount: packageCount + 1 }, conflict)
-  await expected(context, token, 'POST', `FBA入仓码${inbound.inboundCode}超收被拒绝`,
+  const already = await pda(context, token, 'POST', `FBA组${[...inboundCodes].join('|')}新键重复累计为零增量`,
     '/api/pda/v1/last-leg/receiving-containers/current/receipts/bulk',
-    { ...body, packageCount: Number(inbound.totalPackages) + 1, idempotencyKey: key(context, `fba-over-${index}`) }, conflict)
+    { ...body, idempotencyKey: key(context, `fba-already-${index}`) })
+  context.assert(MODULE, `FBA组${[...inboundCodes].join('|')}重复累计不产生超收`, already.response,
+    success(already.response) && already.data?.result === 'ALREADY_RECEIVED'
+      && Number(already.data?.acceptedPackages) === 0, trace(already.response), OPTIONS)
   return true
 }
 
@@ -604,9 +625,12 @@ async function receiveDropship(context, token, producer, inbounds) {
     await expected(context, token, 'POST', `一件代发整托${index + 1}同键异载荷冲突`,
       '/api/pda/v1/last-leg/receiving-containers/current/receipts/pallet',
       { ...body, sourcePalletNo: `${sourcePalletNo}-MUTATED` }, conflict)
-    await expected(context, token, 'POST', `一件代发来源托盘重复收货被拒绝${index + 1}`,
+    const duplicate = await pda(context, token, 'POST', `一件代发来源托盘新键重复收货${index + 1}`,
       '/api/pda/v1/last-leg/receiving-containers/current/receipts/pallet',
-      { ...body, idempotencyKey: key(context, `dropship-pallet-duplicate-${index}`) }, conflict)
+      { ...body, idempotencyKey: key(context, `dropship-pallet-duplicate-${index}`) })
+    context.assert(MODULE, `一件代发来源托盘重复收货不重复入账${index + 1}`, duplicate.response,
+      success(duplicate.response) && duplicate.data?.result === 'ALREADY_RECEIVED'
+        && Number(duplicate.data?.acceptedPackages) === 0, trace(duplicate.response), OPTIONS)
   }
   context.assert(MODULE, '一件代发整托实收箱数与待收箱数守恒', null,
     accepted === expectedPending, `accepted=${accepted}, expected=${expectedPending}`, OPTIONS)
@@ -728,8 +752,15 @@ async function runReceiving(context, token, secondaryToken, merchantToken, prefe
       cartonMark: fbaCarton?.cartonMark,
       palletCode: pallets.get(firstFba.inboundCode).palletCode, idempotencyKey: key(context, 'fba-carton-forbidden'),
     }, (response) => a0409Message(response, /^FBA destination must use bulk count$/))
-    for (const [index, inbound] of fbaInbounds.entries()) {
-      await receiveFba(context, token, inbound, pallets.get(inbound.inboundCode), cartonFixtures, index)
+    const groups = new Map()
+    for (const inbound of fbaInbounds) {
+      const fixture = cartonFixtures.find((item) => item.inbound.inboundCode === inbound.inboundCode)
+      const groupKey = fixture?.resolved?.groupKey || `INBOUND:${inbound.inboundCode}`
+      if (!groups.has(groupKey)) groups.set(groupKey, [])
+      groups.get(groupKey).push(inbound)
+    }
+    for (const [index, group] of [...groups.values()].entries()) {
+      await receiveFba(context, token, group, pallets.get(group[0].inboundCode), cartonFixtures, index)
     }
   } else if (!strictDropship && preferredProducer?.destinationType !== 'OVERSEAS') {
     blockerGap(context, 'FBA按箱数链', '当前FBA柜没有带真实托盘的 FBA 入仓码')
@@ -785,24 +816,36 @@ async function runReceiving(context, token, secondaryToken, merchantToken, prefe
   if (context.createdResources.phase4OverseasPda.finalStatus === 'COMPLETED') {
     const physicalPallets = [...new Map([...pallets.values()]
       .map((item) => [id(item.palletId), item])).values()]
-    context.createdResources.phase4OverseasPda.completedContainerFacts.push({
-      containerNo,
-      containerBookingId: id(preferredProducer?.containerBookingId),
-      expectedPalletCost: physicalPallets.reduce((sum, item) => sum + Number(item.unitPrice || 0), 0),
-      palletIds: physicalPallets.map((item) => item.palletId),
-    })
+    const generatedContainerPallets = current.data.inbounds.flatMap((item) =>
+      context.createdResources.phase4OverseasPda.generatedPalletsByInbound[item.inboundCode] || [])
+    const completedFixtures = []
     const order = await captureCompletedOrder(context, containerNo, preferredProducer?.tenantId)
     for (const inbound of current.data.inbounds.filter((item) => pallets.has(item.inboundCode))) {
       const warehouseFacts = await verifyWarehouseQueries(context, token, inbound.inboundCode,
         pallets.get(inbound.inboundCode), inbound.destinationType)
       if (warehouseFacts && context.context?.phase4OverseasPdaOperations) {
-        context.context.phase4OverseasPdaOperations.completedFixtures.push({
+        const fixture = {
           containerNo, order, destinationType: inbound.destinationType,
           fbaWarehouseCode: inbound.destinationType === 'FBA' ? inbound.fbaWarehouseCode : null,
+          auxiliaryPallets: generatedContainerPallets.filter((candidate) =>
+            id(candidate?.palletId) !== id(warehouseFacts.pallet?.palletId)),
           ...warehouseFacts,
-        })
+        }
+        context.context.phase4OverseasPdaOperations.completedFixtures.push(fixture)
+        completedFixtures.push(fixture)
       }
     }
+    const receivedPallets = [...new Map(completedFixtures.map((fixture) => {
+      const palletId = id(fixture.pallet?.palletId)
+      const source = physicalPallets.find((candidate) => id(candidate?.palletId) === palletId)
+      return [palletId, { palletId, unitPrice: Number(source?.unitPrice || 0) }]
+    }).filter(([palletId]) => longId(palletId))).values()]
+    context.createdResources.phase4OverseasPda.completedContainerFacts.push({
+      containerNo,
+      containerBookingId: id(preferredProducer?.containerBookingId),
+      expectedPalletCost: receivedPallets.reduce((sum, item) => sum + item.unitPrice, 0),
+      palletIds: receivedPallets.map((item) => item.palletId),
+    })
   }
 }
 
@@ -869,6 +912,12 @@ export async function run(context) {
         'Dropship/FBA与OVERSEAS实际处理柜尚未全部达到PICKUP_READY；跨区消费已独立验证，不回退处理历史柜')
       return
     }
+    if (producers.length && context.options?.modules?.includes('phase5-terminal-drayage')
+        && !(await prepareTerminalDrayage(context, producers[0]))) {
+      blockerGap(context, '目的港码头拖车提柜前置',
+        '本轮首个PICKUP_READY货柜未能在卸柜前完成选车队、预约和实际提柜')
+      return
+    }
     for (const [index, producer] of (producers.length ? producers : [null]).entries()) {
       context.pdaContainerSuffix = producer?.containerNo || `CONTAINER-${index + 1}`
       context.createdResources.phase4OverseasPda.finalStatus = null
@@ -878,6 +927,10 @@ export async function run(context) {
         context.createdResources.phase4OverseasPda.completedContainers.push(producer?.containerNo || null)
       }
     }
+    const refreshedMerchantToken = await loginMerchantForNegativeProbe(context)
+    if (nonBlank(refreshedMerchantToken)) {
+      context.context.phase4OverseasPdaOperations.merchantToken = refreshedMerchantToken
+    }
     handoffReady = context.context.phase4OverseasPdaOperations.completedFixtures.length > 0
   } finally {
     delete context.pdaContainerSuffix
diff --git a/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs b/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
new file mode 100644
index 000000000..f8b2a421d
--- /dev/null
+++ b/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
@@ -0,0 +1,48 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { readFile } from 'node:fs/promises'
+
+const moduleUrl = new URL('./phase4-overseas-return-receipt.mjs', import.meta.url)
+const acceptanceUrl = new URL('../admin-test-env-acceptance.mjs', import.meta.url)
+
+test('full acceptance registers return receipt as a configured overseas module with an isolated merchant fixture', async () => {
+  const source = await readFile(acceptanceUrl, 'utf8')
+  assert.match(source, /CONFIGURED_MODULES[^\n]+phase4-overseas-return-receipt/)
+  assert.match(source, /\['phase4-overseas-return-receipt', \['merchant-qualification-fixture'\]\]/)
+  assert.match(source, /requiresMarkerOwnedMerchantFixture[\s\S]+phase4-overseas-return-receipt/)
+})
+
+test('return receipt acceptance covers both lookup paths, partial/final receipt and normal empty results', async () => {
+  const source = await readFile(moduleUrl, 'utf8')
+  assert.match(source, /PDA_RECEIPTS = '\/api\/pda\/v1\/last-leg\/return-receipts'/)
+  assert.match(source, /\$\{PDA_RECEIPTS\}\/start/)
+  assert.match(source, /\$\{PDA_RECEIPTS\}\/sku-candidates/)
+  assert.match(source, /PDA首次分批签收2件/)
+  assert.match(source, /PDA按SKU完成剩余3件签收/)
+  assert.match(source, /不存在SKU不是业务错误/)
+  assert.match(source, /已完成退货单不再进入待签收流程/)
+})
+
+test('return receipt acceptance proves idempotency, over-receipt isolation and exact inventory', async () => {
+  const source = await readFile(moduleUrl, 'utf8')
+  assert.match(source, /预报幂等重放复用同一退货单/)
+  assert.match(source, /签收重放不重复创建签收单、箱或计费批次/)
+  assert.match(source, /超收被拒绝且不得生成费用批次/)
+  assert.match(source, /订单5件核平且恰有两个唯一仓储计费批次/)
+  assert.match(source, /两个实收箱逐一引用对应计费批次且数量守恒/)
+})
+
+test('return receipt acceptance includes fee-batch evidence and return packing lifecycle', async () => {
+  const source = await readFile(moduleUrl, 'utf8')
+  assert.match(source, /billingExpectation: 'One PENDING_PRICING storage billing batch per successful non-replayed receipt'/)
+  assert.match(source, /receiptBatchNos/)
+  assert.match(source, /sourceBatchNo/)
+  assert.match(source, /PDA查询完成退货单的可合箱库存/)
+  assert.match(source, /PDA将同客户退货库存合为新箱/)
+  assert.match(source, /合箱重放复用同一新箱且不重复扣减/)
+})
+
+test('HTTP acceptance uses injected clients and never bypasses APIs with database access', async () => {
+  const source = await readFile(moduleUrl, 'utf8')
+  assert.doesNotMatch(source, /process\.env|https?:\/\/|\bfetch\s*\(|\bmysql\b|\bSELECT\s|\bINSERT\s|\bUPDATE\s/i)
+})
diff --git a/scripts/admin-test-env-modules/phase4-overseas-return-receipt.mjs b/scripts/admin-test-env-modules/phase4-overseas-return-receipt.mjs
new file mode 100644
index 000000000..3507217bf
--- /dev/null
+++ b/scripts/admin-test-env-modules/phase4-overseas-return-receipt.mjs
@@ -0,0 +1,310 @@
+import { createPicker, disablePicker, resolvePickerAccess } from './phase4-overseas-pda.mjs'
+
+const MODULE = 'phase4-overseas-return-receipt'
+const SCENARIO = 'phase4-overseas-return-receipt-and-billing'
+const OPTIONS = { scenario: SCENARIO, deploymentBlocker: true }
+const RETURN_ORDERS = '/api/merchant/v1/last-leg/return-orders'
+const PDA_RECEIPTS = '/api/pda/v1/last-leg/return-receipts'
+const RETURN_INVENTORY = '/api/merchant/v1/last-leg/return-inventory'
+
+function id(value) { return value == null ? '' : String(value) }
+function nonBlank(value) { return typeof value === 'string' && value.trim() !== '' }
+function code(response) { return String(response?.body?.code ?? '') }
+function success(response) { return response?.http === 200 && code(response) === '200' }
+function conflict(response) {
+  return (response?.http === 409 || (response?.http === 200 && ['409', 'A0409'].includes(code(response))))
+    && nonBlank(response?.requestId) && nonBlank(response?.traceId)
+}
+function notFound(response) {
+  return (response?.http === 404 || (response?.http === 200 && ['404', 'A0404'].includes(code(response))))
+    && nonBlank(response?.requestId) && nonBlank(response?.traceId)
+}
+function records(value) { return Array.isArray(value?.records) ? value.records : Array.isArray(value) ? value : [] }
+function trace(response) {
+  return `HTTP=${response?.http ?? 'missing'}, code=${code(response) || 'missing'}, requestId=${response?.requestId || 'missing'}, traceId=${response?.traceId || 'missing'}`
+}
+function query(path, values) {
+  const params = new URLSearchParams()
+  for (const [name, value] of Object.entries(values || {})) {
+    if (value !== undefined && value !== null && String(value) !== '') params.set(name, String(value))
+  }
+  return params.size ? `${path}?${params}` : path
+}
+function key(context, action) {
+  return `${context.marker}-RETURN-${action}`.replace(/[^A-Za-z0-9:_-]/g, '').slice(0, 255)
+}
+function markerSuffix(context) {
+  return String(context.marker).replace(/[^A-Za-z0-9]/g, '').slice(-18).toUpperCase()
+}
+
+function add(context, name, response, passed, evidence = '') {
+  context.addStep(MODULE, name, response, passed, `${evidence}${evidence ? '; ' : ''}${trace(response)}`, OPTIONS)
+}
+
+async function overseas(context, token, method, name, path, body = undefined) {
+  const response = await context.requestOverseas(method, path, body, {}, token)
+  add(context, name, response, success(response))
+  return { response, data: success(response) ? response.body?.data : null }
+}
+
+async function resolveWarehouse(context) {
+  const existing = id(context.createdResources?.phase4OverseasPda?.overseasWarehouseId)
+  const response = await context.request('GET',
+    '/api/platform/v1/warehouse-admin?tenantId=0&page=1&size=200&capabilityCode=RECEIVING&warehouseType=OVERSEAS&status=ACTIVE')
+  const rows = records(response?.body?.data)
+  const fixedIds = new Set(['193000000000200003', '193000000000200004'])
+  const warehouse = rows.find((item) => id(item?.id) === existing)
+    || rows.find((item) => fixedIds.has(id(item?.id)))
+    || rows[0]
+  add(context, '读取可执行退货签收的海外仓', response,
+    success(response) && nonBlank(id(warehouse?.id)), `warehouseId=${id(warehouse?.id) || 'missing'}`)
+  return success(response) && warehouse ? { id: id(warehouse.id), name: warehouse.warehouseName || warehouse.name } : null
+}
+
+async function loginMerchant(context) {
+  const fixture = context.context?.merchantQualificationFixture
+  if (fixture?.marker !== context.marker || !fixture?.username || !fixture?.password) {
+    add(context, '取得本轮客户账号', null, false, `marker=${fixture?.marker || 'missing'}`)
+    return null
+  }
+  const response = await context.request('POST', '/api/auth/login', {
+    loginId: fixture.username, password: fixture.password,
+  }, '')
+  const token = success(response) ? response.body?.data?.overseasAccessToken : null
+  add(context, '客户登录并取得海外访问令牌', response, nonBlank(token), `tokenPresent=${nonBlank(token)}`)
+  return nonBlank(token) ? token : null
+}
+
+function itemMap(items) {
+  return new Map((Array.isArray(items) ? items : []).map((item) => [item.skuCode, item]))
+}
+
+export async function run(context) {
+  context.createdResources.phase4OverseasReturnReceipt = {
+    marker: context.marker, returnNo: null, receiptNos: [], receiptBatchNos: [], cartonMarks: [],
+    billingExpectation: 'One PENDING_PRICING storage billing batch per successful non-replayed receipt',
+  }
+  const merchantToken = await loginMerchant(context)
+  const warehouse = await resolveWarehouse(context)
+  const access = await resolvePickerAccess(context)
+  if (!merchantToken || !warehouse || !access) return
+  const picker = await createPicker(context, 91, warehouse.id, access)
+  if (!picker?.token) {
+    add(context, '创建退货签收PDA操作员', null, false, '未取得绑定仓PDA令牌')
+    if (picker?.membershipId) await disablePicker(context, picker, 91)
+    return
+  }
+
+  const suffix = markerSuffix(context)
+  const skuA = `RET-A-${suffix}`.slice(0, 128)
+  const skuB = `RET-B-${suffix}`.slice(0, 128)
+  const createBody = {
+    overseasWarehouseId: warehouse.id,
+    warehouseContactName: '全量验收海外仓', warehouseContactPhone: '0000000000',
+    customerReferenceNo: `REF-${suffix}`, needRelabel: false, remark: context.marker,
+    idempotencyKey: key(context, 'CREATE'),
+    items: [
+      { skuCode: skuA, productNameZh: '退货验收商品A', expectedQuantity: 3 },
+      { skuCode: skuB, productNameZh: '退货验收商品B', expectedQuantity: 2 },
+    ],
+  }
+
+  try {
+    const created = await overseas(context, merchantToken, 'POST', '客户创建双SKU退货预报', RETURN_ORDERS, createBody)
+    const returnNo = id(created.data?.order?.returnNo)
+    context.assert(MODULE, '退货预报初始数量和状态正确', created.response,
+      nonBlank(returnNo) && created.data?.order?.status === 'PENDING_RECEIPT'
+        && Number(created.data?.order?.expectedQuantity) === 5
+        && Number(created.data?.order?.receivedQuantity) === 0
+        && itemMap(created.data?.items).size === 2,
+      `returnNo=${returnNo || 'missing'}`, OPTIONS)
+    if (!returnNo) return
+    context.createdResources.phase4OverseasReturnReceipt.returnNo = returnNo
+
+    const createReplay = await overseas(context, merchantToken, 'POST', '退货预报同键同载荷重放', RETURN_ORDERS, createBody)
+    context.assert(MODULE, '预报幂等重放复用同一退货单', createReplay.response,
+      id(createReplay.data?.order?.returnNo) === returnNo, trace(createReplay.response), OPTIONS)
+    const createConflict = await context.requestOverseas('POST', RETURN_ORDERS,
+      { ...createBody, remark: `${context.marker}-CHANGED` }, {}, merchantToken)
+    add(context, '退货预报同键异载荷返回冲突', createConflict, conflict(createConflict))
+
+    const emptySku = await overseas(context, picker.token, 'POST', 'PDA查询不存在SKU返回正常空候选',
+      `${PDA_RECEIPTS}/sku-candidates`, { skuCode: `MISSING-${suffix}` })
+    context.assert(MODULE, '不存在SKU不是业务错误', emptySku.response,
+      success(emptySku.response) && Array.isArray(emptySku.data?.candidates) && emptySku.data.candidates.length === 0,
+      trace(emptySku.response), OPTIONS)
+
+    const started = await overseas(context, picker.token, 'POST', 'PDA按退货单号开始签收',
+      `${PDA_RECEIPTS}/start`, { returnNo })
+    context.assert(MODULE, '首次开始返回全部未收SKU', started.response,
+      started.data?.status === 'PENDING_RECEIPT' && itemMap(started.data?.expectedItems).size === 2,
+      trace(started.response), OPTIONS)
+    const skuCandidates = await overseas(context, picker.token, 'POST', 'PDA按SKU查询当前仓候选退货单',
+      `${PDA_RECEIPTS}/sku-candidates`, { skuCode: skuB })
+    context.assert(MODULE, 'SKU候选包含本轮退货单及准确数量', skuCandidates.response,
+      skuCandidates.data?.candidates?.some?.((candidate) => candidate.returnNo === returnNo
+        && Number(candidate.skuExpectedQuantity) === 2 && Number(candidate.skuReceivedQuantity) === 0),
+      trace(skuCandidates.response), OPTIONS)
+
+    const cartonA = `RC-${suffix}-A`.slice(0, 128)
+    const firstBody = {
+      returnNo, trackingNo: `TRACK-${suffix}`, startedBy: 'RETURN_NO', cartonMark: cartonA,
+      items: [{ skuCode: skuA, receivedQuantity: 2 }], idempotencyKey: key(context, 'RECEIPT-1'),
+    }
+    const first = await overseas(context, picker.token, 'POST', 'PDA首次分批签收2件', `${PDA_RECEIPTS}/confirm`, firstBody)
+    context.assert(MODULE, '首次签收形成唯一箱和仓储计费批次', first.response,
+      first.data?.orderStatus === 'PARTIALLY_RECEIVED' && first.data?.fullyMatched === false
+        && Number(first.data?.receivedQuantity) === 2 && first.data?.cartonMark === cartonA
+        && nonBlank(first.data?.receiptNo) && nonBlank(first.data?.receiptBatchNo),
+      `receiptNo=${id(first.data?.receiptNo) || 'missing'}, billingBatch=${id(first.data?.receiptBatchNo) || 'missing'}`, OPTIONS)
+    const firstReceiptNo = id(first.data?.receiptNo)
+    const firstBatchNo = id(first.data?.receiptBatchNo)
+
+    const firstReplay = await overseas(context, picker.token, 'POST', '首次签收同键同载荷重放', `${PDA_RECEIPTS}/confirm`, firstBody)
+    context.assert(MODULE, '签收重放不重复创建签收单、箱或计费批次', firstReplay.response,
+      id(firstReplay.data?.receiptNo) === firstReceiptNo
+        && id(firstReplay.data?.receiptBatchNo) === firstBatchNo
+        && id(firstReplay.data?.cartonMark) === cartonA,
+      trace(firstReplay.response), OPTIONS)
+    const firstConflict = await context.requestOverseas('POST', `${PDA_RECEIPTS}/confirm`, {
+      ...firstBody, trackingNo: `TRACK-${suffix}-CHANGED`,
+    }, {}, picker.token)
+    add(context, '签收同键异载荷返回冲突', firstConflict, conflict(firstConflict))
+
+    const overReceipt = await context.requestOverseas('POST', `${PDA_RECEIPTS}/confirm`, {
+      returnNo, startedBy: 'SKU', items: [{ skuCode: skuA, receivedQuantity: 2 }],
+      idempotencyKey: key(context, 'OVER-RECEIPT'),
+    }, {}, picker.token)
+    add(context, '超收被拒绝且不得生成费用批次', overReceipt, conflict(overReceipt))
+
+    const afterPartial = await overseas(context, merchantToken, 'GET', '客户回查部分签收状态',
+      `${RETURN_ORDERS}/${encodeURIComponent(returnNo)}`)
+    context.assert(MODULE, '超收失败后订单、签收和费用批次数量均未变化', afterPartial.response,
+      afterPartial.data?.order?.status === 'PARTIALLY_RECEIVED'
+        && Number(afterPartial.data?.order?.receivedQuantity) === 2
+        && afterPartial.data?.receipts?.length === 1
+        && id(afterPartial.data.receipts[0]?.receiptBatchNo) === firstBatchNo,
+      `receipts=${afterPartial.data?.receipts?.length ?? 'missing'}`, OPTIONS)
+
+    const secondBody = {
+      returnNo, startedBy: 'SKU',
+      items: [{ skuCode: skuA, receivedQuantity: 1 }, { skuCode: skuB, receivedQuantity: 2 }],
+      idempotencyKey: key(context, 'RECEIPT-2'),
+    }
+    const second = await overseas(context, picker.token, 'POST', 'PDA按SKU完成剩余3件签收', `${PDA_RECEIPTS}/confirm`, secondBody)
+    context.assert(MODULE, '最终签收自动核平并生成第二个费用批次', second.response,
+      second.data?.orderStatus === 'COMPLETED' && second.data?.fullyMatched === true
+        && Number(second.data?.receivedQuantity) === 5 && nonBlank(second.data?.cartonMark)
+        && nonBlank(second.data?.receiptNo) && nonBlank(second.data?.receiptBatchNo)
+        && id(second.data?.receiptBatchNo) !== firstBatchNo,
+      `billingBatch=${id(second.data?.receiptBatchNo) || 'missing'}`, OPTIONS)
+    const secondReceiptNo = id(second.data?.receiptNo)
+    const secondBatchNo = id(second.data?.receiptBatchNo)
+    const cartonB = id(second.data?.cartonMark)
+    context.createdResources.phase4OverseasReturnReceipt.receiptNos.push(firstReceiptNo, secondReceiptNo)
+    context.createdResources.phase4OverseasReturnReceipt.receiptBatchNos.push(firstBatchNo, secondBatchNo)
+    context.createdResources.phase4OverseasReturnReceipt.cartonMarks.push(cartonA, cartonB)
+
+    const completedStart = await context.requestOverseas('POST', `${PDA_RECEIPTS}/start`, { returnNo }, {}, picker.token)
+    add(context, '已完成退货单不再进入待签收流程', completedStart, notFound(completedStart))
+    const completedCandidates = await overseas(context, picker.token, 'POST', '完成后SKU候选自动清空',
+      `${PDA_RECEIPTS}/sku-candidates`, { skuCode: skuB })
+    context.assert(MODULE, '完成单不再出现在SKU候选', completedCandidates.response,
+      !completedCandidates.data?.candidates?.some?.((candidate) => candidate.returnNo === returnNo),
+      trace(completedCandidates.response), OPTIONS)
+
+    const detail = await overseas(context, merchantToken, 'GET', '客户回查完成退货单与两次签收',
+      `${RETURN_ORDERS}/${encodeURIComponent(returnNo)}`)
+    const detailItems = itemMap(detail.data?.items)
+    const detailReceipts = Array.isArray(detail.data?.receipts) ? detail.data.receipts : []
+    const detailBatches = new Set(detailReceipts.map((receipt) => id(receipt.receiptBatchNo)))
+    context.assert(MODULE, '订单5件核平且恰有两个唯一仓储计费批次', detail.response,
+      detail.data?.order?.status === 'COMPLETED' && Number(detail.data?.order?.receivedQuantity) === 5
+        && Number(detailItems.get(skuA)?.receivedQuantity) === 3
+        && Number(detailItems.get(skuB)?.receivedQuantity) === 2
+        && detailReceipts.length === 2 && detailBatches.size === 2
+        && detailBatches.has(firstBatchNo) && detailBatches.has(secondBatchNo),
+      `receipts=${detailReceipts.length}, billingBatches=${detailBatches.size}`, OPTIONS)
+
+    const merchantInventory = await context.requestOverseas('GET',
+      query(RETURN_INVENTORY, { page: 1, size: 20, overseasWarehouseId: warehouse.id, returnNo }),
+      undefined, {}, merchantToken)
+    add(context, '客户权限可读取自身退货库存', merchantInventory, success(merchantInventory))
+
+    const customerId = id(context.context?.merchantQualificationFixture?.tenantId)
+    const inventory = await overseas(context, context.overseasToken, 'GET', '平台按客户和退货单回查全部退货箱库存',
+      query('/api/platform/v1/last-leg/return-inventory/cartons', {
+        page: 1, size: 20, customerId, overseasWarehouseId: warehouse.id, returnNo,
+      }))
+    const inventoryRows = records(inventory.data)
+    const sourceBatches = new Set(inventoryRows.map((row) => id(row.sourceBatchNo)))
+    context.assert(MODULE, '两个实收箱逐一引用对应计费批次且数量守恒', inventory.response,
+      inventoryRows.length === 2
+        && inventoryRows.reduce((sum, row) => sum + Number(row.totalQuantity || 0), 0) === 5
+        && sourceBatches.size === 2 && sourceBatches.has(firstBatchNo) && sourceBatches.has(secondBatchNo),
+      `cartons=${inventoryRows.length}, quantity=${inventoryRows.reduce((sum, row) => sum + Number(row.totalQuantity || 0), 0)}`, OPTIONS)
+
+    const summary = await overseas(context, context.overseasToken, 'GET', '平台回查退货SKU汇总库存',
+      query('/api/platform/v1/last-leg/return-inventory', {
+        page: 1, size: 20, customerId, overseasWarehouseId: warehouse.id,
+      }))
+    const summaries = new Map(records(summary.data).filter((row) => [skuA, skuB].includes(row.skuCode))
+      .map((row) => [row.skuCode, row]))
+    context.assert(MODULE, '退货SKU汇总数量与两个实收箱一致', summary.response,
+      Number(summaries.get(skuA)?.totalQuantity) === 3
+        && Number(summaries.get(skuB)?.totalQuantity) === 2,
+      `skuA=${summaries.get(skuA)?.totalQuantity ?? 'missing'}, skuB=${summaries.get(skuB)?.totalQuantity ?? 'missing'}`, OPTIONS)
+
+    for (const [index, expected] of [{ cartonMark: cartonA, batchNo: firstBatchNo, quantity: 2 },
+      { cartonMark: cartonB, batchNo: secondBatchNo, quantity: 3 }].entries()) {
+      const carton = await overseas(context, context.overseasToken, 'GET', `平台回查第${index + 1}个退货箱明细`,
+        `/api/platform/v1/last-leg/return-inventory/cartons/${encodeURIComponent(expected.cartonMark)}`)
+      context.assert(MODULE, `第${index + 1}个退货箱来源费用批次和数量正确`, carton.response,
+        carton.data?.sourceBatchNo === expected.batchNo
+          && Number(carton.data?.totalQuantity) === expected.quantity
+          && Array.isArray(carton.data?.items) && carton.data.items.length > 0,
+        `batch=${carton.data?.sourceBatchNo || 'missing'}, quantity=${carton.data?.totalQuantity ?? 'missing'}`, OPTIONS)
+      const label = await overseas(context, context.overseasToken, 'GET', `平台生成第${index + 1}个退货箱标签`,
+        `/api/platform/v1/last-leg/return-inventory/cartons/${encodeURIComponent(expected.cartonMark)}/label`)
+      context.assert(MODULE, `第${index + 1}个箱标签保留来源批次`, label.response,
+        label.data?.cartonMark === expected.cartonMark && label.data?.sourceBatchNo === expected.batchNo
+          && Number(label.data?.totalQuantity) === expected.quantity && nonBlank(label.data?.printableHtml),
+        trace(label.response), OPTIONS)
+    }
+
+    const packing = await overseas(context, picker.token, 'GET', 'PDA查询完成退货单的可合箱库存',
+      query('/api/pda/v1/last-leg/return-inventory/packing/orders', { returnNo }))
+    const packingSkus = new Map((packing.data?.skus || []).map((row) => [row.skuCode, row]))
+    context.assert(MODULE, '退货合箱候选只含本轮完成单且库存准确', packing.response,
+      packing.data?.orders?.some?.((order) => order.returnNo === returnNo && order.status === 'COMPLETED')
+        && Number(packingSkus.get(skuA)?.availableQuantity) === 3
+        && Number(packingSkus.get(skuB)?.availableQuantity) === 2,
+      trace(packing.response), OPTIONS)
+
+    const mergeBody = {
+      returnNos: [returnNo], items: [{ skuCode: skuA, quantity: 1 }, { skuCode: skuB, quantity: 1 }],
+      length: 30, width: 20, height: 10, weight: 2, idempotencyKey: key(context, 'MERGE'),
+    }
+    const merged = await overseas(context, picker.token, 'POST', 'PDA将同客户退货库存合为新箱',
+      '/api/pda/v1/last-leg/return-inventory/cartons/merge', mergeBody)
+    if (success(merged.response)) {
+      context.assert(MODULE, '退货合箱生成含两SKU和箱规的可打印新箱', merged.response,
+        nonBlank(merged.data?.cartonMark) && Number(merged.data?.totalQuantity) === 2
+          && merged.data?.label?.sourceBatchNo === 'MERGED'
+          && Number(merged.data?.label?.items?.length) === 2
+          && nonBlank(merged.data?.label?.printableHtml),
+        `cartonMark=${merged.data?.cartonMark || 'missing'}`, OPTIONS)
+      const mergeReplay = await overseas(context, picker.token, 'POST', '退货合箱同键同载荷重放',
+        '/api/pda/v1/last-leg/return-inventory/cartons/merge', mergeBody)
+      context.assert(MODULE, '合箱重放复用同一新箱且不重复扣减', mergeReplay.response,
+        success(mergeReplay.response) && nonBlank(merged.data?.cartonMark)
+          && id(mergeReplay.data?.cartonMark) === id(merged.data?.cartonMark), trace(mergeReplay.response), OPTIONS)
+      const mergeConflict = await context.requestOverseas('POST',
+        '/api/pda/v1/last-leg/return-inventory/cartons/merge',
+        { ...mergeBody, weight: 3 }, {}, picker.token)
+      add(context, '合箱同键异载荷返回冲突', mergeConflict, conflict(mergeConflict))
+    }
+  } finally {
+    await disablePicker(context, picker, 91)
+  }
+}
diff --git a/scripts/admin-test-env-modules/phase4-overseas-wallet-and-pallet-cost-contract.test.mjs b/scripts/admin-test-env-modules/phase4-overseas-wallet-and-pallet-cost-contract.test.mjs
index c88834fbb..6d447dff7 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-wallet-and-pallet-cost-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-wallet-and-pallet-cost-contract.test.mjs
@@ -18,6 +18,7 @@ test('采购单号按北京时间日期执行精确合同', () => {
 test('钱包闭环覆盖充值、授信、采购冻结结算和换标结算释放', () => {
   for (const token of [
     '/accounts/${encodeURIComponent(customerId)}/credit-limit',
+    'creditExpiresOn',
     '/accounts/${encodeURIComponent(customerId)}/adjustments',
     "const CLIENT_FINANCE = '/api/client/finance/v1'",
     "['VOUCHER', 'RECEIPT']",
@@ -28,6 +29,8 @@ test('钱包闭环覆盖充值、授信、采购冻结结算和换标结算释
     'item.sourceNo === businessNo',
     "'RELEASED'",
     "terminalStatus === 'COMPLETED'",
+    "status: 'CUSTOMER_CONFIRM_PENDING'",
+    "status: 'READY_FOR_OUTBOUND'",
     "'CANCELLED'",
     'relabelPayload(context, warehouseId, source, suffix, 0.01)',
     '/relabel-applications/inventory-candidates',
@@ -38,6 +41,7 @@ test('钱包闭环覆盖充值、授信、采购冻结结算和换标结算释
     'destinationFbaWarehouseCode: source.destinationFbaWarehouseCode',
     'cartonMark:',
     'fbaCartonMark:',
+    "deliveryMethod: 'TRUCK'",
   ]) assert.ok(source.includes(token), token)
   assert.match(source, /actualBalance[\s\S]*frozenBalance[\s\S]*availableBalance[\s\S]*creditLimit[\s\S]*creditUsed[\s\S]*availableCredit/)
   assert.match(source, /voucherFileId: id\(files\.find\(\(item\) => item\.category === 'VOUCHER'\)\?\.fileId\)/)
diff --git a/scripts/admin-test-env-modules/phase4-overseas-wallet-and-pallet-cost.mjs b/scripts/admin-test-env-modules/phase4-overseas-wallet-and-pallet-cost.mjs
index ab094501e..bbb213f2f 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-wallet-and-pallet-cost.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-wallet-and-pallet-cost.mjs
@@ -67,8 +67,10 @@ async function prepareWallet(context, customerId) {
   if (!before.account) return null
 
   const creditLimit = 2.00
+  const creditExpiresOn = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10)
   const credit = await context.request('PUT', `${FINANCE}/accounts/${encodeURIComponent(customerId)}/credit-limit`,
-    { creditLimit, remark: context.marker, expectedAccountVersion: Number(before.account.accountVersion) }, context.token,
+    { creditLimit, creditExpiresOn, remark: context.marker,
+      expectedAccountVersion: Number(before.account.accountVersion) }, context.token,
     { 'Idempotency-Key': `${context.marker}-wallet-credit-limit`.slice(0, 128) })
   assert(context, '授信额度可通过正式接口初始化', credit,
     success(credit) && money(credit.body.data?.creditLimitAfter) === creditLimit,
@@ -175,6 +177,7 @@ function relabelPayload(context, warehouseId, source, suffix, chargeAmount) {
     customerOrderNo: `${context.marker}-${suffix}`.slice(0, 128), operationWarehouseId: id(warehouseId),
     labelDeadline: new Date(Date.now() + 86_400_000).toISOString().slice(0, 19),
     contactName: '全量验收联系人', contactPhone: '+1-213-555-0199', chargeAmount,
+    deliveryMethod: 'TRUCK', printShippingLabel: false,
     remark: context.marker, idempotencyKey: `${context.marker}-${suffix}`.slice(0, 255),
     items: [{ sourceInventoryBalanceId: id(source.inventoryBalanceId),
       sourceInventoryPositionId: id(source.position.positionId), sourceInboundOrderId: id(source.inboundOrderId),
@@ -223,6 +226,14 @@ async function relabelFlow(context, overseasToken, warehouseId, suffix, terminal
     const processing = await context.requestOverseas('PUT', `${detailPath}/status`, { status: 'PROCESSING', remark: context.marker })
     assert(context, '换标单冻结后才允许进入处理中', processing,
       success(processing) && processing.body.data?.application?.status === 'PROCESSING')
+    const confirmPending = await context.requestOverseas('PUT', `${detailPath}/status`,
+      { status: 'CUSTOMER_CONFIRM_PENDING', remark: context.marker })
+    assert(context, '换标处理完成后进入客户确认', confirmPending,
+      success(confirmPending) && confirmPending.body.data?.application?.status === 'CUSTOMER_CONFIRM_PENDING')
+    const readyForOutbound = await context.requestOverseas('PUT', `${detailPath}/status`,
+      { status: 'READY_FOR_OUTBOUND', remark: context.marker })
+    assert(context, '换标客户确认后进入待出库', readyForOutbound,
+      success(readyForOutbound) && readyForOutbound.body.data?.application?.status === 'READY_FOR_OUTBOUND')
   }
   const terminal = await context.requestOverseas('PUT', `${detailPath}/status`, { status: terminalStatus, remark: context.marker })
   assert(context, `${suffix}换标单进入${terminalStatus}`, terminal,
diff --git a/scripts/admin-test-env-modules/phase5-terminal-drayage-contract.test.mjs b/scripts/admin-test-env-modules/phase5-terminal-drayage-contract.test.mjs
index 40d6cf557..c39c9eb87 100644
--- a/scripts/admin-test-env-modules/phase5-terminal-drayage-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase5-terminal-drayage-contract.test.mjs
@@ -3,7 +3,7 @@ import { readFile } from 'node:fs/promises'
 import test from 'node:test'
 import { fileURLToPath } from 'node:url'
 import { normalizeModuleOrder } from '../admin-test-env-acceptance.mjs'
-import { run } from './phase5-terminal-drayage.mjs'
+import { prepareTerminalDrayage, run } from './phase5-terminal-drayage.mjs'
 
 const source = await readFile(fileURLToPath(new URL('./phase5-terminal-drayage.mjs', import.meta.url)), 'utf8')
 
@@ -19,11 +19,12 @@ test('four real command payloads mutate contract fields and preserve remarks and
   let conflicts = 0
   let replays = 0
   const response = (data, code = '200') => ({ http: 200, body: { code, data }, requestId: 'offline-request', traceId: 'offline-trace' })
+  const producer = { containerBookingId, containerNo, shippingReady: true,
+    carrierScheduleQueryId: '9223372036854775805', carrierLatestActualAt: '2026-09-09T01:00:00' }
   const context = {
     marker, token: 'offline-only',
     createdResources: {
-      phase4InboundProducerFixtures: { marker, containers: [{ containerBookingId, containerNo,
-        shippingReady: true, carrierScheduleQueryId: '9223372036854775805', carrierLatestActualAt: '2026-09-09T01:00:00' }] },
+      phase4InboundProducerFixtures: { marker, containers: [producer] },
       phase4OverseasPda: { marker, finalStatus: 'COMPLETED', completedContainerFacts: [{ containerBookingId, containerNo }] },
     },
     apiSuccess(_module, name, result) { assert.equal(result.body.code, '200', name); return result.body.data },
@@ -58,13 +59,15 @@ test('four real command payloads mutate contract fields and preserve remarks and
       state = { ...state, version: state.version + 1 }
       if (index === 0) Object.assign(state, { fleetSupplierId: body.fleetSupplierId, fleetSupplierName: body.fleetSupplierName, allowedActions: ['SCHEDULE_PICKUP'] })
       if (index === 1) state.pickupAppointmentAt = body.pickupAppointmentAt
-      if (index === 2) Object.assign(state, { status: 'UNLOADED', actualPickupAt: body.actualAt, unloadingCompletedAt: '2026-09-09T04:00:00', allowedActions: ['RECORD_EMPTY_RETURN'] })
+      if (index === 2) Object.assign(state, { status: 'PICKED_UP', actualPickupAt: body.actualAt, allowedActions: [] })
       if (index === 3) Object.assign(state, { status: 'EMPTY_RETURNED', actualEmptyReturnAt: body.actualAt, allowedActions: [], emptyReturnWarning: { status: 'RESOLVED' } })
       history.push({ action: actions[index], fromVersion: index, toVersion: index + 1, reason: body[field] })
       commands.set(key, { body: structuredClone(body), state: structuredClone(state) })
       return response(state)
     },
   }
+  await prepareTerminalDrayage(context, producer)
+  state = { ...state, status: 'UNLOADED', unloadingCompletedAt: '2026-09-09T04:00:00', allowedActions: ['RECORD_EMPTY_RETURN'] }
   await run(context)
   assert.equal(commands.size, 4)
   assert.equal(replays, 4)
@@ -73,7 +76,7 @@ test('four real command payloads mutate contract fields and preserve remarks and
   assert.equal(context.createdResources.phase5TerminalDrayage.finalStatus, 'EMPTY_RETURNED')
 })
 
-test('terminal drayage runs after pickup-ready and overseas unloading but before final carrier validation', () => {
+test('terminal drayage prepares pickup before unloading and finalizes return before carrier validation', () => {
   const modules = normalizeModuleOrder(['phase4-carrier-nodes'])
   const pickup = modules.indexOf('phase4-carrier-pickup-ready')
   const pda = modules.indexOf('phase4-overseas-pda')
@@ -81,6 +84,8 @@ test('terminal drayage runs after pickup-ready and overseas unloading but before
   const finalCarrier = modules.indexOf('phase4-carrier-nodes')
   assert.ok(pickup >= 0 && pickup < pda)
   assert.ok(pda < drayage && drayage < finalCarrier)
+  assert.match(source, /attempt <= 30/)
+  assert.match(source, /initialData\?\.status === 'UNLOADED'/)
 })
 
 test('module uses only public business endpoints and reuses public trucking master data', () => {
@@ -106,12 +111,10 @@ test('all four commands cover idempotent replay hash conflict and lifecycle sema
 
 test('target is strictly current-marker pickup and completed-PDA container', () => {
   assert.match(source, /matrix\?\.marker !== context\.marker/)
-  assert.match(source, /pda\?\.marker !== context\.marker/)
+  assert.match(source, /prepared\?\.marker !== context\.marker/)
   assert.match(source, /pda\?\.finalStatus !== 'COMPLETED'/)
   assert.match(source, /completedContainerFacts/)
-  assert.match(source, /item\?\.shippingReady === true/)
-  assert.match(source, /carrierScheduleQueryId/)
-  assert.match(source, /carrierLatestActualAt/)
+  assert.match(source, /producer\?\.shippingReady !== true/)
   assert.match(source, /phase4CarrierPickupReady =/)
   assert.match(source, /禁止借历史货柜/)
 })
diff --git a/scripts/admin-test-env-modules/phase5-terminal-drayage.mjs b/scripts/admin-test-env-modules/phase5-terminal-drayage.mjs
index 580fe9e7d..656c3a5f2 100644
--- a/scripts/admin-test-env-modules/phase5-terminal-drayage.mjs
+++ b/scripts/admin-test-env-modules/phase5-terminal-drayage.mjs
@@ -20,22 +20,15 @@ function blocker(context, name, evidence, response = null) {
   context.addStep(MODULE, name, response, false, `${evidence}; ${trace(response)}`, OPTIONS)
   context.addCoverageGap(MODULE, SCENARIO, name, evidence, 'fixture', { deploymentBlocker: true })
 }
-function fixture(context) {
-  const matrix = context.createdResources?.phase4InboundProducerFixtures
+function completedTarget(context) {
+  const prepared = context.createdResources?.phase5TerminalDrayage?.prepared
   const pda = context.createdResources?.phase4OverseasPda
-  if (matrix?.marker !== context.marker || pda?.marker !== context.marker
+  if (prepared?.marker !== context.marker || pda?.marker !== context.marker
       || pda?.finalStatus !== 'COMPLETED') return null
-  const producers = Array.isArray(matrix.containers) ? matrix.containers : []
-  for (const completed of pda.completedContainerFacts || []) {
-    const producer = producers.find((item) => id(item?.containerBookingId) === id(completed?.containerBookingId)
-      && id(item?.containerNo) === id(completed?.containerNo)
-      && item?.shippingReady === true && id(item?.carrierScheduleQueryId)
-      && item?.carrierLatestActualAt)
-    if (producer) return {
-      matrix, producer, pda, completed, containerBookingId: id(producer.containerBookingId),
-    }
-  }
-  return null
+  const completed = (pda.completedContainerFacts || []).find((item) =>
+    id(item?.containerBookingId) === id(prepared.containerBookingId)
+      && id(item?.containerNo) === id(prepared.containerNo))
+  return completed ? { ...prepared, pda, completed } : null
 }
 async function command(context, target, action, path, body) {
   const key = `${context.marker}-terminal-${path}`.replace(/[^A-Za-z0-9:_-]/g, '').slice(0, 128)
@@ -58,32 +51,37 @@ async function command(context, target, action, path, body) {
   return first
 }
 
-export async function run(context) {
-  context.createdResources.phase5TerminalDrayage = {
+export async function prepareTerminalDrayage(context, producer) {
+  const matrix = context.createdResources?.phase4InboundProducerFixtures
+  if (matrix?.marker !== context.marker || !producer || producer?.shippingReady !== true
+      || !id(producer?.containerBookingId) || !id(producer?.containerNo)
+      || !id(producer?.carrierScheduleQueryId) || !producer?.carrierLatestActualAt) {
+    blocker(context, '取得本轮PICKUP_READY货柜执行码头提柜前置',
+      `matrix=${matrix?.marker || 'missing'}, container=${id(producer?.containerNo) || 'missing'}; 禁止借历史货柜`)
+    return null
+  }
+  const resource = context.createdResources.phase5TerminalDrayage || {
     marker: context.marker, containerBookingId: null, containerNo: null, finalStatus: null,
     cleanup: 'Terminal drayage ends at immutable EMPTY_RETURNED and is retained as acceptance evidence',
   }
-  const target = fixture(context)
-  if (!target) {
-    blocker(context, '取得本轮PICKUP_READY且已卸柜货柜',
-      `matrix=${context.createdResources?.phase4InboundProducerFixtures?.marker || 'missing'}, shippingReady=${context.createdResources?.phase4InboundProducerFixtures?.containers?.filter((item) => item?.shippingReady === true).length ?? 0}, pda=${context.createdResources?.phase4OverseasPda?.finalStatus || 'missing'}; 禁止借历史货柜`)
-    return
-  }
+  context.createdResources.phase5TerminalDrayage = resource
+  const target = { marker: context.marker, producer, containerBookingId: id(producer.containerBookingId),
+    containerNo: id(producer.containerNo) }
   const path = `${BASE}/${encodeURIComponent(target.containerBookingId)}`
-  const initial = await api(context, 'GET', '读取目的港码头拖车初始聚合', path)
-  context.assert(MODULE, '初始聚合绑定本轮货柜且允许选择车队', initial.response,
+  const initial = await api(context, 'GET', '卸柜前读取目的港码头拖车初始聚合', path)
+  context.assert(MODULE, 'PICKUP_READY货柜允许选择车队', initial.response,
     id(initial.data?.containerBookingId) === target.containerBookingId
-      && id(initial.data?.containerNo) === id(target.completed.containerNo)
+      && id(initial.data?.containerNo) === target.containerNo
       && Number(initial.data?.version) === 0 && initial.data?.allowedActions?.includes('SELECT_FLEET'),
     `status=${initial.data?.status || 'missing'}, actions=${initial.data?.allowedActions?.join(',') || 'missing'}; ${trace(initial.response)}`, OPTIONS)
-  if (!success(initial.response)) return
+  if (!success(initial.response) || !initial.data?.allowedActions?.includes('SELECT_FLEET')) return null
 
   const suppliers = await api(context, 'GET', '查询ACTIVE码头拖车供应商',
     '/api/platform/v1/suppliers?tenantId=0&category=TRUCKING&status=ACTIVE&page=1&size=100')
   const fleet = suppliers.data?.records?.find((item) => id(item?.id) && item?.status === 'ACTIVE')
   if (!fleet) {
     blocker(context, '取得有效码头拖车供应商', '没有可复用的ACTIVE + TRUCKING公共供应商；脚本不临时创建主数据', suppliers.response)
-    return
+    return null
   }
   const selected = await command(context, target, '选择车队', 'fleet', {
     expectedVersion: Number(initial.data.version), fleetSupplierId: id(fleet.id),
@@ -92,9 +90,9 @@ export async function run(context) {
   context.assert(MODULE, '选车队后只绑定公共供应商并开放预约', selected.response,
     id(selected.data?.fleetSupplierId) === id(fleet.id) && selected.data?.fleetSupplierName === fleet.name
       && selected.data?.allowedActions?.includes('SCHEDULE_PICKUP'), trace(selected.response), OPTIONS)
-  if (!success(selected.response)) return
+  if (!success(selected.response)) return null
 
-  const latestActual = Date.parse(`${target.producer.carrierLatestActualAt}Z`)
+  const latestActual = Date.parse(`${producer.carrierLatestActualAt}Z`)
   const appointmentAt = localIso(new Date((Number.isNaN(latestActual) ? Date.now() : latestActual) + 60 * 60_000))
   const scheduled = await command(context, target, '预约提柜', 'pickup-appointment', {
     expectedVersion: Number(selected.data.version), pickupAppointmentAt: appointmentAt, reason: context.marker,
@@ -103,22 +101,66 @@ export async function run(context) {
     scheduled.data?.pickupAppointmentAt === appointmentAt
       && Number(scheduled.data?.version) === Number(selected.data.version) + 1,
     trace(scheduled.response), OPTIONS)
-  if (!success(scheduled.response)) return
+  if (!success(scheduled.response)) return null
 
   const pickupAt = localIso(new Date(Date.parse(`${appointmentAt}Z`) + 60 * 60_000))
   const picked = await command(context, target, '确认实际提柜', 'pickup', {
     expectedVersion: Number(scheduled.data.version), actualAt: pickupAt, remark: context.marker,
   })
-  context.assert(MODULE, '实际提柜同步PICKED_UP事实并在已卸柜聚合开放还柜', picked.response,
-    picked.data?.status === 'UNLOADED' && picked.data?.actualPickupAt === pickupAt
-      && picked.data?.allowedActions?.includes('RECORD_EMPTY_RETURN'), trace(picked.response), OPTIONS)
-  if (!success(picked.response)) return
+  context.assert(MODULE, '实际提柜同步PICKED_UP并等待海外仓卸柜', picked.response,
+    picked.data?.status === 'PICKED_UP' && picked.data?.actualPickupAt === pickupAt,
+    trace(picked.response), OPTIONS)
+  if (!success(picked.response) || picked.data?.status !== 'PICKED_UP') return null
+  resource.prepared = { ...target, appointmentAt, pickupAt, pickedVersion: Number(picked.data.version) }
+  resource.containerBookingId = target.containerBookingId
+  resource.containerNo = target.containerNo
+  return resource.prepared
+}
 
-  const unloadingAt = Date.parse(`${picked.data?.unloadingCompletedAt}Z`)
-  const returnBase = Math.max(Date.parse(`${pickupAt}Z`), Number.isNaN(unloadingAt) ? 0 : unloadingAt)
+export async function run(context) {
+  const resource = context.createdResources.phase5TerminalDrayage || {
+    marker: context.marker, containerBookingId: null, containerNo: null, finalStatus: null,
+    cleanup: 'Terminal drayage ends at immutable EMPTY_RETURNED and is retained as acceptance evidence',
+  }
+  context.createdResources.phase5TerminalDrayage = resource
+  const target = completedTarget(context)
+  if (!target) {
+    blocker(context, '取得本轮已提柜且已卸柜货柜',
+      `prepared=${resource.prepared?.marker || 'missing'}, pda=${context.createdResources?.phase4OverseasPda?.finalStatus || 'missing'}; 禁止借历史货柜`)
+    return
+  }
+  const path = `${BASE}/${encodeURIComponent(target.containerBookingId)}`
+  let initialResponse = null
+  let initialData = null
+  let pollRequests = 0
+  for (let attempt = 1; attempt <= 30; attempt += 1) {
+    pollRequests = attempt
+    initialResponse = await context.request('GET', path, undefined, context.token)
+    initialData = success(initialResponse) ? initialResponse.body?.data : null
+    if (initialData?.status === 'UNLOADED'
+        && initialData?.allowedActions?.includes('RECORD_EMPTY_RETURN')) break
+    await new Promise((resolve) => setTimeout(resolve, 1000))
+  }
+  const initial = {
+    response: initialResponse,
+    data: context.apiSuccess(MODULE, '卸柜后等待跨区事件并读取目的港码头拖车聚合', initialResponse,
+      `pollRequests=${pollRequests}; ${trace(initialResponse)}`, OPTIONS),
+  }
+  context.assert(MODULE, '卸柜聚合保留提柜事实并开放还柜', initial.response,
+    id(initial.data?.containerBookingId) === target.containerBookingId
+      && id(initial.data?.containerNo) === id(target.completed.containerNo)
+      && Number(initial.data?.version) === Number(target.pickedVersion)
+      && initial.data?.status === 'UNLOADED'
+      && initial.data?.actualPickupAt === target.pickupAt
+      && initial.data?.allowedActions?.includes('RECORD_EMPTY_RETURN'),
+    `pollRequests=${pollRequests}, status=${initial.data?.status || 'missing'}, actions=${initial.data?.allowedActions?.join(',') || 'missing'}; ${trace(initial.response)}`, OPTIONS)
+  if (!success(initial.response)) return
+
+  const unloadingAt = Date.parse(`${initial.data?.unloadingCompletedAt}Z`)
+  const returnBase = Math.max(Date.parse(`${target.pickupAt}Z`), Number.isNaN(unloadingAt) ? 0 : unloadingAt)
   const returnedAt = localIso(new Date(returnBase + 60 * 60_000))
   const returned = await command(context, target, '确认实际还柜', 'empty-return', {
-    expectedVersion: Number(picked.data.version), actualAt: returnedAt, remark: context.marker,
+    expectedVersion: Number(initial.data.version), actualAt: returnedAt, remark: context.marker,
   })
   context.assert(MODULE, '实际还柜同步EMPTY_RETURNED并关闭全部动作', returned.response,
     returned.data?.status === 'EMPTY_RETURNED' && returned.data?.actualEmptyReturnAt === returnedAt
diff --git a/scripts/admin-test-env-modules/smart-loading-channel-group.mjs b/scripts/admin-test-env-modules/smart-loading-channel-group.mjs
new file mode 100644
index 000000000..dacbfbdef
--- /dev/null
+++ b/scripts/admin-test-env-modules/smart-loading-channel-group.mjs
@@ -0,0 +1,14 @@
+export function channelGroup(channelCode) {
+  const value = String(channelCode || '').trim().toUpperCase()
+  if (value.startsWith('EXX_') || ['EXXHK', 'EXXHWK', 'NYEXX'].includes(value)) return 'EXX'
+  if (value.startsWith('MATSON_CLX_') || ['ZBYHK', 'ZBYHWK', 'ZBYHP'].includes(value)) return 'MATSON_CLX'
+  if (value.startsWith('MATSON_MAX_') || ['BYHK', 'BYHWK', 'BYHP'].includes(value)) return 'MATSON_MAX'
+  if (value.startsWith('HEDE_') || ['HDHK', 'HDHWK', 'HDHP'].includes(value)) return 'HEDE'
+  if (value.startsWith('OA_LA_') || value === 'OA_PARCEL'
+      || ['PCHK', 'PCHWK', 'PCKK', 'PCHP'].includes(value)) return 'OA_LA'
+  if (value.startsWith('OA_CHICAGO_') || value === 'CPHT') return 'OA_CHICAGO'
+  if (value.startsWith('OA_HOUSTON_') || value === 'HPHK') return 'OA_HOUSTON'
+  if (value.startsWith('OA_SAVANNAH_') || value === 'SPHK') return 'OA_SAVANNAH'
+  if (['OA_NEW_YORK_TRUCK', 'NPHK', 'NPHWK'].includes(value)) return 'OA_NEW_YORK_TRUCK'
+  throw new Error(`unsupported smart-loading channel group: ${channelCode}`)
+}
diff --git a/scripts/agents-index-contract.ps1 b/scripts/agents-index-contract.ps1
index b595214c9..b8b29f6b3 100644
--- a/scripts/agents-index-contract.ps1
+++ b/scripts/agents-index-contract.ps1
@@ -87,11 +87,50 @@ $overseasPdaAgentsPath = Join-Path $workspaceRoot 'apps/pda-overseas-uniapp/AGEN
 $backendAgentsPath = Join-Path $backendRoot 'AGENTS.md'
 
 $rootAgents = Read-RequiredText $rootAgentsPath
+$businessIndexPath = Join-Path $workspaceRoot 'docs/业务快速索引.md'
+$businessIndex = Read-RequiredText $businessIndexPath
+Assert-Contains $rootAgents 'docs/业务快速索引.md' '根按需业务索引入口'
+Assert-MarkdownTableUnique $businessIndexPath '## 业务快速路由表' 0 '详细业务路由表'
+Assert-MarkdownTableUnique $businessIndexPath '## 常用说法与歧义分流' 0 '业务歧义分流表'
+Assert-Contains $businessIndex '## 业务快速路由表' '详细业务表存在'
+Assert-Contains $businessIndex '## 常用说法与歧义分流' '业务歧义分流存在'
 $adminAgents = Read-RequiredText $adminAgentsPath
+$adminOverseasAgentsPath = Join-Path $workspaceRoot 'apps/admin-web/src/modules/overseas-warehouse/AGENTS.md'
+$adminOverseasAgents = Read-RequiredText $adminOverseasAgentsPath
+Assert-Contains $adminAgents 'src/modules/overseas-warehouse/AGENTS.md' 'Admin 海外仓按需指引入口'
+Assert-MarkdownTableUnique $adminOverseasAgentsPath '## 页面与业务快速索引' 0 'Admin 海外仓模块表'
 $clientAgents = Read-RequiredText $clientAgentsPath
 $pdaAgents = Read-RequiredText $pdaAgentsPath
 $overseasPdaAgents = Read-RequiredText $overseasPdaAgentsPath
 $backendAgents = Read-RequiredText $backendAgentsPath
+
+# 固定样本只检查目标索引行和真实文件，不递归搜索；字符数是读取量指标，不是耗时或 Token 实测。
+$lookupSamples = @(
+    @{ Key = '客户专属价格簿'; Text = $adminAgents; Entry = 'modules/fba-pricing/carrier-rates/pages/CarrierRateDetailView.vue'; Base = 'apps/admin-web/src' },
+    @{ Key = '入库扣货、解除与凭证历史'; Text = $adminAgents; Entry = 'modules/unified-orders/pages/UnifiedOrdersView.vue'; Base = 'apps/admin-web/src' },
+    @{ Key = '国内/海外 PDA 独立人员'; Text = $adminAgents; Entry = 'modules/iam/pages/InternalUsersView.vue'; Base = 'apps/admin-web/src' },
+    @{ Key = '尾程订单控制'; Text = $adminOverseasAgents; Entry = 'pages/LastMileOrdersView.vue'; Base = 'apps/admin-web/src/modules/overseas-warehouse' },
+    @{ Key = '排车查询'; Text = $adminOverseasAgents; Entry = 'pages/DispatchesView.vue'; Base = 'apps/admin-web/src/modules/overseas-warehouse' },
+    @{ Key = '海外出库与派送'; Text = $adminOverseasAgents; Entry = 'pages/OutboundsView.vue'; Base = 'apps/admin-web/src/modules/overseas-warehouse' },
+    @{ Key = '异常退回与客户回访'; Text = $adminOverseasAgents; Entry = 'pages/ExceptionOrdersView.vue'; Base = 'apps/admin-web/src/modules/overseas-warehouse' },
+    @{ Key = '库存余额'; Text = $adminOverseasAgents; Entry = 'pages/InventoryView.vue'; Base = 'apps/admin-web/src/modules/overseas-warehouse' },
+    @{ Key = '退货入库签收与合箱'; Text = $overseasPdaAgents; Entry = 'src/pages/return-receipt/return-receipt.vue'; Base = 'apps/pda-overseas-uniapp' },
+    @{ Key = '退货入库签收与合箱'; Text = $overseasPdaAgents; Entry = 'src/pages/return-packing/return-packing.vue'; Base = 'apps/pda-overseas-uniapp' }
+)
+$lookupCharacters = 0
+foreach ($sample in $lookupSamples) {
+    $hits = @($sample.Text -split '\r?\n' | Where-Object { $_.StartsWith('| ' + $sample.Key) })
+    $script:checked++
+    if ($hits.Count -ne 1) {
+        Add-Failure "检索样本必须唯一命中: $($sample.Key)，实际 $($hits.Count) 行"
+        continue
+    }
+    Assert-Contains $hits[0] $sample.Entry "检索样本 $($sample.Key)"
+    Assert-Path ($sample.Base + '/' + $sample.Entry)
+    $lookupCharacters += $hits[0].Length
+}
+Write-Host "定向检索样本：$($lookupSamples.Count) 项，命中行共 $lookupCharacters 字符（不含上层指引读取量，非端到端性能测量）。"
+
 $scriptsAgents = Read-RequiredText (Join-Path $backendRoot 'scripts/AGENTS.md')
 $engineeringConstraints = Read-RequiredText (Join-Path $workspaceRoot 'docs/AI工程执行与协作约束.md')
 $docsIndex = Read-RequiredText (Join-Path $workspaceRoot 'docs/README.md')
@@ -104,7 +143,7 @@ Assert-Contains $rootAgents '源码结构、接口与 DTO、字段、状态机
 Assert-Contains $rootAgents '数据库记录、上传文件、缓存、会话、消息、搜索索引和其他运行状态均视为可丢弃' '根开发运行状态范围'
 Assert-Contains $rootAgents '后端 MyBatis Mapper 新增、移动或扫描遗漏' '根 Mapper 快速入口'
 Assert-Contains $rootAgents 'node scripts/mapper-scan-contract.mjs' '根 Mapper 静态门禁'
-Assert-Contains $rootAgents '脚本管理、全量验证与测试造数' '根脚本管理快速入口'
+Assert-Contains $businessIndex '脚本管理、全量验证与测试造数' '根脚本管理快速入口'
 Assert-Contains $rootAgents 'baiyue-firstleg/scripts/AGENTS.md' '根脚本最近指引'
 Assert-Contains $engineeringConstraints '禁止为旧代码、旧调用或开发环境存量保留旧接口/旧字段别名' '工程无兼容执行规则'
 Assert-Contains $engineeringConstraints '不授权自动重置数据库、删除数据/文件、执行 SQL、部署或修改环境' '无兼容安全边界'
@@ -124,29 +163,15 @@ Assert-Contains $rootAgents 'docs/独立任务协作登记.md' '根测试协作
 Assert-Contains $engineeringConstraints '不得同时加载两表后混合选取任务' '工程协作登记选择门禁'
 Assert-Contains $docsIndex '[测试环境独立任务协作登记](独立任务协作登记.md)' '文档测试登记入口'
 Assert-Contains $docsIndex '[开发环境独立任务协作登记](开发环境独立任务协作登记.md)' '文档开发登记入口'
-Assert-Contains $testTaskRegistry 'projectId `c64729ff-6710-43c6-8ef2-d84e9666cc1e`' '测试登记保存项目'
-Assert-Contains $testTaskRegistry 'C:\Users\BY-OY\Desktop\code\chongchong-global`' '测试登记工作目录'
-# 启用状态属于各环境当前登记事实；不得用测试分支的历史任务名称/ID强制重新启用本地清空表。
-$registeredTestRows = @([regex]::Matches($testTaskRegistry, '(?m)^\|\s*`([0-9a-f-]{36})`\s*\|'))
-if ($registeredTestRows.Count -eq 0) {
-    Assert-Contains $testTaskRegistry '不启用总控调度' '测试登记清空状态'
-    Assert-Contains $testTaskRegistry '当前无已登记总控或长期专项' '测试登记清空明示'
-    Assert-Contains $testTaskRegistry '持续授权同步失效' '测试登记清空授权边界'
-} else {
-    Assert-Contains $testTaskRegistry '已重新启用测试环境总控调度' '测试登记启用状态'
-    Assert-Contains $testTaskRegistry 'parent_task_id' '测试登记父任务字段'
-    Assert-Contains $testTaskRegistry 'project_id' '测试登记项目字段'
-    Assert-Matches $testTaskRegistry '(?m)^\|[^\r\n]*【总控】[^\r\n]*\|' '测试登记总控职责'
-    $registeredIds = @($registeredTestRows | ForEach-Object { $_.Groups[1].Value })
-    if (@($registeredIds | Select-Object -Unique).Count -ne $registeredIds.Count) {
-        Add-Failure '测试登记存在重复 task_id'
-    }
-    $taskLines = @($testTaskRegistry -split '\r?\n' | Where-Object { $_ -match '^\|\s*`[0-9a-f-]{36}`\s*\|' })
-    $controlLines = @($taskLines | Where-Object { $_.Contains('【总控】') })
-    if ($controlLines.Count -ne 1) { Add-Failure '测试登记必须有且仅有一个总控' }
-    foreach ($taskLine in $taskLines) {
-        Assert-Contains $taskLine '`c64729ff-6710-43c6-8ef2-d84e9666cc1e`' '测试任务项目隔离'
-    }
+# 当前测试登记已明确清空；历史 projectId/task_id 不得成为恢复调度的依据。
+Assert-Contains $testTaskRegistry '当前无登记任务' '测试登记清空明示'
+Assert-Contains $testTaskRegistry '清空全部任务登记与调度规则' '测试登记清空状态'
+Assert-Contains $testTaskRegistry '不根据旧登记、历史消息或历史台账自动派工、恢复任务或回传进度' '测试登记禁止历史派工'
+Assert-Contains $testTaskRegistry '不作为当前调度或授权依据' '测试登记清空授权边界'
+Assert-NotContains $testTaskRegistry '已重新启用测试环境总控调度' '测试登记不得隐式启用'
+$checked++
+if ($testTaskRegistry -match '(?m)^\|\s*`[0-9a-f-]{36}`\s*\|') {
+    Add-Failure '测试登记不得残留任务行'
 }
 Assert-NotContains $testTaskRegistry '01a0194a-259c-7171-8967-074731a27618' '测试登记历史总控'
 Assert-NotContains $testTaskRegistry '01a06c0b-0515-7c60-b329-77342b54e666' '测试登记当前开发总控'
@@ -164,7 +189,7 @@ foreach ($businessDocsEntry in @(
     'docs/国内货柜履约/README.md',
     'docs/海外仓业务/README.md'
 )) {
-    Assert-Contains $rootAgents $businessDocsEntry "根业务域入口 $businessDocsEntry"
+    Assert-Contains $businessIndex $businessDocsEntry "根业务域入口 $businessDocsEntry"
 }
 foreach ($removedPhaseDocsEntry in @('docs/一期/', 'docs/二期/', 'docs/三期/', 'docs/四期/')) {
     Assert-NotContains $rootAgents $removedPhaseDocsEntry "根已删除阶段目录 $removedPhaseDocsEntry"
@@ -172,18 +197,18 @@ foreach ($removedPhaseDocsEntry in @('docs/一期/', 'docs/二期/', 'docs/三
 Assert-NotContains $rootAgents '不含出库和派送' '根海外仓全流程范围'
 
 # 新增稳定业务能力必须从根表和目标部署单元直接命中。
-Assert-Contains $rootAgents '入库单扣货、解除与履约门禁' '根入库扣货路由'
+Assert-Contains $businessIndex '入库扣货、解除与凭证' '根入库扣货路由'
 Assert-Contains $adminAgents '入库扣货、解除与凭证历史' 'Admin 入库扣货路由'
 Assert-Contains $backendAgents '入库单扣货、解除、凭证与履约门禁' '后端入库扣货路由'
-Assert-Contains $rootAgents '客户资金账户、充值与海外业务资金指令' '根客户资金账户路由'
+Assert-Contains $businessIndex '客户资金账户、充值、授信与业务扣费' '根客户资金账户路由'
 Assert-Contains $adminAgents '客户资金账户与柜级公共费用分摊' 'Admin 客户资金账户路由'
 Assert-Contains $clientAgents '客户资金账户、授信与充值申请' 'Client 客户资金账户路由'
 Assert-Contains $backendAgents '客户资金账户、充值、授信、冻结、结算与跨区资金指令' '后端客户资金账户路由'
-Assert-Contains $rootAgents '顶层授权快照' '根海外顶层授权快照'
+Assert-Contains $businessIndex '顶层授权快照' '根海外顶层授权快照'
 Assert-Contains $backendAgents '顶层授权快照' '后端海外顶层授权快照'
-Assert-Contains $rootAgents '目的港码头拖车与还空预警' '根目的港码头拖车路由'
-Assert-Contains $rootAgents '与订舱级拖车预约是不同生命周期' '根两类拖车边界'
-Assert-Contains $rootAgents '尾程订单控制与柜级入仓计划转换' '根尾程订单控制路由'
+Assert-Contains $businessIndex '目的港码头拖车与还空预警' '根目的港码头拖车路由'
+Assert-Contains $businessIndex '与订舱级拖车预约是不同生命周期' '根两类拖车边界'
+Assert-Contains $businessIndex '尾程订单控制与柜级入仓计划转换' '根尾程订单控制路由'
 Assert-Contains $adminAgents '目的港码头拖车与还空预警' 'Admin 目的港码头拖车路由'
 Assert-Contains $adminAgents '尾程订单控制与柜级入仓计划转换' 'Admin 尾程订单控制路由'
 Assert-Contains $backendAgents '目的港码头拖车与还空预警' '后端目的港码头拖车路由'
@@ -209,7 +234,7 @@ $firstlegAgents = Read-RequiredText (Join-Path $backendRoot 'firstleg/AGENTS.md'
 $lastlegAgents = Read-RequiredText (Join-Path $backendRoot 'lastleg-service/AGENTS.md')
 $warehouseAgents = Read-RequiredText (Join-Path $backendRoot 'warehouse/AGENTS.md')
 $coloadOpenApi = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/main/resources/openapi/coload-groups-v1.yaml')
-Assert-Contains $rootAgents 'modules/unified-orders/api/coLoadGroups.ts' '根同柜不可拆组入口'
+Assert-Contains $businessIndex 'modules/unified-orders/api/coLoadGroups.ts' '根同柜不可拆组入口'
 Assert-Contains $adminAgents '成员数是入仓片段数，不等于订单票数' 'Admin 同柜成员语义'
 Assert-Contains $backendAgents 'loading/coload/controller/PlatformColoadGroupController.java' '后端同柜不可拆组入口'
 Assert-Contains $firstlegAgents '服务端冻结每票全部 `WAIT_SPLIT` 可用入仓片段与满箱数' 'Firstleg 同柜建组边界'
@@ -233,7 +258,7 @@ Assert-Contains $lastlegAgents '/api/platform/v1/last-leg/inbound-plans/convert-
 # 本轮新增的批量下单、测量计费、智能装柜、账单联查与导出重试必须从最近指引直达。
 $fileAgents = Read-RequiredText (Join-Path $backendRoot 'file/AGENTS.md')
 $financeAgents = Read-RequiredText (Join-Path $backendRoot 'finance/AGENTS.md')
-Assert-Contains $rootAgents '客户头程订单批量导入' '根批量下单快速路由'
+Assert-Contains $businessIndex '客户头程订单批量导入' '根批量下单快速路由'
 Assert-Contains $orderAgents 'MerchantBatchImportService.java' 'Order 批量导入入口'
 Assert-Contains $orderAgents '仓库目录必须翻页读取全部候选' 'Order 批量模板全量仓库约束'
 Assert-Contains $clientAgents '中文批量导入' 'Client 批量导入入口'
@@ -259,7 +284,7 @@ $orderDeclarationService = Read-RequiredText (Join-Path $backendRoot 'order/src/
 $unifiedOrderQueryService = Read-RequiredText (Join-Path $backendRoot 'order/src/main/java/com/baiyue/order/service/UnifiedOrderQueryService.java')
 $firstlegDeclarationService = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/main/java/com/baiyue/firstleg/service/OrderDeclarationSyncService.java')
 $adminDeclarationEditor = Read-RequiredText (Join-Path $workspaceRoot 'apps/admin-web/src/modules/unified-orders/components/OrderDeclarationEditorDialog.vue')
-Assert-Contains $rootAgents '平台修改客户原始申报与履约渠道' '根订单申报快速路由'
+Assert-Contains $businessIndex '平台修改客户原始申报与履约渠道' '根订单申报快速路由'
 Assert-Contains $adminAgents '客户原始申报资料编辑与渠道变更' 'Admin 订单申报快速路由'
 Assert-Contains $backendAgents '平台修改客户原始申报、履约渠道变更与跨服务同步' '后端订单申报快速路由'
 Assert-Contains $orderAgents '平台版本化修改客户原始申报' 'Order 申报编辑入口'
@@ -272,7 +297,7 @@ Assert-Contains $orderDeclarationService 'ORDER_DECLARATION_UPDATED_V1' 'Order 
 Assert-Contains $firstlegDeclarationService 'mapper.byEvent(event.tenantId(), event.eventId())' 'Firstleg 申报 eventId 幂等'
 Assert-Contains $firstlegDeclarationService 'event.version() < current.orderVersion()' 'Firstleg 申报版本单调性'
 Assert-Contains $adminDeclarationEditor '仓库/PDA 实测数据不会被覆盖' 'Admin 申报事实边界提示'
-Assert-Contains $rootAgents '统一列表仍固定显示 `PENDING_REVIEW` 并提供审核动作' '根待审核订单优先状态'
+Assert-Contains $businessIndex '统一列表仍固定显示 `PENDING_REVIEW` 并提供审核动作' '根待审核订单优先状态'
 Assert-Contains $orderAgents '统一主状态/下一动作仍固定为 `PENDING_REVIEW/APPROVE_ORDER`' 'Order 待审核优先状态'
 Assert-Contains $unifiedOrderQueryService 'order.getStatus() == OrderStatus.SUBMITTED' 'Order 待审核状态判断'
 Assert-Contains $unifiedOrderQueryService 'pendingReview ? "PENDING_REVIEW" : summary.mainStatus()' 'Order 待审核主状态优先'
@@ -285,14 +310,14 @@ $fbaPricingService = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/mai
 $inboundFeeDetailService = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/main/java/com/baiyue/firstleg/service/InboundFeeDetailService.java')
 $adminUnifiedOrdersApi = Read-RequiredText (Join-Path $workspaceRoot 'apps/admin-web/src/modules/unified-orders/api/unifiedOrders.ts')
 $adminCarrierRatesView = Read-RequiredText (Join-Path $workspaceRoot 'apps/admin-web/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.vue')
-Assert-Contains $rootAgents '头程订单、批量审核预览与入仓码关系' '根批量审核预览路由'
+Assert-Contains $businessIndex '头程订单、批量审核预览与入仓码关系' '根批量审核预览路由'
 Assert-Contains $adminAgents '订单列表、批量审核预览、详情、商品图片与入库费用' 'Admin 批量审核预览路由'
 Assert-Contains $backendAgents '平台订单批量审核预览' '后端批量审核预览路由'
 Assert-Contains $orderAgents '平台批量审核预览' 'Order 批量审核预览入口'
 Assert-Contains $orderOpenApi '/api/platform/v1/orders/first-leg/batch-review-preview:' 'Order 批量审核预览 OpenAPI'
 Assert-Contains $batchReviewPreviewService '固定两次批量查询生成审核弹窗快照' 'Order 批量审核禁止逐票查询'
 Assert-Contains $adminUnifiedOrdersApi '/platform/v1/orders/first-leg/batch-review-preview' 'Admin 批量审核预览 API'
-Assert-Contains $rootAgents '客户专属报价、柜级阶梯运费与费用调整' '根客户专属报价路由'
+Assert-Contains $businessIndex '客户专属报价、柜级阶梯运费与费用调整' '根客户专属报价路由'
 Assert-Contains $adminAgents '客户专属价格簿、柜级阶梯运费与受控调价' 'Admin 客户专属报价路由'
 Assert-Contains $backendAgents '客户专属价格簿、柜级阶梯运费与受控调价' '后端客户专属报价路由'
 Assert-Contains $firstlegAgents '客户专属价格簿、柜级阶梯运费与调价边界' 'Firstleg 客户专属报价入口'
@@ -309,8 +334,8 @@ Assert-Path 'baiyue-firstleg/firstleg/src/main/java/com/baiyue/firstleg/pricing/
 # 海外异常处理必须贯通证据、原出库来源和库存恢复，不能退化为仅修改派送状态。
 $exceptionOrderService = Read-RequiredText (Join-Path $backendRoot 'lastleg-service/src/main/java/com/baiyue/lastleg/exceptionorder/service/ExceptionOrderService.java')
 $inventoryCommandService = Read-RequiredText (Join-Path $backendRoot 'lastleg-service/src/main/java/com/baiyue/lastleg/inventory/command/service/InventoryCommandService.java')
-Assert-Contains $rootAgents '退回海外仓时先把实收恢复到指定真实托盘/库位' '根海外异常库存恢复路由'
-Assert-Contains $adminAgents '库存恢复、异常完成与派送 `RETURNED` 由服务端原子推进' 'Admin 海外异常原子边界'
+Assert-Contains $businessIndex '退回海外仓时先把实收恢复到指定真实托盘/库位' '根海外异常库存恢复路由'
+Assert-Contains $adminOverseasAgents '库存恢复、异常完成与派送 `RETURNED` 由服务端原子推进' 'Admin 海外异常原子边界'
 Assert-Contains $backendAgents '海外异常退回、库存恢复与客户回访' '后端海外异常库存恢复路由'
 Assert-Contains $lastlegAgents 'ExceptionEvidenceFileGateway.java' 'Lastleg 异常证据入口'
 Assert-Contains $lastlegAgents '`RETURN_STOCK_IN` 流水' 'Lastleg 退回库存流水边界'
@@ -325,9 +350,9 @@ $pendingReviewOrderService = Read-RequiredText (Join-Path $backendRoot 'order/sr
 $merchantInboundBillingService = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/main/java/com/baiyue/firstleg/service/MerchantInboundBillingService.java')
 $clientSession = Read-RequiredText (Join-Path $workspaceRoot 'apps/client-web/src/api/session.ts')
 $clientHttp = Read-RequiredText (Join-Path $workspaceRoot 'apps/client-web/src/api/http.ts')
-Assert-Contains $rootAgents '`PENDING_REVIEW/WAIT_MEASURE/WAIT_SPLIT/LOADING`' '根智能装柜四态候选'
-Assert-Contains $rootAgents '能否加入以服务端 `canAssign` 为准' '根智能装柜资格边界'
-Assert-Contains $rootAgents '人工加入允许跨渠道，智能推荐仍按柜次渠道' '根智能装柜渠道边界'
+Assert-Contains $businessIndex '`PENDING_REVIEW/WAIT_MEASURE/WAIT_SPLIT/LOADING`' '根智能装柜四态候选'
+Assert-Contains $businessIndex '能否加入以服务端 `canAssign` 为准' '根智能装柜资格边界'
+Assert-Contains $businessIndex '人工加入允许跨渠道，智能推荐仍按柜次渠道' '根智能装柜渠道边界'
 Assert-Contains $backendAgents '/pending-review-assignments' '后端待审核装柜占位入口'
 Assert-Contains $backendAgents '/unpicked-items' '后端未拣整批移除入口'
 Assert-Contains $firstlegAgents '任一成员已拣则整组保留' 'Firstleg 同柜组整批移除边界'
@@ -338,7 +363,7 @@ Assert-Contains $firstlegOpenApi '/api/platform/v1/first-leg/smart-loading/plans
 Assert-Contains $firstlegOpenApi '/api/platform/v1/first-leg/smart-loading/plans/{planId}/unpicked-items:' '未拣整批移除 OpenAPI'
 Assert-Contains $pendingReviewOrderService 'orders.pendingReviewPage' 'Order 待审核候选权威查询'
 Assert-Contains $pendingReviewOrderService '"PENDING_REVIEW"' 'Order 待审核候选状态映射'
-Assert-Contains $rootAgents '客户入库结果与头程费用确认' '根客户入库费用确认入口'
+Assert-Contains $businessIndex '客户入库结果与头程费用确认' '根客户入库费用确认入口'
 Assert-Contains $firstlegAgents 'expectedFeeVersion' 'Firstleg 客户费用版本确认'
 Assert-Contains $clientAgents 'components/InboundBillingPanel.vue' 'Client 入库费用确认入口'
 Assert-Contains $firstlegOpenApi '/api/merchant/v1/first-leg/orders/{orderId}/inbound-billing/confirm:' '客户费用确认 OpenAPI'
@@ -358,7 +383,7 @@ $smartLoadingService = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/m
 $inboundSchema = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/main/resources/db/phase2-inbound-schema.sql')
 $adminWeightPanel = Read-RequiredText (Join-Path $workspaceRoot 'apps/admin-web/src/modules/inbounds/weight/components/WeightOcrPanel.vue')
 $clientOrdersView = Read-RequiredText (Join-Path $workspaceRoot 'apps/client-web/src/modules/first-leg/views/FirstLegOrdersView.vue')
-Assert-Contains $rootAgents '称重确认、整票库位块与部分拣货资源结算' '根称重库位块路由'
+Assert-Contains $businessIndex '称重确认、整票库位块与部分拣货资源结算' '根称重库位块路由'
 Assert-Contains $backendAgents '称重确认、整票库位块与 PDA 资源结算' '后端称重库位块路由'
 Assert-Contains $firstlegAgents 'MeasurementLocationOccupationService.java' 'Firstleg 称重库位块入口'
 Assert-Contains $firstlegAgents '最新测量批次的正数 `totalVolumeCbm/originalVolumeCbm` 取较大值' 'Firstleg 库位块测量批次体积选择'
@@ -378,7 +403,7 @@ Assert-Contains $inboundSchema 'UNIQUE KEY uk_pallet_allocation_weight (tenant_i
 Assert-Contains $adminWeightPanel 'row.locationCode' 'Admin 称重卡片库位消费'
 Assert-Contains $adminWeightPanel 'putawayStatusLabel(row.slotStatus)' 'Admin 称重卡片槽位状态'
 Assert-NotContains $adminWeightPanel 'class="putaway-guide"' 'Admin 已移除整票预留引导区'
-Assert-Contains $rootAgents '`totalPackageCount/remainingPackageCount`' '根智能装柜暂估数量'
+Assert-Contains $businessIndex '`totalPackageCount/remainingPackageCount`' '根智能装柜暂估数量'
 Assert-Contains $firstlegAgents '`totalPackageCount/remainingPackageCount`' 'Firstleg 智能装柜暂估数量'
 Assert-Contains $adminAgents '`totalPackageCount/remainingPackageCount`' 'Admin 智能装柜暂估数量'
 Assert-Contains $firstlegOpenApi 'required: [id, packageCount, totalPackageCount, remainingPackageCount' '智能装柜计划数量 OpenAPI'
@@ -397,7 +422,7 @@ $iamMemberService = Read-RequiredText (Join-Path $backendRoot 'iam/src/main/java
 $adminCustomersView = Read-RequiredText (Join-Path $workspaceRoot 'apps/admin-web/src/modules/customers/pages/CustomersView.vue')
 $clientCompanyProfile = Read-RequiredText (Join-Path $workspaceRoot 'apps/client-web/src/modules/tenant-management/views/CompanyProfileView.vue')
 $clientMembersView = Read-RequiredText (Join-Path $workspaceRoot 'apps/client-web/src/modules/tenant-management/views/MembersView.vue')
-Assert-Contains $rootAgents '公司联系电话/邮箱是企业资料，不作为成员登录标识' '根企业联系人边界'
+Assert-Contains $businessIndex '公司联系电话/邮箱是企业资料，不作为成员登录标识' '根企业联系人边界'
 Assert-Contains $adminAgents '公司联系电话只作企业联系信息，不修改管理员/成员登录手机号' 'Admin 企业联系人边界'
 Assert-Contains $clientAgents '成员登录手机号可选，修改时同步 Auth、撤销该账号会话并审计' 'Client 成员登录手机号边界'
 Assert-Contains $authAgents '登录标识与企业联系人解耦' 'Auth 登录标识入口'
@@ -411,7 +436,7 @@ Assert-Contains $clientCompanyProfile '不会修改任何成员的登录手机
 Assert-Contains $clientMembersView '用于该成员手机号登录；修改后会同步认证账号并退出该成员现有会话' 'Client 成员登录手机号提示'
 $fileAgents = Read-RequiredText (Join-Path $backendRoot 'file/AGENTS.md')
 $qualificationOpenApi = Read-RequiredText (Join-Path $backendRoot 'file/src/main/resources/openapi/qualification-required-package-v1.yaml')
-Assert-Contains $rootAgents '法人身份证选填，可在已有营业执照后单独补传或替换' '根法人身份证单独上传语义'
+Assert-Contains $businessIndex '法人身份证选填，可在已有营业执照后单独补传或替换' '根法人身份证单独上传语义'
 Assert-Contains $fileAgents '法人身份证选填，客户可在已有营业执照后通过 `/api/merchant/v1/files/qualifications` 单独新增或替换' 'File 法人身份证单独上传入口'
 Assert-Contains $qualificationOpenApi '/api/merchant/v1/files/qualifications:' '客户单文件资质 OpenAPI'
 Assert-Contains $qualificationOpenApi 'LEGAL_PERSON_ID 可在已有营业执照后单独新增或替换' '客户法人身份证单独上传契约'
@@ -427,8 +452,8 @@ $adminLastMileOrders = Read-RequiredText (Join-Path $workspaceRoot 'apps/admin-w
 $loadingListsOpenApi = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/main/resources/openapi/loading-lists-v1.yaml')
 $pdaLoadingApi = Read-RequiredText (Join-Path $workspaceRoot 'apps/pda-uniapp/api/pda-loading.js')
 $cabinetEvidenceService = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/main/java/com/baiyue/firstleg/loading/service/CabinetLoadingEvidenceService.java')
-Assert-Contains $rootAgents '拖车预约由 `RELEASED` 订舱拥有，不按客户、柜次、装柜计划或真实柜号归属' '根订舱级拖车语义'
-Assert-Contains $rootAgents '证据以 `taskId + warehouseId` 进入任务专用 API' '根柜级证据入口'
+Assert-Contains $businessIndex '拖车预约由 `RELEASED` 订舱拥有，不按客户、柜次、装柜计划或真实柜号归属' '根订舱级拖车语义'
+Assert-Contains $businessIndex '证据以 `taskId + warehouseId` 进入任务专用 API' '根柜级证据入口'
 Assert-Contains $adminAgents '订舱级拖车预约' 'Admin 拖车快速入口'
 Assert-Contains $adminAgents '不选择或提交客户、柜次、装柜计划或真实集装箱号' 'Admin 拖车订舱级边界'
 Assert-Contains $backendAgents '订舱级拖车' '后端拖车快速入口'
@@ -454,7 +479,7 @@ Assert-Contains $lastlegOrderCommandService '必须提交完整8行人工时间
 Assert-Contains $lastlegOrderCommandService '尾程订单已进入出库流程，不能新增暂扣' '尾程暂扣出库门禁实现'
 Assert-Contains $adminLastMileOrders '/platform/v1/last-leg/orders/${encodeURIComponent(orderId)}/hold' 'Admin 尾程暂扣入口'
 Assert-Contains $adminLastMileOrders '/platform/v1/last-leg/orders/${encodeURIComponent(orderId)}/manual-nodes' 'Admin 尾程人工节点入口'
-Assert-Contains $adminAgents '入仓码只读展示并提交订单冻结值' 'Admin 尾程计划冻结入仓码边界'
+Assert-Contains $adminOverseasAgents '入仓码只读展示并提交订单冻结值' 'Admin 尾程计划冻结入仓码边界'
 Assert-Contains $lastlegAgents '接柜仓编码/名称以该 ID 当前目录快照为准' 'Lastleg 稳定接柜仓身份边界'
 Assert-Contains $lastlegOrderCommandService '同一幂等键不能用于不同请求' '尾程命令请求哈希重放边界'
 Assert-Contains $loadingListsOpenApi '真实集装箱号可在PDA确认装柜完成前补录' '预装真实柜号晚录门禁'
@@ -465,7 +490,7 @@ Assert-Contains $adminAgents 'PDA 最终完成前必须补齐' 'Admin 真实柜
 Assert-Contains $pdaAgents '当前 `taskId + warehouseId` 走任务专用 API' '国内 PDA 柜级证据入口'
 Assert-Contains $pdaLoadingApi '/first-leg/pda-loading/tasks/${encodeURIComponent(taskId)}/evidence?warehouseId=' '国内 PDA 证据查询 API'
 Assert-NotContains $pdaLoadingApi '/inbounds/${encodeURIComponent(inboundId)}/loading/evidence' '国内 PDA 旧入仓证据 API'
-Assert-Contains $rootAgents '上传以幂等键绑定包含文件内容的请求哈希' '根装柜证据上传重放边界'
+Assert-Contains $businessIndex '上传以幂等键绑定包含文件内容的请求哈希' '根装柜证据上传重放边界'
 Assert-Contains $firstlegAgents '完全重放返回当前视图且不得再次上传 File' 'Firstleg 装柜证据重放边界'
 Assert-Contains $cabinetEvidenceService 'uploadHash(warehouseId, expectedVersion, evidenceType, sealNo, remark, multipart)' '装柜证据上传请求哈希'
 Assert-Contains $cabinetEvidenceService 'digest.update(multipart.getBytes())' '装柜证据文件内容哈希'
@@ -525,13 +550,13 @@ foreach ($pdaApplication in $pdaApplications) {
     }
 }
 
-# 海外 PDA 已开放拆柜收货、库内、换标和现场查询真实作业。
+# 海外 PDA 已开放拆柜收货、移库、托盘、换标和现场查询真实作业；库存盘点仅保留底层实现。
 $overseasWorkbenchPath = Join-Path $workspaceRoot 'apps/pda-overseas-uniapp/src/data/overseas-workbench.js'
 $overseasWorkbench = Read-RequiredText $overseasWorkbenchPath
 Assert-Matches $overseasWorkbench "(?s)name:\s*'拆柜收货'.{0,300}?available:\s*true" 'Overseas PDA 拆柜收货开关'
 Assert-Matches $overseasWorkbench "(?s)name:\s*'托盘管理'.{0,300}?available:\s*true.{0,200}?route:\s*'/pages/pallet/pallet'" 'Overseas PDA 托盘管理开关'
+Assert-NotContains $overseasWorkbench "key: 'stocktake'" 'Overseas PDA 隐藏库存盘点入口'
 foreach ($enabledOperation in @(
-    @{ Name = '库存盘点'; Route = '/pages/stocktake/stocktake' },
     @{ Name = '商品移库'; Route = '/pages/move/move' },
     @{ Name = '换标收货'; Route = '/pages/relabel/relabel\?op=relabelReceive' },
     @{ Name = '换标执行'; Route = '/pages/relabel/relabel\?op=relabelExecute' },
@@ -589,7 +614,7 @@ Assert-Contains $backendAgents 'RestClientTraceInterceptor.java' '后端同步 T
 $oceanBookingOpenApi = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/main/resources/openapi/ocean-bookings-v1.yaml')
 Assert-Contains $oceanBookingOpenApi 'never represents linked or ACTIVE containers' '订舱柜量语义'
 Assert-Contains $oceanBookingOpenApi '/api/platform/v1/ocean-bookings/link-candidates:' '订舱关联候选契约'
-Assert-Contains $oceanBookingOpenApi 'exact warehouseId, channelCode and containerType' '订舱关联候选筛选语义'
+Assert-Contains $oceanBookingOpenApi 'booking channel belonging to channelGroupCode' '订舱关联候选筛选语义'
 
 $adminOceanBookingApi = Read-RequiredText (Join-Path $workspaceRoot 'apps/admin-web/src/modules/ocean-bookings/api/platformOceanBookings.ts')
 $adminOceanBookingView = Read-RequiredText (Join-Path $workspaceRoot 'apps/admin-web/src/modules/ocean-bookings/pages/OceanBookingsView.vue')
@@ -612,7 +637,7 @@ foreach ($overseasFulfillmentRoute in @(
 foreach ($overseasFulfillmentRootEntry in @(
     'OutboundsView.vue', 'DeliveryOrdersView.vue', 'ExceptionOrdersView.vue', 'CustomerVisitsView.vue'
 )) {
-    Assert-Contains $rootAgents $overseasFulfillmentRootEntry '根海外履约正式业务路由'
+    Assert-Contains $businessIndex $overseasFulfillmentRootEntry '根海外履约正式业务路由'
 }
 Assert-Contains $adminAgents '海外排车、出库与派送' 'Admin 海外出库派送入口'
 Assert-Contains $adminAgents '海外异常退回与客户回访' 'Admin 海外异常回访入口'
@@ -704,8 +729,8 @@ $containerCustomsOpenApi = Read-RequiredText (Join-Path $backendRoot 'firstleg/s
 $adminContainerCustomsApi = Read-RequiredText (Join-Path $workspaceRoot 'apps/admin-web/src/modules/container-loading/api/platformContainerCustoms.ts')
 $clientContainerCustomsApi = Read-RequiredText (Join-Path $workspaceRoot 'apps/client-web/src/modules/first-leg/api/customs.ts')
 $customsFileOpenApi = Read-RequiredText (Join-Path $backendRoot 'file/src/main/resources/openapi/customs-file-and-export-v1.yaml')
-Assert-Contains $rootAgents 'ContainerCustomsPanel.vue' '根整柜报关 Admin 入口'
-Assert-Contains $rootAgents 'CustomsDocumentsDialog.vue' '根整柜报关 Client 入口'
+Assert-Contains $businessIndex 'ContainerCustomsPanel.vue' '根整柜报关 Admin 入口'
+Assert-Contains $businessIndex 'CustomsDocumentsDialog.vue' '根整柜报关 Client 入口'
 Assert-Contains $adminAgents 'components/ContainerCustomsPanel.vue' 'Admin 整柜报关入口'
 Assert-Contains $adminAgents 'complete-all-buy' 'Admin 全买单柜入口'
 Assert-Contains $clientAgents 'components/CustomsDocumentsDialog.vue' 'Client 退税报关资料入口'
@@ -746,16 +771,16 @@ Assert-Contains $lastlegBusinessOpenApi '/api/platform/v1/last-leg/inbound-plans
 Assert-Contains $lastlegBusinessOpenApi 'snapshotVersion' 'Lastleg 整柜计划快照版本'
 Assert-Contains $lastlegBusinessOpenApi 'snapshotHash' 'Lastleg 整柜计划快照哈希'
 Assert-Contains $lastlegBusinessOpenApi 'sourceContainerBookingId' 'Lastleg 稳定来源柜身份'
-Assert-Contains $adminAgents '/orders/container-summaries' 'Admin 柜级摘要目标入口'
-Assert-Contains $rootAgents '尾程订单控制与柜级入仓计划转换' '根柜级计划入口'
+Assert-Contains $adminOverseasAgents '/orders/container-summaries' 'Admin 柜级摘要目标入口'
+Assert-Contains $businessIndex '尾程订单控制与柜级入仓计划转换' '根柜级计划入口'
 Assert-Contains $backendAgents '分页返回全部稳定来源柜' '后端全柜工作台范围'
-Assert-Contains $adminAgents '服务端分页返回全部稳定来源柜' 'Admin 全柜工作台范围'
+Assert-Contains $adminOverseasAgents '服务端分页返回全部稳定来源柜' 'Admin 全柜工作台范围'
 Assert-Contains $lastlegAgents '分页返回全部稳定来源柜' 'Lastleg 全柜工作台范围'
 Assert-Contains $lastlegBusinessOpenApi '返回全部稳定来源柜' 'Lastleg 全柜工作台 OpenAPI'
-Assert-Contains $adminAgents 'ACTIVE + FBA' 'Admin FBA 权威仓候选'
-Assert-Contains $adminAgents '/inbound-plans/convert-container' 'Admin 整柜转换目标入口'
-Assert-Contains $adminAgents '/inbound-plans/container-preview' 'Admin 整柜预览目标入口'
-Assert-Contains $adminAgents '同一 `snapshotVersion/snapshotHash` 原样提交' 'Admin 整柜快照确认边界'
+Assert-Contains $adminOverseasAgents 'ACTIVE + FBA' 'Admin FBA 权威仓候选'
+Assert-Contains $adminOverseasAgents '/inbound-plans/convert-container' 'Admin 整柜转换目标入口'
+Assert-Contains $adminOverseasAgents '/inbound-plans/container-preview' 'Admin 整柜预览目标入口'
+Assert-Contains $adminOverseasAgents '同一 `snapshotVersion/snapshotHash` 原样提交' 'Admin 整柜快照确认边界'
 Assert-Contains $adminLastMileApi '/orders/container-summaries' 'Admin 柜级摘要真实调用'
 Assert-Contains $adminLastMileApi '/platform/v1/last-leg/inbound-plans/container-preview' 'Admin 柜级预览真实调用'
 Assert-NotContains $adminLastMileApi '/orders/pending-containers' 'Admin 旧柜级摘要调用'
@@ -791,8 +816,8 @@ $eventTypes = Read-RequiredText (Join-Path $backendRoot 'common-event-contract/s
 $overseasDispatcher = Read-RequiredText (Join-Path $backendRoot 'event-bridge-service/src/main/java/com/baiyue/eventbridge/service/OverseasEventDispatcher.java')
 $financeEventConsumer = Read-RequiredText (Join-Path $backendRoot 'finance/src/main/java/com/baiyue/finance/service/BusinessFeeSourceEventService.java')
 $financePhase1Service = Read-RequiredText (Join-Path $backendRoot 'finance/src/main/java/com/baiyue/finance/service/FinancePhase1OperationService.java')
-Assert-Contains $rootAgents '财务管理与柜级公共费用分摊' '根柜费分摊快速路由'
-Assert-Contains $rootAgents '海外业务费用来源与客户财务' '根海外费用快速路由'
+Assert-Contains $businessIndex '财务管理与柜级公共费用分摊' '根柜费分摊快速路由'
+Assert-Contains $businessIndex '海外业务费用来源与客户财务' '根海外费用快速路由'
 Assert-Contains $adminAgents '财务、客户资金账户与柜级公共费用分摊' 'Admin 柜费分摊快速路由'
 Assert-Contains $backendAgents '柜级公共费用跨客户分摊' '后端柜费分摊快速路由'
 Assert-Contains $backendAgents '海外业务费用来源跨区入池' '后端海外费用快速路由'
@@ -827,16 +852,16 @@ Assert-Contains $overseasDispatcher 'EventTypes.WALLET_COMMAND_REQUESTED' 'Event
 Assert-Matches $overseasDispatcher '(?s)FINANCE_EVENT_TYPES\.contains\(eventType\).{0,150}?financeEventClient\.deliver\(event\)' 'Event Bridge Finance 事件定向投递'
 Assert-Contains $financeAgents '`eventId + payloadHash` 防重放冲突' 'Finance 海外事件幂等边界'
 Assert-Contains $financeAgents '`PAYABLE + DIRECT_PAID` 审核版本必须生成 `BUSINESS_DIRECT_PAID`' 'Finance 直接已付隔离边界'
-Assert-Contains $rootAgents '入库单扣货、解除与履约门禁' '根入库扣货快速路由'
-Assert-Contains $adminAgents '入库单扣货、解除、凭证与历史' 'Admin 入库扣货快速路由'
+Assert-Contains $businessIndex '入库扣货、解除与凭证' '根入库扣货快速路由'
+Assert-Contains $adminAgents '入库扣货、解除与凭证历史' 'Admin 入库扣货快速路由'
 Assert-Contains $backendAgents '入库单扣货、解除、凭证与履约门禁' '后端入库扣货快速路由'
 Assert-Contains $firstlegAgents '入库单扣货、履约门禁与凭证' 'Firstleg 入库扣货入口'
-Assert-Contains $rootAgents '客户资金账户、充值与海外业务资金指令' '根客户钱包快速路由'
+Assert-Contains $businessIndex '客户资金账户、充值、授信与业务扣费' '根客户钱包快速路由'
 Assert-Contains $backendAgents '客户资金账户、充值、授信、冻结、结算与跨区资金指令' '后端客户钱包快速路由'
 Assert-Contains $lastlegAgents '海外业务资金指令与结果' 'Lastleg 跨区钱包入口'
 Assert-Contains $lastlegAgents '拆柜打托成本与客户应收分摊' 'Lastleg 拆柜打托费用入口'
 Assert-Contains $clientAgents '换标申请必须提交正数 CNY `chargeAmount`' 'Client 换标钱包金额边界'
-Assert-Contains $rootAgents '海外 Token 只携带稳定身份、客户/仓库范围和版本声明，不携带角色或权限集' '根海外小 Token 边界'
+Assert-Contains $businessIndex '海外 Token 不携带角色或权限集' '根海外小 Token 边界'
 Assert-Contains $backendAgents '海外 Token 只携带稳定身份、客户/仓库范围和版本声明，不携带角色或权限集' '后端海外小 Token 边界'
 Assert-Contains $financeEventConsumer 'envelope.payloadHash().equals(row.get("payload_hash"))' 'Finance 海外事件 Payload 哈希幂等'
 Assert-Contains $financeEventConsumer "cost_origin='BUSINESS_DIRECT_PAID'" 'Finance 海外直接已付成本投影'
@@ -1121,6 +1146,7 @@ foreach ($removedOverseasWarehouseMasterPath in @(
 $indexedAgentFiles = @(
     $rootAgentsPath,
     $adminAgentsPath,
+    $adminOverseasAgentsPath,
     $clientAgentsPath,
     $pdaAgentsPath,
     $overseasPdaAgentsPath,
diff --git a/scripts/agents-index-registry-contract.test.mjs b/scripts/agents-index-registry-contract.test.mjs
index 171ae4dab..cba8c5e78 100644
--- a/scripts/agents-index-registry-contract.test.mjs
+++ b/scripts/agents-index-registry-contract.test.mjs
@@ -1,47 +1,24 @@
 import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
-import { spawnSync } from 'node:child_process'
 import test from 'node:test'
 
 const source = readFileSync(new URL('./agents-index-contract.ps1', import.meta.url), 'utf8')
-const start = source.indexOf('$registeredTestRows =')
-const end = source.indexOf("Assert-NotContains $testTaskRegistry '01a0194a", start)
-assert.ok(start > 0 && end > start)
-const registryContract = source.slice(start, end)
-const project = 'c64729ff-6710-43c6-8ef2-d84e9666cc1e'
-const root = '00000000-0000-4000-8000-000000000001'
-const child = '00000000-0000-4000-8000-000000000002'
-const enabled = `已重新启用测试环境总控调度\nparent_task_id project_id\n| \`${root}\` | \`${project}\` | 【总控】测试环境全流程 |\n| \`${child}\` | \`${root}\` | \`${project}\` | 【前端】专项 |`
 
-function checkRegistry(text) {
-  const script = `
-$ErrorActionPreference = 'Stop'
-$failures = [System.Collections.Generic.List[string]]::new()
-function Add-Failure([string]$message) { $script:failures.Add($message) }
-function Assert-Contains([string]$text, [string]$needle, [string]$scope) { if (-not $text.Contains($needle)) { Add-Failure "$scope 缺少 $needle" } }
-function Assert-Matches([string]$text, [string]$pattern, [string]$scope) { if ($text -notmatch $pattern) { Add-Failure "$scope 缺少结构" } }
-$testTaskRegistry = [System.Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${Buffer.from(text).toString('base64')}'))
-${registryContract}
-Write-Output ('RESULT:' + (ConvertTo-Json -InputObject @($failures) -Compress))
-`
-  const result = spawnSync('pwsh', ['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(script, 'utf16le').toString('base64')], { encoding: 'utf8' })
-  assert.equal(result.status, 0, result.stderr)
-  const output = result.stdout.match(/RESULT:(\[[^\r\n]*\])/)
-  assert.ok(output, result.stdout)
-  return JSON.parse(output[1])
-}
-
-test('cleared test registry stays disabled and explicitly revokes inherited authorization', () => {
-  assert.deepEqual(checkRegistry('不启用总控调度\n当前无已登记总控或长期专项\n持续授权同步失效'), [])
-  assert.ok(checkRegistry('当前无已登记总控或长期专项').length > 0)
-  assert.ok(checkRegistry('').length > 0)
+test('cleared test registry is mandatory and cannot inherit historical task authorization', () => {
+  for (const token of [
+    "Assert-Contains $testTaskRegistry '当前无登记任务'",
+    "Assert-Contains $testTaskRegistry '清空全部任务登记与调度规则'",
+    "Assert-Contains $testTaskRegistry '不根据旧登记、历史消息或历史台账自动派工、恢复任务或回传进度'",
+    "Assert-Contains $testTaskRegistry '不作为当前调度或授权依据'",
+    "Assert-NotContains $testTaskRegistry '已重新启用测试环境总控调度'",
+  ]) assert.ok(source.includes(token), token)
+  assert.match(source, /if \(\$testTaskRegistry -match '\(\?m\)\^\\\|\\s\*`\[0-9a-f-\]\{36\}`\\s\*\\\|'\)/)
 })
 
-test('enabled registry requires explicit activation, one controller, unique tasks and its own project', () => {
-  assert.deepEqual(checkRegistry(enabled), [])
-  assert.ok(checkRegistry(enabled.replace('已重新启用测试环境总控调度', '')).length > 0)
-  assert.ok(checkRegistry(enabled.replace('parent_task_id', '')).length > 0)
-  assert.ok(checkRegistry(enabled.replace(child, root)).length > 0)
-  assert.ok(checkRegistry(enabled.replace('【前端】专项', '【总控】其他')).length > 0)
-  assert.ok(checkRegistry(enabled.replaceAll(project, '6f874ec3-d3b2-49bd-8625-327f4d685f98')).length > 0)
+test('cleared registry rejects every retired controller and project identity', () => {
+  for (const retired of [
+    '01a0194a-259c-7171-8967-074731a27618',
+    '01a06c0b-0515-7c60-b329-77342b54e666',
+    '6f874ec3-d3b2-49bd-8625-327f4d685f98',
+  ]) assert.match(source, new RegExp(`Assert-NotContains \\$testTaskRegistry '${retired}'`))
 })
diff --git a/scripts/db/incremental.sql b/scripts/db/incremental.sql
index 58277f0e7..6f6a0a2a1 100644
--- a/scripts/db/incremental.sql
+++ b/scripts/db/incremental.sql
@@ -273,7 +273,7 @@ CREATE TABLE IF NOT EXISTS ll_inbound_plan_pallet (
   actual_volume_cbm DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '实际入托体积（立方米）',
   actual_package_count INT NOT NULL DEFAULT 0 COMMENT '实际入托箱数',
   PRIMARY KEY (id),
-  UNIQUE KEY uk_ll_inbound_pallet_no (pallet_no),
+  KEY idx_ll_inbound_pallet_no (pallet_no),
   UNIQUE KEY uk_ll_inbound_pallet_sequence (plan_id,sequence_no),
   KEY idx_ll_inbound_pallet_plan (plan_id)
 ) ENGINE=InnoDB COMMENT='尾程入库计划托盘表：按目的仓隔离合托';
@@ -1265,10 +1265,16 @@ PREPARE inventory_carton_qty_020 FROM @ddl; EXECUTE inventory_carton_qty_020; DE
 
 CREATE TABLE IF NOT EXISTS ll_dropship_order_profile (
   id BIGINT NOT NULL COMMENT '主键ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户租户ID', order_id BIGINT NOT NULL COMMENT '订单ID',
-  warehouse_pallet_id BIGINT NOT NULL COMMENT '仓库实物托盘ID', pallet_no VARCHAR(128) NOT NULL COMMENT '托盘号', inventory_position_id BIGINT NULL COMMENT '库存仓位记录ID',
-  status VARCHAR(32) NOT NULL DEFAULT 'RECEIVED' COMMENT '业务状态', idempotency_key VARCHAR(255) NOT NULL COMMENT '业务幂等键', version BIGINT NOT NULL DEFAULT 0 COMMENT '乐观锁版本',
+  warehouse_pallet_id BIGINT NULL COMMENT '仓库实物托盘ID', pallet_no VARCHAR(128) NULL COMMENT '托盘号',
+  source_pallet_no VARCHAR(128) NOT NULL COMMENT '来源托盘号快照',
+  manifest_version INT NOT NULL COMMENT '整托清单版本', manifest_package_count INT NOT NULL COMMENT '整托总箱数',
+  manifest_fragment_count INT NOT NULL COMMENT '整托客户分片总数', manifest_hash CHAR(64) NOT NULL COMMENT '整托完整清单摘要',
+  inventory_position_id BIGINT NULL COMMENT '库存仓位记录ID',
+  status VARCHAR(32) NOT NULL DEFAULT 'PENDING_INBOUND' COMMENT '业务状态', idempotency_key VARCHAR(255) NOT NULL COMMENT '业务幂等键', version BIGINT NOT NULL DEFAULT 0 COMMENT '乐观锁版本',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间', updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
-  PRIMARY KEY(id), UNIQUE KEY uk_ll_dropship_profile_order(customer_id,order_id), UNIQUE KEY uk_ll_dropship_profile_key(customer_id,idempotency_key)
+  PRIMARY KEY(id), UNIQUE KEY uk_ll_dropship_profile_order_pallet(customer_id,order_id,source_pallet_no),
+  UNIQUE KEY uk_ll_dropship_profile_key(customer_id,idempotency_key), KEY idx_ll_dropship_profile_order(customer_id,order_id),
+  KEY idx_ll_dropship_profile_manifest(source_pallet_no,manifest_hash)
 ) ENGINE=InnoDB COMMENT='一件代发托盘档案';
 CREATE TABLE IF NOT EXISTS ll_dropship_carton (
   id BIGINT NOT NULL COMMENT '主键ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户租户ID', order_id BIGINT NOT NULL COMMENT '订单ID', profile_id BIGINT NOT NULL COMMENT '托盘档案ID',
@@ -3928,7 +3934,7 @@ CREATE TABLE IF NOT EXISTS wh_pallet_batch_item (
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
   PRIMARY KEY (id), UNIQUE KEY uk_wh_pallet_batch_item_business (customer_id,warehouse_id,business_key),
-  UNIQUE KEY uk_wh_pallet_batch_item_sequence (batch_id,sequence_no), UNIQUE KEY uk_wh_pallet_batch_item_pallet (pallet_id),
+  UNIQUE KEY uk_wh_pallet_batch_item_sequence (batch_id,sequence_no), KEY idx_wh_pallet_batch_item_pallet (pallet_id),
   KEY idx_wh_pallet_batch_item_batch (batch_id,status)
 ) ENGINE=InnoDB COMMENT='柜级入库计划批量托盘明细与资源锁关联';
 USE baiyue_lastleg;
diff --git a/scripts/finance-deployment-contract.test.mjs b/scripts/finance-deployment-contract.test.mjs
index e6f5d0895..17a496a53 100644
--- a/scripts/finance-deployment-contract.test.mjs
+++ b/scripts/finance-deployment-contract.test.mjs
@@ -25,7 +25,7 @@ test('Compose and deploy script expose finance with fail-closed database config'
   assert.match(compose, /image: \$\{IMAGE_REPOSITORY\}\/finance:\$\{IMAGE_TAG\}/)
   assert.match(compose, /SERVER_PORT: 9203/)
   assert.match(compose, /FINANCE_DB_URL: \$\{FINANCE_DB_URL\}/)
-  assert.match(compose, /FINANCE_WALLET_DEFAULT_CREDIT_LIMIT: \$\{FINANCE_WALLET_DEFAULT_CREDIT_LIMIT:-0\.00\}/)
+  assert.doesNotMatch(compose, /FINANCE_WALLET_DEFAULT_CREDIT_LIMIT/)
   assert.match(serviceMap, /^  finance:\s*$/m)
   assert.match(serviceMap, /jar: finance\/target\/finance-service-1\.0\.0-SNAPSHOT\.jar/)
   assert.match(deployScript, /FINANCE_DB_URL FINANCE_DB_USERNAME FINANCE_DB_PASSWORD/)
diff --git a/scripts/phase4-overseas-acceptance-entry-contract.test.mjs b/scripts/phase4-overseas-acceptance-entry-contract.test.mjs
index 9e90032c5..0c82de1e1 100644
--- a/scripts/phase4-overseas-acceptance-entry-contract.test.mjs
+++ b/scripts/phase4-overseas-acceptance-entry-contract.test.mjs
@@ -160,10 +160,12 @@ test('PDA entry expands the real phase-three producer chain and builds an FBA/OV
   assert.match(source, /runPhase4ProducerVariant\('DROPSHIP-PRIMARY', 'FBA', 'ONE_CLICK_DROPSHIP', true\)/)
   assert.match(source, /runPhase4ProducerVariant\('OVERSEAS-PRIMARY', 'OVERSEAS', 'ONE_CLICK_DROPSHIP', true\)/)
   assert.match(source, /runPhase4ProducerVariant\('FBA-STANDARD', 'FBA', 'STANDARD', true\)/)
-  assert.match(source, /includes\('-P4-FBA-STANDARD:'\)/)
+  assert.match(source, /-P4-FBA-STANDARD\(\?:-R\\d\+\)\?:/)
   assert.match(source, /runPhase4ProducerVariant\('SECONDARY', 'FBA', 'STANDARD', false\)/)
   assert.match(source, /runUntilPickupReady\(this\)/)
   const variant = source.slice(source.indexOf('async runPhase4ProducerVariant'), source.indexOf('async ensurePhase4PdaProducerMatrix'))
+  assert.match(variant, /this\.phase4ProducerAttempts\.get\(label\)/)
+  assert.match(variant, /attempt === 1 \? '' : `-R\$\{attempt\}`/)
   assert.ok(variant.indexOf('ensureInitialCalculated') < variant.indexOf('phase3-loading-phase4-'))
   assert.match(variant, /fulfillmentType === 'ONE_CLICK_DROPSHIP'/)
   assert.doesNotMatch(variant, /inboundFees\.run\(this\)/)
diff --git a/scripts/synchronous-dependency-baseline.mjs b/scripts/synchronous-dependency-baseline.mjs
index efd9731c1..0f7792b31 100644
--- a/scripts/synchronous-dependency-baseline.mjs
+++ b/scripts/synchronous-dependency-baseline.mjs
@@ -121,6 +121,8 @@ export const SYNCHRONOUS_CLIENTS = Object.freeze([
 
   feign('order/src/main/java/com/baiyue/order/client/FirstlegColoadGroupClient.java',
     'order-service', 'firstleg-service', ['REQUEST'], 'READ', 'SAFE_READ', '批量读取同柜不可拆组聚合'),
+  feign('order/src/main/java/com/baiyue/order/client/FinanceWalletClient.java',
+    'order-service', 'finance-service', ['REQUEST'], 'READ', 'SAFE_READ', '提交订单前读取客户钱包余额与有效授信'),
   feign('order/src/main/java/com/baiyue/order/client/FirstlegInboundClient.java',
     'order-service', 'firstleg-service', ['REQUEST', 'BACKGROUND'], 'READ_WRITE', 'BUSINESS_KEY',
     '列表查询/缺失修复在线执行；审核建单由 Outbox 投递，按 orderId/inboundCode 收敛'),
diff --git a/scripts/synchronous-dependency-contract.test.mjs b/scripts/synchronous-dependency-contract.test.mjs
index cf322b3aa..1eb2db488 100644
--- a/scripts/synchronous-dependency-contract.test.mjs
+++ b/scripts/synchronous-dependency-contract.test.mjs
@@ -37,6 +37,7 @@ const expectedOnlineEdges = [
   'lastleg-service->warehouse-overseas-service',
   'lastleg-service->warehouse-service',
   'order-service->file-service',
+  'order-service->finance-service',
   'order-service->firstleg-service',
   'order-service->iam-service',
   'order-service->warehouse-service',
@@ -98,11 +99,11 @@ async function discoverFeignEdges() {
   return clients.sort((left, right) => left.path.localeCompare(right.path))
 }
 
-test('all 56 Feign clients have reviewed context, access and idempotency metadata', async () => {
+test('all 57 Feign clients have reviewed context, access and idempotency metadata', async () => {
   const reviewed = SYNCHRONOUS_CLIENTS.filter(client => client.transport === 'FEIGN')
     .map(({ path, source, target }) => ({ path, source, target }))
     .sort((left, right) => left.path.localeCompare(right.path))
-  assert.equal(reviewed.length, 56)
+  assert.equal(reviewed.length, 57)
   assert.deepEqual(await discoverFeignEdges(), reviewed)
 })
 
@@ -193,7 +194,7 @@ test('REQUEST, BACKGROUND and full graphs remain separate executable baselines',
   ])
   assert.deepEqual(stronglyConnectedComponents(graphEdges('REQUEST')), [
     ['auth-service', 'iam-service'],
-    ['firstleg-service', 'order-service']
+    ['finance-service', 'firstleg-service', 'order-service']
   ])
   assert.deepEqual(stronglyConnectedComponents(graphEdges('BACKGROUND')), [[
     'event-bridge-service', 'finance-service', 'firstleg-service', 'lastleg-service', 'order-service'
@@ -210,7 +211,7 @@ test('overseas security projection stays in Lastleg infrastructure and backgroun
   assert.ok(graphEdges('BACKGROUND').includes('event-bridge-service->lastleg-service'))
 })
 
-test('Order and Firstleg remain a bilateral REQUEST SCC until loading-complete timing is frozen', () => {
+test('Order, Firstleg and Finance form the reviewed REQUEST SCC', () => {
   const requestClients = SYNCHRONOUS_CLIENTS.filter(client => client.contexts.includes('REQUEST'))
   const orderToFirstleg = requestClients.filter(client =>
     client.source === 'order-service' && client.target === 'firstleg-service')
@@ -230,7 +231,8 @@ test('Order and Firstleg remain a bilateral REQUEST SCC until loading-complete t
     'firstleg/src/main/java/com/baiyue/firstleg/client/PrintableOrderInboundClient.java'
   ])
   assert.ok(stronglyConnectedComponents(graphEdges('REQUEST')).some(component =>
-    component.includes('firstleg-service') && component.includes('order-service')))
+    component.includes('firstleg-service') && component.includes('order-service')
+      && component.includes('finance-service')))
 })
 
 test('known user entries expose every longest simple REQUEST path over the two-hop budget', () => {
@@ -246,13 +248,13 @@ test('known user entries expose every longest simple REQUEST path over the two-h
       'iam-service->auth-service',
       'iam-service->warehouse-service'
     ] },
-    'order-service': { hops: 4, paths: [
-      'order-service->firstleg-service->file-service->iam-service->auth-service',
-      'order-service->firstleg-service->file-service->iam-service->warehouse-service'
+    'order-service': { hops: 5, paths: [
+      'order-service->finance-service->firstleg-service->file-service->iam-service->auth-service',
+      'order-service->finance-service->firstleg-service->file-service->iam-service->warehouse-service'
     ] },
-    'firstleg-service': { hops: 4, paths: [
-      'firstleg-service->order-service->file-service->iam-service->auth-service',
-      'firstleg-service->order-service->file-service->iam-service->warehouse-service'
+    'firstleg-service': { hops: 5, paths: [
+      'firstleg-service->order-service->finance-service->file-service->iam-service->auth-service',
+      'firstleg-service->order-service->finance-service->file-service->iam-service->warehouse-service'
     ] },
     'finance-service': { hops: 5, paths: [
       'finance-service->firstleg-service->order-service->file-service->iam-service->auth-service',
diff --git a/warehouse-overseas-service/AGENTS.md b/warehouse-overseas-service/AGENTS.md
index 9fb3d57f7..9da3839df 100644
--- a/warehouse-overseas-service/AGENTS.md
+++ b/warehouse-overseas-service/AGENTS.md
@@ -15,7 +15,7 @@
 | 内部资源锁定、释放、报废 | `controller/InternalWarehouseResourceLockController.java` |
 | PDA 托盘状态流转与补偿 | `controller/InternalPdaPalletTransitionController.java`、`service/WarehousePalletTransitionService.java`、`mapper/WarehousePalletTransitionMapper.java`；内部前缀 `/internal/v1/pda-pallet-transitions` |
 | 托盘解析与业务绑定 | `controller/InternalWarehousePalletController.java`、`dto/WarehousePalletResolveResponse.java`、`entity/WarehousePalletBindingEntity.java` |
-| 柜级入库计划批量托盘 | `controller/InternalWarehousePalletBatchController.java`、`service/WarehousePalletBatchService.java`、`warehouse-pallet-batch-internal-v1.yaml`；以稳定批次键幂等执行 `ensure-reserved → confirm`，只从可预留真实托盘/库位建立逐项资源锁；Lastleg 本地计划事务失败时仅补偿仍为 `RESERVED` 的未确认资源，已 `CONFIRMED` 批次不得回退，同柜重放不得产生第二批资源 |
+| 柜级入库计划批量托盘 | `controller/InternalWarehousePalletBatchController.java`、`service/WarehousePalletBatchService.java`、`warehouse-pallet-batch-internal-v1.yaml`；以稳定批次键幂等执行 `ensure-reserved → confirm`，权威托盘码已存在且资源可预留时必须复用，未提供或不存在时才创建；Lastleg 本地计划事务失败时仅补偿仍为 `RESERVED` 的未确认资源，已 `CONFIRMED` 批次不得回退，同柜重放不得产生第二批资源 |
 | 仓储资源服务 | `service/WarehouseResourceService.java`、`WarehouseResourceLockService.java` |
 | 内部服务令牌 | `security/InternalServiceTokenGuard.java` |
 | 数据库基线与中文注释契约 | `src/main/resources/db/warehouse.sql`、`src/test/java/com/baiyue/warehouse/schema/SchemaChineseCommentContractTest.java` |
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/mapper/WarehouseResourceLockMapper.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/mapper/WarehouseResourceLockMapper.java
index 8ededdeaa..7bd67e1a1 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/mapper/WarehouseResourceLockMapper.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/mapper/WarehouseResourceLockMapper.java
@@ -21,11 +21,18 @@ public interface WarehouseResourceLockMapper extends BaseMapper<WarehouseResourc
     @Select("SELECT * FROM wh_resource_lock WHERE customer_id=#{customerId} AND id=#{id} LIMIT 1 FOR UPDATE")
     WarehouseResourceLockEntity lockById(@Param("customerId") long customerId, @Param("id") long id);
 
+    @Select("SELECT * FROM wh_resource_lock WHERE id=#{id} LIMIT 1 FOR UPDATE")
+    WarehouseResourceLockEntity lockAnyById(@Param("id") long id);
+
     @Select("SELECT * FROM wh_resource_lock WHERE customer_id=#{customerId} AND pallet_id=#{palletId} " +
         "AND status='ACTIVE' ORDER BY locked_at DESC LIMIT 1")
     WarehouseResourceLockEntity findActiveByPallet(@Param("customerId") long customerId,
                                                     @Param("palletId") long palletId);
 
+    @Select("SELECT * FROM wh_resource_lock WHERE pallet_id=#{palletId} AND status='ACTIVE' " +
+        "ORDER BY locked_at DESC LIMIT 1")
+    WarehouseResourceLockEntity findAnyActiveByPallet(@Param("palletId") long palletId);
+
     @Update("""
         UPDATE wh_pallet
         SET status = 'OCCUPIED', location_id = #{locationId}, updated_at = CURRENT_TIMESTAMP(3), version = version + 1
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseResourceLockRepository.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseResourceLockRepository.java
index f5a06df50..b479a6943 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseResourceLockRepository.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseResourceLockRepository.java
@@ -26,10 +26,16 @@ public class WarehouseResourceLockRepository {
         return locks.lockById(customerId, lockId);
     }
 
+    public WarehouseResourceLockEntity findAny(long lockId) { return locks.lockAnyById(lockId); }
+
     public WarehouseResourceLockEntity findActiveByPallet(long customerId, long palletId) {
         return locks.findActiveByPallet(customerId, palletId);
     }
 
+    public WarehouseResourceLockEntity findAnyActiveByPallet(long palletId) {
+        return locks.findAnyActiveByPallet(palletId);
+    }
+
     public WarehousePalletEntity findPallet(long customerId, long palletId) {
         return pallets.selectOne(new LambdaQueryWrapper<WarehousePalletEntity>()
             .eq(WarehousePalletEntity::getCustomerId, PUBLIC_RESOURCE_SCOPE)
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseResourceRepository.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseResourceRepository.java
index 2cac2c33d..ac973e401 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseResourceRepository.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseResourceRepository.java
@@ -130,6 +130,13 @@ public class WarehouseResourceRepository {
             .orderByAsc(WarehousePalletEntity::getId));
     }
 
+    public WarehousePalletEntity findPublicPalletByCode(long warehouseId, String palletCode) {
+        return pallets.selectOne(new LambdaQueryWrapper<WarehousePalletEntity>()
+            .eq(WarehousePalletEntity::getCustomerId, 0L)
+            .eq(WarehousePalletEntity::getWarehouseId, warehouseId)
+            .eq(WarehousePalletEntity::getPalletCode, palletCode));
+    }
+
     public WarehousePalletEntity findPublicPallet(long palletId) {
         return pallets.selectOne(new LambdaQueryWrapper<WarehousePalletEntity>()
             .eq(WarehousePalletEntity::getCustomerId, 0L).eq(WarehousePalletEntity::getId, palletId));
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehousePalletBatchService.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehousePalletBatchService.java
index 0f6c9b495..0672f1689 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehousePalletBatchService.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehousePalletBatchService.java
@@ -32,6 +32,8 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.HexFormat;
 import java.util.List;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
@@ -81,16 +83,28 @@ public class WarehousePalletBatchService {
         }
 
         List<WarehousePalletBatchItemEntity> created = new ArrayList<>();
+        Map<String, SharedReservation> sharedDropship = new LinkedHashMap<>();
         for (WarehousePalletBatchRequests.Item requested : normalized.items()) {
-            Long palletId = resources.createPallet(WarehouseResourceService.PUBLIC_RESOURCE_SCOPE,
-                normalized.warehouseId(), new PalletRequests.SaveRequest(requested.palletCode(), "WOOD",
-                    AUTO_PALLET_CAPACITY_CBM, AUTO_PALLET_UNIT_PRICE_USD, "IDLE", null, AUTO_PALLET_REMARK,
-                    requested.fbaWarehouseCode()));
-            WarehousePalletEntity pallet = resources.pallet(WarehouseResourceService.PUBLIC_RESOURCE_SCOPE,
-                normalized.warehouseId(), palletId);
-            WarehouseResourceLockResponse lock = locks.reserve(new WarehouseResourceLockRequests.ReserveRequest(
-                requested.customerId(), normalized.warehouseId(), pallet.getId(), pallet.getLocationId(),
-                BUSINESS_TYPE, requested.businessKey(), reservationKey(batch, requested.sequenceNo())));
+            SharedReservation shared = isDropshipPallet(requested.palletCode())
+                ? sharedDropship.get(requested.palletCode()) : null;
+            if (shared == null) {
+                WarehousePalletEntity createdPallet = resources.reusablePublicPallet(
+                    normalized.warehouseId(), requested.palletCode());
+                if (createdPallet == null) {
+                    Long palletId = resources.createPallet(WarehouseResourceService.PUBLIC_RESOURCE_SCOPE,
+                        normalized.warehouseId(), new PalletRequests.SaveRequest(requested.palletCode(), "WOOD",
+                            AUTO_PALLET_CAPACITY_CBM, AUTO_PALLET_UNIT_PRICE_USD, "IDLE", null, AUTO_PALLET_REMARK,
+                            requested.fbaWarehouseCode()));
+                    createdPallet = resources.pallet(WarehouseResourceService.PUBLIC_RESOURCE_SCOPE,
+                        normalized.warehouseId(), palletId);
+                }
+                WarehouseResourceLockResponse lock = locks.reserve(new WarehouseResourceLockRequests.ReserveRequest(
+                    requested.customerId(), normalized.warehouseId(), createdPallet.getId(), createdPallet.getLocationId(),
+                    BUSINESS_TYPE, requested.businessKey(), reservationKey(batch, requested.sequenceNo())));
+                shared = new SharedReservation(createdPallet, lock.lockId());
+                if (isDropshipPallet(requested.palletCode())) sharedDropship.put(requested.palletCode(), shared);
+            }
+            WarehousePalletEntity pallet = shared.pallet();
 
             WarehousePalletBatchItemEntity item = new WarehousePalletBatchItemEntity();
             item.setId(IdWorker.getId());
@@ -103,7 +117,7 @@ public class WarehousePalletBatchService {
             item.setPalletId(pallet.getId());
             item.setPalletCode(pallet.getPalletCode());
             item.setLocationId(pallet.getLocationId());
-            item.setResourceLockId(lock.lockId());
+            item.setResourceLockId(shared.lockId());
             item.setStatus("RESERVED");
             item.setCreatedAt(LocalDateTime.now());
             item.setUpdatedAt(item.getCreatedAt());
@@ -127,13 +141,14 @@ public class WarehousePalletBatchService {
             throw conflict("Only a RESERVED pallet batch can be confirmed");
         }
         for (WarehousePalletBatchItemEntity item : batchItems) {
-            var lock = lockRecords.find(item.getCustomerId(), item.getResourceLockId());
+            var lock = isDropshipPallet(item.getPalletCode())
+                ? lockRecords.findAny(item.getResourceLockId())
+                : lockRecords.find(item.getCustomerId(), item.getResourceLockId());
             if (lock == null || !"ACTIVE".equals(lock.getStatus())
                 || !Objects.equals(lock.getWarehouseId(), batch.getWarehouseId())
                 || !Objects.equals(lock.getPalletId(), item.getPalletId())
                 || !Objects.equals(lock.getLocationId(), item.getLocationId())
-                || !BUSINESS_TYPE.equals(lock.getBusinessType())
-                || !item.getBusinessKey().equals(lock.getBusinessId())) {
+                || !BUSINESS_TYPE.equals(lock.getBusinessType())) {
                 throw conflict("Inbound plan pallet reservation is no longer active");
             }
             WarehousePalletBindingEntity binding = repository.lockPalletBinding(item.getCustomerId(),
@@ -177,13 +192,22 @@ public class WarehousePalletBatchService {
         if (!"RESERVED".equals(batch.getStatus())) {
             throw conflict("Confirmed or subsequently occupied pallets cannot be compensated");
         }
+        Set<Long> releasedLocks = new HashSet<>();
         for (WarehousePalletBatchItemEntity item : batchItems) {
             WarehousePalletBindingEntity binding = repository.lockPalletBinding(item.getCustomerId(),
                 batch.getWarehouseId(), BUSINESS_TYPE, item.getBusinessKey());
             if (binding != null && Objects.equals(binding.getPalletId(), item.getPalletId())) {
                 throw conflict("A bound inbound plan pallet cannot be compensated");
             }
-            locks.release(item.getCustomerId(), item.getResourceLockId());
+            if (releasedLocks.add(item.getResourceLockId())) {
+                long lockCustomerId = item.getCustomerId();
+                if (isDropshipPallet(item.getPalletCode())) {
+                    var lock = lockRecords.findAny(item.getResourceLockId());
+                    if (lock == null) throw conflict("Inbound plan pallet resource lock was not found");
+                    lockCustomerId = lock.getCustomerId();
+                }
+                locks.release(lockCustomerId, item.getResourceLockId());
+            }
             item.setStatus("RELEASED");
             item.setUpdatedAt(LocalDateTime.now());
             items.updateById(item);
@@ -208,12 +232,17 @@ public class WarehousePalletBatchService {
                 throw conflict("Inbound plan pallet business key became bound after compensation");
             }
         }
+        Map<Long, WarehouseResourceLockResponse> reactivated = new LinkedHashMap<>();
         for (WarehousePalletBatchItemEntity item : batchItems) {
             WarehousePalletEntity pallet = resources.pallet(WarehouseResourceService.PUBLIC_RESOURCE_SCOPE,
                 batch.getWarehouseId(), item.getPalletId());
-            WarehouseResourceLockResponse lock = locks.reserve(new WarehouseResourceLockRequests.ReserveRequest(
-                item.getCustomerId(), batch.getWarehouseId(), pallet.getId(), item.getLocationId(), BUSINESS_TYPE,
-                item.getBusinessKey(), reservationKey(batch.getId(), attempt, item.getSequenceNo())));
+            WarehouseResourceLockResponse lock = reactivated.get(pallet.getId());
+            if (lock == null) {
+                lock = locks.reserve(new WarehouseResourceLockRequests.ReserveRequest(
+                    item.getCustomerId(), batch.getWarehouseId(), pallet.getId(), item.getLocationId(), BUSINESS_TYPE,
+                    item.getBusinessKey(), reservationKey(batch.getId(), attempt, item.getSequenceNo())));
+                reactivated.put(pallet.getId(), lock);
+            }
             item.setResourceLockId(lock.lockId());
             item.setStatus("RESERVED");
             item.setUpdatedAt(LocalDateTime.now());
@@ -341,6 +370,10 @@ public class WarehousePalletBatchService {
 
     private static int number(Integer value) { return value == null ? 0 : value; }
     private static String trim(String value) { return value == null || value.isBlank() ? null : value.trim(); }
+    private static boolean isDropshipPallet(String palletCode) {
+        return palletCode != null && palletCode.trim().toUpperCase(java.util.Locale.ROOT).startsWith("DP");
+    }
+    private record SharedReservation(WarehousePalletEntity pallet, long lockId) { }
     private static String required(String value, String message) {
         String normalized = trim(value);
         if (normalized == null) throw badRequest(message);
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceLockService.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceLockService.java
index b3ef444ff..cf00e7907 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceLockService.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceLockService.java
@@ -106,8 +106,12 @@ public class WarehouseResourceLockService {
             throw new BizException(ResultCode.CONFLICT, "Only an OCCUPIED pallet can be scrapped after shipment");
         }
         WarehouseResourceLockEntity lock = repository.findActiveByPallet(customerId, palletId);
+        if (lock == null && pallet.getPalletCode() != null
+            && pallet.getPalletCode().toUpperCase(java.util.Locale.ROOT).startsWith("DP-")) {
+            lock = repository.findAnyActiveByPallet(palletId);
+        }
         if (lock != null) {
-            scrap(customerId, lock.getId());
+            scrap(lock.getCustomerId(), lock.getId());
         } else if (repository.scrapPalletWithoutLock(customerId, palletId) != 1) {
             throw new BizException(ResultCode.CONFLICT, "Pallet state changed concurrently");
         }
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceService.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceService.java
index 724e8540e..407991006 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceService.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceService.java
@@ -214,6 +214,12 @@ public class WarehouseResourceService {
         return palletReference(pallet);
     }
 
+    public WarehousePalletEntity reusablePublicPallet(long warehouseId, String palletCode) {
+        if (!StringUtils.hasText(palletCode)) return null;
+        requireWarehouseReference(warehouseId);
+        return repository.findPublicPalletByCode(warehouseId, palletCode.trim());
+    }
+
     public WarehousePalletResolveResponse resolvePublicPallet(long palletId) {
         WarehousePalletEntity pallet = repository.findPublicPallet(palletId);
         if (pallet == null) throw new BizException(ResultCode.NOT_FOUND, "托盘不存在");
diff --git a/warehouse-overseas-service/src/main/resources/db/warehouse.sql b/warehouse-overseas-service/src/main/resources/db/warehouse.sql
index 9d041e1b9..fa42e96cb 100644
--- a/warehouse-overseas-service/src/main/resources/db/warehouse.sql
+++ b/warehouse-overseas-service/src/main/resources/db/warehouse.sql
@@ -106,7 +106,7 @@ CREATE TABLE IF NOT EXISTS wh_pallet_business_binding (
   business_type VARCHAR(32) NOT NULL COMMENT '业务类型', business_id VARCHAR(128) NOT NULL COMMENT '绑定业务记录ID',
   pallet_id BIGINT NOT NULL COMMENT '托盘ID', created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   PRIMARY KEY (id), UNIQUE KEY uk_wh_pallet_binding (customer_id,warehouse_id,business_type,business_id),
-  UNIQUE KEY uk_wh_pallet_binding_pallet (pallet_id)
+  KEY idx_wh_pallet_binding_pallet (pallet_id)
 ) ENGINE=InnoDB COMMENT='托盘业务绑定关系';
 
 CREATE TABLE IF NOT EXISTS wh_pallet_operation (
@@ -166,7 +166,7 @@ CREATE TABLE IF NOT EXISTS wh_pallet_batch_item (
   PRIMARY KEY (id),
   UNIQUE KEY uk_wh_pallet_batch_item_business (customer_id,warehouse_id,business_key),
   UNIQUE KEY uk_wh_pallet_batch_item_sequence (batch_id,sequence_no),
-  UNIQUE KEY uk_wh_pallet_batch_item_pallet (pallet_id),
+  KEY idx_wh_pallet_batch_item_pallet (pallet_id),
   KEY idx_wh_pallet_batch_item_batch (batch_id,status)
 ) ENGINE=InnoDB COMMENT='柜级入库计划批量托盘明细与资源锁关联';
 
diff --git a/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/schema/WarehousePalletBatchContractTest.java b/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/schema/WarehousePalletBatchContractTest.java
index 9d252a6f5..1ae2df1e7 100644
--- a/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/schema/WarehousePalletBatchContractTest.java
+++ b/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/schema/WarehousePalletBatchContractTest.java
@@ -21,7 +21,9 @@ class WarehousePalletBatchContractTest {
                 .contains("confirm_command_hash CHAR(64)")
                 .contains("compensate_command_hash CHAR(64)")
                 .contains("business_key VARCHAR(100)")
-                .contains("pallet_code VARCHAR(64)");
+                .contains("pallet_code VARCHAR(64)")
+                .contains("KEY idx_wh_pallet_batch_item_pallet (pallet_id)")
+                .doesNotContain("UNIQUE KEY uk_wh_pallet_batch_item_pallet (pallet_id)");
         }
     }
 
diff --git a/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/WarehousePalletBatchServiceTest.java b/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/WarehousePalletBatchServiceTest.java
index ab3f2b447..58dcb1bbe 100644
--- a/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/WarehousePalletBatchServiceTest.java
+++ b/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/WarehousePalletBatchServiceTest.java
@@ -86,6 +86,26 @@ class WarehousePalletBatchServiceTest {
             .containsExactly("container:plan-a:1", "container:plan-b:2");
     }
 
+    @Test
+    void oneDropshipPalletSharedByMultipleCustomersUsesOnePhysicalResourceAndLock() {
+        when(batches.insertIgnore(any())).thenReturn(1);
+        when(resources.createPallet(anyLong(), anyLong(), any())).thenReturn(301L);
+        when(resources.pallet(0L, WAREHOUSE, 301L)).thenReturn(pallet(301L, 401L, "DP-260910-0001"));
+        when(locks.reserve(any())).thenReturn(lockResponse(CUSTOMER_A, 501L));
+        var request = new WarehousePalletBatchRequests.EnsureReserved(WAREHOUSE, "dropship-container", List.of(
+            new WarehousePalletBatchRequests.Item(CUSTOMER_A, "container:dropship-a:1", "PLAN-A", 1,
+                "STANDARD", null, "DP-260910-0001"),
+            new WarehousePalletBatchRequests.Item(CUSTOMER_B, "container:dropship-b:2", "PLAN-B", 2,
+                "STANDARD", null, "DP-260910-0001")));
+
+        var response = service.ensureReserved(request);
+
+        assertThat(response.items()).extracting(value -> value.palletId()).containsOnly(301L);
+        assertThat(response.items()).extracting(value -> value.resourceLockId()).containsOnly(501L);
+        verify(resources, times(1)).createPallet(anyLong(), anyLong(), any());
+        verify(locks, times(1)).reserve(any());
+    }
+
     @Test
     void missingSourcePalletCodeUsesWarehouseGeneratedPhysicalCode() {
         when(batches.insertIgnore(any())).thenReturn(1);
@@ -112,6 +132,25 @@ class WarehousePalletBatchServiceTest {
         assertThat(response.items()).extracting(value -> value.palletCode()).containsExactly("PAL-301");
     }
 
+    @Test
+    void compensatedSourcePalletCodeReusesTheExistingIdlePhysicalPallet() {
+        when(batches.insertIgnore(any())).thenReturn(1);
+        WarehousePalletEntity existing = pallet(301L, 401L, "DP-260910-0001");
+        existing.setStatus("IDLE");
+        when(resources.reusablePublicPallet(WAREHOUSE, "DP-260910-0001")).thenReturn(existing);
+        when(locks.reserve(any())).thenReturn(lockResponse(CUSTOMER_A, 501L));
+        var request = new WarehousePalletBatchRequests.EnsureReserved(WAREHOUSE, "retry-container", List.of(
+            new WarehousePalletBatchRequests.Item(CUSTOMER_A, "container:dropship-a:1", "PLAN-A", 1,
+                "STANDARD", null, "DP-260910-0001")));
+
+        var response = service.ensureReserved(request);
+
+        assertThat(response.items()).extracting(value -> value.palletId()).containsExactly(301L);
+        assertThat(response.items()).extracting(value -> value.palletCode()).containsExactly("DP-260910-0001");
+        verify(resources, never()).createPallet(anyLong(), anyLong(), any());
+        verify(locks).reserve(any());
+    }
+
     @Test
     void concurrentSameRequestReplaysWinningBatchWithoutCreatingResources() {
         AtomicReference<WarehousePalletBatchEntity> inserted = new AtomicReference<>();
diff --git a/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/WarehouseResourceLockServiceTest.java b/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/WarehouseResourceLockServiceTest.java
index a5420b4ba..2ce1ad2e1 100644
--- a/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/WarehouseResourceLockServiceTest.java
+++ b/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/WarehouseResourceLockServiceTest.java
@@ -219,6 +219,29 @@ class WarehouseResourceLockServiceTest {
         verify(repository).scrapPalletAtVirtualLocation(lock);
     }
 
+    @Test
+    void sharedDropshipPalletIsScrappedThroughItsActualLockOwner() {
+        WarehousePalletEntity pallet = pallet("OCCUPIED");
+        pallet.setPalletCode("DP-260910-0001");
+        pallet.setWarehouseId(WAREHOUSE);
+        pallet.setLocationId(LOCATION);
+        WarehouseResourceLockEntity lock = activeLock();
+        lock.setCustomerId(TENANT + 1);
+        when(repository.findPallet(TENANT, PALLET)).thenReturn(pallet);
+        when(repository.findAnyActiveByPallet(PALLET)).thenReturn(lock);
+        when(repository.find(TENANT + 1, lock.getId())).thenReturn(lock);
+        WarehouseLocationEntity virtual = location("ACTIVE");
+        virtual.setLocationType("VIRTUAL");
+        when(repository.findLocation(TENANT + 1, WAREHOUSE, LOCATION)).thenReturn(virtual);
+        when(repository.scrapPalletAtVirtualLocation(lock)).thenReturn(1);
+        when(repository.close(lock, "SCRAPPED")).thenReturn(1);
+
+        assertThat(service.scrapByPallet(TENANT, PALLET).status()).isEqualTo("SCRAPPED");
+
+        verify(repository).findAnyActiveByPallet(PALLET);
+        verify(repository).find(TENANT + 1, lock.getId());
+    }
+
     @Test
     void scrapByPalletIsIdempotentWhenAlreadyScrapped() {
         WarehousePalletEntity pallet = pallet("SCRAPPED");
diff --git a/warehouse/AGENTS.md b/warehouse/AGENTS.md
index 5e9a9083f..c8bd3761c 100644
--- a/warehouse/AGENTS.md
+++ b/warehouse/AGENTS.md
@@ -12,7 +12,7 @@
 
 | 目标 | 入口 |
 |---|---|
-| 仓库/地址/能力 | `controller/PlatformWarehouseController.java`、`MerchantWarehouseController.java`、`service/WarehouseApplicationService.java` |
+| 仓库/地址/能力 | `controller/PlatformWarehouseController.java`、`MerchantWarehouseController.java`、`service/WarehouseApplicationService.java`；国内 PDA 仓库目录由 `InternalWarehouseController.java` 的 `/internal/warehouses/domestic` 提供给 Firstleg |
 | FBA 目的仓公共主数据与 Admin 候选 | 权威表 `wh_warehouse` 的 `tenant_id=0 + warehouse_type=FBA` 记录；Admin 直接调用 `GET /api/platform/v1/warehouse-admin?warehouseType=FBA&status=ACTIVE&page=1&size=200`，权限 `platform:warehouse:list`，DTO `WarehouseSummaryResponse` 的 `id/warehouseCode/warehouseName/status/countryCode/primaryAddress.stateProvince` 分别作为 ID/编码/名称/状态/国家/区域 |
 | FBA 目的仓内部校验 | `InternalWarehouseController.java` 的 `GET /internal/warehouses/0/{warehouseId}/active`，使用内部服务令牌返回 `WarehouseDetailResponse`；调用方仍须校验 `warehouseType=FBA` 及 ID/编码/名称一致，不得把 `OVERSEAS` 实际收货仓或 `DOMESTIC` 中转仓当作 FBA 目的仓 |
 | 公共海外收货仓内部目录 | `controller/InternalWarehouseController.java` 的 `/internal/warehouses/shared-overseas`、`/shared-overseas/{warehouseId}`，响应 `dto/SharedOverseasWarehouseResponse.java`；只返回平台公共 `OVERSEAS + ACTIVE + RECEIVING` 仓，供海外资源服务按 warehouseId 引用 |
diff --git a/warehouse/scripts/warehouse-public-master-data-contract.test.mjs b/warehouse/scripts/warehouse-public-master-data-contract.test.mjs
index 4693fa5d4..55eeb0d4d 100644
--- a/warehouse/scripts/warehouse-public-master-data-contract.test.mjs
+++ b/warehouse/scripts/warehouse-public-master-data-contract.test.mjs
@@ -95,7 +95,19 @@ assert.deepEqual(fixedWarehouses.map((row) => row.timezone), [
   'UTC-8',
   'UTC-5',
 ])
-assert.ok(fixedWarehouses.every((row) => row.address_line1.includes('待维护') || row.address_line1.includes('pending maintenance')))
+assert.deepEqual(
+  fixedWarehouses.filter((row) => row.warehouse_type === 'OVERSEAS').map((row) => ({
+    warehouse_code: row.warehouse_code,
+    state_province: row.state_province,
+    city: row.city,
+    postal_code: row.postal_code,
+    address_line1: row.address_line1,
+  })),
+  [
+    { warehouse_code: 'US-LAX-01', state_province: 'California', city: 'Rancho Cucamonga', postal_code: '91730', address_line1: '10767 7th Street' },
+    { warehouse_code: 'US-NYC-01', state_province: 'New Jersey', city: 'Edison', postal_code: '08817', address_line1: 'Door 13-14, 75 Carter Dr' },
+  ],
+)
 
 assert.match(sql, /CREATE TEMPORARY TABLE tmp_wh_fixed_platform_warehouse/)
 assert.match(sql, /'CN-YIWU-01','义乌仓','DOMESTIC','CN','UTC\+8'/)
diff --git a/warehouse/src/main/java/com/baiyue/warehouse/controller/InternalWarehouseController.java b/warehouse/src/main/java/com/baiyue/warehouse/controller/InternalWarehouseController.java
index 5cb2fce13..b6fddbb0e 100644
--- a/warehouse/src/main/java/com/baiyue/warehouse/controller/InternalWarehouseController.java
+++ b/warehouse/src/main/java/com/baiyue/warehouse/controller/InternalWarehouseController.java
@@ -4,6 +4,7 @@ import com.baiyue.common.core.api.ApiResponse;
 import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.warehouse.dto.WarehouseDetailResponse;
+import com.baiyue.warehouse.dto.DomesticWarehouseOptionResponse;
 import com.baiyue.warehouse.dto.OverseasPartnerWarehouseResponse;
 import com.baiyue.warehouse.dto.SharedOverseasWarehouseResponse;
 import com.baiyue.warehouse.service.WarehouseApplicationService;
@@ -49,6 +50,13 @@ public class InternalWarehouseController {
         return ApiResponse.success(service.activeOverseasPartners());
     }
 
+    @GetMapping("/domestic")
+    public ApiResponse<List<DomesticWarehouseOptionResponse>> domesticWarehouses(
+            @RequestHeader(value="X-Internal-Service-Token", required=false) String token) {
+        verifyToken(token);
+        return ApiResponse.success(service.activeDomesticWarehouses());
+    }
+
     @GetMapping("/shared-overseas")
     public ApiResponse<List<SharedOverseasWarehouseResponse>> sharedOverseasWarehouses(
             @RequestHeader(value="X-Internal-Service-Token", required=false) String token) {
diff --git a/warehouse/src/main/java/com/baiyue/warehouse/dto/DomesticWarehouseOptionResponse.java b/warehouse/src/main/java/com/baiyue/warehouse/dto/DomesticWarehouseOptionResponse.java
new file mode 100644
index 000000000..88aa7b2dd
--- /dev/null
+++ b/warehouse/src/main/java/com/baiyue/warehouse/dto/DomesticWarehouseOptionResponse.java
@@ -0,0 +1,11 @@
+package com.baiyue.warehouse.dto;
+
+import com.baiyue.warehouse.entity.WarehouseEntity;
+
+/** 国内 PDA 可选择的启用仓库主档。 */
+public record DomesticWarehouseOptionResponse(Long id, String warehouseCode, String warehouseName) {
+    public static DomesticWarehouseOptionResponse of(WarehouseEntity warehouse) {
+        return new DomesticWarehouseOptionResponse(
+            warehouse.getId(), warehouse.getWarehouseCode(), warehouse.getWarehouseName());
+    }
+}
diff --git a/warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseApplicationService.java b/warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseApplicationService.java
index d6abc3986..0a3dd7d29 100644
--- a/warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseApplicationService.java
+++ b/warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseApplicationService.java
@@ -6,6 +6,7 @@ import com.baiyue.common.core.api.PageResult;
 import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.warehouse.dto.WarehouseDetailResponse;
+import com.baiyue.warehouse.dto.DomesticWarehouseOptionResponse;
 import com.baiyue.warehouse.dto.WarehouseRequests;
 import com.baiyue.warehouse.dto.OverseasPartnerWarehouseResponse;
 import com.baiyue.warehouse.dto.WarehouseSummaryResponse;
@@ -96,6 +97,14 @@ public class WarehouseApplicationService {
             .toList();
     }
 
+    public List<DomesticWarehouseOptionResponse> activeDomesticWarehouses() {
+        return repository.findActiveByType(WarehouseSaveNormalizer.PUBLIC_TENANT_ID,
+                WarehouseSaveNormalizer.TYPE_DOMESTIC)
+            .stream()
+            .map(DomesticWarehouseOptionResponse::of)
+            .toList();
+    }
+
     public List<SharedOverseasWarehouseResponse> activeSharedOverseasWarehouses() {
         return repository.findActiveByType(WarehouseSaveNormalizer.PUBLIC_TENANT_ID,
                 WarehouseSaveNormalizer.TYPE_OVERSEAS)
diff --git a/warehouse/src/main/resources/db/master-data/platform-fixed-warehouses.csv b/warehouse/src/main/resources/db/master-data/platform-fixed-warehouses.csv
index 82ae74c36..c31a2a01a 100644
--- a/warehouse/src/main/resources/db/master-data/platform-fixed-warehouses.csv
+++ b/warehouse/src/main/resources/db/master-data/platform-fixed-warehouses.csv
@@ -1,5 +1,5 @@
 warehouse_id_seed,address_id_seed,warehouse_code,warehouse_name,warehouse_type,country_code,timezone,state_province,city,postal_code,address_line1,note
 193000000000200001,193000000000300001,CN-YIWU-01,义乌仓,DOMESTIC,CN,UTC+8,浙江省,义乌市,322000,义乌仓通用地址待维护,按用户确认生成通用格式；后续运营可维护真实地址。
 193000000000200002,193000000000300002,CN-DONGGUAN-01,东莞仓,DOMESTIC,CN,UTC+8,广东省,东莞市,523000,东莞仓通用地址待维护,按用户确认生成通用格式；后续运营可维护真实地址。
-193000000000200003,193000000000300003,US-LAX-01,洛杉矶仓,OVERSEAS,US,UTC-8,CA,Los Angeles,90001,Los Angeles warehouse generic address pending maintenance,按用户确认生成通用格式；后续运营可维护真实地址。
-193000000000200004,193000000000300004,US-NYC-01,纽约仓,OVERSEAS,US,UTC-5,NY,New York,10001,New York warehouse generic address pending maintenance,按用户确认生成通用格式；后续运营可维护真实地址。
+193000000000200003,193000000000300003,US-LAX-01,洛杉矶仓,OVERSEAS,US,UTC-8,California,Rancho Cucamonga,91730,10767 7th Street,用户确认的真实海外仓地址。
+193000000000200004,193000000000300004,US-NYC-01,纽约仓,OVERSEAS,US,UTC-5,New Jersey,Edison,08817,"Door 13-14, 75 Carter Dr",用户确认的真实海外仓地址。
diff --git a/warehouse/src/main/resources/db/phase2-pallet-seed.sql b/warehouse/src/main/resources/db/phase2-pallet-seed.sql
index 69c6aa626..d40c77f8b 100644
--- a/warehouse/src/main/resources/db/phase2-pallet-seed.sql
+++ b/warehouse/src/main/resources/db/phase2-pallet-seed.sql
@@ -16,7 +16,8 @@ ON DUPLICATE KEY UPDATE
  capacity_cbm=VALUES(capacity_cbm),
  weight_kg=VALUES(weight_kg),
  color=VALUES(color),
- remark=VALUES(remark);
+ remark=VALUES(remark),
+ deleted=0;
 
 DROP PROCEDURE IF EXISTS assert_domestic_pallet_seed;
 DELIMITER //
@@ -38,6 +39,14 @@ BEGIN
  ) THEN
    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='国内作业仓木托盘、塑料托盘初始化不完整';
  END IF;
+ IF (SELECT COUNT(*)
+       FROM wh_pallet
+      WHERE tenant_id=0
+        AND deleted=0
+        AND ((warehouse_id=190000000000000001 AND pallet_code IN ('TP-001','YW-TP-002'))
+          OR (warehouse_id=190000000000000002 AND pallet_code IN ('TP-002','DG-TP-002')))) <> 4 THEN
+   SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='国内作业仓固定可复用托盘编码初始化不完整';
+ END IF;
 END//
 DELIMITER ;
 CALL assert_domestic_pallet_seed();
diff --git a/warehouse/src/main/resources/db/warehouse-public-master-data.sql b/warehouse/src/main/resources/db/warehouse-public-master-data.sql
index 7751b86ca..8875427c2 100644
--- a/warehouse/src/main/resources/db/warehouse-public-master-data.sql
+++ b/warehouse/src/main/resources/db/warehouse-public-master-data.sql
@@ -30,8 +30,8 @@ INSERT INTO tmp_wh_fixed_platform_warehouse
 VALUES
 (193000000000200001,193000000000300001,'CN-YIWU-01','义乌仓','DOMESTIC','CN','UTC+8','浙江省','义乌市','322000','义乌仓通用地址待维护'),
 (193000000000200002,193000000000300002,'CN-DONGGUAN-01','东莞仓','DOMESTIC','CN','UTC+8','广东省','东莞市','523000','东莞仓通用地址待维护'),
-(193000000000200003,193000000000300003,'US-LAX-01','洛杉矶仓','OVERSEAS','US','UTC-8','CA','Los Angeles','90001','Los Angeles warehouse generic address pending maintenance'),
-(193000000000200004,193000000000300004,'US-NYC-01','纽约仓','OVERSEAS','US','UTC-5','NY','New York','10001','New York warehouse generic address pending maintenance');
+(193000000000200003,193000000000300003,'US-LAX-01','洛杉矶仓','OVERSEAS','US','UTC-8','California','Rancho Cucamonga','91730','10767 7th Street'),
+(193000000000200004,193000000000300004,'US-NYC-01','纽约仓','OVERSEAS','US','UTC-5','New Jersey','Edison','08817','Door 13-14, 75 Carter Dr');
 
 DROP PROCEDURE IF EXISTS assert_wh_fixed_platform_warehouse_seed;
 DELIMITER //
diff --git a/warehouse/src/test/java/com/baiyue/warehouse/controller/InternalWarehouseControllerTest.java b/warehouse/src/test/java/com/baiyue/warehouse/controller/InternalWarehouseControllerTest.java
index f246fcd69..5aa71a2b7 100644
--- a/warehouse/src/test/java/com/baiyue/warehouse/controller/InternalWarehouseControllerTest.java
+++ b/warehouse/src/test/java/com/baiyue/warehouse/controller/InternalWarehouseControllerTest.java
@@ -3,6 +3,7 @@ package com.baiyue.warehouse.controller;
 import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.warehouse.dto.WarehouseDetailResponse;
+import com.baiyue.warehouse.dto.DomesticWarehouseOptionResponse;
 import com.baiyue.warehouse.dto.OverseasPartnerWarehouseResponse;
 import com.baiyue.warehouse.dto.SharedOverseasWarehouseResponse;
 import com.baiyue.warehouse.entity.WarehouseEntity;
@@ -85,6 +86,17 @@ class InternalWarehouseControllerTest {
         verify(service).activeOverseasPartners();
     }
 
+    @Test
+    void listsActiveDomesticWarehouseOptionsForInternalCallers() {
+        var option = new DomesticWarehouseOptionResponse(200001L, "CN-DONGGUAN-01", "东莞仓");
+        when(service.activeDomesticWarehouses()).thenReturn(List.of(option));
+
+        var response = controller.domesticWarehouses(INTERNAL_TOKEN);
+
+        assertThat(response.data()).containsExactly(option);
+        verify(service).activeDomesticWarehouses();
+    }
+
     @Test
     void exposesSharedOverseasReceivingDirectoryOnlyWithInternalToken() {
         var warehouse = new SharedOverseasWarehouseResponse(200003L, "US-LAX-01",
diff --git a/warehouse/src/test/java/com/baiyue/warehouse/repository/InitialWarehouseResourceSeedSqlContractTest.java b/warehouse/src/test/java/com/baiyue/warehouse/repository/InitialWarehouseResourceSeedSqlContractTest.java
index 9e09034f1..e2dd761f1 100644
--- a/warehouse/src/test/java/com/baiyue/warehouse/repository/InitialWarehouseResourceSeedSqlContractTest.java
+++ b/warehouse/src/test/java/com/baiyue/warehouse/repository/InitialWarehouseResourceSeedSqlContractTest.java
@@ -27,6 +27,7 @@ class InitialWarehouseResourceSeedSqlContractTest {
     }
 
     private static void assertSeed(String sql, String yiwuId, String dongguanId, String idPrefix) {
+        String compactSql = sql.replaceAll("\\s+", "");
         int locationSeedStart = sql.indexOf("WHEN zones.zone_index = 0 AND slots.slot_number = 1 THEN 201");
         int locationSeedEnd = sql.indexOf("DROP PROCEDURE IF EXISTS assert_yiwu_location_seed", locationSeedStart);
         String locationSeed = sql.substring(locationSeedStart, locationSeedEnd);
@@ -37,6 +38,7 @@ class InitialWarehouseResourceSeedSqlContractTest {
             .contains("0," + dongguanId + ",'DG-TP-002','木托盘'")
             .contains("COUNT(DISTINCT pallet.pallet_type)")
             .contains("国内作业仓木托盘、塑料托盘初始化不完整")
+            .contains("固定可复用托盘编码初始化不完整")
             .doesNotContain("'胶托盘'")
             .contains("WHEN zones.zone_index = 0 AND slots.slot_number = 1 THEN 201")
             .contains("ELSE 203 + zones.zone_index * 15 + slots.slot_number")
@@ -55,6 +57,7 @@ class InitialWarehouseResourceSeedSqlContractTest {
             .contains("'AVAILABLE'")
             .doesNotContain("INSERT INTO wh_location_reservation")
             .doesNotContain("INSERT INTO wh_location_occupancy");
+        assertThat(compactSql).contains("remark=VALUES(remark),deleted=0;");
         assertThat(locationSeed)
             .doesNotContain("status='AVAILABLE'")
             .doesNotContain("status = 'AVAILABLE'")