打印箱唛修改尾程垮桥事件提交

2026-08-13 17:13:58 +08:00
parent b004edaf9e
commit c43d581ba6
59 changed files with 1609 additions and 96 deletions
@@ -0,0 +1,55 @@
+SET NAMES utf8mb4;
+USE baiyue_firstleg;
+
+DROP PROCEDURE IF EXISTS phase2_carton_label_add_column;
+DELIMITER $$
+CREATE PROCEDURE phase2_carton_label_add_column(IN p_column VARCHAR(64), IN p_definition TEXT)
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'fl_inbound_carton_label' AND COLUMN_NAME = p_column) THEN
+    SET @sql = CONCAT('ALTER TABLE fl_inbound_carton_label ADD COLUMN ', p_column, ' ', p_definition);
+    PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+  END IF;
+END$$
+DELIMITER ;
+CALL phase2_carton_label_add_column('label_version', 'INT UNSIGNED NOT NULL DEFAULT 1 COMMENT ''箱唛批次版本，从1递增'' AFTER carton_index');
+CALL phase2_carton_label_add_column('batch_status', 'VARCHAR(16) NOT NULL DEFAULT ''ACTIVE'' COMMENT ''批次状态：ACTIVE有效、VOID已作废'' AFTER label_version');
+CALL phase2_carton_label_add_column('cargo_fingerprint', 'CHAR(64) NULL COMMENT ''影响标签字段的SHA-256指纹'' AFTER batch_status');
+CALL phase2_carton_label_add_column('voided_at', 'DATETIME(3) NULL COMMENT ''批次作废时间'' AFTER cargo_fingerprint');
+DROP PROCEDURE phase2_carton_label_add_column;
+
+UPDATE fl_inbound_carton_label
+   SET label_version = 1,
+       batch_status = 'ACTIVE'
+ WHERE label_version IS NULL OR batch_status IS NULL;
+
+UPDATE fl_inbound_carton_label
+   SET box_code = CONCAT(inbound_code, '#V', label_version, '#', total_carton_count, '-', carton_index)
+ WHERE box_code NOT LIKE CONCAT(inbound_code, '#V%#%');
+
+SET @has_old_index := (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = 'fl_inbound_carton_label'
+   AND index_name = 'uk_carton_label_index');
+SET @drop_old_index := IF(@has_old_index > 0,
+  'ALTER TABLE fl_inbound_carton_label DROP INDEX uk_carton_label_index', 'SELECT 1');
+PREPARE carton_label_stmt FROM @drop_old_index;
+EXECUTE carton_label_stmt;
+DEALLOCATE PREPARE carton_label_stmt;
+
+SET @has_version_index := (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = 'fl_inbound_carton_label'
+   AND index_name = 'uk_carton_label_index');
+SET @add_version_index := IF(@has_version_index = 0,
+  'ALTER TABLE fl_inbound_carton_label ADD UNIQUE KEY uk_carton_label_index (tenant_id, inbound_id, label_version, carton_index)', 'SELECT 1');
+PREPARE carton_label_index_stmt FROM @add_version_index;
+EXECUTE carton_label_index_stmt;
+DEALLOCATE PREPARE carton_label_index_stmt;
+
+SET @has_active_index := (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = 'fl_inbound_carton_label'
+   AND index_name = 'idx_carton_label_active');
+SET @add_active_index := IF(@has_active_index = 0,
+  'ALTER TABLE fl_inbound_carton_label ADD KEY idx_carton_label_active (tenant_id, inbound_id, batch_status, label_version)', 'SELECT 1');
+PREPARE carton_label_active_stmt FROM @add_active_index;
+EXECUTE carton_label_active_stmt;
+DEALLOCATE PREPARE carton_label_active_stmt;
@@ -15,6 +15,10 @@ CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
  box_code VARCHAR(80) NOT NULL COMMENT '固定二维码内容：入仓码#总箱数-箱下标',
  total_carton_count INT UNSIGNED NOT NULL COMMENT '首次分配时整单总箱数',
  carton_index INT UNSIGNED NOT NULL COMMENT '整单从1开始的稳定箱下标',
+  label_version INT UNSIGNED NOT NULL DEFAULT 1 COMMENT '箱唛批次版本，从1递增',
+  batch_status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE' COMMENT '批次状态：ACTIVE有效、VOID已作废',
+  cargo_fingerprint CHAR(64) NULL COMMENT '影响标签字段的SHA-256指纹',
+  voided_at DATETIME(3) NULL COMMENT '批次作废时间',
  box_specification VARCHAR(255) NOT NULL COMMENT '订单箱规或货物明细描述快照',
  length_cm DECIMAL(12,3) NULL COMMENT '下单箱规长度cm快照',
  width_cm DECIMAL(12,3) NULL COMMENT '下单箱规宽度cm快照',
