一件代发拣货

2026-09-03 10:44:34 +08:00
parent cf77e19765
commit a3715f618f
40 changed files with 804 additions and 103 deletions
@@ -10,6 +10,7 @@ CREATE TABLE IF NOT EXISTS fl_customer_dimension_config (
  inner_width_cm DECIMAL(9,3) NOT NULL COMMENT '箱规内宽（厘米）',
  inner_height_cm DECIMAL(9,3) NOT NULL COMMENT '箱规内高（厘米）',
  edge_addition_cm DECIMAL(6,3) NOT NULL DEFAULT 2.000 COMMENT '每个尺寸方向的单侧加宽厘米数',
+  default_calculation_mode VARCHAR(16) NOT NULL DEFAULT 'ADD' COMMENT '订单外箱规默认计算方式：ADD或MULTIPLY',
  remark VARCHAR(500) NULL COMMENT '备注',
  initialization_key VARCHAR(128) NOT NULL COMMENT '创建流程幂等键及补偿归属',
  created_by BIGINT UNSIGNED NOT NULL COMMENT '创建人ID',
@@ -57,6 +57,7 @@ CREATE TABLE IF NOT EXISTS fl_customer_dimension_config (
  inner_width_cm DECIMAL(9,3) NOT NULL COMMENT '箱规内宽（厘米）',
  inner_height_cm DECIMAL(9,3) NOT NULL COMMENT '箱规内高（厘米）',
  edge_addition_cm DECIMAL(6,3) NOT NULL DEFAULT 2.000 COMMENT '每个尺寸方向的单侧加宽厘米数',
+  default_calculation_mode VARCHAR(16) NOT NULL DEFAULT 'ADD' COMMENT '订单外箱规默认计算方式：ADD或MULTIPLY',
  remark VARCHAR(500) NULL COMMENT '备注',
  initialization_key VARCHAR(128) NOT NULL COMMENT '创建流程幂等键及补偿归属',
  created_by BIGINT UNSIGNED NOT NULL COMMENT '创建人ID',
@@ -20,6 +20,10 @@ CALL phase2_fba_add_column('fl_inbound_order', 'carrier_id', "BIGINT UNSIGNED NU
 CALL phase2_fba_add_column('fl_inbound_order', 'carrier_name', "VARCHAR(128) NULL COMMENT '计费船司名称快照' AFTER carrier_id");
 CALL phase2_fba_add_column('fl_carrier_fba_rate', 'business_type', "VARCHAR(32) NOT NULL DEFAULT 'FBA' COMMENT '业务或计费类型' AFTER origin_warehouse_name");
 CALL phase2_fba_add_column('fl_customer_charge_rule', 'version', "INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号' AFTER deleted");
+CALL phase2_fba_add_column('fl_customer_charge_rule', 'length_factor', "DECIMAL(18,6) NOT NULL DEFAULT 1 COMMENT '长度计算系数' AFTER conversion_factor");
+CALL phase2_fba_add_column('fl_customer_charge_rule', 'width_factor', "DECIMAL(18,6) NOT NULL DEFAULT 1 COMMENT '宽度计算系数' AFTER length_factor");
+CALL phase2_fba_add_column('fl_customer_charge_rule', 'height_factor', "DECIMAL(18,6) NOT NULL DEFAULT 1 COMMENT '高度计算系数' AFTER width_factor");
+CALL phase2_fba_add_column('fl_customer_charge_rule', 'default_rule', "TINYINT(1) NOT NULL DEFAULT 0 COMMENT '客户默认生效规则' AFTER status");
 CALL phase2_fba_add_column('fl_carrier_fba_rate', 'version', "INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号' AFTER deleted");
 CALL phase2_fba_add_column('fl_inbound_fee', 'rule_code', "VARCHAR(50) NOT NULL DEFAULT '' COMMENT '客户规则编码快照' AFTER carrier_rate_version");
 CALL phase2_fba_add_column('fl_inbound_fee', 'customer_id', "BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '客户ID快照' AFTER rule_code");
@@ -59,6 +59,10 @@ CALL phase2_measure_add_column('fl_inbound_measurement_item', 'outer_width_cm',
  'DECIMAL(12,3) NULL COMMENT ''外箱规宽度cm'' AFTER outer_length_cm');
 CALL phase2_measure_add_column('fl_inbound_measurement_item', 'outer_height_cm',
  'DECIMAL(12,3) NULL COMMENT ''外箱规高度cm'' AFTER outer_width_cm');
+CALL phase2_measure_add_column('fl_inbound_measurement_item', 'charge_rule_id',
+  'BIGINT UNSIGNED NULL COMMENT ''该测量明细绑定的客户计费规则ID'' AFTER volume_weight_kg');
+CALL phase2_measure_add_column('fl_inbound_measurement_item', 'coefficient_mode',
+  'VARCHAR(16) NULL COMMENT ''系数模式快照：ADD或MULTIPLY'' AFTER charge_rule_id');

 DROP PROCEDURE IF EXISTS phase2_measure_add_column;

@@ -268,6 +268,8 @@ CREATE TABLE IF NOT EXISTS fl_inbound_measurement_item (
  volume_cbm DECIMAL(18,4) NOT NULL COMMENT '业务体积m3',
  total_volume_cbm DECIMAL(18,4) NOT NULL COMMENT '本箱规总体积m3',
  volume_weight_kg DECIMAL(18,3) NOT NULL COMMENT '本箱规材积重kg',
+  charge_rule_id BIGINT UNSIGNED NULL COMMENT '该测量明细绑定的客户计费规则ID',
+  coefficient_mode VARCHAR(16) NULL COMMENT '系数模式快照：ADD或MULTIPLY',
  calculation_rule_version VARCHAR(64) NOT NULL COMMENT '体积计算和舍入规则版本',
  source_image_file_id BIGINT UNSIGNED NULL COMMENT '测量设备图片文件ID',
  machine_no VARCHAR(64) NULL COMMENT '本次测量设备编号',
@@ -858,6 +860,7 @@ CREATE TABLE IF NOT EXISTS fl_customer_dimension_config (
  inner_width_cm DECIMAL(9,3) NOT NULL COMMENT '箱规内宽（厘米）',
  inner_height_cm DECIMAL(9,3) NOT NULL COMMENT '箱规内高（厘米）',
  edge_addition_cm DECIMAL(6,3) NOT NULL DEFAULT 2.000 COMMENT '每个尺寸方向的单侧加宽厘米数',
+  default_calculation_mode VARCHAR(16) NOT NULL DEFAULT 'ADD' COMMENT '订单外箱规默认计算方式：ADD或MULTIPLY',
  remark VARCHAR(500) NULL COMMENT '备注',
  initialization_key VARCHAR(128) NOT NULL COMMENT '创建流程幂等键及补偿归属',
  created_by BIGINT UNSIGNED NOT NULL COMMENT '创建人ID',
@@ -12,6 +12,10 @@ paths:
      description: 需要 firstleg:fba-pricing:rule:view 权限
      parameters:
        - {$ref: '#/components/parameters/OptionalTenantId'}
+        - name: customerId
+          in: query
+          required: false
+          schema: {type: integer, format: int64, minimum: 1}
        - {name: ruleCode, in: query, schema: {type: string, maxLength: 50}}
      responses:
        '200':
@@ -23,10 +27,16 @@ paths:
  /api/platform/v1/fba-pricing/customer-rules/versions:
    post:
      summary: 新建客户计费规则版本
-      description: 版本内容不可原地修改；有效期使用 [effectiveFrom,effectiveTo) 半开区间。
+      description: 新增配置固定为未启用，可保存有效期重叠的多条配置；保存后通过设置默认规则接口启用其中一条。
      parameters: [{$ref: '#/components/parameters/TenantId'}]
      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/CustomerRuleVersionRequest'}}}}
      responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
+  /api/platform/v1/fba-pricing/customer-rules/{id}/default:
+    put:
+      summary: 启用客户计费规则
+      description: 将指定配置设为当前客户唯一默认生效规则，并取消原默认规则。
+      parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/Id'}]
+      responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
  /api/platform/v1/fba-pricing/customer-rules/{id}:
    get:
      summary: 查询客户计费规则版本详情
@@ -137,13 +147,13 @@ paths:
  /api/platform/v1/inbounds/{inboundId}/fees/confirm:
    post:
      summary: 确认最新费用快照
-      description: 确认费用只更新费用状态；主流程已到 WAIT_SPLIT 时保持不变。
+      description: 需要 firstleg:inbound:confirm-send-fee 或兼容权限 firstleg:fba-pricing:confirm。确认费用只更新费用状态；主流程已到 WAIT_SPLIT 时保持不变。
      parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
      responses: {'200': {description: 成功或业务失败, content: {application/json: {schema: {$ref: '#/components/schemas/FeeSnapshotApiResponse'}}}}, '403': {description: 无权限}}
  /api/platform/v1/inbounds/{inboundId}/fees/send:
    post:
      summary: 发送已确认费用快照
-      description: 人工发布当前已确认版本；仅此动作将费用置为 SENT、生成 PUBLISHED 的 FBA_PRICING 只读派生明细并写入 Finance Outbox。入库单已到 WAIT_SPLIT 时不得回退或阻塞主流程。
+      description: 需要 firstleg:inbound:confirm-send-fee 或兼容权限 firstleg:inbound:send-fee。人工发布当前已确认版本；仅此动作将费用置为 SENT、生成 PUBLISHED 的 FBA_PRICING 只读派生明细并写入 Finance Outbox。入库单已到 WAIT_SPLIT 时不得回退或阻塞主流程。
      parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
      responses: {'200': {description: 成功或业务失败, content: {application/json: {schema: {$ref: '#/components/schemas/FeeSnapshotApiResponse'}}}}, '403': {description: 无权限}}
  /api/platform/v1/inbounds/{inboundId}/fees/latest:
@@ -168,6 +168,20 @@ paths:
      responses:
        '200': {description: 成功时 data 为更新后的 CustomerDimensionConfigGroupResponse}
        '403': {description: 无编辑权限}
+  /api/platform/v1/first-leg/customer-dimension-config/default-calculation-mode:
+    put:
+      summary: 设置客户订单外箱规默认计算方式
+      description: 需要 firstleg:dimension-config:edit 权限；ADD 表示按箱规尺寸加宽，MULTIPLY 表示按默认权重系数计算。
+      parameters:
+        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/CustomerDimensionDefaultCalculationModeUpdateRequest'}
+      responses:
+        '200': {description: 成功时 data 为更新后的 CustomerDimensionConfigGroupResponse}
+        '403': {description: 无编辑权限}
  /internal/firstleg/v1/inbounds/order-approved:
    post:
      summary: 订单审核通过后幂等创建入库单
@@ -762,7 +776,8 @@ paths:
    post:
      summary: 平台模拟单箱设备扫描
      description: >-
-        需要 platform:firstleg:inbound:measure:edit 权限；仅用于平台联调和代设备录入，
+        需要 platform:firstleg:inbound:warehouse-suggestion:edit 或兼容权限
+        platform:firstleg:inbound:measure:edit；仅用于平台联调和代设备录入，
        复用正式单箱覆盖规则，不代表最终第三方设备协议或鉴权方式。
      parameters:
        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
@@ -1354,6 +1369,11 @@ components:
          maxItems: 4
          description: 必须恰好包含 SMALL、MEDIUM、LARGE、EXTRA_LARGE 各一行
          items: {$ref: '#/components/schemas/CustomerDimensionConfigRuleUpdateRequest'}
+    CustomerDimensionDefaultCalculationModeUpdateRequest:
+      type: object
+      required: [defaultCalculationMode]
+      properties:
+        defaultCalculationMode: {type: string, enum: [ADD, MULTIPLY]}
    CustomerDimensionConfigRuleUpdateRequest:
      type: object
      required: [boxType, innerLengthCm, innerWidthCm, innerHeightCm, edgeAdditionCm, version]
@@ -1373,9 +1393,10 @@ components:
        version: {type: integer, minimum: 0, description: 乐观锁版本号}
    CustomerDimensionConfigGroupResponse:
      type: object
-      required: [tenantId, rules]
+      required: [tenantId, defaultCalculationMode, rules]
      properties:
        tenantId: {type: string, pattern: '^[1-9][0-9]*$'}
+        defaultCalculationMode: {type: string, enum: [ADD, MULTIPLY]}
        rules:
          type: array
          minItems: 4
@@ -1508,6 +1529,8 @@ components:
        outerLengthCm: {type: number, format: double, nullable: true}
        outerWidthCm: {type: number, format: double, nullable: true}
        outerHeightCm: {type: number, format: double, nullable: true}
+        chargeRuleId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        coefficientMode: {type: string, enum: [ADD, MULTIPLY], nullable: true}
        remark: {type: string, nullable: true}
        boxCode: {type: string, nullable: true}
        scannedShipmentId: {type: string, nullable: true}
@@ -1622,6 +1645,8 @@ components:
        outerLengthCm: {type: number, minimum: 0, nullable: true}
        outerWidthCm: {type: number, minimum: 0, nullable: true}
        outerHeightCm: {type: number, minimum: 0, nullable: true}
+        chargeRuleId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        coefficientMode: {type: string, enum: [ADD, MULTIPLY], nullable: true}
        remark: {type: string, maxLength: 500, nullable: true}
    InboundMeasurementDetailEnvelope:
      type: object