优化

warehouse/src/main/resources/db/warehouse-supplier.sql

@@ -1,4 +1,4 @@
--- 平台公共供应商业务档案。可用于空库初始化，也可重复执行升级存量结构。
+-- 平台公共供应商最新初始化基线。拖车类型必填，不推断或回填测试存量。
 USE baiyue_warehouse;
 SET NAMES utf8mb4;
 
@@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS wh_supplier (
   tenant_id BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '平台公共作用域，固定为0',
   name VARCHAR(160) NOT NULL COMMENT '供应商名称',
   category VARCHAR(20) NOT NULL COMMENT '供应商类别：BOOKING订舱、CUSTOMS报关、TRUCKING拖车、CERTIFICATE认证',
+  trucking_scope VARCHAR(16) NULL COMMENT '拖车类型：DOMESTIC国内拖车、OVERSEAS海外车队；非拖车为空',
   region VARCHAR(80) NOT NULL COMMENT '地区',
   legal_representative VARCHAR(80) NOT NULL COMMENT '法人代表',
   contact_name VARCHAR(80) NOT NULL COMMENT '联系人',
@@ -26,7 +27,8 @@ CREATE TABLE IF NOT EXISTS wh_supplier (
   version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本',
   PRIMARY KEY (id),
   UNIQUE KEY uk_wh_supplier_name (tenant_id,name),
-  KEY idx_wh_supplier_filter (tenant_id,category,status,region),
+  KEY idx_wh_supplier_filter (tenant_id,category,trucking_scope,status,region),
+  CONSTRAINT chk_wh_supplier_trucking_scope CHECK ((category = 'TRUCKING' AND trucking_scope IS NOT NULL AND trucking_scope IN ('DOMESTIC','OVERSEAS')) OR (category <> 'TRUCKING' AND trucking_scope IS NULL)),
   CONSTRAINT chk_wh_supplier_category CHECK (category IN ('BOOKING','CUSTOMS','TRUCKING','CERTIFICATE')),
   CONSTRAINT chk_wh_supplier_tenant CHECK (tenant_id = 0),
   CONSTRAINT chk_wh_supplier_status CHECK (status IN ('ACTIVE','INACTIVE')),
@@ -67,7 +69,7 @@ DROP PROCEDURE supplier_add_column_if_missing;
 
 SET @supplier_index_ddl=IF(EXISTS(SELECT 1 FROM information_schema.statistics WHERE table_schema='baiyue_warehouse' AND table_name='wh_supplier' AND index_name='uk_wh_supplier_name'),'SELECT 1','ALTER TABLE wh_supplier ADD UNIQUE KEY uk_wh_supplier_name (tenant_id,name)');
 PREPARE supplier_statement FROM @supplier_index_ddl; EXECUTE supplier_statement; DEALLOCATE PREPARE supplier_statement;
-SET @supplier_index_ddl=IF(EXISTS(SELECT 1 FROM information_schema.statistics WHERE table_schema='baiyue_warehouse' AND table_name='wh_supplier' AND index_name='idx_wh_supplier_filter'),'SELECT 1','ALTER TABLE wh_supplier ADD KEY idx_wh_supplier_filter (tenant_id,category,status,region)');
+SET @supplier_index_ddl=IF(EXISTS(SELECT 1 FROM information_schema.statistics WHERE table_schema='baiyue_warehouse' AND table_name='wh_supplier' AND index_name='idx_wh_supplier_filter'),'SELECT 1','ALTER TABLE wh_supplier ADD KEY idx_wh_supplier_filter (tenant_id,category,trucking_scope,status,region)');
 PREPARE supplier_statement FROM @supplier_index_ddl; EXECUTE supplier_statement; DEALLOCATE PREPARE supplier_statement;
 
 DROP PROCEDURE IF EXISTS supplier_add_check_if_missing;
@@ -95,7 +97,7 @@ BEGIN
      OR (SELECT COUNT(DISTINCT index_name) FROM information_schema.statistics WHERE table_schema='baiyue_warehouse' AND table_name='wh_supplier' AND index_name IN ('PRIMARY','uk_wh_supplier_name','idx_wh_supplier_filter')) <> 3
      OR (SELECT COUNT(DISTINCT index_name) FROM information_schema.statistics WHERE table_schema='baiyue_warehouse' AND table_name='wh_supplier_carrier' AND index_name IN ('PRIMARY','idx_wh_supplier_carrier_code')) <> 2
      OR (SELECT COUNT(*) FROM information_schema.table_constraints WHERE table_schema='baiyue_warehouse' AND table_name='wh_supplier_carrier' AND constraint_type='CHECK' AND constraint_name IN ('chk_wh_supplier_carrier_tenant','chk_wh_supplier_carrier_code')) <> 2
-     OR (SELECT COUNT(*) FROM information_schema.table_constraints WHERE table_schema='baiyue_warehouse' AND table_name='wh_supplier' AND constraint_type='CHECK' AND constraint_name IN ('chk_wh_supplier_category','chk_wh_supplier_tenant','chk_wh_supplier_status','chk_wh_supplier_settlement')) <> 4 THEN
+     OR (SELECT COUNT(*) FROM information_schema.table_constraints WHERE table_schema='baiyue_warehouse' AND table_name='wh_supplier' AND constraint_type='CHECK' AND constraint_name IN ('chk_wh_supplier_category','chk_wh_supplier_tenant','chk_wh_supplier_status','chk_wh_supplier_settlement','chk_wh_supplier_trucking_scope')) <> 5 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='供应商表、索引或约束初始化不完整';
   END IF;
 END$$

warehouse/src/main/resources/openapi/supplier-frontend-handoff.md

@@ -48,6 +48,7 @@
 | `page` | integer | 否 | 默认 `1`，最小 `1` |
 | `size` | integer | 否 | 默认 `20`，范围 `1..200` |
 | `category` | enum | 否 | 供应商分类 |
+| `truckingScope` | enum | 否 | DOMESTIC 国内拖车或 OVERSEAS 海外车队；拖车业务候选必须按对应类型筛选 |
 | `region` | string | 否 | 地区精确匹配，最长 80 |
 | `status` | enum | 否 | 合作状态 |
 | `keyword` | string | 否 | 按供应商名称或联系人模糊匹配 |
@@ -119,7 +120,7 @@
 }
 ```
 
-必填字段：`name`、`category`、`region`、`legalRepresentative`、`contactName`、`phone`、`status`、`settlementPeriod`。`BOOKING` 必须提交至少一个去重后的 `carrierCodes`；非 `BOOKING` 可不提交该字段或提交空数组，提交非空数组返回 `A0400`。订舱供应商不区分国内或国外。
+必填字段：`name`、`category`、`region`、`legalRepresentative`、`contactName`、`phone`、`status`、`settlementPeriod`。`BOOKING` 必须提交至少一个去重后的 `carrierCodes`；非 `BOOKING` 可不提交该字段或提交空数组，提交非空数组返回 `A0400`。订舱供应商不区分国内或国外。拖车供应商必须单选 `truckingScope=DOMESTIC`（国内拖车）或 `OVERSEAS`（海外车队），非拖车类别为空。列表、详情和内部快照返回该字段，国内拖车预约仅可用 DOMESTIC，清关提柜仅可用 OVERSEAS；导入模板版本3的“拖车类型（TRUCKING必填）”列填写相同枚举。
 
 Admin 订舱供应商候选固定复用分页接口：`GET /api/platform/v1/suppliers?category=BOOKING&status=ACTIVE&carrierCode=MATSON&page=1&size=200`，权限为 `platform:supplier:list`，响应为 `PageResult<Supplier>`。服务端完成关联过滤，前端不得先拉全量再自行过滤。
 

warehouse/src/main/resources/openapi/supplier-v1.yaml

@@ -11,6 +11,7 @@ paths:
         - { 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: category, in: query, schema: { $ref: '#/components/schemas/Category' } }
+        - { name: truckingScope, in: query, schema: { type: string, enum: [DOMESTIC, OVERSEAS] }, description: 国内拖车或海外车队 }
         - { name: region, in: query, schema: { type: string } }
         - { name: status, in: query, schema: { $ref: '#/components/schemas/Status' } }
         - { name: keyword, in: query, description: 供应商名称或联系人, schema: { type: string } }
@@ -32,7 +33,7 @@ paths:
   /api/platform/v1/suppliers/import:
     post:
       summary: 原子批量导入供应商
-      description: 权限 platform:supplier:create；整批校验通过后才写入。BOOKING的多值船司编码在文件中使用逗号分隔，数据库始终保存为关联行。
+      description: 权限 platform:supplier:create；使用版本3模板，TRUCKING必须填写DOMESTIC或OVERSEAS拖车类型，其他类别留空；整批校验通过后才写入。BOOKING的多值船司编码在文件中使用逗号分隔，数据库始终保存为关联行。
       security: [{ bearerAuth: [] }]
       parameters: [{ $ref: '#/components/parameters/RequiredTenantId' }]
       requestBody: { required: true, content: { multipart/form-data: { schema: { type: object, required: [file], properties: { file: { type: string, format: binary } } } } } }
@@ -45,6 +46,7 @@ paths:
       parameters:
         - { $ref: '#/components/parameters/TenantId' }
         - { name: category, in: query, schema: { $ref: '#/components/schemas/Category' } }
+        - { name: truckingScope, in: query, schema: { type: string, enum: [DOMESTIC, OVERSEAS] }, description: 国内拖车或海外车队 }
         - { name: region, in: query, schema: { type: string } }
         - { name: status, in: query, schema: { $ref: '#/components/schemas/Status' } }
         - { name: keyword, in: query, schema: { type: string } }
@@ -84,7 +86,7 @@ paths:
   /internal/warehouse/v1/suppliers/{supplierId}/trucking-contact:
     get:
       summary: 内部查询码头车队收件资料
-      description: 固定校验TRUCKING类别与平台归属；取消旧车队请求允许requireActive=false。
+      description: 固定校验TRUCKING类别、OVERSEAS拖车类型与平台归属；取消旧车队请求允许requireActive=false。
       security: [{internalServiceToken: []}]
       parameters:
         - {name: supplierId, in: path, required: true, schema: {type: integer, format: int64, minimum: 1}}
@@ -134,6 +136,7 @@ components:
     RequiredTenantId: { name: tenantId, in: query, required: true, schema: { type: integer, format: int64, enum: [0] } }
   schemas:
     Category: { type: string, enum: [BOOKING, CUSTOMS, TRUCKING, CERTIFICATE] }
+    TruckingScope: { type: string, nullable: true, enum: [DOMESTIC, OVERSEAS], description: TRUCKING必选国内拖车DOMESTIC或海外车队OVERSEAS；非TRUCKING必须为空，不支持兼营 }
     CarrierCode: { type: string, enum: [MATSON, SML, ZIM, COSCO, EMC, HEDE, OTHER] }
     CarrierCodes: { type: array, uniqueItems: true, maxItems: 7, items: { $ref: '#/components/schemas/CarrierCode' }, description: BOOKING必填且至少一个；非BOOKING可省略或为空，提交非空数组返回A0400 }
     Status: { type: string, enum: [ACTIVE, INACTIVE] }
@@ -143,6 +146,7 @@ components:
       properties:
         name: { type: string, maxLength: 160 }
         category: { $ref: '#/components/schemas/Category' }
+        truckingScope: { $ref: '#/components/schemas/TruckingScope' }
         carrierCodes: { $ref: '#/components/schemas/CarrierCodes' }
         region: { type: string, maxLength: 80 }
         legalRepresentative: { type: string, maxLength: 80 }
@@ -202,6 +206,7 @@ components:
         supplierId: { type: integer, format: int64 }
         name: { type: string }
         category: { $ref: '#/components/schemas/Category' }
+        truckingScope: { $ref: '#/components/schemas/TruckingScope' }
         status: { $ref: '#/components/schemas/Status' }
         carrierCodes: { $ref: '#/components/schemas/CarrierCodes' }
     InternalSnapshotResponse: