优化

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

@@ -7,7 +7,6 @@ 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认证',
-  scope VARCHAR(20) NULL COMMENT '订舱分类范围：DOMESTIC/INTERNATIONAL',
   region VARCHAR(80) NOT NULL COMMENT '地区',
   legal_representative VARCHAR(80) NOT NULL COMMENT '法人代表',
   contact_name VARCHAR(80) NOT NULL COMMENT '联系人',
@@ -30,7 +29,6 @@ CREATE TABLE IF NOT EXISTS wh_supplier (
   KEY idx_wh_supplier_filter (tenant_id,category,status,region),
   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_scope CHECK ((category='BOOKING' AND scope IN ('DOMESTIC','INTERNATIONAL')) OR (category<>'BOOKING' AND scope IS NULL)),
   CONSTRAINT chk_wh_supplier_status CHECK (status IN ('ACTIVE','INACTIVE')),
   CONSTRAINT chk_wh_supplier_settlement CHECK (settlement_period IN ('MONTHLY_30','MONTHLY_45','MONTHLY_60','MONTHLY_90','PER_TRANSACTION','IMMEDIATE'))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='平台公共供应商业务档案';
@@ -46,7 +44,6 @@ BEGIN
   END IF;
 END$$
 DELIMITER ;
-CALL supplier_add_column_if_missing('scope', "VARCHAR(20) NULL COMMENT '订舱分类范围：DOMESTIC/INTERNATIONAL' AFTER category");
 CALL supplier_add_column_if_missing('license_file_id', "VARCHAR(128) NULL COMMENT 'File服务营业执照文件ID' AFTER business_license_no");
 CALL supplier_add_column_if_missing('created_by', "BIGINT UNSIGNED NULL COMMENT '创建人ID'");
 CALL supplier_add_column_if_missing('created_at', "DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间'");
@@ -73,7 +70,6 @@ END$$
 DELIMITER ;
 CALL supplier_add_check_if_missing('chk_wh_supplier_category', "category IN ('BOOKING','CUSTOMS','TRUCKING','CERTIFICATE')");
 CALL supplier_add_check_if_missing('chk_wh_supplier_tenant', "tenant_id = 0");
-CALL supplier_add_check_if_missing('chk_wh_supplier_scope', "(category='BOOKING' AND scope IN ('DOMESTIC','INTERNATIONAL')) OR (category<>'BOOKING' AND scope IS NULL)");
 CALL supplier_add_check_if_missing('chk_wh_supplier_status', "status IN ('ACTIVE','INACTIVE')");
 CALL supplier_add_check_if_missing('chk_wh_supplier_settlement', "settlement_period IN ('MONTHLY_30','MONTHLY_45','MONTHLY_60','MONTHLY_90','PER_TRANSACTION','IMMEDIATE')");
 DROP PROCEDURE supplier_add_check_if_missing;
@@ -84,7 +80,7 @@ CREATE PROCEDURE assert_supplier_schema()
 BEGIN
   IF (SELECT COUNT(*) FROM information_schema.tables WHERE table_schema='baiyue_warehouse' AND table_name='wh_supplier') <> 1
      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(*) 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_scope','chk_wh_supplier_status','chk_wh_supplier_settlement')) <> 5 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')) <> 4 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='供应商表、索引或约束初始化不完整';
   END IF;
 END$$

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

@@ -45,7 +45,6 @@
 | `page` | integer | 否 | 默认 `1`，最小 `1` |
 | `size` | integer | 否 | 默认 `20`，范围 `1..200` |
 | `category` | enum | 否 | 供应商分类 |
-| `scope` | enum | 否 | 仅订舱分类适用 |
 | `region` | string | 否 | 地区精确匹配，最长 80 |
 | `status` | enum | 否 | 合作状态 |
 | `keyword` | string | 否 | 按供应商名称或联系人模糊匹配 |
@@ -72,7 +71,6 @@
 | `tenantId` | string | 固定为 `0` |
 | `name` | string | 供应商名称，平台内唯一 |
 | `category` | enum | 分类 |
-| `scope` | enum/null | 订舱供应商必填；其他分类为 `null` |
 | `region` | string | 地区 |
 | `legalRepresentative` | string | 法人代表 |
 | `contactName` | string | 联系人 |
