一件代发拣货

firstleg/src/main/resources/db/customer-dimension-config.sql

@@ -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',

firstleg/src/main/resources/db/firstleg.sql

@@ -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',

firstleg/src/main/resources/db/phase2-fba-pricing-migration.sql

@@ -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");

firstleg/src/main/resources/db/phase2-inbound-measurement-maintenance.sql

@@ -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;
 

firstleg/src/main/resources/db/phase2-inbound-schema.sql

@@ -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',