fix(lastleg): route all relabel pickups directly to outbound and verify final schemas

lastleg-service/src/main/resources/db/appointment-work.sql

@@ -1,21 +1,21 @@
 -- DDL proposal only. The coordinator must integrate the approved baseline; do not execute from this task.
 CREATE TABLE IF NOT EXISTS ll_dispatch_appointment_allocation (
-  dispatch_id BIGINT NOT NULL,
-  dispatch_item_id BIGINT NOT NULL,
-  plan_pallet_id BIGINT NOT NULL,
-  batch_key VARCHAR(96) NOT NULL,
-  customer_id VARCHAR(64) NOT NULL,
-  source_key VARCHAR(160) NOT NULL,
-  destination_key VARCHAR(160) NOT NULL,
-  package_count INT NOT NULL,
+  dispatch_id BIGINT NOT NULL COMMENT '排车单标识',
+  dispatch_item_id BIGINT NOT NULL COMMENT '排车明细标识',
+  plan_pallet_id BIGINT NOT NULL COMMENT '入仓计划托盘标识',
+  batch_key VARCHAR(96) NOT NULL COMMENT '预约稳定批次键',
+  customer_id VARCHAR(64) NOT NULL COMMENT '所属客户标识',
+  source_key VARCHAR(160) NOT NULL COMMENT '货物来源稳定键',
+  destination_key VARCHAR(160) NOT NULL COMMENT '目的地稳定键',
+  package_count INT NOT NULL COMMENT '本票分配实物箱数',
   PRIMARY KEY(dispatch_item_id,batch_key,source_key,destination_key),
   KEY idx_dispatch_appointment_batch(batch_key,customer_id),
   KEY idx_dispatch_appointment_dispatch(dispatch_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='排车实物与预约批次逐票分配，原执行域事实';
 CREATE TABLE IF NOT EXISTS ll_appointment_work_commitment (
-  entity_key VARCHAR(160) NOT NULL,
+  entity_key VARCHAR(160) NOT NULL COMMENT '原业务实体稳定键',
   state_json LONGTEXT NOT NULL COMMENT '原业务命令产生的只读语义影响基线，不是第二份可编辑计划',
-  impact_version BIGINT NOT NULL DEFAULT 0,
+  impact_version BIGINT NOT NULL DEFAULT 0 COMMENT '承诺影响单调递增版本',
   PRIMARY KEY (entity_key)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='工作事项承诺影响审计基线';
 CREATE TABLE IF NOT EXISTS ll_appointment_work_guard (

lastleg-service/src/main/resources/db/lastleg.sql

@@ -2210,6 +2210,7 @@ CREATE TABLE IF NOT EXISTS ll_warehouse_transfer_source_order (
 ) ENGINE=InnoDB COMMENT='转仓来源历史订单绑定';
 
 CREATE TABLE IF NOT EXISTS ll_warehouse_transfer_item (
+  declared_quantity BIGINT NULL COMMENT 'SKU申报件数，非预计或实收箱数',
   id BIGINT NOT NULL COMMENT '主键ID', transfer_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) NOT NULL COMMENT '产品中文名称',
   package_count INT NOT NULL COMMENT '箱数', shipping_mark VARCHAR(255) NULL COMMENT '运输唛头',
@@ -2218,8 +2219,21 @@ CREATE TABLE IF NOT EXISTS ll_warehouse_transfer_item (
 ) ENGINE=InnoDB COMMENT='转仓货物冻结明细';
 
 CREATE TABLE IF NOT EXISTS ll_warehouse_transfer_carton (
+  length_cm DECIMAL(12,2) NULL COMMENT '箱子实测长度厘米',
+  width_cm DECIMAL(12,2) NULL COMMENT '箱子实测宽度厘米',
+  height_cm DECIMAL(12,2) NULL COMMENT '箱子实测高度厘米',
+  gross_weight_kg DECIMAL(12,2) NULL COMMENT '箱子实测重量千克',
+  counted_quantity BIGINT NULL COMMENT '箱内SKU实点件数',
+  count_idempotency_key VARCHAR(255) NULL COMMENT '箱内清点幂等键',
+  count_request_hash VARCHAR(64) NULL COMMENT '箱内清点请求摘要',
+  counted_by VARCHAR(128) NULL COMMENT '箱内清点操作人',
+  counted_at DATETIME(3) NULL COMMENT '箱内清点完成时间',
+  discrepancy_reason VARCHAR(1000) NULL COMMENT '实收与预报箱数差异原因',
+  transfer_pallet_id BIGINT NULL COMMENT '签收箱所属转运托盘事实ID',
+  sku_items_json JSON NULL COMMENT '实收箱内SKU及逐项件数明细',
   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',
+  customer_carton_mark VARCHAR(255) NULL COMMENT '客户原箱唛，用于换标现场绑定',
   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 '创建时间',
@@ -2370,7 +2384,7 @@ 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快递；仅涉及箱唛换标时必填',
+  delivery_method VARCHAR(32) NULL COMMENT '派送方式：TRUCK平台卡车、EXPRESS快递、PICKUP自提、AMAZON_PICKUP亚马逊自提、CUSTOMER_PICKUP客户自提；仅平台卡车进入预排车',
   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 '客户上传面单文件名',
@@ -2407,7 +2421,7 @@ CREATE TABLE IF NOT EXISTS ll_relabel_application (
 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='delivery_method'), 'SELECT 1', 'ALTER TABLE ll_relabel_application ADD COLUMN delivery_method VARCHAR(32) NULL COMMENT ''派送方式：TRUCK平台卡车、EXPRESS快递、PICKUP自提、AMAZON_PICKUP亚马逊自提、CUSTOMER_PICKUP客户自提；仅平台卡车进入预排车'' 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;
@@ -2662,6 +2676,8 @@ CREATE TABLE IF NOT EXISTS ll_cargo_discard_item (
   UNIQUE KEY uk_ll_discard_position_sku(application_id,inventory_position_id,sku_code),
   KEY idx_ll_cargo_discard_item_list(customer_id,application_id),
   KEY idx_ll_cargo_discard_item_inbound(customer_id,inbound_code,sku_code)
+,
+  KEY idx_ll_cargo_discard_return_carton(customer_id,return_carton_id)
 ) ENGINE=InnoDB COMMENT='货物废弃SKU明细';
 
 CREATE TABLE IF NOT EXISTS ll_cargo_discard_carton (
@@ -3981,21 +3997,21 @@ CREATE TABLE ll_selfop_sku_profile (
 
 -- PDA cargo discard photo evidence
 CREATE TABLE IF NOT EXISTS ll_cargo_discard_photo (
-  id BIGINT NOT NULL,
-  customer_id VARCHAR(64) NOT NULL,
-  application_id BIGINT NOT NULL,
-  pallet_no VARCHAR(128) NOT NULL,
-  file_id BIGINT NOT NULL,
-  file_name VARCHAR(255) NOT NULL,
-  content_type VARCHAR(128) NOT NULL,
-  size_bytes BIGINT NOT NULL,
-  operator_id VARCHAR(64) NOT NULL,
-  created_at DATETIME(6) NOT NULL,
-  submitted_at DATETIME(6) NULL,
+  id BIGINT NOT NULL COMMENT '照片记录标识',
+  customer_id VARCHAR(64) NOT NULL COMMENT '所属客户标识',
+  application_id BIGINT NOT NULL COMMENT '废弃申请标识',
+  pallet_no VARCHAR(128) NOT NULL COMMENT '托盘业务码',
+  file_id BIGINT NOT NULL COMMENT '照片文件标识',
+  file_name VARCHAR(255) NOT NULL COMMENT '原始文件名',
+  content_type VARCHAR(128) NOT NULL COMMENT '文件媒体类型',
+  size_bytes BIGINT NOT NULL COMMENT '文件字节数',
+  operator_id VARCHAR(64) NOT NULL COMMENT '上传操作人标识',
+  created_at DATETIME(6) NOT NULL COMMENT '照片创建时间',
+  submitted_at DATETIME(6) NULL COMMENT '照片提交时间',
   PRIMARY KEY (id),
   UNIQUE KEY uk_cargo_discard_photo_file (file_id),
   KEY idx_cargo_discard_photo_application (customer_id, application_id, pallet_no)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='海外PDA货物废弃照片凭证';
 
 CREATE TABLE ll_selfop_owner (
   id BIGINT NOT NULL COMMENT '主键',
@@ -4154,22 +4170,22 @@ PREPARE transfer_sku_stmt FROM @ddl; EXECUTE transfer_sku_stmt; DEALLOCATE PREPA
 -- Appointment work scope, audit and physical batch allocation.
 USE baiyue_lastleg;
 CREATE TABLE IF NOT EXISTS ll_dispatch_appointment_allocation (
-  dispatch_id BIGINT NOT NULL,
-  dispatch_item_id BIGINT NOT NULL,
-  plan_pallet_id BIGINT NOT NULL,
-  batch_key VARCHAR(96) NOT NULL,
-  customer_id VARCHAR(64) NOT NULL,
-  source_key VARCHAR(160) NOT NULL,
-  destination_key VARCHAR(160) NOT NULL,
-  package_count INT NOT NULL,
+  dispatch_id BIGINT NOT NULL COMMENT '排车单标识',
+  dispatch_item_id BIGINT NOT NULL COMMENT '排车明细标识',
+  plan_pallet_id BIGINT NOT NULL COMMENT '入仓计划托盘标识',
+  batch_key VARCHAR(96) NOT NULL COMMENT '预约稳定批次键',
+  customer_id VARCHAR(64) NOT NULL COMMENT '所属客户标识',
+  source_key VARCHAR(160) NOT NULL COMMENT '货物来源稳定键',
+  destination_key VARCHAR(160) NOT NULL COMMENT '目的地稳定键',
+  package_count INT NOT NULL COMMENT '本票分配实物箱数',
   PRIMARY KEY(dispatch_item_id,batch_key,source_key,destination_key),
   KEY idx_dispatch_appointment_batch(batch_key,customer_id),
   KEY idx_dispatch_appointment_dispatch(dispatch_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='排车实物与预约批次逐票分配，原执行域事实';
 CREATE TABLE IF NOT EXISTS ll_appointment_work_commitment (
-  entity_key VARCHAR(160) NOT NULL,
+  entity_key VARCHAR(160) NOT NULL COMMENT '原业务实体稳定键',
   state_json LONGTEXT NOT NULL COMMENT '原业务命令产生的只读语义影响基线，不是第二份可编辑计划',
-  impact_version BIGINT NOT NULL DEFAULT 0,
+  impact_version BIGINT NOT NULL DEFAULT 0 COMMENT '承诺影响单调递增版本',
   PRIMARY KEY (entity_key)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='工作事项承诺影响审计基线';
 CREATE TABLE IF NOT EXISTS ll_appointment_work_guard (

lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml

@@ -1710,7 +1710,7 @@ paths:
         '200': { description: 客户换标申请分页, content: { application/json: { schema: { $ref: '#/components/schemas/RelabelMerchantPageResponse' } } } }
     post:
       summary: 创建客户换标申请
-      description: 权限 merchant:overseas-warehouse:relabel:create；申请创建即冻结对应库存。一张申请只能选择一种换标类型，所有 items.operationType 必须一致；不同类型混合提交返回业务参数错误且不冻结库存。SKU_LABEL 不要求派送方式；CARTON_LABEL/CARTON_AND_SKU 必须指定 TRUCK、PICKUP 或 EXPRESS。
+      description: 权限 merchant:overseas-warehouse:relabel:create；申请创建即冻结对应库存。一张申请只能选择一种换标类型，所有 items.operationType 必须一致；不同类型混合提交返回业务参数错误且不冻结库存。SKU_LABEL 不要求派送方式；CARTON_LABEL/CARTON_AND_SKU 必须指定 TRUCK、EXPRESS、PICKUP、AMAZON_PICKUP 或 CUSTOMER_PICKUP。
       security: [{ bearerAuth: [] }]
       requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/RelabelCreate' } } } }
       responses:
@@ -1791,7 +1791,7 @@ paths:
   /api/merchant/v1/last-leg/relabel-applications/{relabelNo}/confirm-completion:
     post:
       summary: 客户确认换标完成
-      description: 权限 merchant:overseas-warehouse:relabel:confirm；仅 CUSTOMER_CONFIRM_PENDING 可确认。TRUCK 进入 WAIT_PRE_DISPATCH，PICKUP/EXPRESS 幂等生成 RELABEL_OUTBOUND 出库单；EXPRESS 且要求打印面单时必须先上传面单。
+      description: 权限 merchant:overseas-warehouse:relabel:confirm；仅 CUSTOMER_CONFIRM_PENDING 可确认，确认前复验实际托盘绑定，仓库手动完工不豁免该门禁。普通库存箱唛换标必须绑定实际托盘；退货整箱 EXPRESS、PICKUP、AMAZON_PICKUP、CUSTOMER_PICKUP 可不组托但仍校验全箱 SKU 数量。只有平台卡车 TRUCK 进入 WAIT_PRE_DISPATCH；EXPRESS 与全部自提方式幂等生成 RELABEL_OUTBOUND 出库单和 PDA 出库任务，不进入预排车候选，直接预排请求也拒绝。已分配仓储转运保持原转运出库链，不生成独立出库。EXPRESS 且要求打印面单时必须先上传面单。
       security: [{ bearerAuth: [] }]
       parameters: [{ name: relabelNo, in: path, required: true, schema: { type: string, maxLength: 64 } }]
       requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/RelabelCustomerConfirm' } } } }
@@ -3154,7 +3154,7 @@ components:
         notifiedPackageCount: { type: integer }
         productNameZh: { type: string, description: 明细非空中文品名按原顺序去重并以顿号连接 }
         labelRequirement: { type: string, description: 明细非空贴标要求按原顺序去重并以中文分号连接 }
-        deliveryMethod: { type: string, nullable: true, enum: [TRUCK, PICKUP, EXPRESS] }
+        deliveryMethod: { type: string, nullable: true, enum: [TRUCK, EXPRESS, PICKUP, AMAZON_PICKUP, CUSTOMER_PICKUP], description: 仅TRUCK进入平台预排车；快递及全部自提直接创建出库任务 }
         printShippingLabel: { type: boolean }
         shippingLabelFileId: { type: string, nullable: true }
         fulfillmentStatus: { type: string, nullable: true, enum: [WAIT_RELABEL, WAIT_PRE_DISPATCH, WAIT_TRANSFER_OUTBOUND, READY_FOR_OUTBOUND, OUTBOUND_CREATED, OUTBOUNDED, COMPLETED] }
@@ -3293,7 +3293,7 @@ components:
         chargeAmount: { type: number, nullable: true, minimum: 0.01, description: 本次贴标费用（CNY）；未传时不冻结或结算资金 }
         remark: { type: string, nullable: true, maxLength: 1000 }
         idempotencyKey: { type: string, maxLength: 255 }
-        deliveryMethod: { type: string, nullable: true, enum: [TRUCK, EXPRESS, AMAZON_PICKUP, CUSTOMER_PICKUP, PICKUP], description: 只换箱唛或SKU与箱唛同时换时必填；只换SKU时不传 }
+        deliveryMethod: { type: string, nullable: true, enum: [TRUCK, EXPRESS, AMAZON_PICKUP, CUSTOMER_PICKUP, PICKUP], description: 只换箱唛或SKU与箱唛同时换时必填；只换SKU时不传；仅TRUCK进入平台预排车，其余方式直接创建出库任务 }
         printShippingLabel: { type: boolean, default: false, description: 仅快递派送可选，客户确认前必须已上传面单 }
         items: { type: array, minItems: 1, maxItems: 500, items: { $ref: '#/components/schemas/RelabelItem' } }
     RelabelItem:

lastleg-service/src/main/resources/openapi/overseas-pda-operations-v1.yaml

@@ -858,8 +858,8 @@ components:
       type: object
       required: [relabelNo, applicationStatus, operationType, taskStatus, expectedPackages, relabelledPackages, skippedPackages, exceptionPackages, version, completionPhotoFileIds, items, unitFacts, history]
       properties:
-        deliveryMethod: { type: string, nullable: true, description: 申请真实运输方式，留仓为空 }
-        requiresPalletBinding: { type: boolean, description: 退货任务仅TRUCK为true，留仓及快递为false }
+        deliveryMethod: { type: string, nullable: true, enum: [TRUCK, EXPRESS, PICKUP, AMAZON_PICKUP, CUSTOMER_PICKUP], description: 申请真实运输方式，纯SKU留仓为空；只有平台卡车TRUCK进入预排车，快递和所有自提直接创建出库任务 }
+        requiresPalletBinding: { type: boolean, description: 普通库存箱唛或混合换标须实际托盘绑定；退货整箱EXPRESS、PICKUP、AMAZON_PICKUP、CUSTOMER_PICKUP不要求排车组托，TRUCK要求；纯SKU留仓为空派送方式时不要求组托 }
         relabelNo: { type: string }
         customerOrderNo: { type: string, nullable: true }
         labelDeadline: { type: string, format: date-time, nullable: true }