@@ -22,7 +26,8 @@ CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '首次分配时间',
  PRIMARY KEY (id),
  UNIQUE KEY uk_carton_label_box_code (tenant_id, box_code),
-  UNIQUE KEY uk_carton_label_index (tenant_id, inbound_id, carton_index),
+  UNIQUE KEY uk_carton_label_index (tenant_id, inbound_id, label_version, carton_index),
+  KEY idx_carton_label_active (tenant_id, inbound_id, batch_status, label_version),
  KEY idx_carton_label_detail (tenant_id, inbound_id, inbound_detail_id),
  CONSTRAINT fk_carton_label_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)
 ) ENGINE=InnoDB COMMENT='首次打印前冻结的实际箱号与订单货物明细映射';
@@ -153,6 +153,10 @@ CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
  box_code VARCHAR(80) NOT NULL COMMENT '固定二维码内容：入仓码#总箱数-箱下标',
  total_carton_count INT UNSIGNED NOT NULL COMMENT '首次分配时整单总箱数',
  carton_index INT UNSIGNED NOT NULL COMMENT '整单从1开始的稳定箱下标',
+  label_version INT UNSIGNED NOT NULL DEFAULT 1 COMMENT '箱唛批次版本，从1递增',
+  batch_status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE' COMMENT '批次状态：ACTIVE有效、VOID已作废',
+  cargo_fingerprint CHAR(64) NULL COMMENT '影响标签字段的SHA-256指纹',
+  voided_at DATETIME(3) NULL COMMENT '批次作废时间',
  box_specification VARCHAR(255) NOT NULL COMMENT '订单箱规或货物明细描述快照',
  length_cm DECIMAL(12,3) NULL COMMENT '下单箱规长度cm快照',
  width_cm DECIMAL(12,3) NULL COMMENT '下单箱规宽度cm快照',
@@ -160,7 +164,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '首次分配时间',
  PRIMARY KEY (id),
  UNIQUE KEY uk_carton_label_box_code (tenant_id, box_code),
-  UNIQUE KEY uk_carton_label_index (tenant_id, inbound_id, carton_index),
+  UNIQUE KEY uk_carton_label_index (tenant_id, inbound_id, label_version, carton_index),
  KEY idx_carton_label_detail (tenant_id, inbound_id, inbound_detail_id),
  CONSTRAINT fk_carton_label_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)
 ) ENGINE=InnoDB COMMENT='首次打印前冻结的实际箱号与订单货物明细映射';
@@ -0,0 +1,2 @@
+-- 装柜完成跨区事件使用标准 sha256: 摘要，共 71 字符。
+ALTER TABLE fl_inbound_outbox MODIFY COLUMN payload_hash VARCHAR(71) NULL COMMENT '事件规范化负载SHA-256；标准跨区事件含sha256:前缀';
@@ -6,6 +6,26 @@ info:
 security:
  - bearerAuth: []
 paths:
+  /api/merchant/v1/first-leg/inbounds/{inboundId}/carton-label-pdf:
+    post:
+      summary: 客户端生成本客户入库单箱唛 PDF
+      parameters:
+        - {name: inboundId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: cartonIndex, in: query, required: false, schema: {type: array, items: {type: integer, minimum: 1}}}
+      responses:
+        '200': {description: PDF 文件}
+        '403': {description: 非客户端身份、无订单查看权限或入库单不属于当前客户}
+  /api/merchant/v1/first-leg/orders/{orderId}/carton-label-pdf:
+    post:
+      summary: 客户端按订单生成本客户草稿或正式订单箱唛 PDF
+      description: 后端按登录客户和 orderId 查找真实预入库单；不要求客户端先取得 inboundId。
+      parameters:
+        - {name: orderId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: cartonIndex, in: query, required: false, schema: {type: array, items: {type: integer, minimum: 1}}}
+      responses:
+        '200': {description: PDF 文件}
+        '403': {description: 非客户端身份、无订单查看权限或订单不属于当前客户}
+        '404': {description: 订单尚未生成预入库单}
  /internal/firstleg/v1/customer-dimension-configs/defaults:
    post:
      summary: 幂等初始化客户四箱规默认配置