优化

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

@@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_order (
   hold_flag TINYINT(1) NOT NULL DEFAULT 0 COMMENT '当前是否扣货',
   current_hold_reason VARCHAR(500) NULL COMMENT '当前扣货理由快照',
   total_package_count INT UNSIGNED NULL COMMENT '确认后的总箱数',
-  actual_gross_weight_kg DECIMAL(18,3) NULL COMMENT '确认后的实际总毛重kg',
+  actual_gross_weight_kg DECIMAL(18,3) NULL COMMENT '下游货物实际毛重kg，汇总已确认称重净重',
   chargeable_weight_kg DECIMAL(18,3) NULL COMMENT '当前费用快照的计费重量kg',
   actual_volume_cbm DECIMAL(18,4) NULL COMMENT '确认后的实际总体积m3',
   chargeable_volume_cbm DECIMAL(18,4) NULL COMMENT '当前费用快照的计费体积m3',
@@ -270,6 +270,11 @@ CREATE TABLE IF NOT EXISTS fl_inbound_weight_result (
   tenant_id BIGINT UNSIGNED NOT NULL COMMENT '客户ID和数据隔离键',
   inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
   file_id BIGINT UNSIGNED NOT NULL COMMENT '称重图片文件ID',
+  pallet_id BIGINT UNSIGNED NOT NULL COMMENT 'Warehouse托盘ID',
+  pallet_code VARCHAR(50) NOT NULL COMMENT '托盘编码快照',
+  pallet_type VARCHAR(32) NOT NULL COMMENT '托盘类型快照',
+  pallet_capacity_cbm DECIMAL(18,4) NOT NULL COMMENT '托盘容量CBM快照',
+  pallet_tare_weight_kg DECIMAL(18,3) NOT NULL COMMENT '托盘皮重KG快照',
   ocr_provider VARCHAR(64) NULL COMMENT 'OCR服务商编码',
   ocr_raw_text VARCHAR(1000) NULL COMMENT 'OCR原始文本',
   ocr_weight_value DECIMAL(18,3) NULL COMMENT 'OCR识别原始重量值',
@@ -277,7 +282,8 @@ CREATE TABLE IF NOT EXISTS fl_inbound_weight_result (
   confidence DECIMAL(6,5) NULL COMMENT '识别置信度',
   adjusted_weight_value DECIMAL(18,3) NULL COMMENT '人工修正后的原单位重量',
   adjusted_weight_unit VARCHAR(8) NULL COMMENT '人工修正后的单位',
-  final_weight_kg DECIMAL(18,3) NULL COMMENT '确认并统一换算后的重量kg',
+  gross_weight_kg DECIMAL(18,3) NULL COMMENT '确认时统一换算后的含托盘毛重kg',
+  net_weight_kg DECIMAL(18,3) NULL COMMENT '确认毛重扣除托盘皮重后的货物净重kg',
   recognition_status VARCHAR(24) NOT NULL DEFAULT 'PENDING' COMMENT '重量识别状态：PENDING待识别、PENDING_CONFIRM待确认、NEEDS_MANUAL需人工录入、CONFIRMED已确认',
   adjustment_reason VARCHAR(500) NULL COMMENT '人工修正原因',
   adjusted_by BIGINT UNSIGNED NULL COMMENT '修正人ID',
@@ -293,8 +299,9 @@ CREATE TABLE IF NOT EXISTS fl_inbound_weight_result (
   PRIMARY KEY (id),
   UNIQUE KEY uk_weight_inbound_file (tenant_id, inbound_id, file_id),
   KEY idx_weight_inbound_status (tenant_id, inbound_id, recognition_status),
+  KEY idx_weight_inbound_pallet (tenant_id, inbound_id, pallet_id),
   CONSTRAINT fk_weight_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)
-) ENGINE=InnoDB COMMENT='称重图片OCR原值、人工修正值和确认重量';
+) ENGINE=InnoDB COMMENT='称重图片、托盘皮重快照、OCR毛重和确认净重';
 
 CREATE TABLE IF NOT EXISTS fl_inbound_weight_revision (
   id BIGINT UNSIGNED NOT NULL COMMENT 'OCR重量修订记录ID',
@@ -307,7 +314,8 @@ CREATE TABLE IF NOT EXISTS fl_inbound_weight_revision (
   before_weight_unit VARCHAR(8) NULL COMMENT '变更前单位',
   after_weight_value DECIMAL(18,3) NULL COMMENT '变更后原单位重量',
   after_weight_unit VARCHAR(8) NULL COMMENT '变更后单位',
-  final_weight_kg DECIMAL(18,3) NULL COMMENT '确认时统一换算后的重量kg',
+  gross_weight_kg DECIMAL(18,3) NULL COMMENT '确认时统一换算后的含托盘毛重kg',
+  net_weight_kg DECIMAL(18,3) NULL COMMENT '确认毛重扣除托盘皮重后的货物净重kg',
   reason VARCHAR(500) NULL COMMENT '人工修正原因',
   operator_id BIGINT UNSIGNED NOT NULL COMMENT '操作人ID',
   operator_name VARCHAR(64) NULL COMMENT '操作人名称快照',
@@ -664,7 +672,6 @@ CREATE TABLE IF NOT EXISTS fl_inbound_pallet_allocation (
   updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
   PRIMARY KEY (id),
   UNIQUE KEY uk_pallet_allocation_no (tenant_id, inbound_id, allocation_no),
-  UNIQUE KEY uk_pallet_allocation_pallet (tenant_id, inbound_id, pallet_id),
   KEY idx_allocation_location (tenant_id, warehouse_id, location_id, allocation_status),
   KEY idx_allocation_reservation (reservation_id),
   CONSTRAINT fk_allocation_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)