@@ -101,7 +99,6 @@
 {
   "name": "示例供应商有限公司",
   "category": "BOOKING",
-  "scope": "DOMESTIC",
   "region": "宁波",
   "legalRepresentative": "张三",
   "contactName": "李经理",
@@ -116,7 +113,7 @@
 }
 ```
 
-必填字段：`name`、`category`、`region`、`legalRepresentative`、`contactName`、`phone`、`status`、`settlementPeriod`。`BOOKING` 时 `scope` 必填；其他分类 `scope` 必须传 `null` 或省略。
+必填字段：`name`、`category`、`region`、`legalRepresentative`、`contactName`、`phone`、`status`、`settlementPeriod`。订舱供应商不区分国内或国外。
 
 新增成功的 `data` 是供应商 ID 字符串。编辑成功的 `data` 为 `null`。
 
@@ -152,13 +149,6 @@
 | `TRUCKING` | 拖车 |
 | `CERTIFICATE` | 证书 |
 
-订舱范围：
-
-| 值 | 展示文案 |
-|---|---|
-| `DOMESTIC` | 国内 |
-| `INTERNATIONAL` | 国外 |
-
 合作状态：
 
 | 值 | 展示文案 |
@@ -187,7 +177,7 @@
 | `A0403` | 非平台用户或缺少对应权限 | 显示无权限 |
 | `A0404` | 供应商不存在 | 提示记录不存在并刷新列表 |
 | `A0409` | 供应商名称重复或并发唯一键冲突 | 保留表单并提示名称已存在 |
-| `A0422` | 字段校验失败、订舱范围规则不满足 | 使用 `message`/`data` 显示字段错误 |
+| `A0422` | 字段校验失败 | 使用 `message`/`data` 显示字段错误 |
 | `S0500` | 未预期服务异常 | 展示通用错误并记录 `requestId/traceId` |
 | `S0503` | Warehouse 数据库不可用 | 展示稍后重试并记录 `requestId/traceId` |
 

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

@@ -11,7 +11,6 @@ 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: scope, in: query, description: 仅订舱供应商适用, schema: { $ref: '#/components/schemas/Scope' } }
         - { name: region, in: query, schema: { type: string } }
         - { name: status, in: query, schema: { $ref: '#/components/schemas/Status' } }
         - { name: keyword, in: query, description: 供应商名称或联系人, schema: { type: string } }
@@ -57,13 +56,12 @@ paths:
   /internal/warehouse/v1/suppliers/{supplierId}:
     get:
       summary: 内部服务查询并校验供应商快照
-      description: 仅服务间调用，需 X-Internal-Service-Token；不经 Gateway。可要求 ACTIVE，并校验类别与订舱范围。
+      description: 仅服务间调用，需 X-Internal-Service-Token；不经 Gateway。可要求 ACTIVE，并校验供应商类别。
       security: [{ internalServiceToken: [] }]
       parameters:
         - { name: supplierId, in: path, required: true, schema: { type: integer, format: int64, minimum: 1 } }
         - { name: requireActive, in: query, schema: { type: boolean, default: false } }
         - { name: category, in: query, schema: { $ref: '#/components/schemas/Category' } }
-        - { name: scope, in: query, schema: { $ref: '#/components/schemas/Scope' } }
       responses:
         '200': { description: 成功, content: { application/json: { schema: { $ref: '#/components/schemas/InternalSnapshotResponse' } } } }
         '403': { $ref: '#/components/responses/Forbidden' }
@@ -74,7 +72,6 @@ components:
     RequiredTenantId: { name: tenantId, in: query, required: true, schema: { type: integer, format: int64, enum: [0] } }
   schemas:
     Category: { type: string, enum: [BOOKING, CUSTOMS, TRUCKING, CERTIFICATE] }
-    Scope: { type: string, enum: [DOMESTIC, INTERNATIONAL] }
     Status: { type: string, enum: [ACTIVE, INACTIVE] }
     SupplierSave:
       type: object
@@ -82,7 +79,6 @@ components:
       properties:
         name: { type: string, maxLength: 160 }
         category: { $ref: '#/components/schemas/Category' }
-        scope: { $ref: '#/components/schemas/Scope', description: BOOKING 必填，其他分类必须为空 }
         region: { type: string, maxLength: 80 }
         legalRepresentative: { type: string, maxLength: 80 }
         contactName: { type: string, maxLength: 80 }
@@ -140,7 +136,6 @@ components:
         supplierId: { type: integer, format: int64 }
         name: { type: string }
         category: { $ref: '#/components/schemas/Category' }
-        scope: { $ref: '#/components/schemas/Scope' }
         status: { $ref: '#/components/schemas/Status' }
     InternalSnapshotResponse:
       allOf: [{ $ref: '#/components/schemas/ApiResponse' }, { type: object, properties: { data: { $ref: '#/components/schemas/InternalSnapshot' } } }]